Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

-re-enabled Now playing bar

This commit is contained in:
mkonecny 2011-02-04 18:32:57 -05:00
parent 27293c6b8f
commit 89ae221f4c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
application/Bootstrap.php
View File

@ -60,8 +60,8 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
$view->headScript()->appendFile('/js/libs/jquery.stickyPanel.js','text/javascript'); $view->headScript()->appendFile('/js/libs/jquery.stickyPanel.js','text/javascript');
//scripts for now playing bar //scripts for now playing bar
//$this->view->headScript()->appendFile('/js/playlist/helperfunctions.js','text/javascript'); $this->view->headScript()->appendFile('/js/playlist/helperfunctions.js','text/javascript');
//$this->view->headScript()->appendFile('/js/playlist/playlist.js','text/javascript'); $this->view->headScript()->appendFile('/js/playlist/playlist.js','text/javascript');
$view->headScript()->appendFile('/js/airtime/common/common.js','text/javascript'); $view->headScript()->appendFile('/js/airtime/common/common.js','text/javascript');
} }

4
application/models/Nowplaying.php
View File

@ -60,10 +60,10 @@ class Application_Model_Nowplaying
$date = Schedule::GetSchedulerTime(); $date = Schedule::GetSchedulerTime();
$timeNow = $date->getDate(); $timeNow = $date->getDate();
$currentShow = Schedule::GetCurrentShow($timeNow); $currentShow = Schedule::GetCurrentShow($timeNow);
$groupIDs = array();
if (count($currentShow) > 0){ if (count($currentShow) > 0){
$dbRows = Show_DAL::GetShowGroupIDs($currentShow[0]["id"]); $dbRows = Show_DAL::GetShowGroupIDs($currentShow[0]["id"]);
$groupIDs = array();
foreach ($dbRows as $row){ foreach ($dbRows as $row){
array_push($groupIDs, $row["group_id"]); array_push($groupIDs, $row["group_id"]);