From 0582de5bb074f810e469db3b9ade76bdb71da131 Mon Sep 17 00:00:00 2001
From: Mischa Spelt <mischa.spelt@nhgooi.nl>
Date: Thu, 20 Feb 2020 15:42:51 +0100
Subject: [PATCH] Stream gemeenteraad, kanalen, footers, bug fix zoeken

---
 website/app/Http/Controllers/Controller.php            | 4 +++-
 website/public/css/nhgooi.css                          | 6 ++++++
 website/resources/views/frequenties.blade.php          | 9 +++++++--
 website/resources/views/layouts/master.blade.php       | 4 ++--
 website/resources/views/newslist.blade.php             | 6 +++++-
 website/resources/views/partial/podcastitems.blade.php | 3 ++-
 website/resources/views/programlist.blade.php          | 2 +-
 website/resources/views/widgets/menu.blade.php         | 1 +
 website/routes/web.php                                 | 1 +
 9 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/website/app/Http/Controllers/Controller.php b/website/app/Http/Controllers/Controller.php
index ff3350ce..a67a3c39 100644
--- a/website/app/Http/Controllers/Controller.php
+++ b/website/app/Http/Controllers/Controller.php
@@ -52,8 +52,10 @@ class Controller extends BaseController
 				$program->end = new \DateTimeImmutable($item_data->end->date, new \DateTimeZone($item_data->end->timezone));
 			}
 
-			$now = new \DateTimeImmutable();
+			// Need a bit of slack here, otherwise the current program may show up
+			$now = new \DateTimeImmutable('2 minutes ago');
 			$data = json_decode(Storage::disk('local')->get('zojuist.json'))->schedule;
+			$i = 0;
 			foreach(array_reverse($data) as $item_data) 
 			{
 				$recent = $program = new \Model\Program($item_data->program);
diff --git a/website/public/css/nhgooi.css b/website/public/css/nhgooi.css
index 7ca99477..53f68cd1 100644
--- a/website/public/css/nhgooi.css
+++ b/website/public/css/nhgooi.css
@@ -297,6 +297,12 @@ button[disabled]:hover
 	background-color: #03A6E0;
 }
 
