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

-updated all views to use new menu bar

This commit is contained in:
martin 2011-01-26 21:43:56 -05:00
parent 8151ec6429
commit ea14dd44e9
7 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
application/Bootstrap.php
View File

@ -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-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/jquery-ui-1.8.8.custom.min.js','text/javascript');
$view->headScript()->appendFile('/js/libs/stuHover.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->headScript()->appendFile('/js/playlist/playlist.js','text/javascript');
$view->headLink()->appendStylesheet('/css/styles.css');
} }
} }

6
application/controllers/NowplayingController.php
View File

@ -11,9 +11,9 @@ class NowplayingController extends Zend_Controller_Action
public function indexAction() public function indexAction()
{ {
$this->view->headScript()->appendFile('/js/datatables/js/jquery.dataTables.min.js','text/javascript'); $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/pro_dropdown_3.css');
$this->view->headLink()->appendStylesheet('/css/datatables/css/demo_table.css'); $this->view->headLink()->appendStylesheet('/css/styles.css');
} }
public function getDataGridDataAction() public function getDataGridDataAction()

2
application/controllers/PluploadController.php
View File

@ -168,6 +168,8 @@ class PluploadController extends Zend_Controller_Action
$view->headScript()->appendFile('/js/airtime/library/plupload.js','text/javascript'); $view->headScript()->appendFile('/js/airtime/library/plupload.js','text/javascript');
$view->headLink()->appendStylesheet('/css/plupload.queue.css'); $view->headLink()->appendStylesheet('/css/plupload.queue.css');
$view->headLink()->appendStylesheet('/css/pro_dropdown_3.css');
$view->headLink()->appendStylesheet('/css/styles.css');
} }

5
application/controllers/ScheduleController.php
View File

@ -40,7 +40,8 @@ class ScheduleController extends Zend_Controller_Action
$this->view->headLink()->appendStylesheet('/css/jquery.contextMenu.css'); $this->view->headLink()->appendStylesheet('/css/jquery.contextMenu.css');
$this->view->headLink()->appendStylesheet('/css/fullcalendar.css'); $this->view->headLink()->appendStylesheet('/css/fullcalendar.css');
$this->view->headLink()->appendStylesheet('/css/schedule.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();
//$eventDefaultMenu[] = array('action' => '/Schedule/delete-show', 'text' => 'Delete'); //$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/fullcalendar.css');
$this->view->headLink()->appendStylesheet('/css/colorpicker/css/colorpicker.css'); $this->view->headLink()->appendStylesheet('/css/colorpicker/css/colorpicker.css');
$this->view->headLink()->appendStylesheet('/css/add-show.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(); $request = $this->getRequest();
$formWhat = new Application_Form_AddShowWhat(); $formWhat = new Application_Form_AddShowWhat();

5
application/controllers/UserController.php
View File

@ -12,11 +12,14 @@ class UserController extends Zend_Controller_Action
public function indexAction() public function indexAction()
{ {
// action body
} }
public function addUserAction() public function addUserAction()
{ {
$this->view->headLink()->appendStylesheet('/css/pro_dropdown_3.css');
$this->view->headLink()->appendStylesheet('/css/styles.css');
$request = $this->getRequest(); $request = $this->getRequest();
$form = new Application_Form_AddUser(); $form = new Application_Form_AddUser();

7
application/layouts/scripts/layout.phtml
View File

@ -10,7 +10,12 @@
<body> <body>
<div id="nowplayingbar"><?= $this->partial('partialviews/header.phtml') ?></div> <div id="nowplayingbar"><?= $this->partial('partialviews/header.phtml') ?></div>
<div id="nav"><?php echo $this->navigation()->menu()->setRenderInvisible(true) ?></div> <div class="logo"></div>
<?php $partial = array('menu.phtml', 'default');
$this->navigation()->menu()->setPartial($partial); ?>
<?php echo $this->navigation()->menu() ?>
<div id="content"><?php echo $this->layout()->content ?></div> <div id="content"><?php echo $this->layout()->content ?></div>
</body> </body>

4
application/views/scripts/nowplaying/index.phtml
View File

@ -54,8 +54,8 @@ function createDataGrid(){
datagridData.columnHeaders[3]["fnRender"] = getTimeText; datagridData.columnHeaders[3]["fnRender"] = getTimeText;
datagridData.columnHeaders[4]["fnRender"] = changeTimePrecisionInit; datagridData.columnHeaders[4]["fnRender"] = changeTimePrecisionInit;
$('#demo').html( '<table cellpadding="0" cellspacing="0" border="0" class="display" id="example"></table>' ); $('#demo').html( '<table cellpadding="0" cellspacing="0" border="0" class="display" width="100%" id="nowplayingtable"></table>' );
$('#example').dataTable( { $('#nowplayingtable').dataTable( {
"bSort" : false, "bSort" : false,
"bJQueryUI": true, "bJQueryUI": true,
"bFilter": false, "bFilter": false,