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

Veel kleine puntjes weggewerkt

Browse Source
This commit is contained in:
Mischa Spelt
2020-02-05 00:40:31 +01:00
parent d1210e1441
commit 74d3219e10
26 changed files with 305 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api-dev Symbolic link
View File

@@ -0,0 +1 @@
../api-dev

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

@@ -12,7 +12,7 @@ class CalendarController extends Controller
$apiResult = $this->API('agenda/item/' . (int)$id); $apiResult = $this->API('agenda/item/' . (int)$id);
$calendarEvent = new \Model\CalendarEvent($apiResult); $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) public function overview(Request $request)

4
website/app/Http/Controllers/NewsController.php
View File

@@ -21,7 +21,7 @@ class NewsController extends Controller
switch($apiResult->version) { switch($apiResult->version) {
case 1: 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; break;
case 2: case 2:
@@ -32,7 +32,7 @@ class NewsController extends Controller
$newsItem->images = null; // Images will be embedded $newsItem->images = null; // Images will be embedded
$newsItem->video = null; // Videos will be embedded $newsItem->video = null; // Videos will be embedded
$newsItem->content = $source->blocks; $newsItem->content = $source->blocks;
return view('newsitem', ['news' => $newsItem]); return view('newsitem', ['news' => $newsItem, 'metadata' => $newsItem->metadata]);
} }
} }

2
website/app/Http/Controllers/RadioController.php
View File

@@ -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) public function podcasts(Request $request, $programma = null)

2
website/app/Http/Controllers/StreamController.php
View File

