From 738107515c28d04245118b63bf4ea2a1b08ab18e Mon Sep 17 00:00:00 2001 From: NH Gooi Date: Sat, 15 Jun 2024 22:45:53 +0200 Subject: [PATCH 01/20] Wijzigingen voor nieuwe API --- app/Http/Controllers/NewsController.php | 9 ++++-- public/css/style.css | 2 ++ resources/views/home.blade.php | 38 ++++++++++++------------- resources/views/newsitem.blade.php | 34 ++++------------------ resources/views/newslist.blade.php | 15 ++++------ routes/web.php | 1 + 6 files changed, 39 insertions(+), 60 deletions(-) diff --git a/app/Http/Controllers/NewsController.php b/app/Http/Controllers/NewsController.php index f5678748..6e827c06 100644 --- a/app/Http/Controllers/NewsController.php +++ b/app/Http/Controllers/NewsController.php @@ -72,14 +72,19 @@ class NewsController extends Controller return view('partial/newslist_small', ['id' => $id, 'news' => $populair]); } + public function taglist(Request $request, $tag) + { + return $this->listNews($request, 'tag/' . $tag, ucfirst($tag)); + } + public function regionlist(Request $request, $region) { - return $this->listNews($request, 'regio/' . $region, ucfirst($region)); + return $this->listNews($request, 'tag/' . $region, ucfirst($region)); } public function themelist(Request $request, $theme) { - return $this->listNews($request, 'thema/' . $theme, ucfirst($theme)); + return $this->listNews($request, 'tag/' . $theme, ucfirst($theme)); } public function search(Request $request, $query) diff --git a/public/css/style.css b/public/css/style.css index 334eac24..73c9b2a1 100644 --- a/public/css/style.css +++ b/public/css/style.css @@ -725,6 +725,8 @@ div.pp_default .pp_close:hover { margin: 0; padding: 0; list-style: none; + display: flex; + gap: 3px; } .blog_grid .post .slider_content_box .post_details .category a { padding: 6px 11px 7px; diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php index f2e19ffe..ab06f92f 100644 --- a/resources/views/home.blade.php +++ b/resources/views/home.blade.php @@ -24,13 +24,13 @@

{!!$item->title!!}

@@ -61,13 +61,13 @@

{!!$item->title!!}

@@ -102,13 +102,13 @@
{!!$item->title!!}
diff --git a/resources/views/newsitem.blade.php b/resources/views/newsitem.blade.php index 79aedbcf..5ec55082 100644 --- a/resources/views/newsitem.blade.php +++ b/resources/views/newsitem.blade.php @@ -11,16 +11,18 @@
  • Home
  • Nieuws
    • -
    • +{{--
  • {{$news->region->title}}
    • -
    • +--}}
  • {!!$news->title!!}
    • @endsection @section('tags') @endsection @@ -28,12 +30,6 @@
    +
    + @endif +@endif + From 2799b1843f7835b82d6f74d292e998d41852841b Mon Sep 17 00:00:00 2001 From: NH Gooi Date: Sun, 23 Jun 2024 23:18:38 +0200 Subject: [PATCH 08/20] Podcasts en lees meer... toegevoegd aan nieuwsartikelen --- public/js/main.js | 7 - resources/views/newsitem.blade.php | 28 +-- resources/views/partial/nh_story.blade.php | 181 +++++++++++------- .../views/widgets/podcastplayer.blade.php | 89 ++++----- 4 files changed, 154 insertions(+), 151 deletions(-) diff --git a/public/js/main.js b/public/js/main.js index 6ea6ddb3..e69de29b 100644 --- a/public/js/main.js +++ b/public/js/main.js @@ -1,7 +0,0 @@ -$(function() { - $('.podcast-player').each(function() { - var id = $(this).data('id'); - var auth = $(this).data('auth'); - $(this).load('/luister/fragment/inline/' + id + '?auth=' + auth); - }); -}); diff --git a/resources/views/newsitem.blade.php b/resources/views/newsitem.blade.php index 5ec55082..6b2b81a2 100644 --- a/resources/views/newsitem.blade.php +++ b/resources/views/newsitem.blade.php @@ -47,30 +47,6 @@ - @if($news->podcast) - @include('widgets/mediaplayer') -
    -
    - -
    - -
    - @endif -
    @if($news->images) @@ -119,6 +95,10 @@
    @endif + @if($news->podcast) + @include('widgets/podcastplayer', ['podcast' => $news->podcast]) + @endif + @if($news->source && $news->source->show)

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

    diff --git a/resources/views/partial/nh_story.blade.php b/resources/views/partial/nh_story.blade.php index d325b421..b3ceab43 100644 --- a/resources/views/partial/nh_story.blade.php +++ b/resources/views/partial/nh_story.blade.php @@ -1,51 +1,51 @@ @foreach($content as $block) - @if($block->type == "headerRichA") - @php($block->image->url = isset($block->image->crops) - ? $block->image->crops->{'16:9'}->{'1600'} - : $block->image->crop) - - {{$block->image->title}} - -
    - {{$block->image->title}} - @if($block->image->author) - {{$block->image->author}} - @endif -
    - @elseif($block->type == "text") -
    {!!$block->text!!}
    - @if (preg_match('!/gemist/fragment/([0-9]*)/!', $block->text, $match)) -
    - @endif - @elseif($block->type == "intro") -

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

    - @elseif($block->type == "info") - @if(strpos($block->text, "Meer nieuws uit 't Gooi?") === false) -
    {!!($block->text)!!}
    - @endif - @elseif($block->type == "quote") -
    - {!!$block->text!!} -
    {{$block->name}}
    -
    - @elseif($block->type == "image") - type == "headerRichA") +@php($block->image->url = isset($block->image->crops) +? $block->image->crops->{'16:9'}->{'1600'} +: $block->image->crop) + + {{$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 == "info") +@if(strpos($block->text, "Meer nieuws uit 't Gooi?") === false) +
    {!!($block->text)!!}
    +@endif +@elseif($block->type == "quote") +
    + {!!$block->text!!} +
    {{$block->name}}
    +
    +@elseif($block->type == "image") +image->imageWide)) - $image = $block->image->imageWide; + $image = $block->image->imageWide; else if(isset($block->image->crop)) - $image = $block->image->crop; + $image = $block->image->crop; else if(isset($block->image->crops) && isset($block->image->crops->{'16:9'})) foreach($block->image->crops->{'16:9'} as $image) break; else if(isset($block->image->imageHigh)) $image = $block->image->imageHigh; else $image = null; ?> - @if($image) - - {{$block->image->title}} - -
    - image->title}} © {{$block->image->author}}"> + {{$block->image->title}} + +
    + image->caption) && $block->image->caption) { $sentence[] = '' . $block->image->caption . ''; @@ -57,52 +57,87 @@ } $sentence = join('|', $sentence); ?> - {!!$sentence!!} -
    - @endif - @elseif($block->type == "video" || $block->type == "headerVideo") - @include('widgets/mediaplayer') - +@endif +@elseif($block->type == "video" || $block->type == "headerVideo") +@include('widgets/mediaplayer') +video->images[0]->imageMedia) && $block->video->images[0]->imageMedia) { $attr = ' poster="' . $block->video->images[0]->imageMedia . '"'; } ?> - -
    - {{$block->video->author}} -
    - @elseif($block->type == "carousel") -
    -
      - @foreach($block->items as $image) + +
      + {{$block->video->author}} +
      +@elseif($block->type == "carousel") +
      +
        + @foreach($block->items as $image) image->imageWide)) $img = $image->image->imageWide; else if(isset($block->image->crop)) - $image = $block->image->crop; + $image = $block->image->crop; else if(isset($image->image->crops) && isset($image->image->crops->{'16:9'})) foreach($image->image->crops->{'16:9'} as $img) break; else if(isset($image->image->imageHigh)) - $img = $image->image->imageHigh; - else $img = null; + $img = $image->image->imageHigh; + else $img = null; ?> @if($img) -
      • - - {{$image->image->title}} - -
        • +
      • + + {{$image->image->title}} + +
        • @endif - @endforeach -
      -
      - @elseif($block->type == "oembed") -
      {!!$block->html!!}
       - @endif -@endforeach - + @endforeach +
    +
    +@elseif($block->type == "oembed") +
    {!!$block->html!!}
    +@elseif($block->type == "podcast" && $block->id == $news->podcast?->id) +@include('widgets/podcastplayer', ['podcast' => $news->podcast]) +podcast = null; // Avoid adding the player again ?> +@elseif($block->type == 'article' && count($block->articles)) +
    +

    {{ $block->title }}

    +
    +
      + @foreach($block->articles as $article) + published = new \DateTime($article->published) ?> +
    • +
      + @if($article->image) +
      + + {{ $article->image_title }} + +
      + @endif +
      +

      {!! $article->title !!}

      + + + {{Formatter::relativeDate($article->published)}} om {{$article->published->format('H:i')}} + +
      +
      +
      • + @endforeach +
    +
    +
    +@endif +@endforeach \ No newline at end of file diff --git a/resources/views/widgets/podcastplayer.blade.php b/resources/views/widgets/podcastplayer.blade.php index 1b31b201..00d1b3ce 100644 --- a/resources/views/widgets/podcastplayer.blade.php +++ b/resources/views/widgets/podcastplayer.blade.php @@ -1,61 +1,56 @@
    -@if($podcast == null) + @if($podcast == null) De podcast kan helaas (op dit moment) niet weergegeven worden. -@else + @else @include('widgets/mediaplayer') @if ($podcast) - url . "?auth=" . $podcast->auth); $popoutUrl = route('luister.podcast') . $podcast->url . '?auth=' . $podcast->auth; ?> -
    -

    {{$podcast->title}}

    -
    - +
    +

    {{$podcast->title}}

    +
    + - -
    - - Download fragment - - - Luister in nieuw venster - -
    - -
    - @if($podcast->image) -
    - -
    - {{$podcast->image->title}} -
    -
    - @endif -
    {!!$podcast->content!!}
    -
    -
    - -
    -
    + +
    + + Download fragment + + + Luister in nieuw venster + +
    +
    + @if($podcast->image) +
    + +
    + {{$podcast->image->title}}
    + @endif +
    {!!$podcast->content!!}
    +
    - @endif -@endif +
    + @endif + @endif +
    \ No newline at end of file From e551e551583554ec3440853450a6c17251257e4b Mon Sep 17 00:00:00 2001 From: NH Gooi Date: Sun, 23 Jun 2024 23:46:51 +0200 Subject: [PATCH 09/20] Lees ook... alleen laten zien als het naar loakle artikelen verwijst --- resources/views/partial/nh_story.blade.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/resources/views/partial/nh_story.blade.php b/resources/views/partial/nh_story.blade.php index b3ceab43..0259f022 100644 --- a/resources/views/partial/nh_story.blade.php +++ b/resources/views/partial/nh_story.blade.php @@ -107,13 +107,14 @@ @elseif($block->type == "podcast" && $block->id == $news->podcast?->id) @include('widgets/podcastplayer', ['podcast' => $news->podcast]) podcast = null; // Avoid adding the player again ?> -@elseif($block->type == 'article' && count($block->articles)) +@elseif($block->type == 'article' && count($block->articles) && $block->articles[0]->published)

    {{ $block->title }}

      @foreach($block->articles as $article) - published = new \DateTime($article->published) ?> + published)) continue; + $article->published = new \DateTime($article->published); ?>
    • @if($article->image) From 539dd88d42540c55cc7bb06bc8efeee638551f02 Mon Sep 17 00:00:00 2001 From: NH Gooi Date: Tue, 2 Jul 2024 15:32:48 +0200 Subject: [PATCH 10/20] Content wijzigingen voor Petra en Leon plus een kleine CSS fix op toolbar --- public/css/style.css | 2 +- resources/views/contact.blade.php | 13 ++++++++++++- resources/views/layouts/master.blade.php | 15 ++++++++------- resources/views/widgets/menu.blade.php | 4 ++-- 4 files changed, 23 insertions(+), 11 deletions(-) diff --git a/public/css/style.css b/public/css/style.css index 334eac24..b50b4f76 100644 --- a/public/css/style.css +++ b/public/css/style.css @@ -319,7 +319,7 @@ div.pp_default .pp_close:hover { padding: 3px 9px 3px 6px; margin: 8px auto; } -.top_menu_container ul.right_menu li:last-child, .menu_mobile_container ul.right_menu li:last-child { +.top_menu_container ul.right_menu li.search, .menu_mobile_container ul.right_menu li.search { border: none; line-height: 1; } diff --git a/resources/views/contact.blade.php b/resources/views/contact.blade.php index e1cca86f..59d6dc72 100644 --- a/resources/views/contact.blade.php +++ b/resources/views/contact.blade.php @@ -18,7 +18,18 @@
      -
      +
      +

      NH Gooi is de publieke streekomroep van Gooi en Vechtstreek. We houden je 24 uur per dag +op de hoogte van al het nieuws, betrouwbaar en snel. Dat doen we via een eigen nieuws- +app, onze website en social media, maar ook op radio en televisie. Daarnaast brengen we +een gevarieerd aanbod van podcasts, radio- en televisieprogramma's.

      + +

      Ons team van journalisten en programmamakers bestaat uit betaalde krachten, vrijwilligers +en stagiaires. We vinden het belangrijk mensen op te leiden en een goede plek te bieden +voor talent.

      + +

      De redactie van NH Gooi is journalistiek onafhankelijk en wordt geleid door de chef redactie.

      +

      Contactinformatie

      Neem contact op met NH Gooi, de streekomroep voor Gooi & Vechtstreek.

      diff --git a/resources/views/layouts/master.blade.php b/resources/views/layouts/master.blade.php index cb59819d..76596255 100644 --- a/resources/views/layouts/master.blade.php +++ b/resources/views/layouts/master.blade.php @@ -45,7 +45,7 @@ Tip
      • @if(isset($searchURL)) -
    • +
    • @@ -73,7 +73,7 @@ Tip de streekredactie
      • @if(isset($searchURL)) -
    • +
    • @@ -109,18 +109,19 @@

      NH Gooi

      -

      - NH Gooi is de streekomroep voor Gooi & Vechtstreek. Wij bieden een gevarieerd programma op - radio, podcasts, tv en online met muziek, achtergronden en actueel regionieuws. +

      + NH Gooi is de streekomroep voor Gooi & Vechtstreek. Wij brengen nieuws en achtergronden + op onze website, radio en televisie. Daarnaast brengen we boeiende en belangrijke podcasts + en een gevariëerd programma-aanbod op al onze media-kanalen.

      - Altijd op de hoogte blijven van nieuws en achtergronden uit de regio? Download onze app. + Altijd op de hoogte blijven van nieuws en achtergronden uit de regio? Download onze app.

      - Klik hier waar je ons kunt zien en horen. + Bekijk hier waar je ons kunt zien en horen.

      diff --git a/resources/views/widgets/menu.blade.php b/resources/views/widgets/menu.blade.php index 645bcb9a..3d97eb58 100644 --- a/resources/views/widgets/menu.blade.php +++ b/resources/views/widgets/menu.blade.php @@ -120,7 +120,7 @@ function buildMenu($menu, $ismobile)
      • - Home + Nieuws
        • @@ -143,7 +143,7 @@ function buildMenu($menu, $ismobile)
    • - Home + Nieuws
      • @php($newsUrl = '/nieuws')
    • From 50d6a97fce0302573cfe1f2360f9780f7d68d117 Mon Sep 17 00:00:00 2001 From: NH Gooi Date: Tue, 2 Jul 2024 17:23:38 +0200 Subject: [PATCH 11/20] Regioagenda naar streekagenda hernoemd --- resources/views/calendarevent.blade.php | 4 ++-- resources/views/calendarlist.blade.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/views/calendarevent.blade.php b/resources/views/calendarevent.blade.php index 429a1f6a..9daa8e2c 100644 --- a/resources/views/calendarevent.blade.php +++ b/resources/views/calendarevent.blade.php @@ -12,7 +12,7 @@ @@ -24,7 +24,7 @@
        @if($event->region) -
      • Regio {{$event->region}}
        • +
      • {{$event->region}}
        • @endif
      • diff --git a/resources/views/calendarlist.blade.php b/resources/views/calendarlist.blade.php index 7dcf207f..bfb9f657 100644 --- a/resources/views/calendarlist.blade.php +++ b/resources/views/calendarlist.blade.php @@ -1,7 +1,7 @@ @extends('layouts/sidebar') @section('title') - Regioagenda + Streekagenda @endsection @section('page_class') @@ -28,7 +28,7 @@ @if(!count($events)) @section('content')
        -

        Er zijn geen items in de regioagenda. Iets te melden? Mail het naar {{Html::mailto("info@nhgooi.nl")}} +

        Er zijn geen items in de streekagenda. Iets te melden? Mail het naar {{Html::mailto("info@nhgooi.nl")}} .

        @endsection From e7bae27951b44805cede4a15d451c5ce589ec15a Mon Sep 17 00:00:00 2001 From: NH Gooi Date: Tue, 2 Jul 2024 17:23:50 +0200 Subject: [PATCH 12/20] Podcasts en fragment gemist gescheiden --- app/Http/Controllers/PodcastController.php | 15 ++++++++-- app/Http/Controllers/RadioController.php | 8 ++--- .../partial/podcastdirectitems.blade.php | 6 ++-- .../views/partial/podcastitems.blade.php | 2 +- resources/views/podcastitem.blade.php | 29 +++++++++++-------- resources/views/podcastlist.blade.php | 5 ++-- resources/views/podcastseries.blade.php | 23 ++++++++------- routes/web.php | 2 +- 8 files changed, 53 insertions(+), 37 deletions(-) diff --git a/app/Http/Controllers/PodcastController.php b/app/Http/Controllers/PodcastController.php index e1c3da86..9b945911 100644 --- a/app/Http/Controllers/PodcastController.php +++ b/app/Http/Controllers/PodcastController.php @@ -29,14 +29,23 @@ class PodcastController extends Controller $podcasts[] = new \Model\Podcast($podcast); } - return view($request->ajax() ? 'partial.podcastitems' : 'podcastseries', array_merge($viewData, ['podcasts' => $podcasts, 'searchURL' => 'gemist/zoeken'])); + return view($request->ajax() ? 'partial.podcastitems' : 'podcastseries', array_merge($viewData, ['podcasts' => $podcasts, 'searchURL' => 'gemist/zoeken', 'isPodcast' => true])); } public function podcast(Request $request, $id) { parent::registerView($request, 'podcast', $id); $apiResult = $this->API('podcast/details/' . (int)$id); - $podcast = new \Model\Podcast($apiResult); - return view('podcastitem', ['podcast' => $podcast, 'metadata' => $podcast->metadata]); + $podcast = new \Model\Podcast($apiResult); + $podcasts = []; + if($podcast->program) { + $apiResult = $this->API('podcast/programma/' . (int)$podcast->program->id . '?pagina=1&aantal=5'); + $podcasts = []; + foreach($apiResult->podcasts as $p) + { + $podcasts[] = new \Model\Podcast($p); + } + } + return view('podcastitem', ['podcast' => $podcast, 'metadata' => $podcast->metadata, 'podcasts' => $podcasts, 'isPodcast' => true]); } } diff --git a/app/Http/Controllers/RadioController.php b/app/Http/Controllers/RadioController.php index 39c45c71..ba2087cf 100644 --- a/app/Http/Controllers/RadioController.php +++ b/app/Http/Controllers/RadioController.php @@ -56,7 +56,7 @@ class RadioController extends Controller public function podcast(Request $request, $id, $title = '') { if($this->checkAPI('podcast/details/' . (int)$id) != "200"){ - return view('podcastitem', array_merge($this->getSidebareData(), ['title' => $title, 'podcast' => null, 'metadata' => null, 'related' => [], 'searchURL' => 'gemist/zoeken'])); + return view('podcastitem', array_merge($this->getSidebareData(), ['title' => $title, 'podcast' => null, 'metadata' => null, 'related' => [], 'searchURL' => 'gemist/zoeken', 'isPodcast' => false])); } parent::registerView($request, 'podcast', $id); @@ -71,7 +71,7 @@ class RadioController extends Controller $podcasts[] = new \Model\Podcast($_podcast); } - return view($request->ajax() ? 'partial/podcastitems' : 'podcastitem', ['title' => $title, 'podcast' => $podcast, 'metadata' => $podcast->metadata, 'podcasts' => $podcasts, 'searchURL' => 'gemist/zoeken']); + return view($request->ajax() ? 'partial/podcastitems' : 'podcastitem', ['title' => $title, 'podcast' => $podcast, 'metadata' => $podcast->metadata, 'podcasts' => $podcasts, 'searchURL' => 'gemist/zoeken', 'isPodcast' => false]); } public function podcasts(Request $request, $programma = null) @@ -107,7 +107,7 @@ class RadioController extends Controller } } - return view($request->ajax() ? 'partial/programitems' : 'programlist', ['programs' => array_reverse($programs)]); + return view($request->ajax() ? 'partial/programitems' : 'programlist', ['programs' => array_reverse($programs), 'isPodcast' => false]); } private function getPodcastList(Request $request, $action, $viewData = []) @@ -120,7 +120,7 @@ class RadioController extends Controller $podcasts[] = new \Model\Podcast($podcast); } - return view($request->ajax() ? 'partial/podcastitems' : 'podcastlist', array_merge($viewData, ['id' => 'items-podcasts', 'podcasts' => $podcasts, 'searchURL' => 'gemist/zoeken'])); + return view($request->ajax() ? 'partial/podcastitems' : 'podcastlist', array_merge($viewData, ['id' => 'items-podcasts', 'podcasts' => $podcasts, 'searchURL' => 'gemist/zoeken', 'isPodcast' => false])); } } diff --git a/resources/views/partial/podcastdirectitems.blade.php b/resources/views/partial/podcastdirectitems.blade.php index 7fbd39fa..85e396ef 100644 --- a/resources/views/partial/podcastdirectitems.blade.php +++ b/resources/views/partial/podcastdirectitems.blade.php @@ -1,8 +1,8 @@
        @foreach($podcasts as $podcast) url; - $popoutUrl = route('luister.podcast') . $podcast->url . '?auth=' . $podcast->auth; + $url = ($isPodcast ? '/podcast/aflevering' : '/gemist/fragment') . $podcast->url; + $popoutUrl = route('luister.podcast') . $podcast->url . '?auth=' . $podcast->auth; ?>
        @@ -15,7 +15,7 @@

        {!!$podcast->titleWithoutProgram()!!}

        @if ($podcast->program) - {{$podcast->program->name}} @endif diff --git a/resources/views/partial/podcastitems.blade.php b/resources/views/partial/podcastitems.blade.php index 083cadfe..a7c45d24 100644 --- a/resources/views/partial/podcastitems.blade.php +++ b/resources/views/partial/podcastitems.blade.php @@ -20,7 +20,7 @@ $actionButton = array_merge([ ?> From 173d9dcaf62e7721cad9d07681c7f85769ce7689 Mon Sep 17 00:00:00 2001 From: NH Gooi Date: Thu, 4 Jul 2024 14:48:57 +0200 Subject: [PATCH 14/20] Favicon vervangen --- public/favicon-16x16.png | Bin 944 -> 1150 bytes public/favicon-32x32.png | Bin 2767 -> 0 bytes public/favicon.ico | Bin 15406 -> 1150 bytes resources/views/layouts/_head.blade.php | 8 ++++++-- 4 files changed, 6 insertions(+), 2 deletions(-) delete mode 100644 public/favicon-32x32.png diff --git a/public/favicon-16x16.png b/public/favicon-16x16.png index 25e67152f6c391763513555413b78571c92033e0..2290f1230e74a949c67f42450c9a6a15ba8b772b 100644 GIT binary patch literal 1150 zcma)*e@s(X6vr=0X3%W$Mk2lP?43RY-K`xMXu-`!`EW&WjkIrrt=`#w1* z_k0c^Ui6tem(VqkNWBU1C4_|1pj&juvrk`y(6a?|Jn`cD6-%cyglIk&%Fhmi!#x?Ozu%tKr&GpQ)R%^U(ZpAX*aN2IZkjUkq(#5ar(m zlfM+^WAU(*#=u&(!fmgJle?-!epeRHJYE~*J=M5QfPVRT46B;)XGRnhNxo2}@w@;J zqym^q)?=)<4No+67^zHzqatpKyC6PR?LR|PC-i}-_8dkHT4)bvK($8<{nsf_ON7u# zBf$QU2J?v&Sg+>b*`NXAdKny*B5)VQ_pAMgwO$kiXP*)Ga<@adD;Auo3ob?jUCwHB zf0ckSvmO%<4X~U{#)vEzlQt8a)my+_5Di~mL?&*htOVEJgVs-@(Ovc>oJKX&dt#x_ zOMv0X2VjaeU~HfhwuWLnI{o6&tR3Y_5&*nj^KL*<*`wwb~GBIWsM%1<`!SW9^ZP00~3mKVT&UxBu?5HR0o z!E`bUhC|VK+N*;7)^`{>okZ)W{Ecj$cVG4+&c+WT!I^uYl&rzM{mB@AY{6s24QR5X z(0Sl}jCM4_?HI&Rl?2v{yFK;Srt-X_`kfhl^2qtHwzr~Rb_Oj;!O$0Gp!cVIbYzA@ zzc&gGuNJ~mCB;DL8gLylJReYD^!$4M{u$c;ni_#O?q(;`J7i$fD$p*8fnxK*|Mhsc|Ke&x-sqwJp>;&s^UTL0c0!>#x?2U|8SbWwkwQ-7yD{tBmBBvixuA{~bD;n^3>e3ju`iF-_yB*K3XTOF#V!1nWK? literal 944 zcmV;h15f;kP)Px&YDq*vR5(w4(cMp5bsPrp=lAmc{mx5IUw{@_yN(iuV~k9KGPg-4F1qQwaH1O_ zCQBBhW{W1qME?vmdSTSW;OI19lxzt%ZcOn4FSa=ua|>I@8pKH{lmcrDJ*UTrUd$Vx z>nES&$-~h2MOZ2OkkqnY+p0xbDgsRw)50KA3o?jFlYC{XiZ)f58??#{ISnPh6b7AV zA~ASW+Ul)PSa-DVtTChY7Qdb;@q7tP7?P1mAWQiV#Z0s}*?z&})!F;3w87*xX!?+e zWO~R6s;8gniHD9opJWRwE`~2}TSLXeK%f3~++gWt(3S)ay5MPZg;K=?cKoVn9tLQsWhs<&nw{tG~x*VLlQ}rja zzR%RQbg6q^y?*m#D;qdJi>71%`#b9}Jf1_z!{&rgP~)X1BDgZ^;?K1zdLMHzeAD%B zEnRb`? zo|IoRq|#lAfKVyR%t0Nw7jlt8sjF-OQPSovVK`@2xb^IGbGSy zYM?|R)8f8e!-!xy5$fhjye&1Qn34nB)*n}c&QcAP-HC~b4GbUi{ssPF{u`eqUj8kj z!yCOq%acrs(RHkUboYafd{S>lafw*-hz_*|@2N^1i%pFUc65cmsSS0maY S%bg7X0000PxtT zr%CvXTAi@IDR{nQJx@HSn81-nL`uTygjkFwf$3KOlp$7~T8XSDvFB^3%3&-LL_{4Y z(jehwCw!AwZ;H=1J7M^Q?8sluMVZVIR=mtYXGyr0$=behzcu}RzV!E7c3|FUgw*In z96F|$h{OokFo_CS8En)UEATVM^%ab(^c!a_yMq96Goq*!QW%iziSil=-E^#P0lYv` zee+vncm~2(Jj-+0yjK_+^!(|`0!D{3C=@IXJ25_8ZsGB6fOY^xM0f@Op8+5hSYJ@g z8H^5iI9Byh%qyB9u+w&UdjnUlx* zQZU0X~^Oz}8+brCbfedV*#TSlbD3 z*mEfZeMN)uVIReuA_T!PgM=|uGB{cDFjzE*9bvf<+stN+9USm87tfS! z0w9;S`0>xTF~8D6yBDK2oWYA12Qf0}VfQe?{CXQV?jB-oy9YLciD4fv%oQg56C^A`7(oA`94jk~KIY#&6a0EfyJb5l7SuVqs8Hv@;C zEOhXw9;SL3FDqU?kxhmAqelVm)?K*YMXwzrB#ixar&P2uUd!|4a~1ym->D)Z#y`Hb zj`giJrfPW{pU&g-YzfUE#=9TyVWr-M=V@9A5C)hL5inWt@#3j`D#lNr1Zf&J4kC>9 zDXyH%LapGv#Q>kyUA*0;uob$PFnTTQD;b)aEYhWO1N7=kRrF%u?|!g`jh!CmW{NmA zmB&;qht2&E|MEdSO~c7F=Uy6orxoMDMi&D`gKu0YVYuI7X)nU^PKc%52$h21l~dUi z^!25b0k_pb+zR0m08s*9da8&7z&Bp1B8Y&${lOYGcX~K|tc01#941Dyc(NDb-)?Lp zj2*sqp^WLVOj?R7^#JeRJA`K#uUsf$r0ijBKf=mxh)3HI1`C3#rxO5z_m{&Iz-9|* zMNa{w3`|ZG>GJsj`sPbDgb4#bT*u~47bjYd-_fEfy`0kLURE z*+Kq;E8~bjsRo{GcQ8Ad$Lv%A$EOR}X-4>upKfD)r$fph6cS9#D%&3)B`@e-N3@*HugI)dJ)n_lyt!)=*(CKmu9o6IB%`?QU)3whp~Re zOD8fQW&CI%NEnFryA*a~N~+*mJ(pE8Fqp|)K09c>{put#ImO#Q*~0v43$X*HYdQSx z^A(I#GT7ShVScTH|GIyG$Gc$)wl?JB(sPB>0}>%7ec<~2cB%v4a@q%;pUEHq;q3=$ z6$FPNIz2~0(ukIPPyJ%a7SEk3`>%a-0z;Jy?kpVQ;d%>?>phf;2A5CwqdJ@ch_JlX z!v}X7Sgi*sfXPuGU!E&rV%UO+uyNpUbG3_Bfb{f}gBC}I4EB12cNThhu!~N|(LvtdV*l)#Y3I_Tt zj#e}1D`={p5S*TNpdgs5`l%r$>08>1@xgNH1mU*_?{qejCM?}8Nzi*cfqvc zm_K$zZ#myQAdLJ)1vziRV|{^`&ydIrD~8mHQO}6yE0akFQH~*$d=_Ps+$AfPg_VUR z1!U5Zyk`t|t*1ye2#2K7BcUy}av!3f#Lyd}xfKFlw>Wm8Xo6BQU9`cvN83VOB1)N}h$i6oAz>3-7Vv4Y9neMz=}03*{Dx9FXz` ztUiLXE9&PT_aYqp4}fI7u9cG~{X@3>;7*m;3^3a~S7SCacrq!% zQ=~GLd}kxdLJd}3WJC9y@F(QUnyPk1rA5StqP*jx+(z7LG=6@2w2ObB#KqHK#*7c0mG@E5 zr5@tgl7>EcA+y)p?(BCLZ%+kD@MnRaLHIwsRbIQDFJunK9O+qNTw&$&tTF+neW+ZI z$-NhX-&y?LiN!D4_A>^)=(+!W|10lmr84AavcaThqRUS7c^3XM2n^*LG2!~J7r-+( z6W_VjZ?eG=7P$oFSD3X3#vRAhw1U4Qufx#cec@Jphj VB3+d@N@f56002ovPDHLkV1jdoHjw}T diff --git a/public/favicon.ico b/public/favicon.ico index 87a918d7a6e3e6893ac2be4c680d84cc8d958943..2290f1230e74a949c67f42450c9a6a15ba8b772b 100644 GIT binary patch literal 1150 zcma)*e@s(X6vr=0X3%W$Mk2lP?43RY-K`xMXu-`!`EW&WjkIrrt=`#w1* z_k0c^Ui6tem(VqkNWBU1C4_|1pj&juvrk`y(6a?|Jn`cD6-%cyglIk&%Fhmi!#x?Ozu%tKr&GpQ)R%^U(ZpAX*aN2IZkjUkq(#5ar(m zlfM+^WAU(*#=u&(!fmgJle?-!epeRHJYE~*J=M5QfPVRT46B;)XGRnhNxo2}@w@;J zqym^q)?=)<4No+67^zHzqatpKyC6PR?LR|PC-i}-_8dkHT4)bvK($8<{nsf_ON7u# zBf$QU2J?v&Sg+>b*`NXAdKny*B5)VQ_pAMgwO$kiXP*)Ga<@adD;Auo3ob?jUCwHB zf0ckSvmO%<4X~U{#)vEzlQt8a)my+_5Di~mL?&*htOVEJgVs-@(Ovc>oJKX&dt#x_ zOMv0X2VjaeU~HfhwuWLnI{o6&tR3Y_5&*nj^KL*<*`wwb~GBIWsM%1<`!SW9^ZP00~3mKVT&UxBu?5HR0o z!E`bUhC|VK+N*;7)^`{>okZ)W{Ecj$cVG4+&c+WT!I^uYl&rzM{mB@AY{6s24QR5X z(0Sl}jCM4_?HI&Rl?2v{yFK;Srt-X_`kfhl^2qtHwzr~Rb_Oj;!O$0Gp!cVIbYzA@ zzc&gGuNJ~mCB;DL8gLylJReYD^!$4M{u$c;ni_#O?q(;`J7i$fD$p*8fnxK*|Mhsc|Ke&x-sqwJp>;&s^UTL0c0!>#x?2U|8SbWwkwQ-7yD{tBmBBvixuA{~bD;n^3>e3ju`iF-_yB*K3XTOF#V!1nWK? literal 15406 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 H+JXNA-jB)- diff --git a/resources/views/layouts/_head.blade.php b/resources/views/layouts/_head.blade.php index ef88403d..49ea2318 100644 --- a/resources/views/layouts/_head.blade.php +++ b/resources/views/layouts/_head.blade.php @@ -10,7 +10,8 @@ - + + --}} @@ -35,9 +37,11 @@ } ?> @stack('styles') + {{-- + --}} From 35713d2974cd14b99fe1d4304fc10bea400b9c3d Mon Sep 17 00:00:00 2001 From: NH Gooi Date: Fri, 6 Sep 2024 10:41:21 +0200 Subject: [PATCH 15/20] Parse ...Z date strings to local time correctly --- app/Http/Controllers/Controller.php | 2 +- resources/views/partial/radioscheduleweek.blade.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php index 601337f3..398b135a 100644 --- a/app/Http/Controllers/Controller.php +++ b/app/Http/Controllers/Controller.php @@ -144,7 +144,7 @@ class Controller extends BaseController protected static function JsonToDateTime($obj) { - return is_object($obj) ? new \DateTime($obj->date, new \DateTimeZone($obj->timezone)) : new \DateTime($obj); + return is_object($obj) ? new \DateTime($obj->date, new \DateTimeZone($obj->timezone)) : \Carbon\Carbon::parse($obj)->setTimezone(date_default_timezone_get()); } public function __call($method, $arguments) diff --git a/resources/views/partial/radioscheduleweek.blade.php b/resources/views/partial/radioscheduleweek.blade.php index 73e461eb..f997f585 100644 --- a/resources/views/partial/radioscheduleweek.blade.php +++ b/resources/views/partial/radioscheduleweek.blade.php @@ -16,7 +16,7 @@ {{$item['program']->name}}
        - {{$item['starttime']->format('H:i')}} – {{$item['endtime']->format('H:i')}} + {{$item['starttime']->format('H:i')}} – {{$item['endtime']->format('H:i')}}
        @@ -26,5 +26,5 @@ @endif
        -@endforeach +@endforeach From f4444d44e3a98760c267e9ad5ae3e695cf242c12 Mon Sep 17 00:00:00 2001 From: NH Gooi Date: Sat, 7 Sep 2024 10:50:40 +0200 Subject: [PATCH 16/20] Lettertype en overflow fragment gefixt --- resources/views/partial/podcastdirectitems.blade.php | 4 ++-- resources/views/partial/podcastitems.blade.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/views/partial/podcastdirectitems.blade.php b/resources/views/partial/podcastdirectitems.blade.php index 85e396ef..358167d9 100644 --- a/resources/views/partial/podcastdirectitems.blade.php +++ b/resources/views/partial/podcastdirectitems.blade.php @@ -22,9 +22,9 @@ {{Formatter::relativeDate($podcast->created)}}
      -

      +

      {!!$podcast->content!!} -

      +
      Luister in nieuw venster diff --git a/resources/views/partial/podcastitems.blade.php b/resources/views/partial/podcastitems.blade.php index a7c45d24..ec2bc884 100644 --- a/resources/views/partial/podcastitems.blade.php +++ b/resources/views/partial/podcastitems.blade.php @@ -43,9 +43,9 @@ $actionButton = array_merge([ @endif @if($body['show']) -

      +

      {!!$podcast->content!!} -

      +
      @endif @if(isset($showAction) && $showAction)
      From 3b55a1cf42b622a897be76a0866ab1c4abd31827 Mon Sep 17 00:00:00 2001 From: NH Gooi Date: Tue, 10 Sep 2024 20:48:42 +0200 Subject: [PATCH 17/20] Spelling --- resources/views/radioprogram.blade.php | 2 +- resources/views/widgets/contact.blade.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/views/radioprogram.blade.php b/resources/views/radioprogram.blade.php index a38b9179..478e98d6 100644 --- a/resources/views/radioprogram.blade.php +++ b/resources/views/radioprogram.blade.php @@ -129,7 +129,7 @@
        @foreach($hosts as $host) -
      • {{ Html::mailto($host->email . '@nhgooi.nl', $host->name, ['class' => 'action_button']) }}
        • +
      • {{ $host->name }}
        • @endforeach
      diff --git a/resources/views/widgets/contact.blade.php b/resources/views/widgets/contact.blade.php index e287fe3e..0f94682c 100644 --- a/resources/views/widgets/contact.blade.php +++ b/resources/views/widgets/contact.blade.php @@ -3,7 +3,7 @@

      Contact met de redactie

      Heb jij een tip voor onze streekredactie? Bel of app de tiplijn: 06 - 42 91 36 37, stuur een - mail of kom lang op de Gooise Brink, + mail of kom langs op de Gooise Brink, Kerkstraat 63/27 in Hilversum

      - Lees meer + Contactinformatie
      From cc1eba59599be8becd73b49619788ed8f226dfcd Mon Sep 17 00:00:00 2001 From: NH Gooi Date: Tue, 10 Sep 2024 20:54:56 +0200 Subject: [PATCH 18/20] Luister popout gefixt --- app/Http/Controllers/StreamController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/StreamController.php b/app/Http/Controllers/StreamController.php index dfa1a6bc..4ecb75d5 100644 --- a/app/Http/Controllers/StreamController.php +++ b/app/Http/Controllers/StreamController.php @@ -50,7 +50,7 @@ class StreamController extends Controller } return view('listen', [ - 'source' => $this->API_URL . 'podcast/download' . $apiResult->url . '?auth=' . $podcast->auth, + 'source' => $this->API_URL . 'podcast/download/' . $apiResult->url, 'title' => $podcast->title, 'content' => $podcast->title, 'isStream' => false, From 5ebf7f20bea19b5d246cdc9551ca5ca2e0ff6755 Mon Sep 17 00:00:00 2001 From: NH Gooi Date: Thu, 12 Sep 2024 13:45:41 +0200 Subject: [PATCH 19/20] API ondersteunt /stream en /download --- app/Http/Controllers/StreamController.php | 10 +++++----- resources/views/calendarevent.blade.php | 2 +- resources/views/kerkdienst.blade.php | 2 +- resources/views/listen.blade.php | 5 ++--- resources/views/partial/blogitems.blade.php | 2 +- resources/views/podcastitem.blade.php | 3 ++- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/app/Http/Controllers/StreamController.php b/app/Http/Controllers/StreamController.php index 4ecb75d5..841cf341 100644 --- a/app/Http/Controllers/StreamController.php +++ b/app/Http/Controllers/StreamController.php @@ -50,11 +50,11 @@ class StreamController extends Controller } return view('listen', [ - 'source' => $this->API_URL . 'podcast/download/' . $apiResult->url, + 'source' => $this->API_URL . 'podcast/stream/' . $apiResult->url, 'title' => $podcast->title, 'content' => $podcast->title, 'isStream' => false, - 'canDownload' => true ]); + 'canDownload' => $this->API_URL . 'podcast/download/' . $apiResult->url ]); } public function program(Request $request, $year, $month, $day, $hour, $duration, $offset = 0) { @@ -69,7 +69,7 @@ class StreamController extends Controller } return view('listen', [ - 'source' => $this->API_URL . 'programma/download/' . $current->format('Y/m/d/H') . '/1', + 'source' => $this->API_URL . 'programma/stream/' . $current->format('Y/m/d/H') . '/1', 'tabs' => $hours, 'title' => 'Uitzending terugluisteren', 'content' => 'de uitzending van ' . $current->format('d-m-Y, H') . ':00 uur', @@ -88,10 +88,10 @@ class StreamController extends Controller public function kerkdienst(Request $request) { return view('listen', [ - 'source' => $this->API_URL . 'kerkdienst/download', + 'source' => $this->API_URL . 'kerkdienst/stream', 'title' => 'Kerkdienst gemist', 'content' => 'de kerkdienst van afgelopen zondag', 'isStream' => false, - 'canDownload' => true ]); + 'canDownload' => $this->API_URL . 'kerkdienst/download' ]); } } diff --git a/resources/views/calendarevent.blade.php b/resources/views/calendarevent.blade.php index 9daa8e2c..9e7911f4 100644 --- a/resources/views/calendarevent.blade.php +++ b/resources/views/calendarevent.blade.php @@ -41,7 +41,7 @@
        diff --git a/resources/views/kerkdienst.blade.php b/resources/views/kerkdienst.blade.php index 54b6e5fc..a68efd63 100644 --- a/resources/views/kerkdienst.blade.php +++ b/resources/views/kerkdienst.blade.php @@ -18,7 +18,7 @@

        diff --git a/resources/views/listen.blade.php b/resources/views/listen.blade.php index 145b5c74..1297be65 100644 --- a/resources/views/listen.blade.php +++ b/resources/views/listen.blade.php @@ -42,8 +42,8 @@

        - @if(!$isStream && $canDownload) - + @if(!$isStream && $canDownload !== false) + Download .mp3-bestand @endif @@ -52,7 +52,6 @@ Schakel naar live-uitzending @endif -

        @endif
      @endsection diff --git a/resources/views/partial/blogitems.blade.php b/resources/views/partial/blogitems.blade.php index a04e7499..75f066ee 100644 --- a/resources/views/partial/blogitems.blade.php +++ b/resources/views/partial/blogitems.blade.php @@ -78,7 +78,7 @@
      diff --git a/resources/views/podcastitem.blade.php b/resources/views/podcastitem.blade.php index d9cd1d4b..17f28226 100644 --- a/resources/views/podcastitem.blade.php +++ b/resources/views/podcastitem.blade.php @@ -90,6 +90,7 @@ @if ($podcast) url . "?auth=" . $podcast->auth); + $streamUrl = url($apiUrl . 'podcast/stream' . $podcast->url . "?auth=" . $podcast->auth); $popoutUrl = route('luister.podcast') . $podcast->url . '?auth=' . $podcast->auth; ?> @@ -112,7 +113,7 @@
      From 6d91e1d3ca56ff203b09f55ccb710b5cb4df1e38 Mon Sep 17 00:00:00 2001 From: NH Gooi Date: Thu, 12 Sep 2024 14:06:28 +0200 Subject: [PATCH 20/20] Uitgelicht podcast [#00028] --- app/Http/Controllers/HomeController.php | 12 ++++-------- public/css/style.css | 6 ++++-- resources/views/home.blade.php | 20 ++++++++++++++++++-- 3 files changed, 26 insertions(+), 12 deletions(-) diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index f54d5ff0..668adff1 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -22,13 +22,9 @@ class HomeController extends Controller $populair[] = new \Model\NewsItem($newsItem); } - $podcasts = []; - $apiResult = $this->API('podcast/overzicht?aantal=3'); - $podcast = new \Model\Podcast($apiResult->podcasts[0]); - foreach ($apiResult->podcasts as $_podcast) { - $podcasts[] = new \Model\Podcast($_podcast); - } - - return view('home', ['populair' => $populair, 'podcasts' => $podcasts, 'podcast' => $podcast, 'title' => 'Home', 'news' => $news, 'searchURL' => 'nieuws/zoeken']); + $apiResult = $this->API('podcast/overzicht?aantal=15'); + $index = array_rand($apiResult->podcasts); + $podcast = new \Model\Podcast($apiResult->podcasts[$index]); + return view('home', ['populair' => $populair, 'podcast' => $podcast, 'title' => 'Home', 'news' => $news, 'searchURL' => 'nieuws/zoeken']); } } diff --git a/public/css/style.css b/public/css/style.css index 1e7a9005..c4e245a6 100644 --- a/public/css/style.css +++ b/public/css/style.css @@ -1231,7 +1231,8 @@ div.pp_default .pp_close:hover { .post_container .post_body h3 { font-size: 15px; } -.post_container .post_body .sentence { +.post_container .post_body .sentence, +.box.featured .sentence { font-size: 12px; font-style: italic; line-height: 1.3; @@ -1240,7 +1241,8 @@ div.pp_default .pp_close:hover { display: block; width: 100%; } -.post_container .post_body .sentence span { +.post_container .post_body .sentence span, +.box.featured .sentence span { padding: 0 5px; } .post_container .post_body blockquote { diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php index ab06f92f..0065330f 100644 --- a/resources/views/home.blade.php +++ b/resources/views/home.blade.php @@ -170,12 +170,28 @@ @if ($podcast) url; ?> -

      Uitgelicht

      +

      Uitgelicht fragment

      - + +
      + ' . $podcast->image->title . ''; + } elseif (isset($podcast->image->title) && $podcast->image->title) { + $sentence[] = '' . $podcast->image->title . ''; + } + if (isset($podcast->image->author) && $podcast->image->author) { + $sentence[] = '' . $podcast->image->author . ''; + } + $sentence = join('|', $sentence); + ?> + {!!$sentence!!} +
      +