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

-bug CC-1823 should be fixed.

Browse source
This commit is contained in:
martin 2011-01-30 16:47:11 -05:00
parent 7c70385528
commit 0ba5a1f520
14 changed files with 67 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

3
application/controllers/LibraryController.php
View file

@ -32,6 +32,9 @@ class LibraryController extends Zend_Controller_Action
{
$this->view->headScript()->appendFile('/js/airtime/onready/library.js','text/javascript');
$this->view->headScript()->appendFile('/js/contextmenu/jjmenu.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->headLink()->appendStylesheet('/css/contextmenu.css');
$this->view->headLink()->appendStylesheet('/css/pro_dropdown_3.css');
$this->view->headLink()->appendStylesheet('/css/styles.css');

6
application/controllers/LoginController.php
View file

@ -23,7 +23,7 @@ class LoginController extends Zend_Controller_Action
$request = $this->getRequest();
$form = new Application_Form_Login();
$errorMessage = "";
$message = "Please enter your user name and password";
if($request->isPost())
{
@ -56,12 +56,12 @@ class LoginController extends Zend_Controller_Action
}
else
{
$errorMessage = "Wrong username or password provided. Please try again.";
$message = "Wrong username or password provided. Please try again.";
}
}
}
$this->view->errorMessage = $errorMessage;
$this->view->message = $message;
$this->view->form = $form;
}

9
application/controllers/NowplayingController.php
View file

@ -13,12 +13,11 @@ class NowplayingController extends Zend_Controller_Action
{
$this->view->headScript()->appendFile('/js/datatables/js/jquery.dataTables.min.js','text/javascript');
$this->view->headScript()->appendFile('/js/playlist/nowplayingdatagrid.js','text/javascript');
$this->view->headLink()->appendStylesheet('/css/pro_dropdown_3.css');
$this->view->headScript()->appendFile('/js/playlist/helperfunctions.js','text/javascript');
$this->view->headScript()->appendFile('/js/playlist/playlist.js','text/javascript');
$this->view->headLink()->appendStylesheet('/css/pro_dropdown_3.css');
$this->view->headLink()->appendStylesheet('/css/styles.css');
//$this->view->headLink()->appendStylesheet('/css/datatables/demo_page.css');
//$this->view->headLink()->appendStylesheet('/css/datatables/demo_table.css');
//$this->view->headLink()->appendStylesheet('/css/datatables/demo_table_jui.css');
//$this->view->headLink()->appendStylesheet('/css/styles.css');
}
public function getDataGridDataAction()

18
application/controllers/PluploadController.php
View file

@ -160,16 +160,16 @@ class PluploadController extends Zend_Controller_Action
}
public function pluploadAction()
{
$view = $this->view;
$view->headScript()->appendFile('/js/plupload/plupload.full.min.js','text/javascript');
$view->headScript()->appendFile('/js/plupload/jquery.plupload.queue.min.js','text/javascript');
$view->headScript()->appendFile('/js/airtime/library/plupload.js','text/javascript');
{
$this->view->headScript()->appendFile('/js/plupload/plupload.full.min.js','text/javascript');
$this->view->headScript()->appendFile('/js/plupload/jquery.plupload.queue.min.js','text/javascript');
$this->view->headScript()->appendFile('/js/airtime/library/plupload.js','text/javascript');
$this->view->headScript()->appendFile('/js/playlist/helperfunctions.js','text/javascript');
$this->view->headScript()->appendFile('/js/playlist/playlist.js','text/javascript');
$view->headLink()->appendStylesheet('/css/plupload.queue.css');
$view->headLink()->appendStylesheet('/css/pro_dropdown_3.css');
$view->headLink()->appendStylesheet('/css/styles.css');
$this->view->headLink()->appendStylesheet('/css/plupload.queue.css');
$this->view->headLink()->appendStylesheet('/css/pro_dropdown_3.css');
$this->view->headLink()->appendStylesheet('/css/styles.css');
}

7
application/controllers/ScheduleController.php
View file

@ -35,9 +35,10 @@ class ScheduleController extends Zend_Controller_Action
$this->view->headScript()->appendFile('/js/fullcalendar/fullcalendar.min.js','text/javascript');
$this->view->headScript()->appendFile('/js/contextmenu/jquery.contextMenu.js','text/javascript');
$this->view->headScript()->appendFile('/js/datatables/js/jquery.dataTables.js','text/javascript');
//$this->view->headScript()->appendFile('/js/qtip/jquery.qtip-1.0.0.min.js','text/javascript');
$this->view->headScript()->appendFile('/js/airtime/schedule/full-calendar-functions.js','text/javascript');
$this->view->headScript()->appendFile('/js/airtime/schedule/schedule.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->headLink()->appendStylesheet('/css/jquery.contextMenu.css');
$this->view->headLink()->appendStylesheet('/css/fullcalendar.css');
@ -81,6 +82,8 @@ class ScheduleController extends Zend_Controller_Action
$this->view->headScript()->appendFile('/js/colorpicker/js/colorpicker.js','text/javascript');
$this->view->headScript()->appendFile('/js/airtime/schedule/full-calendar-functions.js','text/javascript');
$this->view->headScript()->appendFile('/js/airtime/schedule/add-show.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->headLink()->appendStylesheet('/css/jquery-ui-timepicker.css.css');
$this->view->headLink()->appendStylesheet('/css/fullcalendar.css');
@ -294,6 +297,7 @@ class ScheduleController extends Zend_Controller_Action
unset($this->view->showContent);
}
/* Commented out for the 1.6 RC1 release.
public function showListAction()
{
$this->view->headScript()->appendFile('/js/datatables/js/jquery.dataTables.min.js','text/javascript');
@ -317,6 +321,7 @@ class ScheduleController extends Zend_Controller_Action
unset($this->view->showContent);
}
*/
}

4
application/controllers/UserController.php
View file

@ -17,6 +17,10 @@ class UserController extends Zend_Controller_Action
public function addUserAction()
{
$this->view->headScript()->appendFile('/js/playlist/helperfunctions.js','text/javascript');
$this->view->headScript()->appendFile('/js/playlist/playlist.js','text/javascript');
$this->view->headLink()->appendStylesheet('/css/pro_dropdown_3.css');
$this->view->headLink()->appendStylesheet('/css/styles.css');