Aanpassingen layout na feedback

website/app/Console/Kernel.php

@@ -38,11 +38,12 @@ class Kernel extends ConsoleKernel
 		// Update now / later
 		$schedule->call(function() {
 			Storage::disk('local')->put('nu_straks.json', file_get_contents($this->API_URL . 'programma/schema/nustraks'));
+			Storage::disk('local')->put('zojuist.json', file_get_contents($this->API_URL . 'programma/schema/recent'));
 		})->everyMinute();
 
-		// Update latest podcasts (3 items)
+		// Update latest podcasts (6 items)
 		$schedule->call(function() {
-			Storage::disk('local')->put('laatste_podcasts.json', file_get_contents($this->API_URL . 'podcast/overzicht?pagina=1&aantal=3'));
+			Storage::disk('local')->put('laatste_podcasts.json', file_get_contents($this->API_URL . 'podcast/overzicht?pagina=1&aantal=6'));
 		})->everyMinute();
 
 		// Update calendar items

website/app/Http/Controllers/Controller.php

@@ -52,6 +52,18 @@ class Controller extends BaseController
 				$program->end = new \DateTimeImmutable($item_data->end->date, new \DateTimeZone($item_data->end->timezone));
 			}
 
+			$now = new \DateTimeImmutable();
+			$data = json_decode(Storage::disk('local')->get('zojuist.json'))->schedule;
+			foreach(array_reverse($data) as $item_data) 
+			{
+				$recent = $program = new \Model\Program($item_data->program);
+				$recent->start = new \DateTimeImmutable($item_data->start->date, new \DateTimeZone($item_data->start->timezone));
+				$recent->end = new \DateTimeImmutable($item_data->end->date, new \DateTimeZone($item_data->end->timezone));
+				if(($recent->end < $now) && (!$recent->nonstop) && (!$recent->rerun)) {
+					$view->with('recent', $recent);
+					break;
+				}
+			}
 
 			$view->with('data', $programs);
 		});

website/resources/views/contact.blade.php

@@ -5,15 +5,24 @@
 @endsection
 
 @section('content')
-<h1>Contact</h1><P>
+<h1>Contact</h1>
-Neem contact op met NH Gooi. De streekomroep voor Hilversum, Huizen, Blaricum, Eemnes en Laren. NH Gooi hoor je in heel Gooi en Eemland op 92.0 FM, 105.1 FM en 106.2 FM.<br><br>
+<p>Neem contact op met NH Gooi. De streekomroep voor Hilversum, Huizen, Blaricum, Eemnes en Laren.</p>
 
-<B>Het postadres van NH Gooi is: </B><br>
+<p class="clearfix">
+Wij zijn te ontvangen in heel Gooi en Eemland. <br>
+<a href="{{url('frequenties')}}" class="action_button">
+<span class="fa fa-list"></span>
+<span>Frequenties</span>
+</a>
+</p>
+
+<p>
+<b>Het postadres van NH Gooi is: </b><br>
 Postbus 83<br>
 1270 AB Huizen<br>
 <br>
 
-<B>Bezoekadres / Studio:</B><br>
+<b>Bezoekadres / Studio:</b><br>
 IJsselmeerstraat 3B<br>
 1271 AA Huizen<br><br>
 

website/resources/views/frequenties.blade.php

@@ -0,0 +1,24 @@
+@extends('layouts.sidebar')
+
+@section('title')
+  Frequenties
+@endsection
+
+@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>
+
+<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>
+
+<h2 class="page_margin_top">NH Gooi TV</h2>
+<p>NH Gooi TV zie je op de kabel:</p>
+
+<ul class="list no_border spacing">
+	<li class="bullet style_2">Bij KPN op <b>kanaal 1379</b>.</li>
+	<li class="bullet style_2">Bij Ziggo op <b>kanaal 40</b>.</li>
+</ul>
+@endsection

website/resources/views/home.blade.php

@@ -171,13 +171,9 @@
 
 				@include('widgets.nustraks')
 
-				<h4 class="page_margin_top box_header"><span class="fa fa-history"></span> &nbsp; Fragment gemist</h4>
+				<h4 class="page_margin_top box_header"><span class="fa fa-history"></span> &nbsp; Iets gemist?</h4>
-				@include('widgets.laatstepodcasts')	
+				<p><a class="more" href="{{route('gemist.fragment')}}">Fragment gemist</a>
-				<a class="more page_margin_top" href="{{route('gemist')}}">Meer Fragment Gemist</a>
+				<a class="more" style="margin-top: 2px;" href="{{route('gemist.programma')}}">Programma terugluisteren</a></p>
-
-				<h4 class="page_margin_top box_header"><span class="fa fa-calendar"></span> &nbsp; Regioagenda</h4>
-				@include('widgets.regioagenda')
-				<a class="more page_margin_top" href="{{route('agenda')}}">Regio-agenda</a>
 
 				@if(!$title)
 				<h4 class="page_margin_top box_header"><span class="fa fa-tag"></span> &nbsp; Recente berichten</h4>

