From cf004abb44521d59cedfcdfa2ee7eff2fb424ffb Mon Sep 17 00:00:00 2001 From: mkonecny Date: Thu, 10 Feb 2011 20:48:26 -0500 Subject: [PATCH] -small fixes -about popup without styling added --- .zfproject.xml | 7 ++++++ application/Bootstrap.php | 1 + .../controllers/DashboardController.php | 22 ++++++++++++++++++ application/controllers/LibraryController.php | 1 - .../views/scripts/dashboard/index.phtml | 1 + .../views/scripts/nowplaying/day-view.phtml | 2 +- .../views/scripts/nowplaying/index.phtml | 2 +- .../views/scripts/partialviews/header.phtml | 7 +++++- public/css/images/progressbar_show_red.png | Bin 150 -> 948 bytes public/js/playlist/nowplayingdatagrid.js | 6 ++--- public/js/playlist/playlist.js | 12 ++++++++++ .../controllers/DashboardControllerTest.php | 20 ++++++++++++++++ 12 files changed, 74 insertions(+), 7 deletions(-) create mode 100644 application/controllers/DashboardController.php create mode 100644 application/views/scripts/dashboard/index.phtml create mode 100644 tests/application/controllers/DashboardControllerTest.php diff --git a/.zfproject.xml b/.zfproject.xml index 10be22481..1807da152 100644 --- a/.zfproject.xml +++ b/.zfproject.xml @@ -95,6 +95,9 @@ + + + @@ -311,6 +314,9 @@ + + + @@ -355,6 +361,7 @@ + diff --git a/application/Bootstrap.php b/application/Bootstrap.php index b9389ca7b..33ec37fd8 100644 --- a/application/Bootstrap.php +++ b/application/Bootstrap.php @@ -59,6 +59,7 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap $view->headScript()->appendFile('/js/libs/jquery-ui-1.8.8.custom.min.js','text/javascript'); $view->headScript()->appendFile('/js/libs/stuHover.js','text/javascript'); $view->headScript()->appendFile('/js/libs/jquery.stickyPanel.js','text/javascript'); + $view->headScript()->appendFile('/js/qtip/jquery.qtip-1.0.0.min.js','text/javascript'); //scripts for now playing bar $this->view->headScript()->appendFile('/js/playlist/helperfunctions.js','text/javascript'); diff --git a/application/controllers/DashboardController.php b/application/controllers/DashboardController.php new file mode 100644 index 000000000..8ab5dd2e5 --- /dev/null +++ b/application/controllers/DashboardController.php @@ -0,0 +1,22 @@ +view->headScript()->appendFile('/js/contextmenu/jjmenu.js','text/javascript'); $this->view->headScript()->appendFile('/js/jplayer/jquery.jplayer.min.js'); $this->view->headScript()->appendFile('/js/datatables/js/jquery.dataTables.js','text/javascript'); - $this->view->headScript()->appendFile('/js/qtip/jquery.qtip-1.0.0.min.js','text/javascript'); $this->view->headScript()->appendFile('/js/airtime/library/library.js','text/javascript'); $this->view->headScript()->appendFile('/js/airtime/library/advancedsearch.js','text/javascript'); diff --git a/application/views/scripts/dashboard/index.phtml b/application/views/scripts/dashboard/index.phtml new file mode 100644 index 000000000..e5b885fc7 --- /dev/null +++ b/application/views/scripts/dashboard/index.phtml @@ -0,0 +1 @@ +

View script for controller Dashboard and script/action name index
\ No newline at end of file diff --git a/application/views/scripts/nowplaying/day-view.phtml b/application/views/scripts/nowplaying/day-view.phtml index 13070f085..bcf641005 100644 --- a/application/views/scripts/nowplaying/day-view.phtml +++ b/application/views/scripts/nowplaying/day-view.phtml @@ -1,4 +1,4 @@
- Now ViewDay View + Now ViewDay View
diff --git a/application/views/scripts/nowplaying/index.phtml b/application/views/scripts/nowplaying/index.phtml index 897b6bb65..e06b49810 100644 --- a/application/views/scripts/nowplaying/index.phtml +++ b/application/views/scripts/nowplaying/index.phtml @@ -1,4 +1,4 @@
- Now ViewDay View + Now ViewDay View
diff --git a/application/views/scripts/partialviews/header.phtml b/application/views/scripts/partialviews/header.phtml index a2a0c864f..2eea3063c 100644 --- a/application/views/scripts/partialviews/header.phtml +++ b/application/views/scripts/partialviews/header.phtml @@ -28,7 +28,7 @@
    -
  • About
    • +
  • About
  •  
  • Signed in:
  • user ?>
    • @@ -37,3 +37,8 @@
