Merge branch 'master' of dev.sourcefabric.org:campcaster
This commit is contained in:
commit
9e20e935ca
12 changed files with 195 additions and 116 deletions
|
@ -5,24 +5,26 @@ class NowplayingController extends Zend_Controller_Action
|
|||
|
||||
public function init()
|
||||
{
|
||||
$ajaxContext = $this->_helper->getHelper('AjaxContext');
|
||||
$ajaxContext->addActionContext('get-data-grid-data', 'json')->initContext();
|
||||
$ajaxContext = $this->_helper->getHelper('AjaxContext');
|
||||
$ajaxContext->addActionContext('get-data-grid-data', 'json')->initContext();
|
||||
}
|
||||
|
||||
public function indexAction()
|
||||
{
|
||||
$this->view->headScript()->appendFile('/js/datatables/js/jquery.dataTables.min.js','text/javascript');
|
||||
|
||||
|
||||
$this->view->headLink()->appendStylesheet('/css/datatables/css/demo_page.css');
|
||||
$this->view->headLink()->appendStylesheet('/css/datatables/css/demo_table.css');
|
||||
|
||||
//$this->_helper->viewRenderer->setResponseSegment('nowplaying');
|
||||
$this->view->headScript()->appendFile('/js/datatables/js/jquery.dataTables.min.js','text/javascript');
|
||||
$this->view->headLink()->appendStylesheet('/css/datatables/css/demo_page.css');
|
||||
$this->view->headLink()->appendStylesheet('/css/datatables/css/demo_table.css');
|
||||
}
|
||||
|
||||
public function getDataGridDataAction()
|
||||
{
|
||||
$this->view->entries = Application_Model_Nowplaying::GetDataGridData();
|
||||
$this->view->entries = Application_Model_Nowplaying::GetDataGridData();
|
||||
}
|
||||
|
||||
public function livestreamAction()
|
||||
{
|
||||
//use bare bones layout (no header bar or menu)
|
||||
$this->_helper->layout->setLayout('bare');
|
||||
}
|
||||
|
||||
|
||||
|
@ -32,3 +34,5 @@ class NowplayingController extends Zend_Controller_Action
|
|||
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue