diff --git a/application/Bootstrap.php b/application/Bootstrap.php index 43d6f69a0..a2b759a9d 100644 --- a/application/Bootstrap.php +++ b/application/Bootstrap.php @@ -53,6 +53,8 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap $view = $this->getResource('view'); $view->headScript()->appendFile('/js/libs/jquery-1.4.4.min.js','text/javascript'); $view->headScript()->appendFile('/js/libs/jquery-ui-1.8.7.custom.min.js','text/javascript'); + $view->headScript()->appendFile('/js/playlist/playlist.js','text/javascript'); + $view->headScript()->appendFile('/js/progressbar/jquery.progressbar.min.js','text/javascript'); } } diff --git a/application/controllers/ScheduleController.php b/application/controllers/ScheduleController.php index c307f24ad..ec1aab5ac 100644 --- a/application/controllers/ScheduleController.php +++ b/application/controllers/ScheduleController.php @@ -177,8 +177,7 @@ class ScheduleController extends Zend_Controller_Action public function viewPlaylistAction() { - $this->view->headScript()->appendFile('/js/playlist/playlist.js','text/javascript'); - $this->view->headScript()->appendFile('/js/progressbar/jquery.progressbar.min.js','text/javascript'); + //TODO: insert code for datagrid } public function getCurrentPlaylistAction() diff --git a/application/layouts/scripts/layout.phtml b/application/layouts/scripts/layout.phtml index 8d6683b57..d9d756fec 100644 --- a/application/layouts/scripts/layout.phtml +++ b/application/layouts/scripts/layout.phtml @@ -11,7 +11,17 @@ -
layout()->content ?>
- +
layout()->content ?>
+
+
 
+
Show:
Playlist:
Host:
+
Previous:
Current:
Upcoming:
+
+
+ diff --git a/application/views/scripts/schedule/view-playlist.phtml b/application/views/scripts/schedule/view-playlist.phtml index 49ba61b1c..51580a791 100644 --- a/application/views/scripts/schedule/view-playlist.phtml +++ b/application/views/scripts/schedule/view-playlist.phtml @@ -2,8 +2,8 @@ -
+
diff --git a/public/js/playlist/playlist.js b/public/js/playlist/playlist.js index 55f6681fd..bddca6f60 100644 --- a/public/js/playlist/playlist.js +++ b/public/js/playlist/playlist.js @@ -21,7 +21,6 @@ $(cc.currentElem).append(prevDiv); var currParentDiv = document.createElement('div'); - currParentDiv.setAttribute("style", "background-color:#bbbbbb;"); $(cc.currentElem).append(currParentDiv); var currDiv = document.createElement('div'); diff --git a/pypo/tests/airtime-schedule-insert.php b/pypo/tests/airtime-schedule-insert.php index a9d5767da..b480e0d43 100644 --- a/pypo/tests/airtime-schedule-insert.php +++ b/pypo/tests/airtime-schedule-insert.php @@ -66,7 +66,7 @@ if (is_null($mediaFile)) { } $pl->addAudioClip($mediaFile->getId()); -$mediaFile = StoredFile::findByOriginalName("Peter Rudenko - Opening.mp3"); +$mediaFile = StoredFile::findByOriginalName("Peter_Rudenko_-_Opening.mp3"); if (is_null($mediaFile)) { echo "Adding test audio clip to the database.\n"; $v = array("filepath" => __DIR__."/../../audio_samples/OpSound/Peter Rudenko - Opening.mp3");