From 22bf7122fc4b175916b43a2fd2e0cf614c0dada2 Mon Sep 17 00:00:00 2001 From: Naomi Date: Thu, 13 Mar 2014 15:42:51 -0400 Subject: [PATCH] CC-5723 : jPlayer HTML/CSS modifications --- airtime_mvc/application/Bootstrap.php | 2 +- .../application/layouts/scripts/layout.phtml | 9 +- .../views/scripts/partialviews/jplayer.phtml | 106 +-- .../public/css/images/player/next_icon.png | Bin 0 -> 1374 bytes .../public/css/images/player/pause_icon.png | Bin 0 -> 1036 bytes .../public/css/images/player/play_current.png | Bin 0 -> 1211 bytes .../public/css/images/player/play_hover.png | Bin 0 -> 1219 bytes .../public/css/images/player/play_icon.png | Bin 0 -> 1296 bytes .../css/images/player/playlist_next.png | Bin 0 -> 1349 bytes .../css/images/player/playlist_open.png | Bin 0 -> 1138 bytes .../css/images/player/playlist_prev.png | Bin 0 -> 1360 bytes .../css/images/player/previous_icon.png | Bin 0 -> 1370 bytes .../public/css/images/player/volume_icon.png | Bin 0 -> 1130 bytes .../css/jplayer.airtime.audio.preview.css | 564 +++++++++++++++ airtime_mvc/public/css/styles.css | 41 +- .../js/airtime/audiopreview/jPlayerWindow.js | 30 +- .../js/jplayer/skin/jplayer-mute-unmute.png | Bin 3128 -> 0 bytes .../skin/jplayer.airtime.audio.preview.css | 368 ---------- .../jplayer.audio-preview.blue.monday.css | 652 ------------------ .../js/jplayer/skin/jplayer.blue.monday.css | 507 -------------- .../js/jplayer/skin/jplayer.blue.monday.jpg | Bin 14525 -> 0 bytes .../skin/jplayer.blue.monday.seeking.gif | Bin 3284 -> 0 bytes .../public/js/jplayer/skin/jplayer.png | Bin 6690 -> 0 bytes .../public/js/jplayer/skin/pbar-ani.gif | Bin 304064 -> 0 bytes 24 files changed, 654 insertions(+), 1625 deletions(-) create mode 100644 airtime_mvc/public/css/images/player/next_icon.png create mode 100644 airtime_mvc/public/css/images/player/pause_icon.png create mode 100644 airtime_mvc/public/css/images/player/play_current.png create mode 100644 airtime_mvc/public/css/images/player/play_hover.png create mode 100644 airtime_mvc/public/css/images/player/play_icon.png create mode 100644 airtime_mvc/public/css/images/player/playlist_next.png create mode 100644 airtime_mvc/public/css/images/player/playlist_open.png create mode 100644 airtime_mvc/public/css/images/player/playlist_prev.png create mode 100644 airtime_mvc/public/css/images/player/previous_icon.png create mode 100644 airtime_mvc/public/css/images/player/volume_icon.png create mode 100644 airtime_mvc/public/css/jplayer.airtime.audio.preview.css delete mode 100644 airtime_mvc/public/js/jplayer/skin/jplayer-mute-unmute.png delete mode 100644 airtime_mvc/public/js/jplayer/skin/jplayer.airtime.audio.preview.css delete mode 100644 airtime_mvc/public/js/jplayer/skin/jplayer.audio-preview.blue.monday.css delete mode 100644 airtime_mvc/public/js/jplayer/skin/jplayer.blue.monday.css delete mode 100644 airtime_mvc/public/js/jplayer/skin/jplayer.blue.monday.jpg delete mode 100644 airtime_mvc/public/js/jplayer/skin/jplayer.blue.monday.seeking.gif delete mode 100644 airtime_mvc/public/js/jplayer/skin/jplayer.png delete mode 100644 airtime_mvc/public/js/jplayer/skin/pbar-ani.gif diff --git a/airtime_mvc/application/Bootstrap.php b/airtime_mvc/application/Bootstrap.php index 53688812e..29a4d1747 100644 --- a/airtime_mvc/application/Bootstrap.php +++ b/airtime_mvc/application/Bootstrap.php @@ -79,7 +79,7 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap $view->headLink()->appendStylesheet($baseUrl.'css/tipsy/jquery.tipsy.css?'.$CC_CONFIG['airtime_version']); //jPlayer css. - $view->headLink()->appendStylesheet($baseUrl.'js/jplayer/skin/jplayer.airtime.audio.preview.css?'.$CC_CONFIG['airtime_version']); + $view->headLink()->appendStylesheet($baseUrl.'css/jplayer.airtime.audio.preview.css?'.$CC_CONFIG['airtime_version']); } protected function _initHeadScript() diff --git a/airtime_mvc/application/layouts/scripts/layout.phtml b/airtime_mvc/application/layouts/scripts/layout.phtml index af24cf693..0798458b8 100644 --- a/airtime_mvc/application/layouts/scripts/layout.phtml +++ b/airtime_mvc/application/layouts/scripts/layout.phtml @@ -32,13 +32,8 @@ navigation()->menu() ?> -
-
- layout()->content ?> -
-
- -
+
+ layout()->content ?> partial('partialviews/jplayer.phtml') ?>
diff --git a/airtime_mvc/application/views/scripts/partialviews/jplayer.phtml b/airtime_mvc/application/views/scripts/partialviews/jplayer.phtml index 231f6c306..637d116c1 100644 --- a/airtime_mvc/application/views/scripts/partialviews/jplayer.phtml +++ b/airtime_mvc/application/views/scripts/partialviews/jplayer.phtml @@ -1,60 +1,80 @@ -