From 8151ec6429cf4ce902cae81cced059290d2b43fe Mon Sep 17 00:00:00 2001 From: martin Date: Wed, 26 Jan 2011 20:59:56 -0500 Subject: [PATCH] -added now-playing bar with new design! --- application/Bootstrap.php | 2 + application/layouts/scripts/library.phtml | 3 +- application/layouts/scripts/search.phtml | 2 +- .../views/scripts/nowplaying/index.phtml | 2 +- .../views/scripts/partialviews/header.phtml | 38 +++++++ public/js/playlist/playlist.js | 103 +++++++++++------- pypo/scripts/ls_script.liq | 2 +- 7 files changed, 108 insertions(+), 44 deletions(-) diff --git a/application/Bootstrap.php b/application/Bootstrap.php index f7405c561..979db159f 100644 --- a/application/Bootstrap.php +++ b/application/Bootstrap.php @@ -56,6 +56,8 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap $view->headScript()->appendFile('/js/libs/stuHover.js','text/javascript'); $view->headScript()->appendFile('/js/progressbar/jquery.progressbar.min.js','text/javascript'); $view->headScript()->appendFile('/js/playlist/playlist.js','text/javascript'); + + $view->headLink()->appendStylesheet('/css/styles.css'); } } diff --git a/application/layouts/scripts/library.phtml b/application/layouts/scripts/library.phtml index 13ab089e0..c64a9d832 100644 --- a/application/layouts/scripts/library.phtml +++ b/application/layouts/scripts/library.phtml @@ -9,10 +9,9 @@ +
partial('partialviews/header.phtml') ?>
-
- navigation()->menu()->setPartial($partial); ?> diff --git a/application/layouts/scripts/search.phtml b/application/layouts/scripts/search.phtml index 2145a32e2..1d9ac2a37 100644 --- a/application/layouts/scripts/search.phtml +++ b/application/layouts/scripts/search.phtml @@ -8,7 +8,7 @@ headLink() ?> - +
partial('partialviews/header.phtml') ?>
diff --git a/application/views/scripts/nowplaying/index.phtml b/application/views/scripts/nowplaying/index.phtml index cc05408eb..78ee78b5f 100644 --- a/application/views/scripts/nowplaying/index.phtml +++ b/application/views/scripts/nowplaying/index.phtml @@ -58,7 +58,7 @@ function createDataGrid(){ $('#example').dataTable( { "bSort" : false, "bJQueryUI": true, - "bFilter": true, + "bFilter": false, "bInfo": false, "bLengthChange": false, "aaData": datagridData.rows, diff --git a/application/views/scripts/partialviews/header.phtml b/application/views/scripts/partialviews/header.phtml index 2bb4e380d..b1d2b8506 100644 --- a/application/views/scripts/partialviews/header.phtml +++ b/application/views/scripts/partialviews/header.phtml @@ -1,3 +1,4 @@ + +
+
+
Previous: 04:45
+
+
03:0501:05
+ Engl - Rammstein 04:10
+
+
+
+
Next: Engl - Rammstein 03:56
+
+
+
 
+
The Fast Show 16:00 - 17:00
+
+
+
+
+
+
ON AIR
+
+
+
    +
  • Station time
    • +
  • 16:45:16
    • +
  • CET
    • +
+
+
+
    +
  • Signed in:
    • +
  • Vladimir Stefanovic
    • +
  • Logout
    • +
+
+