diff --git a/app/Http/Controllers/CalendarController.php b/app/Http/Controllers/CalendarController.php
index ffb32f65..cf11a0d1 100644
--- a/app/Http/Controllers/CalendarController.php
+++ b/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]));
}
diff --git a/resources/views/calendarevent.blade.php b/resources/views/calendarevent.blade.php
index 9e7911f4..ca923e76 100644
--- a/resources/views/calendarevent.blade.php
+++ b/resources/views/calendarevent.blade.php
@@ -104,7 +104,7 @@
@include('partial/nh_story', ['content' => $event->content]);
@else
-
{!!$event->content!!}
+ {!!$event->content!!}
@endif
diff --git a/resources/views/calendarlist.blade.php b/resources/views/calendarlist.blade.php
index 000a3f1d..4ce39203 100644
--- a/resources/views/calendarlist.blade.php
+++ b/resources/views/calendarlist.blade.php
@@ -41,7 +41,7 @@
@php($count = 0)
@foreach($events as $event)
@php($count++)
- $event->id, 'title' => $event->title]); ?>
+ url; ?>
@@ -52,15 +52,19 @@
-
- @foreach($event->tags as $tag)
- - {{$tag->title}}
+
{{Formatter::relativeDate($event->starts, 'W d m y?')}}
@if($event->ends && $event->starts != $event->ends)
- t/m {{strtolower(Formatter::relativeDate($event->ends, 'W d m y?'))}}
+ @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
diff --git a/resources/views/layouts/master.blade.php b/resources/views/layouts/master.blade.php
index 8f7f4876..57b83e0f 100644
--- a/resources/views/layouts/master.blade.php
+++ b/resources/views/layouts/master.blade.php
@@ -101,9 +101,9 @@
diff --git a/resources/views/widgets/menu.blade.php b/resources/views/widgets/menu.blade.php
index 4583cf41..9c5b01fb 100644
--- a/resources/views/widgets/menu.blade.php
+++ b/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",
),