@@ -30,7 +30,7 @@ class StreamController extends Controller
} }
return view('listen', [ 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, 'title' => $podcast->title,
'content' => $podcast->title, 'content' => $podcast->title,
'isStream' => false, 'isStream' => false,

21
website/public/css/nhgooi.css vendored
View File

@@ -34,7 +34,7 @@ h1 a, h2 a, h3 a, h4 a, h5 a, h6 a
width: 100%; width: 100%;
} }
.header .now-playing-header { .now-playing-header {
width: 100% !important; width: 100% !important;
margin-top: 30px !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 { .header .now-playing-header {
float: right; float: right;
}
.now-playing-header {
font-size: 16pt; font-size: 16pt;
font-family: 'Roboto Condensed'; font-family: 'Roboto Condensed';
font-weight: 300; font-weight: 300;
@@ -81,23 +84,23 @@ h1 a, h2 a, h3 a, h4 a, h5 a, h6 a
display: block; display: block;
overflow: hidden; overflow: hidden;
position: relative; position: relative;
margin: 0; margin: auto;
padding-top: 10px; padding-top: 10px;
padding-bottom: 30px; padding-bottom: 30px;
} }
.header .now-playing-header .title, .now-playing-header .title,
.header .now-playing-header .artist { .now-playing-header .artist {
padding: 3px; padding: 3px;
} }
.header .now-playing-header .title { .now-playing-header .title {
font-weight: bold; font-weight: bold;
font-size: 120%; font-size: 120%;
} }
.header .now-playing-header .controls { .now-playing-header .controls {
font-size: 75%; font-size: 75%;
bottom: 0; bottom: 0;
position: absolute; position: absolute;
@@ -106,11 +109,11 @@ h1 a, h2 a, h3 a, h4 a, h5 a, h6 a
background-color: inherit; background-color: inherit;
} }
.header .now-playing-header .controls li { .now-playing-header .controls li {
display: inline-block; display: inline-block;
} }
.header .now-playing-header .controls li a { .now-playing-header .controls li a {
line-height: 120%; line-height: 120%;
font-size: 80%; font-size: 80%;
color: #ABABAB; color: #ABABAB;
@@ -120,7 +123,7 @@ h1 a, h2 a, h3 a, h4 a, h5 a, h6 a
margin-right: 5px; margin-right: 5px;
} }
.header .now-playing-header .controls li a:hover { .now-playing-header .controls li a:hover {
background-color: #E0E0E0; background-color: #E0E0E0;
transition: 500ms; transition: 500ms;
} }

14
website/resources/views/calendarevent.blade.php
View File

@@ -6,7 +6,7 @@
@section('breadcrumb') @section('breadcrumb')
<ul class="bread_crumb"> <ul class="bread_crumb">
<li><a title="Regio-agenda" href="{{url('agenda')}}">Regio-agenda</a></li> <li><a title="Regio-agenda" href="{{route('agenda')}}">Regio-agenda</a></li>
<li class="separator icon_small_arrow right_gray">&nbsp;</li> <li class="separator icon_small_arrow right_gray">&nbsp;</li>
<li>Details</li> <li>Details</li>
</ul> </ul>
@@ -17,15 +17,15 @@
<div class="row"> <div class="row">
<div class="post single small_image"> <div class="post single small_image">
<ul class="post_details clearfix"> <ul class="post_details clearfix">
@if($event->region && $event->region != "Regio")
<li class="detail category">Regio {{$event->region}}</a></li>
@endif
<li class="detail date"> <li class="detail date">
{{Formatter::relativeDate($event->starts, 'W d m y?')}} {{Formatter::relativeDate($event->starts, 'W d m y?')}}
@if($event->ends && $event->starts != $event->ends) @if($event->ends && $event->starts != $event->ends)
t/m {{Formatter::relativeDate($event->ends, 'd m y?')}} t/m {{Formatter::relativeDate($event->ends, 'd m y?')}}
@endif @endif
</li> </li>
@if($event->region && $event->region != "Regio")
<li class="detail category">Regio {{$event->region}}</a></li>
@endif
</ul> </ul>
@@ -40,10 +40,10 @@
<ul class="post_details clearfix"> <ul class="post_details clearfix">
<li class="detail date"> <li class="detail date">
{{ Formatter::relativeDate($event->podcast->created) }} uitgezonden {{ Formatter::relativeDate($event->podcast->created) }} uitgezonden
@if($event->podcast->program) in <a href="{{ url('/gids/programma' . $event->podcast->program->url ) }}">{{ $event->podcast->program->name }}</a> @endif @if($event->podcast->program) in <a href="{{ route('programma') . $event->podcast->program->url }}">{{ $event->podcast->program->name }}</a> @endif
</li> </li>
<li class="detail category"> <li class="detail category">
<a href="{{ url('/gemist/fragment/' . $event->podcast->url) }}"> <a href="{{ route('gemist.details') . $event->podcast->url }}">
<span class="fa "></span> <span class="fa "></span>
<span>Meer over dit fragment</span> <span>Meer over dit fragment</span>
</a> </a>
@@ -100,7 +100,9 @@
</div> </div>
@endif @endif
{{--
@include('widgets/share') @include('widgets/share')
--}}
</div> </div>
</div> </div>
</div> </div>

6
website/resources/views/home.blade.php
View File

@@ -1,4 +1,4 @@
@extends('layouts/master') @extends('layouts.master')
@section('title') @section('title')
NH Gooi - Nieuws NH Gooi - Nieuws
@@ -29,7 +29,7 @@
<div class="slider_content_box"> <div class="slider_content_box">
<ul class="post_details simple"> <ul class="post_details simple">
<li class="category"> <li class="category">
<a title="Regio: {{$item->region->title}}" href="{{url('nieuws/regio/' . $item->region->slug)}}" class="over_image">{{$item->region->title}}</a> <a title="Regio: {{$item->region->title}}" href="{{route('nieuws.regio', ['id' => $item->region->slug])}}" class="over_image">{{$item->region->title}}</a>
</li> </li>
</ul> </ul>
<h2><a href="{{url($item->url)}}" title="{{$item->title}}">{{$item->title}}</a></h2> <h2><a href="{{url($item->url)}}" title="{{$item->title}}">{{$item->title}}</a></h2>
@@ -52,7 +52,7 @@
<div class="slider_content_box"> <div class="slider_content_box">
<ul class="post_details simple"> <ul class="post_details simple">
<li class="category"> <li class="category">
<a title="Regio: {{$item->region->title}}" href="{{url('nieuws/regio/' . $item->region->slug)}}" class="over_image">{{$item->region->title}}</a> <a title="Regio: {{$item->region->title}}" href="{{route('nieuws.regio', ['id' => $item->region->slug])}}" class="over_image">{{$item->region->title}}</a>
</li> </li>
</ul> </ul>
<h5><a href="{{url($item->url)}}" title="{{$item->title}}">{{$item->title}}</a></h5> <h5><a href="{{url($item->url)}}" title="{{$item->title}}">{{$item->title}}</a></h5>

4
website/resources/views/kerkdienst.blade.php
View File

@@ -22,7 +22,7 @@
</audio> </audio>
</p> </p>
<p> <p>
<a href="{{$url = url('kerkdienst/luister')}}" target="_radioplayer" class="action_button" onclick="window.open('{{$url}}', '_radioplayer','width=400,height=400'); return false;"><span class="fa fa-external-link-alt"></span> <span>Luister in nieuw venster</span></a> <a href="{{$url = route('luister.kerkdienst')}}" class="action_button player"><span class="fa fa-external-link-alt"></span> <span>Luister in nieuw venster</span></a>
<a href="{{$url = url($apiUrl . 'kerkdienst/download')}}" class="action_button"><span class="fa fa-download"></span> <span>Download als MP3</span></a> <a href="{{$url = url($apiUrl . 'kerkdienst/download')}}" class="action_button"><span class="fa fa-download"></span> <span>Download als MP3</span></a>
</p> </p>
@@ -35,7 +35,7 @@
@endif @endif
<p> <p>
Zondagochtend van 9:00 tot 12:00 uur kunt u live meeluisteren naar het programma Kerk &amp; Samenleving via de link Zondagochtend van 9:00 tot 12:00 uur kunt u live meeluisteren naar het programma Kerk &amp; Samenleving via de link
<a href="{{$live = url('luister/live')}}" target="_radioplayer" class="" onclick="window.open('{{$live}}', '_radioplayer','width=400,height=400'); return false;"><span class="fa fa-play"></span> <span>Luister live</span></a>. <a href="{{$live = route('luister.live')}}" class="player"><span class="fa fa-play"></span> <span>Luister live</span></a>.
</p> </p>
<p> <p>
Vanaf {{$kerkdienst->isRunning ? "vanmiddag" : "zondagmiddag" }} 12:00 uur is de dienst op deze pagina terug te luisteren. Vanaf {{$kerkdienst->isRunning ? "vanmiddag" : "zondagmiddag" }} 12:00 uur is de dienst op deze pagina terug te luisteren.

37
website/resources/views/layouts/_head.blade.php Normal file
View File

@@ -0,0 +1,37 @@
<head>
<title>@yield('title') | NH Gooi</title>
<!--meta-->
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1.2" />
<meta name="format-detection" content="telephone=no" />
<meta name="keywords" content="NH Gooi,Radio,TV,Nieuws,Lokale omroep,Huizen,Blaricum,Eemnes,Laren,Hilversum,BEL-gemeenten,Streekomroep" />
<meta name="description" content="NH Gooi is de streekomroep voor Hilversum, Huizen, Blaricum, Eemnes en Laren." />
<!--style-->
<link href='//fonts.googleapis.com/css?family=Roboto:300,400,700' rel='stylesheet' type='text/css'>
<link href='//fonts.googleapis.com/css?family=Roboto+Condensed:300,400,700' rel='stylesheet' type='text/css'>
<link rel="stylesheet" type="text/css" href="/css/reset.css">
<link rel="stylesheet" type="text/css" href="/css/superfish.css">
<link rel="stylesheet" type="text/css" href="/css/prettyPhoto.css">
<link rel="stylesheet" type="text/css" href="/css/jquery.qtip.css">
<link rel="stylesheet" type="text/css" href="/css/style.css">
<link rel="stylesheet" type="text/css" href="/css/menu_styles.css">
<link rel="stylesheet" type="text/css" href="/css/animations.css">
<link rel="stylesheet" type="text/css" href="/css/responsive.css">
<link rel="stylesheet" type="text/css" href="/css/odometer-theme-default.css">
<link rel="stylesheet" type="text/css" href="//cdnjs.cloudflare.com/ajax/libs/font-awesome/5.11.2/css/all.min.css">
<link rel="stylesheet" type="text/css" href="/css/nhgooi.css">
<meta property="fb:app_id" content="133349980094758" />
<meta property="og:site_name" content="NH Gooi" />
<?php if(isset($metadata)) {
$metadata->set('url', url()->current())
->prepend('image', $imgBase)
->prepend('audio', route('gemist.details'))
->append('title', ' | NH Gooi')
->metaTags();
} ?>
@stack('styles')
<link rel="shortcut icon" href="/images/favicon.ico">
<!--rss-->
<link rel="alternate" type="application/rss+xml" title="Abonneren op NH Gooi Nieuws" href="{{env('API_URL')}}rss/nieuws" />
<link rel="alternate" type="application/rss+xml" title="Abonneren op NH Gooi Fragment gemist" href="{{env('API_URL')}}rss/podcasts" />
</head>

8
website/resources/views/layouts/empty.blade.php Normal file
View File

@@ -0,0 +1,8 @@
<!DOCTYPE html>
<html>
@include('layouts._head')
<body>
@yield('content')
@stack('scripts')
</body>
</html>

68
website/resources/views/layouts/master.blade.php
View File

@@ -3,54 +3,7 @@
@endsection @endsection
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> @include('layouts._head')
<title>@yield('title')</title>
<!--meta-->
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1.2" />
<meta name="format-detection" content="telephone=no" />
<meta name="keywords" content="NH Gooi,Radio,TV,Nieuws,Lokale omroep,Huizen,Blaricum,Eemnes,Laren,Hilversum,BEL-gemeenten,Streekomroep" />
<meta name="description" content="NH Gooi is de streekomroep voor Hilversum, Huizen, Blaricum, Eemnes en Laren." />
<!--style-->
<link href='//fonts.googleapis.com/css?family=Roboto:300,400,700' rel='stylesheet' type='text/css'>
<link href='//fonts.googleapis.com/css?family=Roboto+Condensed:300,400,700' rel='stylesheet' type='text/css'>
<link rel="stylesheet" type="text/css" href="/css/reset.css">
<link rel="stylesheet" type="text/css" href="/css/superfish.css">
<link rel="stylesheet" type="text/css" href="/css/prettyPhoto.css">
<link rel="stylesheet" type="text/css" href="/css/jquery.qtip.css">
<link rel="stylesheet" type="text/css" href="/css/style.css">
<link rel="stylesheet" type="text/css" href="/css/menu_styles.css">
<link rel="stylesheet" type="text/css" href="/css/animations.css">
<link rel="stylesheet" type="text/css" href="/css/responsive.css">
<link rel="stylesheet" type="text/css" href="/css/odometer-theme-default.css">
<link rel="stylesheet" type="text/css" href="//cdnjs.cloudflare.com/ajax/libs/font-awesome/5.11.2/css/all.min.css">
<link rel="stylesheet" type="text/css" href="/css/nhgooi.css">
@stack('styles')
<link rel="shortcut icon" href="/images/favicon.ico">
<!--rss-->
<link rel="alternate" type="application/rss+xml" title="Abonneren op NH Gooi Nieuws" href="{{env('API_URL')}}rss/nieuws" />
<link rel="alternate" type="application/rss+xml" title="Abonneren op NH Gooi Fragment gemist" href="{{env('API_URL')}}rss/podcasts" />
</head>
<!--<body class="image_1">
<body class="image_1 overlay">
<body class="image_2">
<body class="image_f2 overlay">
<body class="image_3">
<body class="image_3 overlay">
<body class="image_4">
<body class="image_4 overlay">
<body class="image_5">
<body class="image_5 overlay">
<body class="pattern_1">
<body class="pattern_2">
<body class="pattern_3">
<body class="pattern_4">
<body class="pattern_5">
<body class="pattern_6">
<body class="pattern_7">
<body class="pattern_8">
<body class="pattern_9">
<body class="pattern_10">-->
<body> <body>
<div class="site_container boxed"> <div class="site_container boxed">
<div class="header_top_bar_container style_11 clearfix"> <div class="header_top_bar_container style_11 clearfix">
@@ -275,19 +228,19 @@
<div class="controls"> <div class="controls">
<ul> <ul>
<li class="program-link"> <li class="program-link">
<a href='{{url('radio/gids')}}' title="Bekijk het huidige programma in de programmagids"> <a href='{{route('radio.gids')}}' title="Bekijk het huidige programma in de programmagids">
<span class="fa fa-info"></span> <span class="fa fa-info"></span>
<label>Programmagids</label> <label>Programmagids</label>
</a> </a>
</li> </li>
<li class="listen-live"> <li class="listen-live">
<a href='{{url('luister/live')}}' title="Luister live naar NH Gooi Radio"> <a href='{{route('luister.live')}}' title="Luister live naar NH Gooi Radio" class="player">
<span class="fa fa-play"></span> <span class="fa fa-play"></span>
<label>Luister NH Gooi Radio</label> <label>Luister NH Gooi Radio</label>
</a> </a>
</li> </li>
<li class="watch-live"> <li class="watch-live">
<a href='{{url('kijk/live')}}' title="Kijk live naar NH Gooi TV"> <a href='{{route('kijk.live')}}' title="Kijk live naar NH Gooi TV">
<span class="fa fa-camera"></span> <span class="fa fa-camera"></span>
<label>Kijk NH Gooi TV</label> <label>Kijk NH Gooi TV</label>
</a> </a>
@@ -355,6 +308,7 @@
</p> </p>
</div> </div>
</div> </div>
{{--
<h4 class="box_header page_margin_top">Get In Touch With Us</h4> <h4 class="box_header page_margin_top">Get In Touch With Us</h4>
<ul class="social_icons dark page_margin_top clearfix"> <ul class="social_icons dark page_margin_top clearfix">
<li> <li>
@@ -393,6 +347,7 @@
</a> </a>
</li> </li>
</ul> </ul>
--}}
</div> </div>
<div class="column column_1_3"> <div class="column column_1_3">
<h4 class="box_header">Fragment gemist</h4> <h4 class="box_header">Fragment gemist</h4>
@@ -412,6 +367,7 @@
<div class="column column_2_3"> <div class="column column_2_3">
&copy; Copyright <?php echo date('Y'); ?> NH Gooi. <a href="http://quanticalabs.com" title="QuanticaLabs" target="_blank">QuanticaLabs</a> - PressRoom Template. &copy; Copyright <?php echo date('Y'); ?> NH Gooi. <a href="http://quanticalabs.com" title="QuanticaLabs" target="_blank">QuanticaLabs</a> - PressRoom Template.
</div> </div>
{{--
<div class="column column_1_3"> <div class="column column_1_3">
<ul class="footer_menu"> <ul class="footer_menu">
<li> <li>
@@ -425,6 +381,7 @@
</li> </li>
</ul> </ul>
</div> </div>
--}}
</div> </div>
</div> </div>
</div> </div>
@@ -463,7 +420,7 @@
function updateOnAir() { function updateOnAir() {
$.ajax({ $.ajax({
url: '{{url('onair')}}', url: '{{route('onair')}}',
success: function(data) { success: function(data) {
$(document).trigger('onAirUpdated', data); $(document).trigger('onAirUpdated', data);
} }
@@ -488,12 +445,17 @@
$nowPlaying.title.text(data.current.title).attr('title', data.current.title); $nowPlaying.title.text(data.current.title).attr('title', data.current.title);
$nowPlaying.artist.text(data.current.artist).attr('title', data.current.artist); $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(); $nowPlaying.container.slideDown();
// Now playing may have moved the menu // Now playing may have moved the menu
menu_position = $(".menu_container").offset().top; 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;
});
</script> </script>
@stack('scripts') @stack('scripts')
</body> </body>

191
website/resources/views/listen.blade.php
View File

@@ -1,88 +1,145 @@
<!DOCTYPE html> @extends('layouts.empty')
<html lang="{{ app()->getLocale() }}">
<head>
<title>NH Gooi | {{$title}} </title>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" type="text/css" href="{{ url( '/css/bootstrap.min.css' )}}">
<link rel="stylesheet" type="text/css" href="{{ url( '/css/font-awesome.min.css' )}}">
<link rel="stylesheet" type="text/css" href="{{ url( '/css/animate.css' )}}">
<link rel="stylesheet" type="text/css" href="{{ url( '/css/font.css' )}}">
<link rel="stylesheet" type="text/css" href="{{ url( '/css/li-scroller.css' )}}">
<link rel="stylesheet" type="text/css" href="{{ url( '/css/slick.css' )}}">
<link rel="stylesheet" type="text/css" href="{{ url( '/css/jquery.fancybox.css' )}}">
<link rel="stylesheet" type="text/css" href="{{ url( '/css/theme.css' )}}">
<link rel="stylesheet" type="text/css" href="{{ url( '/css/style.css' )}}">
<link rel="stylesheet" type="text/css" href="{{ url( '/css/custom.css' )}}">
<script type="text/javascript" src="{{ url( 'js/jquery.min.js' )}}"></script>
<!--[if lt IE 9]>
<script src="{{ url( '/js/html5shiv.min.js' )}}"></script>
<script src="{{ url( '/js/respond.min.js' )}}"></script>
<![endif]-->
</head>
<body>
<p class='text-right'>
<a href="javascript:window.close();" class="btn btn-link"><span class='fa fa-close fa-fw'></span> Venster sluiten</a>
</p>
@section('content')
<a href="javascript:window.close();" class="close"><span class='fa fa-times fa-fw'></span> Venster sluiten</a>
<p class="logo"><a href="{{ url('/') }}"><img src="{{ url( 'images/logo.png' )}}"></a></p> <p class="logo"><a href="{{ url('/') }}"><img src="{{ url( 'images/logo.png' )}}"></a></p>
<p>
<b>Nu op NH Gooi:</b>
<span id="nowonair"></span>
<script type="text/javascript">
setInterval(function() {
$.ajax({
'url': '{{url('onair')}}',
'success': updateNowPlaying
});
}, 5000);
updateNowPlaying({!!file_get_contents(url('onair'))!!});
function updateNowPlaying(data) {
$("#nowonair").text(data.program.name);
}
</script>
@if(!$isStream) <br />
<a href="{{ url( 'luister/live' ) }}" class="btn-link"><span class='fa fa-fw fa-play'></span> Luister live</a>
@endif
</p>
@if(false && $isStream) @if(false && $isStream)
<p>Wegens een technisch probleem is NH Gooi momenteel niet via Internet te beluisteren. Onze excuses voor het ongemak.</p> <p>Wegens een technisch probleem is NH Gooi momenteel niet via Internet te beluisteren. Onze excuses voor het ongemak.</p>
<p>In Hilversum, Huizen en de BEL-gemeenten zijn wij te ontvangen op 92.0 FM of 105.1 FM.</p> <p>In Hilversum, Huizen en de BEL-gemeenten zijn wij te ontvangen op 92.0 FM of 105.1 FM.</p>
@else @else
<div class="now-playing-header">
<div class="title"></div>
<div class="artist"></div>
@if(!$isStream)
<div class="controls">
<ul>
<li class="program-link">
<a href='{{route('luister.live')}}' title="Luister naar NH Gooi Radio">
<span class="fa fa-music"></span>
<label>Luister live</label>
</a>
</li>
</ul>
</div>
@endif
</div>
<div class="player">
<p><b>U luistert nu naar</b> {!!$content!!}</p> <p><b>U luistert nu naar</b> {!!$content!!}</p>
@if(isset($tabs)) @if(isset($tabs))
<p> <p>
@foreach($tabs as $link => $caption) @foreach($tabs as $link => $caption)
<a href="{{$link}}" class="btn btn-{{$link == '#' ? 'primary' : 'default'}}">{{$caption}}</a> <a class="tab {{$link == '#' ? "active" : ""}}" href="{{$link}}">{{$caption}}</a>
@endforeach @endforeach
</p> </p>
@endif @endif
<p> <p>
<audio controls @if($isStream) autoplay="true" @endif > <audio controls autoplay="true">
<source src="{{$source}}" type="audio/mp3" /> <source src="{{$source}}" type="audio/mp3" />
</audio> </audio>
</p> </p>
<p> <p>
@if(!$isStream && $canDownload) @if(!$isStream && $canDownload)
<a href="{{$source}}" class="btn btn-primary">Download als MP3</a> <a href="{{$source}}" class="action_button">
@endif <span class="fa fa-download"></span><span>Download .mp3-bestand</span>
</p> </a>
@endif
@if(!$isStream)
<a href="{{route('luister.live')}}" class="action_button">
<span class="fa fa-music"></span><span>Schakel naar live-uitzending</span>
</a>
@endif
</p>
@endif @endif
</div>
@endsection
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/mediaelement/4.2.3/mediaelementplayer.css" />
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/mediaelement/4.2.3/mediaelement-and-player.min.js"></script>
<script type="text/javascript">
$("video, audio").mediaelementplayer({
pluginPath: 'https://cdnjs.cloudflare.com/ajax/libs/mediaelement/4.2.3/',
stretching: 'responsive'
});
</script>
</body>
</html>
@push('styles')
<style>
body { padding: 10px; }
.close {
float: right;
}
p {
padding: 5px;
margin: 0;
}
.action_button {
float: none;
}
.logo {
width: 90%;
max-width: 300px;
margin: auto;
}
.logo img {
width: 100%;
}
.now-playing {
color: black;
}
.player {
border: outset 2px #21BBEF;
border-radius: 8px;
margin-top: 10px;
padding: 10px;
}
.player p {
color: black;
}
.player .tab {
color: black;
padding: 5px;
border-bottom: solid 4px transparent;
}
.player .tab.active {
border-bottom: solid 4px #5796C8;
}
.player .tab:hover {
text-decoration: none;
border-bottom: solid 4px #21BBEF;
}
</style>
@endpush
@push('scripts')
<script type="text/javascript" src="/js/jquery-1.12.4.min.js"></script>
<script>
function updateOnAir() {
$.ajax({
url: '{{route('onair')}}',
success: function(data) {
$(document).trigger('onAirUpdated', data);
}
});
}
$(updateOnAir);
var onAirUpdater = setInterval(updateOnAir, 5000);
var $nowPlaying = {
container: $(".now-playing-header").hide(),
title: $(".now-playing-header .title"),
artist: $(".now-playing-header .artist"),
};
$(document).on('onAirUpdated', function(evt, data) {
if(data.inProgram) {
$nowPlaying.title.text(data.program.name).attr('title', data.program.name);
$nowPlaying.artist.text(data.program.tagline);
} else {
$nowPlaying.title.text(data.current.title).attr('title', data.current.title);
$nowPlaying.artist.text(data.current.artist).attr('title', data.current.artist);
}
$nowPlaying.container.slideDown();
});
</script>
@endpush
@include('widgets.mediaplayer')

22
website/resources/views/newsitem.blade.php
View File

@@ -6,9 +6,9 @@
@section('breadcrumb') @section('breadcrumb')
<ul class="bread_crumb"> <ul class="bread_crumb">
<li><a title="Nieuws" href="{{url('nieuws')}}">Nieuws</a></li> <li><a title="Nieuws" href="{{route('nieuws')}}">Nieuws</a></li>
<li class="separator icon_small_arrow right_gray">&nbsp;</li> <li class="separator icon_small_arrow right_gray">&nbsp;</li>
<li><a title="{{$news->region->title}}" href="{{url('nieuws/regio/' . $news->region->slug)}}">{{$news->region->title}}</a></li> <li><a title="{{$news->region->title}}" href="{{route('nieuws.regio', $news->region->slug)}}">{{$news->region->title}}</a></li>
<li class="separator icon_small_arrow right_gray">&nbsp;</li> <li class="separator icon_small_arrow right_gray">&nbsp;</li>
<li>Details</li> <li>Details</li>
</ul> </ul>
@@ -20,10 +20,10 @@
<div class="post single small_image"> <div class="post single small_image">
<ul class="post_details clearfix"> <ul class="post_details clearfix">
@if($news->region && $news->region->title != "Regio") @if($news->region && $news->region->title != "Regio")
<li class="detail category">Regio <a href="{{url('nieuws/regio/' . $news->region->slug)}}" title="{{$news->region->title}}">{{$news->region->title}}</a></li> <li class="detail category">Regio <a href="{{route('nieuws.regio', $news->region->slug)}}" title="{{$news->region->title}}">{{$news->region->title}}</a></li>
@endif @endif
@if($news->theme && $news->theme->title != "Overig") @if($news->theme && $news->theme->title != "Overig")
<li class="detail category">Thema <a href="{{url('nieuws/theme/' . $news->theme->slug)}}" title="{{$news->theme->title}}">{{$news->theme->title}}</a></li> <li class="detail category">Thema <a href="{{route('nieuws.thema', $news->theme->slug)}}" title="{{$news->theme->title}}">{{$news->theme->title}}</a></li>
@endif @endif
<li class="detail date"> <li class="detail date">
{{Formatter::relativeDate($news->published)}} om {{$news->published->format('H:i')}} {{Formatter::relativeDate($news->published)}} om {{$news->published->format('H:i')}}
@@ -52,10 +52,10 @@
<ul class="post_details clearfix"> <ul class="post_details clearfix">
<li class="detail date"> <li class="detail date">
{{ Formatter::relativeDate($news->podcast->created) }} uitgezonden {{ Formatter::relativeDate($news->podcast->created) }} uitgezonden
@if($news->podcast->program) in <a href="{{ url('radio/programma' . $news->podcast->program->url ) }}">{{ $news->podcast->program->name }}</a> @endif @if($news->podcast->program) in <a href="{{ route('programma') . $news->podcast->program->url }}">{{ $news->podcast->program->name }}</a> @endif
</li> </li>
<li class="detail category"> <li class="detail category">
<a href="{{ url('/radio/gemist/fragment/' . $news->podcast->url) }}"> <a href="{{ route('gemist.details') . $news->podcast->url }}">
<span class="fa "></span> <span class="fa "></span>
<span>Meer over dit fragment</span> <span>Meer over dit fragment</span>
</a> </a>
@@ -118,24 +118,28 @@
</div> </div>
@endif @endif
{{--
@include('widgets/share') @include('widgets/share')
--}}
<div class="row page_margin_top"> <div class="row page_margin_top">
{{--
<ul class="taxonomies tags left clearfix"> <ul class="taxonomies tags left clearfix">
@if($news->keywords) @if($news->keywords)
@foreach($news->keywords as $keyword) @foreach($news->keywords as $keyword)
<li> <li>
<a href="{{url('nieuws/onderwerp/' . $keyword)}}" title="Zoek meer nieuws met het onderwerp {{$keyword}}">{{$keyword}}</a> <a href="{{route('nieuws/onderwerp/' . $keyword)}}" title="Zoek meer nieuws met het onderwerp {{$keyword}}">{{$keyword}}</a>
</li> </li>
@endforeach @endforeach
@endif @endif
</ul> </ul>
--}}
<ul class="taxonomies categories right clearfix"> <ul class="taxonomies categories right clearfix">
<li> <li>
<a href="{{url('nieuws/thema/' . $news->theme->slug)}}" title="Zoek meer nieuws met het thema {{$news->theme->title}}">{{$news->theme->title}}</a> <a href="{{route('nieuws.thema', $news->theme->slug)}}" title="Zoek meer nieuws met het thema {{$news->theme->title}}">{{$news->theme->title}}</a>
</li> </li>
<li> <li>
<a href="{{url('nieuws/regio/' . $news->region->slug)}}" title="Zoek meer nieuws uit de regio {{$news->region->title}}">{{$news->region->title}}</a> <a href="{{route('nieuws.regio', $news->region->slug)}}" title="Zoek meer nieuws uit de regio {{$news->region->title}}">{{$news->region->title}}</a>
</li> </li>
</ul> </ul>
</div> </div>

6
website/resources/views/newslist.blade.php
View File

@@ -8,7 +8,7 @@
@section('breadcrumb') @section('breadcrumb')
@if($title) @if($title)
<ul class="bread_crumb" style="margin-top: -10px; margin-bottom: 4px; "> <ul class="bread_crumb" style="margin-top: -10px; margin-bottom: 4px; ">
<li><a title="Nieuws" href="{{url('nieuws')}}">Nieuws</a></li> <li><a title="Nieuws" href="{{route('nieuws')}}">Nieuws</a></li>
<li class="separator icon_small_arrow right_gray">&nbsp;</li> <li class="separator icon_small_arrow right_gray">&nbsp;</li>
<li>{{$title}}</li> <li>{{$title}}</li>
</ul> </ul>
@@ -35,10 +35,10 @@
<h2><a href="{{url($item->url)}}" title="{{strip_tags($item->title)}}">{!!$item->title!!}</a></h2> <h2><a href="{{url($item->url)}}" title="{{strip_tags($item->title)}}">{!!$item->title!!}</a></h2>
<ul class="post_details"> <ul class="post_details">
<li class="category"> <li class="category">
<a title="Regio: {{$item->region->title}}" href="{{url('nieuws/regio/' . $item->region->slug)}}">{{$item->region->title}}</a> <a title="Regio: {{$item->region->title}}" href="{{route('nieuws.regio', ['id' => $item->region->slug])}}">{{$item->region->title}}</a>
</li> </li>
<li class="category"> <li class="category">
<a title="Thema: {{$item->theme->title}}" href="{{url('nieuws/thema/' . $item->theme->slug)}}">{{$item->theme->title}}</a> <a title="Thema: {{$item->theme->title}}" href="{{route('nieuws.thema', ['id' => $item->theme->slug])}}">{{$item->theme->title}}</a>
</li> </li>
36 @if($item->edited && ($item->edited != $item->published)) 36 @if($item->edited && ($item->edited != $item->published))
<li class="date edited"> <li class="date edited">

8
website/resources/views/podcastitems.blade.php → website/resources/views/partial/podcastitems.blade.php
View File

@@ -4,14 +4,14 @@
@if($i > 0) </ul><!--/.row--> @endif @if($i > 0) </ul><!--/.row--> @endif
<ul class='blog row grid'> <ul class='blog row grid'>
@endif @endif
<?php $url = url('radio/gemist/fragment/' . $podcast->url); ?> <?php $url = route('gemist.details') . $podcast->url; ?>
<li class="post column column_1_2"> <li class="post column column_1_2">
<div class="post_content"> <div class="post_content">
<h2><a href="{{$url}}" title="{{$podcast->title}}">{!!$podcast->titleWithoutProgram()!!}</a></h2> <h2><a href="{{$url}}" title="{{$podcast->title}}">{!!$podcast->titleWithoutProgram()!!}</a></h2>
<ul class="post_details"> <ul class="post_details">
@if($podcast->program) @if($podcast->program)
<li class="category"> <li class="category">
<a href="{{ url('radio/programma' . $podcast->program->url ) }}" title="{{$podcast->program->name}}">{{$podcast->program->name}}</a> <a href="{{ route('programma') . $podcast->program->url }}" title="{{$podcast->program->name}}">{{$podcast->program->name}}</a>
</li> </li>
@endif @endif
<li class="date"> <li class="date">
@@ -22,12 +22,12 @@
@if($podcast->image) @if($podcast->image)
<p> <p>
<a href="{{$url}}" title="{{$podcast->title}}"> <a href="{{$url}}" title="{{$podcast->title}}">
<img src='//nhgooi.nl/{{$podcast->image->url}}' alt='{{$podcast->image->title}}'> <img src='{{$imgBase . $podcast->image->url}}' alt='{{$podcast->image->title}}'>
</a> </a>
</p> </p>
@endif @endif
<p>{!! Formatter::excerpt($podcast->content, 200) !!}</p> <p>{!! Formatter::excerpt($podcast->content, 200) !!}</p>
<a class="read_more" href="{{url('radio/gemist/fragment/' . $podcast->url)}}" title="Luister fragment"><span class="arrow"></span><span>Luister fragment</span></a> <a class="read_more" href="{{route('gemist.details') . $podcast->url}}" title="Luister fragment"><span class="arrow"></span><span>Luister fragment</span></a>
</div> </div>
</li> </li>

2
website/resources/views/partial/radioscheduleweek.blade.php
View File

@@ -33,7 +33,7 @@
@endif @endif
@php($durationToday = ($hour + $duration <= 24) ? $duration : (24 - $hour)) @php($durationToday = ($hour + $duration <= 24) ? $duration : (24 - $hour))
<a href="{{url('/radio/programma' . $item['program']->url)}}" class="program{{$class}}" style="height: {{$durationToday * $pixelsPerHour - 2 * $border - $margin}}px;" title="{{$item['program']->name . ($item['program']->tagline ? "\n" . $item['program']->tagline : "")}}"> <a href="{{route('programma') . $item['program']->url}}" class="program{{$class}}" style="height: {{$durationToday * $pixelsPerHour - 2 * $border - $margin}}px;" title="{{$item['program']->name . ($item['program']->tagline ? "\n" . $item['program']->tagline : "")}}">
<div class="program-title">{{$item['program']->name}}</div> <div class="program-title">{{$item['program']->name}}</div>
@if($isCurrent) <div class="current-marker"><span>Nu op NH Gooi</span></div> @endif @if($isCurrent) <div class="current-marker"><span>Nu op NH Gooi</span></div> @endif
<div class="program-content"> <div class="program-content">

44
website/resources/views/podcastitem.blade.php
View File

@@ -8,10 +8,10 @@
@section('breadcrumb') @section('breadcrumb')
<ul class="bread_crumb"> <ul class="bread_crumb">
<li><a title="Fragment gemist" href="{{url('radio/gemist')}}">Fragment gemist</a></li> <li><a title="Fragment gemist" href="{{route('gemist')}}">Fragment gemist</a></li>
<li class="separator icon_small_arrow right_gray">&nbsp;</li> <li class="separator icon_small_arrow right_gray">&nbsp;</li>
@if($podcast->program) @if($podcast->program)
<li><a title="{{$podcast->program->name}}" href="{{url('radio/gemist/programma' . $podcast->program->url)}}">{{$podcast->program->name}}</a></li> <li><a title="{{$podcast->program->name}}" href="{{route('gemist.programma') . $podcast->program->url}}">{{$podcast->program->name}}</a></li>
<li class="separator icon_small_arrow right_gray">&nbsp;</li> <li class="separator icon_small_arrow right_gray">&nbsp;</li>
@endif @endif
<li>Fragment</li> <li>Fragment</li>
@@ -72,8 +72,8 @@ $(".vertical_carousel").each(function() {
@section('content') @section('content')
@parent @parent
<?php <?php
$audioUrl = url( $apiUrl . 'podcast/download/' . $podcast->url . "?auth=" . $podcast->auth ); $audioUrl = url($apiUrl . 'podcast/download' . $podcast->url . "?auth=" . $podcast->auth);
$popoutUrl = url('luister/fragment/' . $podcast->url . '?auth=' . $podcast->auth ); $popoutUrl = route('luister.podcast') . $podcast->url . '?auth=' . $podcast->auth;
?> ?>
<div class="row page_margin_top"> <div class="row page_margin_top">
@@ -82,19 +82,29 @@ $(".vertical_carousel").each(function() {
<div class="post single small_image"> <div class="post single small_image">
<h1>Fragment gemist</h1> <h1>Fragment gemist</h1>
<ul class="post_details clearfix"> <ul class="post_details clearfix">
@if($podcast->program)
<li class="detail"><a href="{{ url('programma' . $podcast->program->url ) }}">{{ $podcast->program->name }}</a></li>
@endif
<li class="detail date">{{ Formatter::relativeDate($podcast->created) }}</li> <li class="detail date">{{ Formatter::relativeDate($podcast->created) }}</li>
@if($podcast->program)
<li class="detail"><a href="{{ route('programma') . $podcast->program->url }}">{{ $podcast->program->name }}</a></li>
@endif
</ul> </ul>
<div class="announcement"> <div class="announcement">
<audio controls autoplay="true"> <audio controls autoplay="true">
<source src="{{$audioUrl}}" type="audio/mpeg" /> <source src="{{$audioUrl}}" type="audio/mpeg" />
</audio> </audio>
<div class="clearfix">
<a class="action_button" href="{{$audioUrl}}" title="Download dit fragment als MP3">
<span class="fa fa-download"></span>
<span>Download fragment</span>
</a>
<a class="action_button player" href="{{$popoutUrl}}">
<span class="fa fa-external-link-alt"></span>
<span>Luister in nieuw venster</span>
</a>
</div>
</div> </div>
<div class="content_box"> <div class="content_box clearfix section_margin_top">
@if($podcast->image) @if($podcast->image)
<div class="post_image_box"> <div class="post_image_box">
@@ -113,18 +123,6 @@ $(".vertical_carousel").each(function() {
<div class="clearfix"></div> <div class="clearfix"></div>
<div class="row page_margin_top">
<div class="share_box clearfix">
<a class="action_button" href="{{$audioUrl}}" title="Download dit fragment als MP3">
<span class="fa fa-download"></span>
<span>Download fragment</span>
</a>
<a class="action_button" href="{{$popoutUrl}}" target="_radioplayer" onclick="window.open('{{$popoutUrl}}', '_radioplayer','width=400,height=400'); return false;" class="btn btn-default">
<span class="fa fa-external-link-alt"></span>
<span>Luister in nieuw venster</span>
</a>
</div>
</div>
</div> </div>
</div> </div>
@@ -185,7 +183,7 @@ $(".vertical_carousel").each(function() {
<li class="post"> <li class="post">
<div class="post_content"> <div class="post_content">
<h5> <h5>
<a href="{{ url('radio/gemist/fragment/' . $relatedItem->url) }}" title="{{$relatedItem->title}}"> <a href="{{ route('gemist.details') . $relatedItem->url }}" title="{{$relatedItem->title}}">
<span class="fa fa-chevron-circle-right"></span> <span class="fa fa-chevron-circle-right"></span>
{{$relatedItem->titleWithoutProgram()}} {{$relatedItem->titleWithoutProgram()}}
</a> </a>
@@ -198,7 +196,7 @@ $(".vertical_carousel").each(function() {
@endforeach @endforeach
</ul> </ul>
</div> </div>
<a href="{{url('radio/gemist/programma' . $podcast->program->url)}}" class="more">Meer {{$podcast->program->name}}</a> <a href="{{route('gemist.programma') . $podcast->program->url}}" class="more">Meer {{$podcast->program->name}}</a>
@endif @endif
@@ -206,7 +204,7 @@ $(".vertical_carousel").each(function() {
<nav> <nav>
<ul class="blog podcasts"> <ul class="blog podcasts">
<li class="post"> <li class="post">
<a href="{{url('radio/gemist')}}" class="read_more"> <a href="{{route('gemist')}}" class="read_more">
<span class="arrow"></span> <span class="arrow"></span>
<span>Alle recente fragmenten</span> <span>Alle recente fragmenten</span>
</a> </a>

8
website/resources/views/podcastlist.blade.php
View File

@@ -20,18 +20,18 @@
@if(isset($program)) @if(isset($program))
<h2>{{$program->name}}</h2> <h2>{{$program->name}}</h2>
<p class="align-right"> <p class="align-right">
<a href="{{url('radio/gemist')}}" title="Alle programma's" class="btn btn-info">&larr; Toon alles</a> <a href="{{route('gemist')}}" title="Alle programma's" class="btn btn-info">&larr; Toon alles</a>
<a href="{{url('radio/programma' . $program->url)}}" title="{{$program->name}}" class="btn btn-info">Programmainfo</a> <a href="{{route('programma') . $program->url}}" title="{{$program->name}}" class="btn btn-info">Programmainfo</a>
</p> </p>
@else @else
<p>Hele uitzendingen kunt u binnen twee weken terugluisteren door het betreffende programma op te zoeken via de <a href="{{url('radio/gids')}}">programmagids</a>. <p>Hele uitzendingen kunt u binnen twee weken terugluisteren door het betreffende programma op te zoeken via de <a href="{{route('radio.gids')}}">programmagids</a>.
@endif @endif
@if($podcasts) @if($podcasts)
<div class="page_layout clearfix"> <div class="page_layout clearfix">
<div class="row grid" id="items"> <div class="row grid" id="items">
@include('podcastitems', ['podcasts' => $podcasts]) @include('partial.podcastitems', ['podcasts' => $podcasts])
</div><!--/.row--> </div><!--/.row-->
</div> </div>

8
website/resources/views/radioprogram.blade.php
View File

@@ -6,7 +6,7 @@
@section('breadcrumb') @section('breadcrumb')
<ul class="bread_crumb"> <ul class="bread_crumb">
<li><a title="Radioprogrammering" href="{{url('radio/gids')}}">Radioprogrammering</a></li> <li><a title="Radioprogrammering" href="{{route('radio.gids')}}">Radioprogrammering</a></li>
<li class="separator icon_small_arrow right_gray">&nbsp;</li> <li class="separator icon_small_arrow right_gray">&nbsp;</li>
<li>Programma-informatie</li> <li>Programma-informatie</li>
</ul> </ul>
@@ -32,7 +32,7 @@
<b>{{$n->name}}</b><br/> <b>{{$n->name}}</b><br/>
@if($n->starts < $now) @if($n->starts < $now)
Nu te horen tot {{$n->ends->format('H:i')}} uur<br /> Nu te horen tot {{$n->ends->format('H:i')}} uur<br />
<a href="{{ $player = url('luister/live') }}" target="_radioplayer" class="action_button" onclick="window.open('{{$player}}', '_radioplayer','width=400,height=400'); return false;"><span class="fa fa-play"></span> <span>Luister live</span></a> <a href="{{ $player = route('luister.live') }}" target="_radioplayer" class="action_button" onclick="window.open('{{$player}}', '_radioplayer','width=400,height=400'); return false;"><span class="fa fa-play"></span> <span>Luister live</span></a>
@break @break
@else @else
{{ Formatter::relativeDate( $n->starts, 'W d m' ) }} om {{ $n->starts->format('H:i') }} uur. {{ Formatter::relativeDate( $n->starts, 'W d m' ) }} om {{ $n->starts->format('H:i') }} uur.
@@ -78,7 +78,7 @@
@if($r->rerun || $r->nonstop) @if($r->rerun || $r->nonstop)
<span title="U kunt geen herhalingen en non-stopuitzendingen terugluisteren."><span class="action_button disabled"><span class="fa fa-play"></span> <span>Luister terug</span></a> <span title="U kunt geen herhalingen en non-stopuitzendingen terugluisteren."><span class="action_button disabled"><span class="fa fa-play"></span> <span>Luister terug</span></a>
@else @else
<a href="{{$url = url('radio/luister/programma/' . $r->starts->format('Y/m/d/H') . '/' . $duration)}}" target="_radioplayer" class="action_button" onclick="window.open('{{$url}}', '_radioplayer', 'width=400,height=400'); return false;"><span class="fa fa-play"></span> <span>Luister terug</span></a> <a href="{{$url = route('luister.programma') . '/' . $r->starts->format('Y/m/d/H') . '/' . $duration}}" class="action_button player"><span class="fa fa-play"></span> <span>Luister terug</span></a>
@endif @endif
</p> </p>
</li> </li>
@@ -90,7 +90,7 @@
<div class="clearfix"></div> <div class="clearfix"></div>
<p>Fragmenten uit dit programma, zoals interviews, vindt u onder "Radio &ndash; Fragment gemist".</p> <p>Fragmenten uit dit programma, zoals interviews, vindt u onder "Radio &ndash; Fragment gemist".</p>
<p> <p>
<a href="{{ url('radio/gemist/programma' . $program->url) }}" class="action_button"> <a href="{{ route('gemist.programma') . $program->url }}" class="action_button">
<span class="fa fa-list"></span> <span class="fa fa-list"></span>
<span>Bekijk alle fragmenten</span> <span>Bekijk alle fragmenten</span>
</a> </a>

12
website/resources/views/radioschedule.blade.php
View File

@@ -13,9 +13,9 @@
@section('content') @section('content')
<nav> <nav>
<ul class="pager"> <ul class="pager">
<li class="action_button previous-week"><a href="{{url('radio/gids/' . ($shift - 1))}}">&larr; Week eerder</a></li> <li class="action_button previous-week"><a href="{{route('radio.gids', ($shift - 1))}}">&larr; Week eerder</a></li>
<li class="action_button current-week"><a href="{{url('radio/gids')}}">Deze week</a></li> <li class="action_button current-week"><a href="{{route('radio.gids')}}">Deze week</a></li>
<li class="action_button next-week"><a href="{{url('radio/gids/' . ($shift + 1))}}">Week later &rarr;</a></li> <li class="action_button next-week"><a href="{{route('radio.gids', ($shift + 1))}}">Week later &rarr;</a></li>
</ul> </ul>
</nav> </nav>
@@ -33,9 +33,9 @@
<nav> <nav>
<ul class="pager"> <ul class="pager">
<li class="action_button previous-week"><a href="{{url('radio/gids/' . ($shift - 1))}}">&larr; Week eerder</a></li> <li class="action_button previous-week"><a href="{{route('radio.gids', ($shift - 1))}}">&larr; Week eerder</a></li>
<li class="action_button current-week"><a href="{{url('radio/gids')}}">Deze week</a></li> <li class="action_button current-week"><a href="{{route('radio.gids')}}">Deze week</a></li>
<li class="action_button next-week"><a href="{{url('radio/gids/' . ($shift + 1))}}">Week later &rarr;</a></li> <li class="action_button next-week"><a href="{{route('radio.gids', ($shift + 1))}}">Week later &rarr;</a></li>
</ul> </ul>
</nav> </nav>
@endsection @endsection

4
website/resources/views/widgets/laatstepodcasts.blade.php
View File

@@ -6,11 +6,11 @@
</a> </a>
<div class="post_content"> <div class="post_content">
<h5> <h5>
<a href="{{url('radio/gemist/fragment/' . $podcast->url)}}" title="{{$podcast->title}}">{{$podcast->titleWithoutProgram()}}</a> <a href="{{route('gemist.details') . $podcast->url}}" title="{{$podcast->title}}">{{$podcast->titleWithoutProgram()}}</a>
</h5> </h5>
<ul class="post_details simple"> <ul class="post_details simple">
@if($podcast->program) @if($podcast->program)
<li class="category"><a href="{{url('radio/gemist/programma' . $podcast->program->url)}}" title="{{$podcast->program->name}}">{{$podcast->program->name}}</a></li> <li class="category"><a href="{{route('gemist.programma') . $podcast->program->url}}" title="{{$podcast->program->name}}">{{$podcast->program->name}}</a></li>
@endif @endif
<li class="date"> <li class="date">
{{Formatter::relativeDate($podcast->created)}} {{Formatter::relativeDate($podcast->created)}}

11
website/resources/views/widgets/menu.blade.php
View File

@@ -1,6 +1,6 @@
<?php $menu = array( <?php $menu = array(
"Radio" => array( "Radio" => array(
"" => "/", "" => "/gids",
"Luister live" => "/luister/live", "Luister live" => "/luister/live",
"Regionieuws" => "/luister/regionieuws", "Regionieuws" => "/luister/regionieuws",
"Programmagids" => "/gids", "Programmagids" => "/gids",
@@ -31,12 +31,13 @@ function buildMenu($menu, $ismobile) {
if($title == "") { continue; } if($title == "") { continue; }
$submenu = is_array($link); $submenu = is_array($link);
$isactive = isActive($link, !$ismobile); $isactive = isActive($link, !$ismobile);
$isplayer = !$submenu && substr($link, 0, 8) == '/luister';
$submenulink = $submenu && isset($link[""]) ? $link[""] : "#"; $submenulink = $submenu && isset($link[""]) ? $link[""] : "#";
if(!$submenu && substr($link, 0, 8) == "/luister") { $icon = "<span class='fas fa-headphones'></span>&nbsp;"; } if($isplayer) { $icon = "<span class='fas fa-headphones'></span>&nbsp;"; }
else { $icon = ""; } else { $icon = ""; }
$result .= $result .=
"<li class=\"" . ($submenu ? "submenu" : "") . ($isactive ? " selected" : "") . "\"> "<li class=\"" . ($submenu ? "submenu" : "") . ($isactive ? " selected" : "") . "\">
<a href=\"" . ($submenu ? $submenulink : $link) . "\" title=\"{$title}\">{$icon}{$title}</a>"; <a href=\"" . ($submenu ? $submenulink : $link) . "\" class=\"" . ($isplayer ? "player" : "") . "\" title=\"{$title}\">{$icon}{$title}</a>";
if($submenu) { if($submenu) {
$result .= "\t\t\t<ul>\n" $result .= "\t\t\t<ul>\n"
. buildMenu($link, $ismobile) . buildMenu($link, $ismobile)
@@ -107,14 +108,14 @@ function buildMenu($menu, $ismobile) {
@endif @endif
@if($podcasts) @if($podcasts)
<li class="submenu"> <li class="submenu">
<a href="{{url('/gemist')}}" title="Gesprek gemist"> <a href="{{route('gemist')}}" title="Gesprek gemist">
Fragment gemist Fragment gemist
</a> </a>
<ul class="mega_menu blog"> <ul class="mega_menu blog">
@foreach($podcasts as $item) @foreach($podcasts as $item)
<li class="post"> <li class="post">
@if($item->image) @if($item->image)
<a href="{{url('/gemist/fragment/' . $item->url)}}" title="{{$item->title}}"> <a href="{{route('gemist.details') . $item->url}}" title="{{$item->title}}">
<img src='{{$imgBase . $item->image->url}}' alt='{{$item->title}}'> <img src='{{$imgBase . $item->image->url}}' alt='{{$item->title}}'>
</a> </a>
@endif @endif

2
website/resources/views/widgets/nustraks.blade.php
View File

@@ -10,7 +10,7 @@
@if($program->tagline) @if($program->tagline)
<p>{{$program->tagline}}</p> <p>{{$program->tagline}}</p>
@endif @endif
<a class="action_button" style="margin-top: 0;" href="{{url('radio/luister/live')}}" title="Luister live"> <a class="action_button player" style="margin-top: 0;" href="{{route('luister.live')}}" title="Luister live">
<span class="fa fa-play"></span> <span class="fa fa-play"></span>
<span>Luister live tot {{$program->end->format('H:i')}} uur.</span> <span>Luister live tot {{$program->end->format('H:i')}} uur.</span>
</a> </a>

2
website/resources/views/widgets/populairnieuws.blade.php
View File

@@ -10,7 +10,7 @@
<a href="{{url($news->url)}}" title="{{$news->title}}">{{$news->title}}</a> <a href="{{url($news->url)}}" title="{{$news->title}}">{{$news->title}}</a>
</h5> </h5>
<ul class="post_details simple"> <ul class="post_details simple">
<li class="category"><a href="{{url('nieuws/regio/' . $news->region->slug)}}" title="{{$news->region->title}}">{{$news->region->title}}</a></li> <li class="category"><a href="{{route('nieuws.regio', $news->region->slug)}}" title="{{$news->region->title}}">{{$news->region->title}}</a></li>
<li class="date"> <li class="date">
{{Formatter::relativeDate($news->published)}} {{Formatter::relativeDate($news->published)}}
</li> </li>

46
website/routes/web.php
View File

@@ -13,11 +13,11 @@
Route::get('/', function() { return redirect()->route('nieuws'); }); Route::get('/', function() { return redirect()->route('nieuws'); });
Route::get('/nieuws', ['as' => 'nieuws', 'uses' => 'NewsController@overview']); Route::get('/nieuws', 'NewsController@overview')->name('nieuws');
Route::get('/nieuws/regio/{region}', 'NewsController@regionlist' )->where(['region' => '[a-z0-9]+']); Route::get('/nieuws/regio/{region}', 'NewsController@regionlist' )->where(['region' => '[a-z0-9]+'])->name('nieuws.regio');
Route::get('/nieuws/thema/{theme}', 'NewsController@themelist' )->where(['themelist' => '[a-z0-9]+']); Route::get('/nieuws/thema/{theme}', 'NewsController@themelist' )->where(['themelist' => '[a-z0-9]+'])->name('nieuws.thema');
Route::get('/nieuws/{id}/{title}', 'NewsController@show')->where(['id' => '\d+']); Route::get('/nieuws/{id}/{title}', 'NewsController@show')->where(['id' => '\d+'])->name('nieuws.detail');
Route::get('/nieuws/zoeken/{query}', 'NewsController@search'); Route::get('/nieuws/zoeken/{query}', 'NewsController@search')->name('nieuws.zoeken');
Route::get('/nieuws/zoeken', function(Illuminate\Http\Request $request) { Route::get('/nieuws/zoeken', function(Illuminate\Http\Request $request) {
if($query = $request->get('query', null)) { if($query = $request->get('query', null)) {
return redirect('/nieuws/zoeken/' . urlencode($query)); return redirect('/nieuws/zoeken/' . urlencode($query));
@@ -25,22 +25,26 @@ Route::get('/nieuws/zoeken', function(Illuminate\Http\Request $request) {
return redirect('/nieuws'); return redirect('/nieuws');
}); });
Route::get('/onair', 'RadioController@onair'); Route::get('/onair', 'RadioController@onair')->name('onair');
Route::get('/agenda', 'CalendarController@overview'); Route::get('/agenda', 'CalendarController@overview')->name('agenda');
Route::get('/agenda/{id}/{title}', 'CalendarController@show')->where(['id' => '\d+']); Route::get('/agenda/{id}/{title}', 'CalendarController@show')->where(['id' => '\d+'])->name('agenda.details');
Route::get('/gids/{shift?}', 'RadioController@schedule')->where(['shift' => '-?\d+']); Route::get('/gids/{shift?}', 'RadioController@schedule')->where(['shift' => '-?\d+'])->name('radio.gids');
Route::get('/programma/{id}/{title}', 'RadioController@program')->where(['id' => '\d+']); Route::get('/programma/{id}/{title}', 'RadioController@program')->where(['id' => '\d+']);
Route::get('/programma')->name('programma');
Route::get('/luister/live', 'StreamController@liveradio'); Route::get('/luister/live', 'StreamController@liveradio')->name('luister.live');
Route::get('/luister/gemeenteraad', 'StreamController@gemeenteraad'); Route::get('/luister/regionieuws', 'NewsController@regionieuws')->name('luister.regionieuws');
Route::get('/luister/gemeenteraad', 'StreamController@gemeenteraad')->name('luister.gemeenteraad');
Route::get('/luister/fragment/{id}/{title}', 'StreamController@podcast')->where(['id' => '\d+']); Route::get('/luister/fragment/{id}/{title}', 'StreamController@podcast')->where(['id' => '\d+']);
Route::get('/luister/fragment')->name('luister.podcast');
Route::get('/luister/programma/{year}/{month}/{day}/{hour}/{duration}/{offset?}', 'StreamController@program') Route::get('/luister/programma/{year}/{month}/{day}/{hour}/{duration}/{offset?}', 'StreamController@program')
->where(['id' => '\d+', 'year' => '20\d\d', 'month' => '\d\d?', 'day' => '\d\d?', 'hour' => '\d\d?', 'duration' => '\d\d?', 'offset' => '\d\d?']); ->where(['id' => '\d+', 'year' => '20\d\d', 'month' => '\d\d?', 'day' => '\d\d?', 'hour' => '\d\d?', 'duration' => '\d\d?', 'offset' => '\d\d?']);
Route::get('/luister/programma')->name('luister.programma');
Route::get('/gemist', ['as' => 'gemist', 'uses' => 'RadioController@podcasts']); Route::get('/gemist', 'RadioController@podcasts')->name('gemist');
Route::get('/gemist/zoeken/{query}', 'RadioController@searchpodcast'); Route::get('/gemist/zoeken/{query}', 'RadioController@searchpodcast')->name('gemist.zoeken');
Route::get('/gemist/zoeken', function(Illuminate\Http\Request $request) { Route::get('/gemist/zoeken', function(Illuminate\Http\Request $request) {
if($query = $request->get('query', null)) { if($query = $request->get('query', null)) {
return redirect('/gemist/zoeken/' . urlencode($query)); return redirect('/gemist/zoeken/' . urlencode($query));
@@ -49,19 +53,17 @@ Route::get('/gemist/zoeken', function(Illuminate\Http\Request $request) {
}); });
Route::get('/gemist/fragment/{id}/{title}', 'RadioController@podcast')->where(['id' => '\d+']); Route::get('/gemist/fragment/{id}/{title}', 'RadioController@podcast')->where(['id' => '\d+']);
Route::get('/gemist/fragment')->name('gemist.details');
Route::get('/gemist/programma/{programma}/{title}', 'RadioController@podcasts')->where(['programma' => '\d+']); Route::get('/gemist/programma/{programma}/{title}', 'RadioController@podcasts')->where(['programma' => '\d+']);
Route::get('/gemist/programma')->name('gemist.programma');
Route::get('/kijk/live', 'StreamController@livetv'); Route::get('/kijk/live', 'StreamController@livetv')->name('kijk.live');
Route::get('/kerkdienst', 'KerkdienstController@main'); Route::get('/kerkdienst', 'KerkdienstController@main')->name('kerkdienst');
Route::get('/kerkdienst/luister', 'StreamController@kerkdienst'); Route::get('/kerkdienst/luister', 'StreamController@kerkdienst')->name('luister.kerkdienst');
Route::get('/contact', 'Controller@view_contact'); Route::get('/contact', 'Controller@view_contact')->name('contact');
//Route::get('/6fm/over-6fm', function() { return view('about'); });
//Route::get('/6fm/contact', function() { return view('contact'); });
//Route::get('/6fm/adverteren', function() { return view('adverteren'); });
//Route::get('/special/stmaarten', function() { return file_get_contents('http://api-dev.6fm.nl/special/stmaarten'); }); //Route::get('/special/stmaarten', function() { return file_get_contents('http://api-dev.6fm.nl/special/stmaarten'); });
//Route::get('/kabelkrant', function() { return view('kabelkrant'); }); //Route::get('/kabelkrant', function() { return view('kabelkrant'); });