diff --git a/.zfproject.xml b/.zfproject.xml index 38ebf854f..a3382d3ed 100644 --- a/.zfproject.xml +++ b/.zfproject.xml @@ -35,7 +35,6 @@ - @@ -237,9 +236,6 @@ - - - diff --git a/application/Bootstrap.php b/application/Bootstrap.php index 9e6c8bf34..f7ee988d0 100644 --- a/application/Bootstrap.php +++ b/application/Bootstrap.php @@ -46,6 +46,9 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap $view = $this->getResource('view'); $view->headLink()->appendStylesheet('/css/redmond/jquery-ui-1.8.8.custom.css'); + + $this->view->headLink()->appendStylesheet('/css/pro_dropdown_3.css'); + $this->view->headLink()->appendStylesheet('/css/styles.css'); } protected function _initHeadScript() @@ -56,6 +59,10 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap $view->headScript()->appendFile('/js/libs/stuHover.js','text/javascript'); $view->headScript()->appendFile('/js/libs/jquery.stickyPanel.js','text/javascript'); + //scripts for now playing bar + $this->view->headScript()->appendFile('/js/playlist/helperfunctions.js','text/javascript'); + $this->view->headScript()->appendFile('/js/playlist/playlist.js','text/javascript'); + $view->headScript()->appendFile('/js/airtime/common/common.js','text/javascript'); //TODO: Find better place to put this in. diff --git a/application/controllers/LibraryController.php b/application/controllers/LibraryController.php index 1faf0bd53..8372158cd 100644 --- a/application/controllers/LibraryController.php +++ b/application/controllers/LibraryController.php @@ -5,8 +5,6 @@ class LibraryController extends Zend_Controller_Action protected $pl_sess = null; - protected $search_sess = null; - public function init() { if(!Zend_Auth::getInstance()->hasIdentity()) @@ -17,11 +15,8 @@ class LibraryController extends Zend_Controller_Action $ajaxContext = $this->_helper->getHelper('AjaxContext'); $ajaxContext->addActionContext('contents', 'html') ->addActionContext('contents', 'json') - ->addActionContext('plupload', 'html') - ->addActionContext('upload', 'json') ->addActionContext('delete', 'json') ->addActionContext('context-menu', 'json') - ->addActionContext('quick-search', 'json') ->initContext(); $this->pl_sess = new Zend_Session_Namespace(UI_PLAYLIST_SESSNAME); @@ -32,13 +27,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->headScript()->appendFile('/js/jplayer/jquery.jplayer.min.js'); $this->view->headLink()->appendStylesheet('/css/contextmenu.css'); - $this->view->headLink()->appendStylesheet('/css/pro_dropdown_3.css'); - $this->view->headLink()->appendStylesheet('/css/styles.css'); $this->_helper->layout->setLayout('library'); @@ -47,7 +38,6 @@ class LibraryController extends Zend_Controller_Action $this->_helper->actionStack('index', 'playlist'); $this->_helper->actionStack('contents', 'library'); - //$this->_helper->actionStack('quick-search', 'library'); } public function contextMenuAction() @@ -169,53 +159,6 @@ class LibraryController extends Zend_Controller_Action $this->view->form = $form; } - - public function quickSearchAction() - { - $this->view->headScript()->appendFile('/js/airtime/library/quicksearch.js','text/javascript'); - - $this->_helper->viewRenderer->setResponseSegment('quick_search'); - - $this->view->qs_value = $this->search_sess->quick_string; - - $format = $this->_getParam('format', 'layout'); - - if($format !== 'json') - return; - - $search = $this->_getParam('search', null); - $this->search_sess->quick_string = $search; - - $categories = array("dc:title", "dc:creator", "dc:source"); - $keywords = explode(" ", $search); - - $md = array(); - - for($group_id=1; $group_id <= count($keywords); $group_id++) { - - for($row_id=1; $row_id <= count($categories); $row_id++) { - - $md["group_".$group_id]["row_".$row_id]["metadata"] = $categories[$row_id-1]; - $md["group_".$group_id]["row_".$row_id]["match"] = "0"; - $md["group_".$group_id]["row_".$row_id]["search"] = $keywords[$group_id-1]; - } - } - - $this->search_sess->quick = $md; - - $currpage = isset($this->search_sess->page) ? $this->search_sess->page : null; - $order = isset($this->search_sess->order) ? $this->search_sess->order : null; - $count = StoredFile::searchFiles($md, $order, true, null, null, true); - - $paginator = new Zend_Paginator(new Zend_Paginator_Adapter_Null($count)); - $paginator->setCurrentPageNumber($currpage); - $this->view->paginator = $paginator; - $this->view->files = StoredFile::searchFiles($md, $order, false, $paginator->getCurrentPageNumber(), $paginator->getItemCountPerPage(), true); - - $this->view->html = $this->view->render('library/contents.phtml'); - unset($this->view->files); - unset($this->view->paginator); - } } diff --git a/application/controllers/LoginController.php b/application/controllers/LoginController.php index 42a7e6ba8..df0f0c2d2 100644 --- a/application/controllers/LoginController.php +++ b/application/controllers/LoginController.php @@ -10,8 +10,6 @@ class LoginController extends Zend_Controller_Action public function indexAction() { - $this->view->headLink()->appendStylesheet('/css/redmond/jquery-ui-1.8.8.custom.css'); - $this->view->headLink()->appendStylesheet('/css/styles.css'); if(Zend_Auth::getInstance()->hasIdentity()) { $this->_redirect('Nowplaying'); diff --git a/application/controllers/NowplayingController.php b/application/controllers/NowplayingController.php index 0c8116d62..ead833224 100644 --- a/application/controllers/NowplayingController.php +++ b/application/controllers/NowplayingController.php @@ -6,18 +6,14 @@ class NowplayingController extends Zend_Controller_Action public function init() { $ajaxContext = $this->_helper->getHelper('AjaxContext'); - $ajaxContext->addActionContext('get-data-grid-data', 'json')->initContext(); + $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->headScript()->appendFile('/js/playlist/nowplayingdatagrid.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/pro_dropdown_3.css'); - $this->view->headLink()->appendStylesheet('/css/styles.css'); } public function getDataGridDataAction() diff --git a/application/controllers/PlaylistController.php b/application/controllers/PlaylistController.php index 8c9cabdf3..a8856ce00 100644 --- a/application/controllers/PlaylistController.php +++ b/application/controllers/PlaylistController.php @@ -146,8 +146,6 @@ class PlaylistController extends Zend_Controller_Action public function editAction() { - $this->view->headScript()->appendFile('/js/airtime/playlist/playlist.js','text/javascript'); - $pl_id = $this->_getParam('id', null); if(!is_null($pl_id)) { diff --git a/application/controllers/PluploadController.php b/application/controllers/PluploadController.php index 10749b550..830590487 100644 --- a/application/controllers/PluploadController.php +++ b/application/controllers/PluploadController.php @@ -164,12 +164,9 @@ class PluploadController extends Zend_Controller_Action $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'); $this->view->headLink()->appendStylesheet('/css/plupload.queue.css'); - $this->view->headLink()->appendStylesheet('/css/pro_dropdown_3.css'); - $this->view->headLink()->appendStylesheet('/css/styles.css'); + } diff --git a/application/controllers/ScheduleController.php b/application/controllers/ScheduleController.php index e13e90dc7..3bc619212 100644 --- a/application/controllers/ScheduleController.php +++ b/application/controllers/ScheduleController.php @@ -37,14 +37,9 @@ class ScheduleController extends Zend_Controller_Action $this->view->headScript()->appendFile('/js/datatables/js/jquery.dataTables.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'); - $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'); @@ -82,15 +77,11 @@ 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'); $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(); @@ -301,6 +292,7 @@ class ScheduleController extends Zend_Controller_Action $this->view->showContent = $show->getShowContent($start_timestamp); $this->view->timeFilled = $show->getTimeScheduled($start_timestamp, $end_timestamp); + $this->view->showName = $show->getName(); $this->view->showLength = $show->getShowLength($start_timestamp, $end_timestamp); $this->view->percentFilled = Schedule::getPercentScheduledInRange($start_timestamp, $end_timestamp); diff --git a/application/controllers/UserController.php b/application/controllers/UserController.php index d30b59e87..9700f2077 100644 --- a/application/controllers/UserController.php +++ b/application/controllers/UserController.php @@ -16,14 +16,7 @@ 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'); - + { $request = $this->getRequest(); $form = new Application_Form_AddUser(); diff --git a/application/models/Shows.php b/application/models/Shows.php index e1c61338b..6f854bfae 100644 --- a/application/models/Shows.php +++ b/application/models/Shows.php @@ -11,6 +11,18 @@ class Show { $this->_showId = $showId; } + public function getName() { + $show = CcShowQuery::create()->findPK($this->_showId); + + return $show->getDbName(); + } + + public function setName($name) { + $show = CcShowQuery::create()->findPK($this->_showId); + + $show->setDbName($name); + } + //end dates are non inclusive. public function addShow($data) { diff --git a/application/views/scripts/schedule/schedule-show-dialog.phtml b/application/views/scripts/schedule/schedule-show-dialog.phtml index 30b300b32..5c3067016 100644 --- a/application/views/scripts/schedule/schedule-show-dialog.phtml +++ b/application/views/scripts/schedule/schedule-show-dialog.phtml @@ -1,4 +1,5 @@
+

showName; ?>, showLength; ?>