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

Merge branch 'master' of dev.sourcefabric.org:campcaster

Browse source
This commit is contained in:
naomiaro 2010-12-21 17:48:08 -05:00
commit 565d789baa
13 changed files with 199 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
application/controllers/ScheduleController.php
View file

@ -18,7 +18,8 @@ class ScheduleController extends Zend_Controller_Action
->addActionContext('resize-show', 'json')
->addActionContext('delete-show', 'json')
->addActionContext('schedule-show', 'json')
->addActionContext('clear-show', 'json')
->addActionContext('clear-show', 'json')
->addActionContext('get-current-playlist', 'json')
->initContext();
}
@ -174,6 +175,15 @@ class ScheduleController extends Zend_Controller_Action
}
}
public function getSchedulerTimeAction()
{
$this->view->headScript()->appendFile('/js/progressbar/jquery.progressbar.min.js','text/javascript');
}
public function getCurrentPlaylistAction()
{
$this->view->entries = Schedule::GetPlayOrderRange();
}
}