From d3ffa07d2fd76e4c124351a18cc075e889e843c2 Mon Sep 17 00:00:00 2001 From: Mischa Spelt Date: Fri, 17 Jan 2020 01:55:00 +0100 Subject: [PATCH] Nieuws layout --- .../app/Http/Controllers/NewsController.php | 12 +- website/public/css/nhgooi.css | 22 +- website/resources/views/about.blade.php | 4 +- website/resources/views/adverteren.blade.php | 4 +- .../resources/views/calendarevent.blade.php | 3 +- .../resources/views/calendarlist.blade.php | 4 +- website/resources/views/contact.blade.php | 4 +- website/resources/views/home.blade.php | 5 +- website/resources/views/kerkdienst.blade.php | 79 ++- .../resources/views/layouts/full.blade.php | 8 + .../views/{ => layouts}/master.blade.php | 7 +- .../resources/views/layouts/sidebar.blade.php | 307 ++++++++++ website/resources/views/newsitem.blade.php | 190 +++--- website/resources/views/newsitem_nh.blade.php | 98 ---- website/resources/views/newslist.blade.php | 540 ++++++++++++++++-- website/resources/views/page.blade.php | 2 +- .../views/partial/newslist_small.blade.php | 38 ++ .../{ => partial}/newslistitems.blade.php | 0 .../views/partial/nh_story.blade.php | 37 ++ .../{ => partial}/radioscheduleweek.blade.php | 0 website/resources/views/podcastitem.blade.php | 9 +- website/resources/views/podcastlist.blade.php | 3 +- .../resources/views/radioprogram.blade.php | 3 +- .../resources/views/radioschedule.blade.php | 4 +- website/resources/views/watch.blade.php | 4 +- website/resources/views/welcome.blade.php | 95 --- .../views/{ => widgets}/banners.blade.php | 0 .../mediaplayer.blade.php} | 1 + .../menu.blade.php} | 0 .../views/{ => widgets}/popularnews.blade.php | 0 .../resources/views/widgets/share.blade.php | 43 ++ 31 files changed, 1154 insertions(+), 372 deletions(-) create mode 100644 website/resources/views/layouts/full.blade.php rename website/resources/views/{ => layouts}/master.blade.php (99%) create mode 100644 website/resources/views/layouts/sidebar.blade.php delete mode 100644 website/resources/views/newsitem_nh.blade.php create mode 100644 website/resources/views/partial/newslist_small.blade.php rename website/resources/views/{ => partial}/newslistitems.blade.php (100%) create mode 100644 website/resources/views/partial/nh_story.blade.php rename website/resources/views/{ => partial}/radioscheduleweek.blade.php (100%) delete mode 100644 website/resources/views/welcome.blade.php rename website/resources/views/{ => widgets}/banners.blade.php (100%) rename website/resources/views/{_mediaplayer.blade.php => widgets/mediaplayer.blade.php} (99%) rename website/resources/views/{_menu.blade.php => widgets/menu.blade.php} (100%) rename website/resources/views/{ => widgets}/popularnews.blade.php (100%) create mode 100644 website/resources/views/widgets/share.blade.php diff --git a/website/app/Http/Controllers/NewsController.php b/website/app/Http/Controllers/NewsController.php index 5fd961dd..29ee5a7a 100644 --- a/website/app/Http/Controllers/NewsController.php +++ b/website/app/Http/Controllers/NewsController.php @@ -20,8 +20,14 @@ class NewsController extends Controller case 2: $newsItem = $apiResult->news; - $newsItem->published = new \DateTimeImmutable('@' . $newsItem->created); - return view('newsitem_nh', ['news' => $newsItem, 'podcast' => $apiResult->podcast]); + $source = $apiResult->source; + $newsItem->published = new \DateTimeImmutable('@' . $source->created); + $newsItem->edited = new \DateTimeImmutable('@' . $source->updated); + $newsItem->author = $source->author; + $newsItem->images = null; // Images will be embedded + $newsItem->video = null; // Videos will be embedded + $newsItem->content = $source->blocks; + return view('newsitem', ['news' => $newsItem]); } } @@ -55,7 +61,7 @@ class NewsController extends Controller $news[] = new \Model\NewsItem($newsItem); } - return view($request->ajax() ? 'newslistitems' : 'newslist', ['title' => $title, 'news' => $news, 'searchURL' => 'nieuws/zoeken']); + return view($request->ajax() ? 'partial/newslist_small' : 'newslist', ['title' => $title, 'news' => $news, 'searchURL' => 'nieuws/zoeken']); } public function popular() diff --git a/website/public/css/nhgooi.css b/website/public/css/nhgooi.css index c2426c78..ad39b233 100644 --- a/website/public/css/nhgooi.css +++ b/website/public/css/nhgooi.css @@ -31,6 +31,19 @@ h1 a, h2 a, h3 a, h4 a, h5 a, h6 a border-color: #2F4A88; } +button[disabled], +button[disabled]:hover +{ + background-color: #F0F0F0; + border-color: #D0D0D0; + color: #333333; + cursor: default; +} + +.blog_grid .post img { + height: 100%; +} + .post.single .post_details a { color: #1F3977; } @@ -38,7 +51,11 @@ h1 a, h2 a, h3 a, h4 a, h5 a, h6 a .post_details li.category { font-weight: bold; - background: #03A6E0; + background-color: #03A6E0; +} + +.post_details date.edited { + font-weight: bold; } .read_more .arrow { @@ -65,6 +82,9 @@ h1 a, h2 a, h3 a, h4 a, h5 a, h6 a padding-top: 5px; } +.post.single { + width: 100%; +} .action_button { diff --git a/website/resources/views/about.blade.php b/website/resources/views/about.blade.php index 5c8e9f01..995b08c4 100644 --- a/website/resources/views/about.blade.php +++ b/website/resources/views/about.blade.php @@ -1,11 +1,11 @@ -@extends('page') +@extends('layouts/full') @section('title') Over 6FM @endsection @section('content') -

