NH_Gooi/nhgooi.nl
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into dev

Browse Source
This commit is contained in:
NH Gooi
2024-11-12 14:17:24 +01:00
parent a930fb7216 e2551b1dab
commit 35a5aa636f
5 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/CalendarController.php
View File

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

2
resources/views/calendarevent.blade.php
View File

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

14
resources/views/calendarlist.blade.php
View File

@@ -41,7 +41,7 @@
@php($count = 0) @php($count = 0)
@foreach($events as $event) @foreach($events as $event)
@php($count++) @php($count++)
<?php $url = route('agenda.details', ['id' => $event->id, 'title' => $event->title]); ?> <?php $url = $event->url; ?>
<div class="box featured"> <div class="box featured">
<div class="row"> <div class="row">
<div class="col-12 col-md-6"> <div class="col-12 col-md-6">
@@ -52,15 +52,19 @@
<div class="col-12 col-md-6"> <div class="col-12 col-md-6">
<h2 class="post_title"><a href="{{$url}}" title="{{$event->title}}">{!!$event->title!!}</a></h2> <h2 class="post_title"><a href="{{$url}}" title="{{$event->title}}">{!!$event->title!!}</a></h2>
<div class="sub_title" style="flex-wrap: wrap"> <div class="sub_title" style="flex-wrap: wrap">
<ul class="post_tags" style="width: 100%; margin: 0 0 8px 0;height: 25px;"> <ul class="post_tags" style="width: 100%; margin: 0 0 8px 0;height: 25px;">
@foreach($event->tags as $tag) @foreach($event->tags as $tag)
<li><a style="padding: 3px 8px 3px" title="{{$tag->title}}">{{$tag->title}}</a></li> <li><a style="padding: 3px 8px 3px" title="{{$tag->title}}">{{$tag->title}}</a></li>
@endforeach @endforeach
</ul> </ul>
<span class="post_date" style="line-height: 1.17; height: 14px;" title="{{Formatter::relativeDate($event->starts, 'W d m y?')}}"> <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?')}} <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 && $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 @endif
</span> </span>
</div> </div>

6
resources/views/layouts/master.blade.php
View File

@@ -101,9 +101,9 @@
<div class="footer_menu"> <div class="footer_menu">
<div class="row"> <div class="row">
<div class="col-12 col-md-3"> <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"> <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 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. en een gevari&euml;erd programma-aanbod op al onze media-kanalen.
</p> </p>
@@ -159,7 +159,7 @@
</div> </div>
</div> </div>
<div class="copyright"> <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> <a class="scroll_top" href="#top" title="Scroll to top"><i class="fa-solid fa-angle-up"></i></a>
</div> </div>
</div> </div>

1
resources/views/widgets/menu.blade.php
View File

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