+ + diff --git a/public/css/images/progressbar_show_red.png b/public/css/images/progressbar_show_red.png index 59f7a899b2ed4fd70f686725b7e37fb3c96513ad..2d585370eaaeb5bdb4e478a6d45bea0fc95e4f92 100644 GIT binary patch literal 948 zcmaJ=J#W)M7(P@~qKYnv1qO6-SK`k&ZmgIpu@h>kj-td;!)C|6Bvxvld%j>N8*I#M zOe`?+2N+OCcBcLb{sQMTNf`*1?7MsKd7k&vANsx5$4AeP0077Kxiw(x1NJ_w9I$V3 z_@%;@XS6e-Lp-6mPY`H@c#NPO`%^SPez?5;iJAZ$z{nlZk#nI3IOhEl!xwSN*Z?%o ziqsG0h{7?NMv1}w{{Dl5QD|_Nsv|n7iDuFHilE`D=LV~J&k=<1HBHlALRpkVL6ikau1cD& z$hs)P&BHNoB%J62tGn^VP6julG}Q$m&vQOkcub~()MzwH4Oy--L^WF`)Gw+@cCuBl zP!^CVr4deGspyaKf*Kr)^e%-s-N`1|rcA70LgA-^#EWH0TcG3o9~#FybVdj0KHh%{ zXYMjZ!T@D>K?2se$w}!d)lGtYiiwNy)wYWL8KyX!;S`!f6<$V3i1TcXb{ySKGU_J* zvMqySd_IaoUGCKCT~kvPwWdi@M{H}VYH3>AJXJbo>$JV)S~yt5D4|&_|0|SH6w!JHX6k~CayA#8@b22Z19G(E55Z65nVn-Ncelf}aXH;dp z(>Wg~&RO6QSX<@vC><(K!GV67Y0!4B@z*Y;oYi dfd>bGA{-rzjlC>;fqEGjJYD@<);T3K0RTL#B<%nI diff --git a/public/js/playlist/nowplayingdatagrid.js b/public/js/playlist/nowplayingdatagrid.js index da8fb5472..ce65d2a00 100644 --- a/public/js/playlist/nowplayingdatagrid.js +++ b/public/js/playlist/nowplayingdatagrid.js @@ -76,11 +76,11 @@ function createDataGrid(){ "aoColumns": columns, "fnRowCallback": function( nRow, aData, iDisplayIndex, iDisplayIndexFull ) { if (aData[aData.length-2] == "t") - $(nRow).attr("style", "background-color:#166622"); + $(nRow).attr("class", "playing-list"); if (aData[0] == "c") - $(nRow).attr("style", "background-color:#61B329"); + $(nRow).attr("class", "playing-song"); else if (aData[0] == "b") - $(nRow).attr("style", "background-color:#EE3B3B"); + $(nRow).attr("class", "gap"); return nRow; }, "bAutoWidth":false diff --git a/public/js/playlist/playlist.js b/public/js/playlist/playlist.js index 7ba2b689f..0116cc5d0 100644 --- a/public/js/playlist/playlist.js +++ b/public/js/playlist/playlist.js @@ -241,6 +241,18 @@ function init() { //begin consumer "thread" secondsTimer(); + + $('#about-link').qtip({ + content: $('#about-txt').html(), + show: 'mouseover', + hide: { when: 'mouseout', fixed: true }, + position: { + corner: { + target: 'center', + tooltip: 'topRight' + } + } + }); } $(document).ready(function() { diff --git a/tests/application/controllers/DashboardControllerTest.php b/tests/application/controllers/DashboardControllerTest.php new file mode 100644 index 000000000..afd891617 --- /dev/null +++ b/tests/application/controllers/DashboardControllerTest.php @@ -0,0 +1,20 @@ +