diff --git a/api-dev b/api-dev
new file mode 120000
index 00000000..44602463
--- /dev/null
+++ b/api-dev
@@ -0,0 +1 @@
+../api-dev
\ No newline at end of file
diff --git a/website/app/Http/Controllers/CalendarController.php b/website/app/Http/Controllers/CalendarController.php
index 51d935cf..f727ea78 100644
--- a/website/app/Http/Controllers/CalendarController.php
+++ b/website/app/Http/Controllers/CalendarController.php
@@ -12,7 +12,7 @@ class CalendarController extends Controller
$apiResult = $this->API('agenda/item/' . (int)$id);
$calendarEvent = new \Model\CalendarEvent($apiResult);
- return view('calendarevent', ['event' => $calendarEvent, 'meta_featuredImage' => count($calendarEvent->images) ? $calendarEvent->images[0]->url : null]);
+ return view('calendarevent', ['event' => $calendarEvent, 'metadata' => $calendarEvent->metadata]);
}
public function overview(Request $request)
diff --git a/website/app/Http/Controllers/NewsController.php b/website/app/Http/Controllers/NewsController.php
index 0a77d085..2bd4f129 100644
--- a/website/app/Http/Controllers/NewsController.php
+++ b/website/app/Http/Controllers/NewsController.php
@@ -21,7 +21,7 @@ class NewsController extends Controller
switch($apiResult->version) {
case 1:
- return view('newsitem', ['news' => $newsItem, 'meta_featuredImage' => count($newsItem->images) ? $newsItem->images[0]->url : null]);
+ return view('newsitem', ['news' => $newsItem, 'metadata' => $newsItem->metadata]);
break;
case 2:
@@ -32,7 +32,7 @@ class NewsController extends Controller
$newsItem->images = null; // Images will be embedded
$newsItem->video = null; // Videos will be embedded
$newsItem->content = $source->blocks;
- return view('newsitem', ['news' => $newsItem]);
+ return view('newsitem', ['news' => $newsItem, 'metadata' => $newsItem->metadata]);
}
}
diff --git a/website/app/Http/Controllers/RadioController.php b/website/app/Http/Controllers/RadioController.php
index 8c5fa4cf..af51efde 100644
--- a/website/app/Http/Controllers/RadioController.php
+++ b/website/app/Http/Controllers/RadioController.php
@@ -55,7 +55,7 @@ class RadioController extends Controller
}
}
- return view('podcastitem', ['podcast' => $podcast, 'related' => $related, 'searchURL' => 'gemist/zoeken']);
+ return view('podcastitem', ['podcast' => $podcast, 'metadata' => $podcast->metadata, 'related' => $related, 'searchURL' => 'gemist/zoeken']);
}
public function podcasts(Request $request, $programma = null)
diff --git a/website/app/Http/Controllers/StreamController.php b/website/app/Http/Controllers/StreamController.php
index 8d39de54..b57b334f 100644
--- a/website/app/Http/Controllers/StreamController.php
+++ b/website/app/Http/Controllers/StreamController.php
@@ -30,7 +30,7 @@ class StreamController extends Controller
}
return view('listen', [
- 'source' => $this->API_URL . 'podcast/download/' . $apiResult->url . '?auth=' . $podcast->auth,
+ 'source' => $this->API_URL . 'podcast/download' . $apiResult->url . '?auth=' . $podcast->auth,
'title' => $podcast->title,
'content' => $podcast->title,
'isStream' => false,
diff --git a/website/public/css/nhgooi.css b/website/public/css/nhgooi.css
index b7336fea..4eec1e0d 100644
--- a/website/public/css/nhgooi.css
+++ b/website/public/css/nhgooi.css
@@ -34,7 +34,7 @@ h1 a, h2 a, h3 a, h4 a, h5 a, h6 a
width: 100%;
}
- .header .now-playing-header {
+ .now-playing-header {
width: 100% !important;
margin-top: 30px !important;
}
@@ -70,6 +70,9 @@ h1 a, h2 a, h3 a, h4 a, h5 a, h6 a
.header .now-playing-header {
float: right;
+}
+
+.now-playing-header {
font-size: 16pt;
font-family: 'Roboto Condensed';
font-weight: 300;
@@ -81,23 +84,23 @@ h1 a, h2 a, h3 a, h4 a, h5 a, h6 a
display: block;
overflow: hidden;
position: relative;
- margin: 0;
+ margin: auto;
padding-top: 10px;
padding-bottom: 30px;
}
- .header .now-playing-header .title,
- .header .now-playing-header .artist {
+ .now-playing-header .title,
+ .now-playing-header .artist {
padding: 3px;
}
- .header .now-playing-header .title {
+ .now-playing-header .title {
font-weight: bold;
font-size: 120%;
}
- .header .now-playing-header .controls {
+ .now-playing-header .controls {
font-size: 75%;
bottom: 0;
position: absolute;
@@ -106,11 +109,11 @@ h1 a, h2 a, h3 a, h4 a, h5 a, h6 a
background-color: inherit;
}
- .header .now-playing-header .controls li {
+ .now-playing-header .controls li {
display: inline-block;
}
- .header .now-playing-header .controls li a {
+ .now-playing-header .controls li a {
line-height: 120%;
font-size: 80%;
color: #ABABAB;
@@ -120,7 +123,7 @@ h1 a, h2 a, h3 a, h4 a, h5 a, h6 a
margin-right: 5px;
}
- .header .now-playing-header .controls li a:hover {
+ .now-playing-header .controls li a:hover {
background-color: #E0E0E0;
transition: 500ms;
}
diff --git a/website/resources/views/calendarevent.blade.php b/website/resources/views/calendarevent.blade.php
index 54f99e46..5258628a 100644
--- a/website/resources/views/calendarevent.blade.php
+++ b/website/resources/views/calendarevent.blade.php
@@ -6,7 +6,7 @@
@section('breadcrumb')
@@ -17,15 +17,15 @@
- @if($event->region && $event->region != "Regio")
- Regio {{$event->region}}
- @endif
{{Formatter::relativeDate($event->starts, 'W d m y?')}}
@if($event->ends && $event->starts != $event->ends)
t/m {{Formatter::relativeDate($event->ends, 'd m y?')}}
@endif
+ @if($event->region && $event->region != "Regio")
+ Regio {{$event->region}}
+ @endif
@@ -40,10 +40,10 @@
{{ Formatter::relativeDate($event->podcast->created) }} uitgezonden
- @if($event->podcast->program) in {{ $event->podcast->program->name }} @endif
+ @if($event->podcast->program) in {{ $event->podcast->program->name }} @endif
-
+
Meer over dit fragment
@@ -100,7 +100,9 @@
@endif
+ {{--
@include('widgets/share')
+ --}}
diff --git a/website/resources/views/home.blade.php b/website/resources/views/home.blade.php
index 2c631bbc..f4cb3f53 100644
--- a/website/resources/views/home.blade.php
+++ b/website/resources/views/home.blade.php
@@ -1,4 +1,4 @@
-@extends('layouts/master')
+@extends('layouts.master')
@section('title')
NH Gooi - Nieuws
@@ -29,7 +29,7 @@
@@ -52,7 +52,7 @@
diff --git a/website/resources/views/kerkdienst.blade.php b/website/resources/views/kerkdienst.blade.php
index 530c7c7c..54b6e5fc 100644
--- a/website/resources/views/kerkdienst.blade.php
+++ b/website/resources/views/kerkdienst.blade.php
@@ -22,7 +22,7 @@
- Luister in nieuw venster
+ Luister in nieuw venster
Download als MP3
@@ -35,7 +35,7 @@
@endif
Zondagochtend van 9:00 tot 12:00 uur kunt u live meeluisteren naar het programma Kerk & Samenleving via de link
- Luister live .
+ Luister live .
Vanaf {{$kerkdienst->isRunning ? "vanmiddag" : "zondagmiddag" }} 12:00 uur is de dienst op deze pagina terug te luisteren.
diff --git a/website/resources/views/layouts/_head.blade.php b/website/resources/views/layouts/_head.blade.php
new file mode 100644
index 00000000..5c37702c
--- /dev/null
+++ b/website/resources/views/layouts/_head.blade.php
@@ -0,0 +1,37 @@
+
+
@yield('title') | NH Gooi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ set('url', url()->current())
+ ->prepend('image', $imgBase)
+ ->prepend('audio', route('gemist.details'))
+ ->append('title', ' | NH Gooi')
+ ->metaTags();
+ } ?>
+ @stack('styles')
+
+
+
+
+
diff --git a/website/resources/views/layouts/empty.blade.php b/website/resources/views/layouts/empty.blade.php
new file mode 100644
index 00000000..9f72e81c
--- /dev/null
+++ b/website/resources/views/layouts/empty.blade.php
@@ -0,0 +1,8 @@
+
+
+ @include('layouts._head')
+
+ @yield('content')
+ @stack('scripts')
+
+
diff --git a/website/resources/views/layouts/master.blade.php b/website/resources/views/layouts/master.blade.php
index a26d96ba..4e1274e5 100644
--- a/website/resources/views/layouts/master.blade.php
+++ b/website/resources/views/layouts/master.blade.php
@@ -3,54 +3,7 @@
@endsection
-
-
@yield('title')
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- @stack('styles')
-
-
-
-
-
-
+ @include('layouts._head')
@@ -412,6 +367,7 @@
+ {{--
+ --}}
@@ -463,7 +420,7 @@
function updateOnAir() {
$.ajax({
- url: '{{url('onair')}}',
+ url: '{{route('onair')}}',
success: function(data) {
$(document).trigger('onAirUpdated', data);
}
@@ -488,12 +445,17 @@
$nowPlaying.title.text(data.current.title).attr('title', data.current.title);
$nowPlaying.artist.text(data.current.artist).attr('title', data.current.artist);
}
- $nowPlaying.programLink.attr('href', '{{url("radio/programma")}}' + data.program.url);
+ $nowPlaying.programLink.attr('href', '{{route("programma")}}' + data.program.url);
$nowPlaying.container.slideDown();
// Now playing may have moved the menu
menu_position = $(".menu_container").offset().top;
});
+ $(".player").click(function(e) {
+ e.preventDefault();
+ window.open($(this).attr('href'), '_player', 'width=500,height=500,titlebar,close');
+ return false;
+ });
@stack('scripts')
diff --git a/website/resources/views/listen.blade.php b/website/resources/views/listen.blade.php
index 8115159b..16a412f1 100644
--- a/website/resources/views/listen.blade.php
+++ b/website/resources/views/listen.blade.php
@@ -1,88 +1,145 @@
-
-
-
-NH Gooi | {{$title}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Venster sluiten
-
+@extends('layouts.empty')
+@section('content')
+ Venster sluiten
-
- Nu op NH Gooi:
-
-
- @if(!$isStream)
- Luister live
- @endif
-
-
@if(false && $isStream)
Wegens een technisch probleem is NH Gooi momenteel niet via Internet te beluisteren. Onze excuses voor het ongemak.
In Hilversum, Huizen en de BEL-gemeenten zijn wij te ontvangen op 92.0 FM of 105.1 FM.
@else
+
+
+
+@endsection
-
-
-
-
-
+@push('styles')
+
+@endpush
+
+@push('scripts')
+
+
+@endpush
+
+@include('widgets.mediaplayer')
diff --git a/website/resources/views/newsitem.blade.php b/website/resources/views/newsitem.blade.php
index 2b6bb09b..86a094bb 100644
--- a/website/resources/views/newsitem.blade.php
+++ b/website/resources/views/newsitem.blade.php
@@ -6,9 +6,9 @@
@section('breadcrumb')
@@ -20,10 +20,10 @@
@if($news->region && $news->region->title != "Regio")
- Regio {{$news->region->title}}
+ Regio {{$news->region->title}}
@endif
@if($news->theme && $news->theme->title != "Overig")
- Thema {{$news->theme->title}}
+ Thema {{$news->theme->title}}
@endif
{{Formatter::relativeDate($news->published)}} om {{$news->published->format('H:i')}}
@@ -52,10 +52,10 @@
{{ Formatter::relativeDate($news->podcast->created) }} uitgezonden
- @if($news->podcast->program) in {{ $news->podcast->program->name }} @endif
+ @if($news->podcast->program) in {{ $news->podcast->program->name }} @endif
-
+
Meer over dit fragment
@@ -118,24 +118,28 @@
@endif
+ {{--
@include('widgets/share')
+ --}}
diff --git a/website/resources/views/newslist.blade.php b/website/resources/views/newslist.blade.php
index 63f7509f..decb9a93 100644
--- a/website/resources/views/newslist.blade.php
+++ b/website/resources/views/newslist.blade.php
@@ -8,7 +8,7 @@
@section('breadcrumb')
@if($title)
@@ -35,10 +35,10 @@
- {{$item->region->title}}
+ {{$item->region->title}}
- {{$item->theme->title}}
+ {{$item->theme->title}}
36 @if($item->edited && ($item->edited != $item->published))
diff --git a/website/resources/views/podcastitems.blade.php b/website/resources/views/partial/podcastitems.blade.php
similarity index 62%
rename from website/resources/views/podcastitems.blade.php
rename to website/resources/views/partial/podcastitems.blade.php
index 479a45cd..ee524110 100644
--- a/website/resources/views/podcastitems.blade.php
+++ b/website/resources/views/partial/podcastitems.blade.php
@@ -4,14 +4,14 @@
@if($i > 0) @endif
@endif
- url); ?>
+ url; ?>
@if($podcast->program)
- {{$podcast->program->name}}
+ {{$podcast->program->name}}
@endif
@@ -22,12 +22,12 @@
@if($podcast->image)
-
+
@endif
{!! Formatter::excerpt($podcast->content, 200) !!}
- Luister fragment
+ Luister fragment
diff --git a/website/resources/views/partial/radioscheduleweek.blade.php b/website/resources/views/partial/radioscheduleweek.blade.php
index d395154a..d8e0678d 100644
--- a/website/resources/views/partial/radioscheduleweek.blade.php
+++ b/website/resources/views/partial/radioscheduleweek.blade.php
@@ -33,7 +33,7 @@
@endif
@php($durationToday = ($hour + $duration <= 24) ? $duration : (24 - $hour))
- tagline : "")}}">
+ tagline : "")}}">
{{$item['program']->name}}
@if($isCurrent) Nu op NH Gooi
@endif
diff --git a/website/resources/views/podcastitem.blade.php b/website/resources/views/podcastitem.blade.php
index 0adf3add..c55de60b 100644
--- a/website/resources/views/podcastitem.blade.php
+++ b/website/resources/views/podcastitem.blade.php
@@ -8,10 +8,10 @@
@section('breadcrumb')