Over 6FM

+@parent 6FM is de publieke streekomroep voor Gooi en Vechtstreek. We zijn 24 uur per dag te horen in de ether op 92.0 FM/105.1 FM, op de kabel in Huizen, Laren, Blaricum en Eemnes op 92.3 FM en in Hilversum op 106.2 FM.

Bij 6FM zijn op de radio en achter de schermen ruim 100 vrijwilligers actief.

diff --git a/website/resources/views/adverteren.blade.php b/website/resources/views/adverteren.blade.php index 1a206634..f2ef66ce 100644 --- a/website/resources/views/adverteren.blade.php +++ b/website/resources/views/adverteren.blade.php @@ -1,11 +1,11 @@ -@extends('page') +@extends('layouts/full') @section('title') Adverteren @endsection @section('content') -

Adverteren

+@parent

6FM biedt (plaatselijke) ondernemers de mogelijkheid om hun producten en/of diensten onder aandacht te brengen bij de luisteraars van Radio 6FM. De scherpe tarieven zijn op aanvraag verkrijgbaar bij Radio 6FM.

diff --git a/website/resources/views/calendarevent.blade.php b/website/resources/views/calendarevent.blade.php index c64cc4e0..f5615b80 100644 --- a/website/resources/views/calendarevent.blade.php +++ b/website/resources/views/calendarevent.blade.php @@ -1,4 +1,4 @@ -@extends('page') +@extends('layouts/full') @section('title') Regioagenda | {{$event->title}} @@ -6,6 +6,7 @@ @section('content') +@parent
- @yield('content') + @yield('page')
diff --git a/website/resources/views/layouts/sidebar.blade.php b/website/resources/views/layouts/sidebar.blade.php new file mode 100644 index 00000000..ad09c910 --- /dev/null +++ b/website/resources/views/layouts/sidebar.blade.php @@ -0,0 +1,307 @@ +@extends('layouts/master') + +@section('page') +
+ +
+
+
+ @yield('content') +
+ +
+

