diff --git a/application/Bootstrap.php b/application/Bootstrap.php index 979db159f..29eecf9ad 100644 --- a/application/Bootstrap.php +++ b/application/Bootstrap.php @@ -54,10 +54,7 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap $view->headScript()->appendFile('/js/libs/jquery-1.4.4.min.js','text/javascript'); $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/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/controllers/NowplayingController.php b/application/controllers/NowplayingController.php index d44091a35..e08837e3e 100644 --- a/application/controllers/NowplayingController.php +++ b/application/controllers/NowplayingController.php @@ -11,9 +11,9 @@ class NowplayingController extends Zend_Controller_Action 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->view->headScript()->appendFile('/js/datatables/js/jquery.dataTables.min.js','text/javascript'); + $this->view->headLink()->appendStylesheet('/css/pro_dropdown_3.css'); + $this->view->headLink()->appendStylesheet('/css/styles.css'); } public function getDataGridDataAction() diff --git a/application/controllers/PluploadController.php b/application/controllers/PluploadController.php index 9b1792e7c..2939ba517 100644 --- a/application/controllers/PluploadController.php +++ b/application/controllers/PluploadController.php @@ -168,6 +168,8 @@ class PluploadController extends Zend_Controller_Action $view->headScript()->appendFile('/js/airtime/library/plupload.js','text/javascript'); $view->headLink()->appendStylesheet('/css/plupload.queue.css'); + $view->headLink()->appendStylesheet('/css/pro_dropdown_3.css'); + $view->headLink()->appendStylesheet('/css/styles.css'); } diff --git a/application/controllers/ScheduleController.php b/application/controllers/ScheduleController.php index 8959948a0..700e3c6e5 100644 --- a/application/controllers/ScheduleController.php +++ b/application/controllers/ScheduleController.php @@ -40,7 +40,8 @@ class ScheduleController extends Zend_Controller_Action $this->view->headLink()->appendStylesheet('/css/jquery.contextMenu.css'); $this->view->headLink()->appendStylesheet('/css/fullcalendar.css'); $this->view->headLink()->appendStylesheet('/css/schedule.css'); - + $this->view->headLink()->appendStylesheet('/css/pro_dropdown_3.css'); + $this->view->headLink()->appendStylesheet('/css/styles.css'); $eventDefaultMenu = array(); //$eventDefaultMenu[] = array('action' => '/Schedule/delete-show', 'text' => 'Delete'); @@ -81,6 +82,8 @@ class ScheduleController extends Zend_Controller_Action $this->view->headLink()->appendStylesheet('/css/fullcalendar.css'); $this->view->headLink()->appendStylesheet('/css/colorpicker/css/colorpicker.css'); $this->view->headLink()->appendStylesheet('/css/add-show.css'); + $this->view->headLink()->appendStylesheet('/css/pro_dropdown_3.css'); + $this->view->headLink()->appendStylesheet('/css/styles.css'); $request = $this->getRequest(); $formWhat = new Application_Form_AddShowWhat(); diff --git a/application/controllers/UserController.php b/application/controllers/UserController.php index 8479fb627..164c51887 100644 --- a/application/controllers/UserController.php +++ b/application/controllers/UserController.php @@ -12,11 +12,14 @@ class UserController extends Zend_Controller_Action public function indexAction() { - // action body + } public function addUserAction() { + $this->view->headLink()->appendStylesheet('/css/pro_dropdown_3.css'); + $this->view->headLink()->appendStylesheet('/css/styles.css'); + $request = $this->getRequest(); $form = new Application_Form_AddUser(); diff --git a/application/layouts/scripts/layout.phtml b/application/layouts/scripts/layout.phtml index 7297c6513..c0277336e 100644 --- a/application/layouts/scripts/layout.phtml +++ b/application/layouts/scripts/layout.phtml @@ -10,7 +10,12 @@
partial('partialviews/header.phtml') ?>
- + + +navigation()->menu()->setPartial($partial); ?> + +navigation()->menu() ?>
layout()->content ?>
diff --git a/application/views/scripts/nowplaying/index.phtml b/application/views/scripts/nowplaying/index.phtml index 78ee78b5f..7800ad03d 100644 --- a/application/views/scripts/nowplaying/index.phtml +++ b/application/views/scripts/nowplaying/index.phtml @@ -54,8 +54,8 @@ function createDataGrid(){ datagridData.columnHeaders[3]["fnRender"] = getTimeText; datagridData.columnHeaders[4]["fnRender"] = changeTimePrecisionInit; - $('#demo').html( '
' ); - $('#example').dataTable( { + $('#demo').html( '
' ); + $('#nowplayingtable').dataTable( { "bSort" : false, "bJQueryUI": true, "bFilter": false,