website/resources/views/layouts/master.blade.php

@@ -273,28 +273,12 @@
 						<div class="column column_1_3">
 							<h4 class="box_header">NH Gooi</h4>
 							<p class="padding_top_bottom_25">
-						 		NH Gooi is de streekomroep voor het Gooi in samenwerking met NH Media.
+						 		<b>NH Gooi</b> is de streekomroep voor het Gooi in samenwerking met NH Media.
-								NH Gooi hoor je in heel Gooi en Eemland op 92.0 FM, 105.1 FM en 106.2 FM.
+								<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>
 							</p>
 							<div class="row">
 								<div class="column column_1_2">
-									<h5>Redactie</h5>
-									<p>
-									Neuweg 12 <br/>
-									1211 LW  Hilversum <br/>
-									035 642 4774
-									</p>
-								</div>
-								<div class="column column_1_2">
-									<h5>Postadres</h5>
-									<p>
-									Postbus 83 <br/>
-									1270 AB  Huizen <br/>
-									</p>
-								</div>
-							</div>
-							<div class="row">
-								<div class="column">
 									<h5>Bezoekadres / Studio</h5>
 									<p>
 									IJsselmeerstraat 3B <br/>
@@ -305,6 +289,13 @@
 									KvK: 	41194132
 									</p>
 								</div>