+.row.grid .card .post_content {
+	padding: 4px;
+	border: solid 1px #03A6E022;
+	border-radius: 8px;
+}
+
 .row.grid .column {
 	margin: 0px;
 	margin-top: 10px;
diff --git a/website/resources/views/frequenties.blade.php b/website/resources/views/frequenties.blade.php
index be4ed7fb..b3a3d169 100644
--- a/website/resources/views/frequenties.blade.php
+++ b/website/resources/views/frequenties.blade.php
@@ -7,12 +7,17 @@
 @section('content')
 
 <h2 class="page_margin_top">NH Gooi Radio</h2>
-<p>NH Gooi Radio hoor je in heel Gooi en Eemland op FM:</p>
+<p>NH Gooi Radio hoor je in heel Gooi en Eemland op FM:
 
 <ul class="list no_border spacing">
 	<li class="bullet style_2">Huizen, BEL-gemeenten: <b>92.0 FM</b> of <b>105.1 FM</b></li>
 	<li class="bullet style_2">Hilversum: <b>106.2 FM</b></li>
-</ul>
+</ul></p>
+
+<p>Of luister via je digitale ontvanger:
+<ul class="list no_border spacing">
+	<li class="bullet style_2">Bij KPN op <b>kanaal 1079</b>.</li>
+</ul></p>
 
 <h2 class="page_margin_top">NH Gooi TV</h2>
 <p>NH Gooi TV zie je op de kabel:</p>
diff --git a/website/resources/views/layouts/master.blade.php b/website/resources/views/layouts/master.blade.php
index 7a75db13..68a0017f 100644
--- a/website/resources/views/layouts/master.blade.php
+++ b/website/resources/views/layouts/master.blade.php
@@ -274,8 +274,8 @@
 							<h4 class="box_header">NH Gooi</h4>
 							<p class="padding_top_bottom_25">
 						 		<b>NH Gooi</b> is de streekomroep voor het Gooi in samenwerking met NH Media.
-								<b>NH Gooi Radio</b> hoor je in heel Gooi en Eemland op 92.0 FM, 105.1 FM en 106.2 FM.
-								<b>NH Gooi TV</b> kijk je op KPN kanaal 1379 of Ziggo kanaal 40. <a href="{{url('frequenties')}}">Meer frequenties?</a>
+								NH Gooi Radio hoor je in heel Gooi en Eemland, bijvoorbeeld op 92.0 FM. 
+								<a href="{{url('frequenties')}}">Alle frequenties / kanalen.</a>
 							</p>
 							<div class="row">
 								<div class="column column_1_2">
diff --git a/website/resources/views/newslist.blade.php b/website/resources/views/newslist.blade.php
index decb9a93..83c31fa9 100644
--- a/website/resources/views/newslist.blade.php
+++ b/website/resources/views/newslist.blade.php
@@ -34,13 +34,17 @@
 						</a>
 						<h2><a href="{{url($item->url)}}" title="{{strip_tags($item->title)}}">{!!$item->title!!}</a></h2>
 						<ul class="post_details">
+							@if($item->region)
 							<li class="category">
 								<a title="Regio: {{$item->region->title}}" href="{{route('nieuws.regio', ['id' => $item->region->slug])}}">{{$item->region->title}}</a>
 							</li>
+							@endif
+							@if($item->theme)
 							<li class="category">
 								<a title="Thema: {{$item->theme->title}}" href="{{route('nieuws.thema', ['id' => $item->theme->slug])}}">{{$item->theme->title}}</a>
 							</li>
-36										@if($item->edited && ($item->edited != $item->published))
+							@endif
+36							@if($item->edited && ($item->edited != $item->published))
 							<li class="date edited">
 								Bijgewerkt 
 								@if($item->edited->format('d m') != $item->published->format('d m'))
diff --git a/website/resources/views/partial/podcastitems.blade.php b/website/resources/views/partial/podcastitems.blade.php
index 4e2f5abc..7507dcf1 100644
--- a/website/resources/views/partial/podcastitems.blade.php
+++ b/website/resources/views/partial/podcastitems.blade.php
@@ -5,7 +5,7 @@
 <ul class='blog row grid'>
 @endif
 	<?php $url = route('gemist.fragment') . $podcast->url; ?>
-	<li class="post column column_1_2">
+	<li class="post card column column_1_2">
 		<div class="post_content">
 			<h2><a href="{{$url}}" title="{{$podcast->title}}">{!!$podcast->titleWithoutProgram()!!}</a></h2>
 			<ul class="post_details">
@@ -28,6 +28,7 @@
 			@endif
 			<p>{!! Formatter::excerpt($podcast->content, 200) !!}</p>
 			<a class="read_more" href="{{route('gemist.fragment') . $podcast->url}}" title="Luister fragment"><span class="arrow"></span><span>Luister fragment</span></a>
+			<span class="clearfix"></span>
 		</div>
 	</li>
 
diff --git a/website/resources/views/programlist.blade.php b/website/resources/views/programlist.blade.php
index 5a60df68..c37c57d4 100644
--- a/website/resources/views/programlist.blade.php
+++ b/website/resources/views/programlist.blade.php
@@ -47,7 +47,7 @@
             @endif
             	<?php $url = route('programma') . $program->program->url; ?>
 		<?php $duration = $program->end->diff($program->start)->h; ?>
-            	<li class="post column column_1_2">
+            	<li class="post card column column_1_2">
             		<div class="post_content">
             			<h2><a href="{{$url}}" title="{{$program->program->name}}">{!!$program->program->name!!}</a></h2>
             			<ul class="post_details" style="margin-top: 0;">
diff --git a/website/resources/views/widgets/menu.blade.php b/website/resources/views/widgets/menu.blade.php
index 6d0668f1..2f24e6e5 100644
--- a/website/resources/views/widgets/menu.blade.php
+++ b/website/resources/views/widgets/menu.blade.php
@@ -120,6 +120,7 @@ function buildMenu($menu, $ismobile) {
 				</a>
 				<ul class="mega_menu blog">
 					@foreach($podcasts as $item)
+					@if($loop->index >= 3) @break @endif
 					<li class="post">
 						@if($item->image)
 						<a href="{{route('gemist.fragment') . $item->url}}" title="{{$item->title}}">
diff --git a/website/routes/web.php b/website/routes/web.php
index 270178af..ccc35df3 100644
--- a/website/routes/web.php
+++ b/website/routes/web.php
@@ -65,6 +65,7 @@ Route::get('/kerkdienst/luister', 'StreamController@kerkdienst')->name('luister.
 Route::get('/contact', 'Controller@view_contact')->name('contact');
 Route::get('/frequenties', 'Controller@view_frequenties')->name('frequenties');
 Route::get('/adverteren', 'Controller@view_adverteren')->name('adverteren');
+Route::get('/test', 'Controller@view_test')->name('test');
 
 //Route::get('/special/stmaarten', function() { return file_get_contents('http://api-dev.6fm.nl/special/stmaarten'); });
 //Route::get('/kabelkrant', function() { return view('kabelkrant'); });