Recommended

+ +

Latest Posts

+ + +

Top Authors

+ +
+ +
+
+ +@endsection diff --git a/website/resources/views/newsitem.blade.php b/website/resources/views/newsitem.blade.php index 829f4566..0487d641 100644 --- a/website/resources/views/newsitem.blade.php +++ b/website/resources/views/newsitem.blade.php @@ -1,92 +1,138 @@ -@extends('page') +@extends('layouts/sidebar') @section('title') - Nieuws | {{$news->title}} + {{$news->title}} @endsection @section('content') -
-
- +@php($imgBase = 'https://nhgooi.nl') -
+
+
+
    + @if($news->region && $news->region->title != "Regio") +
  • Regio {{$news->region->title}}
  • + @endif + @if($news->theme && $news->theme->title != "Overig") +
  • Thema {{$news->theme->title}}
  • + @endif +
  • + {{Formatter::relativeDate($news->published)}} om {{$news->published->format('H:i')}} + @if($news->edited) + | bijgewerkt + @if($news->edited->format('d m') != $news->published->format('d m')) + op {{Formatter::relativeDate($news->edited)}} + @endif + om {{$news->edited->format('H:i')}} uur + @endif +
  • + @if($news->author) +
  • {{$news->author}}
  • + @endif +
-

{{$news->title}}

-@if($news->images && count($news->images) > 0) -@if(!$news->images[0]->title) @php($news->images[0]->title = $news->title) @endif -
- - - - -
- +
+
+ @if($news->images) + @if(count($news->images) == 1) +
+ + {{$news->images[0]->title}} + +
+ {{$news->images[0]->title}} + @if(isset($news->images[0]->author)) + {{$news->images[0]->author}} + @endif +
-@endif -

+ @else +

+
+
    + @foreach($news->images as $image) +
  • + + + {{$image->title}} + +
  • +
+ @endforeach +
+ @endif + @endif - {{$news->region->title}} - {!!$news->content!!} + @if(is_array($news->content)) + @include('partial/nh_story', ['content' => $news->content]); + @else +
+

{!!$news->content!!}

+
+ @endif + + @if($news->source && $news->source->show) +
+

Bron: {{$news->source->title}}

+
+ @endif -

+ @include('widgets/share') - @if($news->source && $news->source->show) -
-

Bron: {{$news->source->title}}

-
- @endif - - @if($news->podcast) -
-

Fragment

-

{{ Formatter::relativeDate($news->podcast->created) }} uitgezonden @if($news->podcast->program) in {{ $news->podcast->program->name }} @endif

-

- -

-

Meer over dit fragment

-
- @endif -
-
-

Meer nieuws

-

- {{$news->region->title}} - {{$news->theme->title}} - - -

- -
-
-
- Correctie melden +
+
    + @if($news->keywords = ['test']) + @foreach($news->keywords as $keyword) +
  • + {{$keyword}} +
  • + @endforeach + @endif +
+ +
+
@endsection - diff --git a/website/resources/views/newsitem_nh.blade.php b/website/resources/views/newsitem_nh.blade.php deleted file mode 100644 index 077543b2..00000000 --- a/website/resources/views/newsitem_nh.blade.php +++ /dev/null @@ -1,98 +0,0 @@ -@extends('page') - -@section('title') - Nieuws | {{$news->title}} -@endsection - -@include('_mediaplayer') - -@section('content') -
-
- - -
- -

{{$news->title}}

-{{-- -@if($news->media && count($news->media) > 0) -@if(!$news->media[0]->title) @php($news->media[0]->title = $news->title) @endif -
- - - - -
- -
-@endif ---}} - - @foreach($news->blocks as $block) - @if($block->type == "text") - {!!$block->text!!} - @elseif($block->type == "intro") -
{!!$block->text!!}
- @elseif($block->type == "quote") -
- {!!$block->text!!} -
{{$block->name}}
-
- @elseif($block->type == "image") -
- {{$block->image->title}} - {{$block->image->imageWide}} -
- @elseif($block->type == "video") - - {{$block->video->author}} - @endif - @endforeach - - @if($podcast) -
-

