From 7f5a6ca40ee7318527d7a22d661a1f7de4805023 Mon Sep 17 00:00:00 2001 From: Mischa Spelt Date: Tue, 11 Feb 2020 08:51:23 +0100 Subject: [PATCH] Stream TV via HTTPS --- website/resources/views/layouts/master.blade.php | 6 +++++- website/resources/views/watch.blade.php | 4 +++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/website/resources/views/layouts/master.blade.php b/website/resources/views/layouts/master.blade.php index 89d7832a..27b69049 100644 --- a/website/resources/views/layouts/master.blade.php +++ b/website/resources/views/layouts/master.blade.php @@ -431,6 +431,7 @@ container: $(".now-playing-header").hide(), title: $(".now-playing-header .title"), 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") }; @@ -444,7 +445,10 @@ $nowPlaying.artist.text(data.current.artist).attr('title', data.current.artist); } $nowPlaying.programLink.attr('href', '{{route("programma")}}' + data.program.url); - $nowPlaying.container.slideDown(); + $nowPlaying.controls.hide(); + $nowPlaying.container.slideDown(function() { + $nowPlaying.controls.fadeIn('slow'); + }); // Now playing may have moved the menu menu_position = $(".menu_container").offset().top; diff --git a/website/resources/views/watch.blade.php b/website/resources/views/watch.blade.php index 03774e7a..751ad11e 100644 --- a/website/resources/views/watch.blade.php +++ b/website/resources/views/watch.blade.php @@ -4,6 +4,8 @@ Kijk NH Gooi TV @endsection +@include('widgets.mediaplayer') + @section('content') @parent @@ -12,7 +14,7 @@ @else
@endif