+								<div class="column column_1_2">
+									<h5>Postadres</h5>
+									<p>
+									Postbus 83 <br/>
+									1270 AB  Huizen <br/>
+									</p>
+								</div>
 							</div>
 							{{--
 							<h4 class="box_header page_margin_top">Get In Touch With Us</h4>
@@ -433,7 +424,8 @@
 				artist: $(".now-playing-header .artist"),
 				controls: $(".now-playing-header .controls"),
 				programLink: $(".now-playing-header .program-link a"),
-				programLabel: $(".now-playing-header .program-link a > label")
+				programLabel: $(".now-playing-header .program-link a > label"),
+				first: true
 			};
 			$(document).on('onAirUpdated', function(evt, data) {
 				if(data.inProgram) {
@@ -445,9 +437,12 @@
 					$nowPlaying.artist.text(data.current.artist).attr('title', data.current.artist);
 				}
 				$nowPlaying.programLink.attr('href', '{{route("programma")}}' + data.program.url);
-				$nowPlaying.controls.hide();
+				if($nowPlaying.first) { $nowPlaying.controls.hide(); }
 				$nowPlaying.container.slideDown(function() {
-					$nowPlaying.controls.fadeIn('slow');
+					if($nowPlaying.first) {
+						$nowPlaying.controls.fadeIn('slow');
+						$nowPlaying.first = false;
+					}
 				});
 
 				// Now playing may have moved the menu

website/resources/views/layouts/sidebar.blade.php

@@ -20,18 +20,6 @@
 				@include('widgets.banners')
 
 				@include('widgets.nustraks')
-
-				<h4 class="page_margin_top box_header"><span class="fa fa-history"></span> &nbsp; Fragment gemist</h4>
-				@include('widgets.laatstepodcasts')	
-				<a class="more page_margin_top" href="{{route('gemist')}}">Meer Fragment Gemist</a>
-
-				<h4 class="page_margin_top box_header"><span class="fa fa-fire"></span> &nbsp; Meest gelezen</h4>
-				@include('widgets.populairnieuws')
-				<a class="more page_margin_top" href="{{route('nieuws')}}">Laatste nieuws</a>
-
-				<h4 class="page_margin_top box_header"><span class="fa fa-calendar"></span> &nbsp; Regioagenda</h4>
-				@include('widgets.regioagenda')
-				<a class="more page_margin_top" href="{{route('agenda')}}">Regio-agenda</a>
 			</div>
 		</div>
 	</div>

website/resources/views/newsitem.blade.php

@@ -28,9 +28,9 @@
 			<li class="detail date">		
 				{{Formatter::relativeDate($news->published)}} om {{$news->published->format('H:i')}}
 				@if($news->edited && ($news->edited->format('d m H i') != $news->published->format('d m H i')))
-					| bijgewerkt om
+					| bijgewerkt:
 					@if($news->edited->format('d m') != $news->published->format('d m'))
-					op {{Formatter::relativeDate($news->edited)}} 
+					{{strtolower(Formatter::relativeDate($news->edited))}} 
 					@endif
 					om {{$news->edited->format('H:i')}} uur
 				@endif

website/resources/views/widgets/laatstepodcasts.blade.php

@@ -1,22 +1,9 @@
-<ul class="blog small clearfix">
+<ul class="list no_border spacing clearfix">
 @foreach($data as $podcast)
-	<li class="post">
+	<li class="bullet_style_2">
-		<a href="{{url($podcast->url)}}" title="{{$podcast->title}}">
-			<img src="{{$podcast->image ? $imgBase . $podcast->image->url : '/images/podcast.png'}}" alt="{{$podcast->title}}">
-		</a>
-		<div class="post_content">
 			<h5>
-				<a href="{{route('gemist.fragment') . $podcast->url}}" title="{{$podcast->title}}">{{$podcast->titleWithoutProgram()}}</a>
+				<a href="{{route('gemist.fragment') . $podcast->url}}" title="{{$podcast->title}}" style="color: inherit;">{{$podcast->titleWithoutProgram()}}</a>
 			</h5>
-			<ul class="post_details simple">
-				@if($podcast->program)
-				<li class="category"><a href="{{route('gemist.programma') . $podcast->program->url}}" title="{{$podcast->program->name}}">{{$podcast->program->name}}</a></li>
-				@endif
-				<li class="date">
-					{{Formatter::relativeDate($podcast->created)}}
-				</li>
-			</ul>
-		</div>
 	</li>
 @endforeach
 </ul>

website/resources/views/widgets/menu.blade.php

@@ -10,9 +10,10 @@
 "TV" => array(
 	"Kijk live" => "/kijk/live"),
 "Regioagenda" => "/agenda",
-"Contact" => array(
+"Over ons" => array(
 	"" => "/contact",
 	"Contact" => "/contact",
+	"Frequenties" => "/frequenties",
 	"Adverteren?" => "/adverteren",
 ),
 	"NH Nieuws" => "https://nhnieuws.nl");

website/resources/views/widgets/nustraks.blade.php

@@ -41,4 +41,17 @@
 	@endif
 @endforeach
 </ul>
+
+@if(isset($recent))
+<h5 class="page_margin_top box_header">Net gemist?</h5>
+<p><b>{{$recent->name}}</b></p>
+<span class="text-muted">{{Formatter::relativeDate($recent->start)}} om {{$recent->start->format('H:i')}}.</span>
+<p class="clearfix">
+@php($duration = $recent->end->diff($recent->start)->h)
+<a class="action_button player" style="margin-top: 0;" href="{{route('luister.programma') . '/' . $recent->start->format('Y/m/d/H') . '/' . $duration}}" title="Luister live">
+	<span class="fa fa-history"></span>
+	<span>Terugluisteren</span>
+</a>
+</p>
+@endif
 </div>

website/resources/views/widgets/regioagenda.blade.php

@@ -1,24 +1,10 @@
-<div class="vertical_carousel_container clearfix">
+<ul class="list no_border spacing clearfix">
-<ul class="blog small vertical_carousel autoplay-1 scroll-1 navigation-1 easing-easeInOutQuint duration-750">
 @foreach($data as $item)
 	@if($loop->index >= 5) @break @endif
-	<li class="post">
+	<li class="bullet_style_2">
-		<a href="{{url($item->url)}}" title="{{$item->title}}">
-			<img src="{{$item->images && count($item->images) ? $imgBase . $item->images[0]->url : '/images/noimage.png'}}" alt="{{$item->title}}">
-		</a>
-		<div class="post_content">
 			<h5>
-				<a href="{{url($item->url)}}" title="{{$item->title}}">{{$item->title}}</a>
+				<a href="{{url($item->url)}}" title="{{$item->title}}" style="color: inherit;">{{$item->title}}</a>
 			</h5>
-			<ul class="post_details simple">
-				<li class="category">{{$item->region}}</a></li>
-				<li class="date">
-					{{Formatter::relativeDate($item->starts)}}
-				</li>
-			</ul>
-		</div>
 	</li>
 @endforeach
 </ul>
-</div>
-

website/routes/web.php

@@ -63,6 +63,7 @@ Route::get('/kerkdienst', 'KerkdienstController@main')->name('kerkdienst');
 Route::get('/kerkdienst/luister', 'StreamController@kerkdienst')->name('luister.kerkdienst');
 
 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('/special/stmaarten', function() { return file_get_contents('http://api-dev.6fm.nl/special/stmaarten'); });