Fragment

-

{{ Formatter::relativeDate($podcast->created) }} uitgezonden @if($podcast->program) in {{ $podcast->program->name }} @endif

-

- -

-

Meer over dit fragment

-
- @endif -
- - -
- -
- -@endsection - diff --git a/website/resources/views/newslist.blade.php b/website/resources/views/newslist.blade.php index fb0a457c..076c7972 100644 --- a/website/resources/views/newslist.blade.php +++ b/website/resources/views/newslist.blade.php @@ -1,17 +1,482 @@ - -@extends('page') +@extends('layouts/master') @section('title') @if($title) {{$title}} - Nieuws @endif @endsection @section('content') -

Nieuwsarchief 6FM

+ @php($imgBase = 'https://nhgooi.nl') + @parent + +
+
+
+
+
+ {{-- Desktop --}} + + {{-- Mobile --}} +
+
+ +
+
+
+
+
+
+
+ {{-- Meer nieuws --}} +
+
+

Laatste nieuws

+ @foreach(array_slice($news, 3, 10) as $item) + @if($loop->index % 2 == 0) +
+ @endif +
+ +
+ @if($loop->index % 2 == 1) +
+ @endif + @endforeach + +
+ @include('partial/newslist_small', array_slice($news, 10, count($news))) +
+ +
+ +
+
+ +
+ +

Latest Posts

+ +

Top Authors

+ +

Science

+ + MORE FROM SCIENCE +
+
+
+
+@endsection + +@section('oud') @if($title)

{{$title}}

@endif
- @include('newslistitems', ['news' => $news]) + @include('partial/newslistitems', ['news' => $news])
- - - @endsection +@push('scripts') + +@endpush + diff --git a/website/resources/views/page.blade.php b/website/resources/views/page.blade.php index 3bc54811..2a7318a5 100644 --- a/website/resources/views/page.blade.php +++ b/website/resources/views/page.blade.php @@ -1,4 +1,4 @@ -@extends('master') +@extends('layouts/master') @section('content')
diff --git a/website/resources/views/partial/newslist_small.blade.php b/website/resources/views/partial/newslist_small.blade.php new file mode 100644 index 00000000..3d5adc4b --- /dev/null +++ b/website/resources/views/partial/newslist_small.blade.php @@ -0,0 +1,38 @@ +@php($imgBase = 'https://nhgooi.nl') +@foreach($news as $item) +@if($loop->index % 3 == 0) + +@endif +@endforeach diff --git a/website/resources/views/newslistitems.blade.php b/website/resources/views/partial/newslistitems.blade.php similarity index 100% rename from website/resources/views/newslistitems.blade.php rename to website/resources/views/partial/newslistitems.blade.php diff --git a/website/resources/views/partial/nh_story.blade.php b/website/resources/views/partial/nh_story.blade.php new file mode 100644 index 00000000..6dd198ab --- /dev/null +++ b/website/resources/views/partial/nh_story.blade.php @@ -0,0 +1,37 @@ +@foreach($content as $block) + @if($block->type == "headerRichA") + @php($block->image->url = $block->image->crops->{'16:9'}->{'1600'}) + + {{$block->image->title}} + +
+ {{$block->image->title}} + @if($block->image->author) + {{$block->image->author}} + @endif +
+ @elseif($block->type == "text") +
{!!$block->text!!}
+ @elseif($block->type == "intro") +

{{strip_tags($block->text)}}

