@@ -35,28 +93,28 @@
/*
var page = 1;
var isLoading = 0;
- var $items = $('#items');
- var $isLoading = $('#loading');
+ var $items = $('#items');
+ var $isLoading = $('#loading');
$(function() {
$(window).scroll(function () {
- var $this = $(this);
+ var $this = $(this);
var tweak = 10;
-
+
if(!isLoading && (page > 0) && ($this.scrollTop() >= $items.height() - $this.height() - tweak))
{
- isLoading = 1;
+ isLoading = 1;
$isLoading.show();
$.ajax({ url: document.location.pathname + '?pagina=' + (++page) })
.always(function() { isLoading = 0; $isLoading.hide(); })
- .done(function(data) {
- if(!data) {
- if(page > 1) $items.append("
Er zijn geen podcasts (meer).
");
- page = -1;
+ .done(function(data) {
+ if(!data) {
+ if(page > 1) $items.append("
Er zijn geen podcasts (meer).
");
+ page = -1;
return;
}
- $newPage = $("
").append(data);
+ $newPage = $("
").append(data);
$items.append($newPage);
- $newPage.find("audio, video").mediaelementplayer({ stretching: 'responsive' });
+ $newPage.find("audio, video").mediaelementplayer({ stretching: 'responsive' });
});
}
});
@@ -65,11 +123,11 @@
@endpush
@else
-
+
Er zijn geen fragmenten beschikbaar.
-
+
@endif
-
+
@endsection
@push('styles')
diff --git a/resources/views/programlist.blade.php b/resources/views/programlist.blade.php
index ca2103c8..8b1093bb 100644
--- a/resources/views/programlist.blade.php
+++ b/resources/views/programlist.blade.php
@@ -1,4 +1,4 @@
-@extends('layouts/sidebar')
+@extends('layouts/full')
@section('title')
Programma gemist
@@ -8,75 +8,111 @@
@section('breadcrumb')
@if(isset($program))
-
+
+ @else
+
+ - Home
+ - Programma gemist
+
@endif
@endsection
@section('content')
- @parent
+
+
+
+
+ @if(isset($program))
+
{{$program->name}}
+
+ ← Toon
+ alles
+ Programmainfo
+
+ @else
+
U kunt programma's terugluisteren tot twee weken na uitzending. Items blijven onbeperkt beschikbaar via fragment gemist.
+ @endif
-
+ @if(isset($programs))
-
U kunt programma's terugluisteren tot twee weken na uitzending. Items blijven onbeperkt beschikbaar via fragment gemist.
+
+ @include('partial/programitems', [
+ 'li' => [
+ 'class' => 'col-12 col-md-6'
+ ],
+ 'content' => [
+ 'class' => 'box full_width flex-column d-flex',
+ 'style' => 'height: 270px'
+ ],
+ 'ul' => [
+ 'class' => 'row overview'
+ ],
+ 'body' => [
+ 'show' => true,
+ 'class' => 'clipText clipText-5'
+ ],
+ 'actionButton' => [
+ 'class' => 'd-flex flex-column justify-content-end flex-grow-1'
+ ],
+ 'showAction' => true,
+ 'showTime' => true,
+ 'programs' => array_slice($programs, 0, 8)])
+
-
-
+ @else
- @php($i = 0)
- @foreach($programs as $program)
- @if($i % 2 == 0)
- @if($i > 0) @endif
-
- @endif
- program->url; ?>
- end->diff($program->start);
- $duration = 24 * $endStartDiff->d + $endStartDiff->h; ?>
- -
-
-
- @if($program->current)
-
Nu live!
- @else
-
- -
- {{ Formatter::relativeDate($program->start) }}
- van {{ $program->start->format('H:i') }} uur tot {{ $program->end->format('H:i') }} uur.
-
-
-
Luister terug
- @endif
-
Meer informatie
-
-
{!! Formatter::excerpt($program->program->description, 200) !!}
-
+ Er zijn geen fragmenten beschikbaar.
- @php($i++)
- @endforeach
+ @endif
+
- @if($i)
-
- @endif
+
-
+
+ - Advertentie -
+
+
+
+
+
@endsection
@@ -91,12 +127,3 @@ setInterval(function() {
}, 1000);
@endpush
-
-@push('styles')
-
-@endpush
diff --git a/resources/views/radioprogram.blade.php b/resources/views/radioprogram.blade.php
index 6af55b08..4775e0a6 100644
--- a/resources/views/radioprogram.blade.php
+++ b/resources/views/radioprogram.blade.php
@@ -8,6 +8,8 @@
@section('breadcrumb')
+ - Home
+ - Radioprogrammering
- Programma-informatie
diff --git a/resources/views/widgets/menu.blade.php b/resources/views/widgets/menu.blade.php
index 900ee18e..2f335c14 100644
--- a/resources/views/widgets/menu.blade.php
+++ b/resources/views/widgets/menu.blade.php
@@ -21,8 +21,8 @@
// "Vroeger of Later Luisterlijst (2 januari)" => "/vol-luisterlijst"),
"App" => "/app",
"Podcast" => array(
- "" => "/podcast/1091/nh-gooi-spreekuur",
- "Waterschapsverkiezing 2023" => "/gemist/fragment/1356528/podcast-waterschapsverkiezingen-2023.mp3",
+ "" => "/podcast/fragment/1356528/podcast-waterschapsverkiezingen-2023.mp3",
+ "Waterschapsverkiezing 2023" => "/podcast/fragment/1356528/podcast-waterschapsverkiezingen-2023.mp3",
"NH Gooi Spreekuur" => "/podcast/1091/nh-gooi-spreekuur",
"Duurzaam Gooi" => "/podcast/1076/podcast-duurzaam-gooi"
),
diff --git a/routes/web.php b/routes/web.php
index b03ab0fe..04c15c32 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -63,11 +63,12 @@ Route::get('/gemist/zoeken', function(Illuminate\Http\Request $request) {
});
Route::get('/gemist/fragment', 'RadioController@podcasts')->name('gemist.fragment');
-Route::get('/gemist/fragment/{id}/{title}', 'RadioController@podcast')->where(['id' => '\d+']);
+Route::get('/gemist/fragment/{id}/{title}', 'RadioController@podcast')->where(['id' => '\d+', 'title' => '.*']);
Route::get('/gemist/programma', 'RadioController@terugluisteren')->name('gemist.programma');
Route::get('/gemist/programma/{programma}/{title}', 'RadioController@podcasts')->where(['programma' => '\d+']);
Route::get('/podcast/{programma}/{title}', 'PodcastController@podcasts')->where(['programma' => '\d+']);
+Route::get('/podcast/fragment/{id}/{title}', 'RadioController@podcast')->where(['id' => '\d+', 'title' => '.*']);
Route::get('/podcast/aflevering/{id}/{title}', 'PodcastController@podcast')->where(['id' => '\d+']);
Route::get('/podcast/zoeken/{query}', 'RadioController@searchpodcast')->name('gemist.zoeken');
Route::get('/podcast/zoeken', function(Illuminate\Http\Request $request) {