From 3ef42413d84150404e4df960c80722b027a53c63 Mon Sep 17 00:00:00 2001 From: Jonas L Date: Tue, 27 Sep 2022 08:14:53 +0200 Subject: [PATCH] fix(legacy): add play button to stream player (#2190) --- .../controllers/DashboardController.php | 4 --- .../layouts/scripts/livestream.phtml | 26 ++++++++++++------- .../scripts/dashboard/stream-player.phtml | 4 ++- 3 files changed, 20 insertions(+), 14 deletions(-) diff --git a/legacy/application/controllers/DashboardController.php b/legacy/application/controllers/DashboardController.php index 9004be045..b7ff20a4b 100644 --- a/legacy/application/controllers/DashboardController.php +++ b/legacy/application/controllers/DashboardController.php @@ -93,10 +93,6 @@ class DashboardController extends Zend_Controller_Action public function streamPlayerAction() { - $CC_CONFIG = Config::getConfig(); - - $baseUrl = Config::getBasePath(); - $this->view->headLink()->appendStylesheet(Assets::url('js/jplayer/skin/jplayer.blue.monday.css')); $this->_helper->layout->setLayout('livestream'); diff --git a/legacy/application/layouts/scripts/livestream.phtml b/legacy/application/layouts/scripts/livestream.phtml index 76bde004a..7c55c0b1b 100644 --- a/legacy/application/layouts/scripts/livestream.phtml +++ b/legacy/application/layouts/scripts/livestream.phtml @@ -1,16 +1,24 @@ -doctype() ?> - + + + - - - - + + + + + + + + <?php echo _("Live stream") ?> - headLink() ?> - headScript() ?> + + headLink() ?> + headScript() ?> + -
layout()->content ?>
+
layout()->content ?>
+ diff --git a/legacy/application/views/scripts/dashboard/stream-player.phtml b/legacy/application/views/scripts/dashboard/stream-player.phtml index 242339091..f190a1027 100644 --- a/legacy/application/views/scripts/dashboard/stream-player.phtml +++ b/legacy/application/views/scripts/dashboard/stream-player.phtml @@ -14,7 +14,7 @@ $("#jquery_jplayer_1").jPlayer("destroy"); $("#jquery_jplayer_1").jPlayer({ ready: function() { - $(this).jPlayer("setMedia", obj).jPlayer("play"); + $(this).jPlayer("setMedia", obj); }, ended: function(event) { $(this).jPlayer("play"); @@ -87,6 +87,8 @@