+ @elseif($block->type == "quote") +
+ {!!$block->text!!} +
{{$block->name}}
+
+ @elseif($block->type == "image") +
+ {{$block->image->title}} + {{$block->image->imageWide}} +
+ @elseif($block->type == "video") + @include('widgets/mediaplayer') + + {{$block->video->author}} + @endif +@endforeach + diff --git a/website/resources/views/radioscheduleweek.blade.php b/website/resources/views/partial/radioscheduleweek.blade.php similarity index 100% rename from website/resources/views/radioscheduleweek.blade.php rename to website/resources/views/partial/radioscheduleweek.blade.php diff --git a/website/resources/views/podcastitem.blade.php b/website/resources/views/podcastitem.blade.php index 2adde5df..8c2d7be8 100644 --- a/website/resources/views/podcastitem.blade.php +++ b/website/resources/views/podcastitem.blade.php @@ -1,6 +1,7 @@ -@extends('page') +@extends('layouts/full') + +@include('widgets/mediaplayer') -@include('_mediaplayer') @section('title') Fragment gemist | {{$podcast->title}} @endsection @@ -57,11 +58,12 @@ $(".vertical_carousel").each(function() { @endpush @section('content') +@parent url . "?auth=" . $podcast->auth ); $popoutUrl = url('luister/fragment/' . $podcast->url . '?auth=' . $podcast->auth ); ?> -
+
@@ -184,6 +186,5 @@ $(".vertical_carousel").each(function() {
-
@endsection diff --git a/website/resources/views/podcastlist.blade.php b/website/resources/views/podcastlist.blade.php index 84208e93..532753a9 100644 --- a/website/resources/views/podcastlist.blade.php +++ b/website/resources/views/podcastlist.blade.php @@ -1,5 +1,4 @@ - -@extends('page') +@extends('layouts/sidebar') @section('title') Fragment gemist diff --git a/website/resources/views/radioprogram.blade.php b/website/resources/views/radioprogram.blade.php index 279fe2db..00d4ae8c 100644 --- a/website/resources/views/radioprogram.blade.php +++ b/website/resources/views/radioprogram.blade.php @@ -1,10 +1,11 @@ -@extends('page') +@extends('layouts/full') @section('title') Radio | {{$program->name}} @endsection @section('content') +@parent @php($now = new \DateTimeImmutable())
diff --git a/website/resources/views/radioschedule.blade.php b/website/resources/views/radioschedule.blade.php index bc17ed0a..b5728870 100644 --- a/website/resources/views/radioschedule.blade.php +++ b/website/resources/views/radioschedule.blade.php @@ -1,4 +1,4 @@ -@extends('page') +@extends('layouts/full') @section('title') Radioprogrammering @@ -24,7 +24,7 @@
- @include('radioscheduleweek', ['schedule' => $schedule]) + @include('partial/radioscheduleweek', ['schedule' => $schedule])
- - -
- @if (Route::has('login')) - - @endif - -
-
- Laravel -
- - -
-
- - diff --git a/website/resources/views/banners.blade.php b/website/resources/views/widgets/banners.blade.php similarity index 100% rename from website/resources/views/banners.blade.php rename to website/resources/views/widgets/banners.blade.php diff --git a/website/resources/views/_mediaplayer.blade.php b/website/resources/views/widgets/mediaplayer.blade.php similarity index 99% rename from website/resources/views/_mediaplayer.blade.php rename to website/resources/views/widgets/mediaplayer.blade.php index aa76a0be..10a5db13 100644 --- a/website/resources/views/_mediaplayer.blade.php +++ b/website/resources/views/widgets/mediaplayer.blade.php @@ -14,6 +14,7 @@ }); @endpush + @push('styles') @endpush diff --git a/website/resources/views/_menu.blade.php b/website/resources/views/widgets/menu.blade.php similarity index 100% rename from website/resources/views/_menu.blade.php rename to website/resources/views/widgets/menu.blade.php diff --git a/website/resources/views/popularnews.blade.php b/website/resources/views/widgets/popularnews.blade.php similarity index 100% rename from website/resources/views/popularnews.blade.php rename to website/resources/views/widgets/popularnews.blade.php diff --git a/website/resources/views/widgets/share.blade.php b/website/resources/views/widgets/share.blade.php new file mode 100644 index 00000000..4f3d9455 --- /dev/null +++ b/website/resources/views/widgets/share.blade.php @@ -0,0 +1,43 @@ +
+ +
+