Merge branch 'main' into dev

app/Http/Controllers/CalendarController.php

@@ -10,7 +10,7 @@ class CalendarController extends Controller
     {
         parent::registerView($request, 'agenda', $id);
         $apiResult = $this->API('agenda/item/' . (int)$id);
-        $calendarEvent = new \Model\CalendarEvent($apiResult);
+        $calendarEvent = new \Model\CalendarEvent($apiResult->news);
 
         return view('calendarevent', array_merge($this->getSidebareData(), ['event' => $calendarEvent, 'metadata' => $calendarEvent->metadata]));
     }

resources/views/calendarevent.blade.php

@@ -104,7 +104,7 @@
 					@include('partial/nh_story', ['content' => $event->content]);
 				@else
 				<div class="text">
-					<p>{!!$event->content!!}</p>
+				{!!$event->content!!}
 				</div>
 				@endif
 

resources/views/calendarlist.blade.php

@@ -41,7 +41,7 @@
                     @php($count = 0)
                     @foreach($events as $event)
                             @php($count++)
-                            <?php $url = route('agenda.details', ['id' => $event->id, 'title' => $event->title]); ?>
+                <?php $url = $event->url; ?>
                             <div class="box featured">
                                 <div class="row">
                                     <div class="col-12 col-md-6">
@@ -60,7 +60,11 @@
                                             <span class="post_date" style="line-height: 1.17; height: 14px;" title="{{Formatter::relativeDate($event->starts, 'W d m y?')}}">
                                                 <i class="fa-regular fa-clock"></i> {{Formatter::relativeDate($event->starts, 'W d m y?')}}
                                                 @if($event->ends && $event->starts != $event->ends)
+                                                    @if($event->ends->format('d M y') != $event->starts->format('d M y'))
                                                         t/m {{strtolower(Formatter::relativeDate($event->ends, 'W d m y?'))}}
+                                                    @else
+                                                        van {{ $event->starts->format('H:i') }} uur tot {{ $event->ends->format('H:i') }} uur 
+                                                    @endif
                                                 @endif
                                             </span>
                                         </div>

resources/views/layouts/master.blade.php

@@ -101,9 +101,9 @@
         <div class="footer_menu">
             <div class="row">
                 <div class="col-12 col-md-3">
-                    <h4 class="box_header"><span>NH Gooi</span></h4>
+                    <h4 class="box_header"><span>NHGooi</span></h4>
 		    <p class="about">
-                        NH Gooi is de streekomroep voor Gooi &amp; Vechtstreek. Wij brengen nieuws en achtergronden
+                        NHGooi is de streekomroep voor Gooi &amp; Vechtstreek. Wij brengen nieuws en achtergronden
 			op onze website, radio en televisie. Daarnaast brengen we boeiende en belangrijke podcasts 
                         en een gevari&euml;erd programma-aanbod op al onze media-kanalen.
                     </p>
@@ -159,7 +159,7 @@
             </div>
         </div>
         <div class="copyright">
-            © NH Gooi
+            © NHGooi
             <a class="scroll_top" href="#top" title="Scroll to top"><i class="fa-solid fa-angle-up"></i></a>
         </div>
     </div>

resources/views/widgets/menu.blade.php

@@ -23,6 +23,7 @@
 		"Podcasts" => array(
 				"" => "/podcast",
 				"NH Gooi Spreekuur" => "/podcast/1091/nh-gooi-spreekuur",
+				"Gooise Mythes Ontrafeld" => "/podcast/1106/gooise-mythes-ontrafeld",
 				"NH Gooi Wijsneuzen" => "/podcast/1098/nh-gooi-wijsneuzen",
 				"Hilversum in de oorlog" => "/podcast/1097/hilversum-in-de-oorlog",
 		),