From 0746115d2c3c0e8592b2e8e3f8fe2237c3ce81f1 Mon Sep 17 00:00:00 2001 From: Naomi Aro Date: Thu, 29 Mar 2012 11:06:57 +0200 Subject: [PATCH 1/3] CC-3504 : Adding a clip when nothing is playing should schedule the clip at the current time --- airtime_mvc/application/models/airtime/CcShowInstances.php | 7 ------- 1 file changed, 7 deletions(-) diff --git a/airtime_mvc/application/models/airtime/CcShowInstances.php b/airtime_mvc/application/models/airtime/CcShowInstances.php index 447c36cc1..35ed43726 100644 --- a/airtime_mvc/application/models/airtime/CcShowInstances.php +++ b/airtime_mvc/application/models/airtime/CcShowInstances.php @@ -111,10 +111,6 @@ class CcShowInstances extends BaseCcShowInstances { //post save hook to update the cc_schedule status column for the tracks in the show. public function updateScheduleStatus(PropelPDO $con) { - Logging::log("in post save for showinstances"); - - $now = time(); - //scheduled track is in the show CcScheduleQuery::create() ->filterByDbInstanceId($this->id) @@ -122,8 +118,6 @@ class CcShowInstances extends BaseCcShowInstances { ->filterByDbEnds($this->ends, Criteria::LESS_EQUAL) ->update(array('DbPlayoutStatus' => 1), $con); - Logging::log("updating status for in show items."); - //scheduled track is a boundary track CcScheduleQuery::create() ->filterByDbInstanceId($this->id) @@ -138,7 +132,6 @@ class CcShowInstances extends BaseCcShowInstances { ->filterByDbPlayoutStatus(0, Criteria::GREATER_EQUAL) ->filterByDbStarts($this->ends, Criteria::GREATER_THAN) ->update(array('DbPlayoutStatus' => 0), $con); - } public function preInsert(PropelPDO $con = null) { From 1b8a967cc02f5500123dd60b60cee6f4c115363b Mon Sep 17 00:00:00 2001 From: Naomi Aro Date: Thu, 29 Mar 2012 11:32:27 +0200 Subject: [PATCH 2/3] CC-3174 : timeline register js getting in way of toggling. --- airtime_mvc/application/views/scripts/form/showbuilder.phtml | 2 +- airtime_mvc/public/js/airtime/showbuilder/main_builder.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/airtime_mvc/application/views/scripts/form/showbuilder.phtml b/airtime_mvc/application/views/scripts/form/showbuilder.phtml index e143c7626..3d7ee8cbf 100644 --- a/airtime_mvc/application/views/scripts/form/showbuilder.phtml +++ b/airtime_mvc/application/views/scripts/form/showbuilder.phtml @@ -7,7 +7,7 @@
-
+
Filter By Show: diff --git a/airtime_mvc/public/js/airtime/showbuilder/main_builder.js b/airtime_mvc/public/js/airtime/showbuilder/main_builder.js index 0ea8d5942..3af9786b1 100644 --- a/airtime_mvc/public/js/airtime/showbuilder/main_builder.js +++ b/airtime_mvc/public/js/airtime/showbuilder/main_builder.js @@ -144,7 +144,7 @@ $(document).ready(function(){ $builder.find('legend').click(function(ev, item){ - $fs = $(this).parents('fieldset'); + var $fs = $(this).parents('fieldset'); if ($fs.hasClass("closed")) { From f48c5ff575a9a0b7435bc7827708d707a54277a9 Mon Sep 17 00:00:00 2001 From: Naomi Aro Date: Thu, 29 Mar 2012 15:34:58 +0200 Subject: [PATCH 3/3] CC-3547 : Refactoring Views, removing action stack to better work with permissions. Reorganizing Statistics Dialog. --- .../application/configs/navigation.php | 4 +- .../controllers/LibraryController.php | 11 -- .../controllers/NowplayingController.php | 146 ------------------ .../controllers/PlaylistController.php | 6 +- .../controllers/SearchController.php | 90 ----------- .../controllers/ShowbuilderController.php | 142 ++++++++--------- .../controllers/UsersettingsController.php | 15 ++ .../application/forms/RegisterAirtime.php | 2 +- .../application/layouts/scripts/builder.phtml | 35 ----- .../application/layouts/scripts/library.phtml | 34 ---- .../application/layouts/scripts/search.phtml | 21 --- .../views/scripts/library/index.phtml | 0 .../views/scripts/library/library.phtml | 3 +- .../views/scripts/nowplaying/day-view.phtml | 4 - .../nowplaying/get-data-grid-data.phtml | 2 - .../views/scripts/nowplaying/index.phtml | 5 - .../views/scripts/nowplaying/livestream.phtml | 9 -- .../views/scripts/playlist/index.phtml | 60 +------ .../views/scripts/playlist/playlist.phtml | 55 +++++++ .../views/scripts/search/display.phtml | 6 - .../views/scripts/search/index.phtml | 1 - .../views/scripts/search/newfield.phtml | 1 - .../views/scripts/search/newgroup.phtml | 1 - .../views/scripts/showbuilder/index.phtml | 22 +++ .../public/js/airtime/nowplaying/register.js | 5 +- .../js/airtime/showbuilder/main_builder.js | 6 +- 26 files changed, 173 insertions(+), 513 deletions(-) delete mode 100644 airtime_mvc/application/controllers/NowplayingController.php delete mode 100644 airtime_mvc/application/controllers/SearchController.php delete mode 100644 airtime_mvc/application/layouts/scripts/builder.phtml delete mode 100644 airtime_mvc/application/layouts/scripts/library.phtml delete mode 100644 airtime_mvc/application/layouts/scripts/search.phtml delete mode 100644 airtime_mvc/application/views/scripts/library/index.phtml delete mode 100644 airtime_mvc/application/views/scripts/nowplaying/day-view.phtml delete mode 100644 airtime_mvc/application/views/scripts/nowplaying/get-data-grid-data.phtml delete mode 100644 airtime_mvc/application/views/scripts/nowplaying/index.phtml delete mode 100644 airtime_mvc/application/views/scripts/nowplaying/livestream.phtml create mode 100644 airtime_mvc/application/views/scripts/playlist/playlist.phtml delete mode 100644 airtime_mvc/application/views/scripts/search/display.phtml delete mode 100644 airtime_mvc/application/views/scripts/search/index.phtml delete mode 100644 airtime_mvc/application/views/scripts/search/newfield.phtml delete mode 100644 airtime_mvc/application/views/scripts/search/newgroup.phtml diff --git a/airtime_mvc/application/configs/navigation.php b/airtime_mvc/application/configs/navigation.php index d9a43686f..878920901 100644 --- a/airtime_mvc/application/configs/navigation.php +++ b/airtime_mvc/application/configs/navigation.php @@ -25,9 +25,9 @@ $pages = array( array( 'label' => 'Playlist Builder', 'module' => 'default', - 'controller' => 'Library', + 'controller' => 'Playlist', 'action' => 'index', - 'resource' => 'library' + 'resource' => 'playlist' ), array( 'label' => 'Calendar', diff --git a/airtime_mvc/application/controllers/LibraryController.php b/airtime_mvc/application/controllers/LibraryController.php index e20421166..5007d2932 100644 --- a/airtime_mvc/application/controllers/LibraryController.php +++ b/airtime_mvc/application/controllers/LibraryController.php @@ -29,16 +29,6 @@ class LibraryController extends Zend_Controller_Action public function indexAction() { - $this->_helper->layout->setLayout('library'); - - $this->_helper->actionStack('library', 'library'); - $this->_helper->actionStack('index', 'playlist'); - } - - public function libraryAction() - { - - $this->_helper->viewRenderer->setResponseSegment('library'); } public function contextMenuAction() @@ -143,7 +133,6 @@ class LibraryController extends Zend_Controller_Action } foreach ($files as $id) { - Logging::log("deleting file {$id}"); $file = Application_Model_StoredFile::Recall($id); diff --git a/airtime_mvc/application/controllers/NowplayingController.php b/airtime_mvc/application/controllers/NowplayingController.php deleted file mode 100644 index 9d73534e6..000000000 --- a/airtime_mvc/application/controllers/NowplayingController.php +++ /dev/null @@ -1,146 +0,0 @@ -_helper->getHelper('AjaxContext'); - $ajaxContext->addActionContext('get-data-grid-data', 'json') - ->addActionContext('register', 'json') - ->addActionContext('remindme', 'json') - ->initContext(); - } - - public function indexAction() - { - global $CC_CONFIG; - - $request = $this->getRequest(); - $baseUrl = $request->getBaseUrl(); - - $this->view->headScript()->appendFile($baseUrl.'/js/datatables/js/jquery.dataTables.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); - - //nowplayingdatagrid.js requires this variable, so that datePicker widget can be offset to server time instead of client time - $this->view->headScript()->appendScript("var timezoneOffset = ".date("Z")."; //in seconds"); - $this->view->headScript()->appendFile($baseUrl.'/js/airtime/nowplaying/nowplayingdatagrid.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); - - $this->view->headScript()->appendFile($baseUrl.'/js/airtime/nowplaying/nowview.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); - - $refer_sses = new Zend_Session_Namespace('referrer'); - $userInfo = Zend_Auth::getInstance()->getStorage()->read(); - $user = new Application_Model_User($userInfo->id); - - if ($request->isPost()) { - $form = new Application_Form_RegisterAirtime(); - - $values = $request->getPost(); - if ($values["Publicise"] != 1 && $form->isValid($values)){ - Application_Model_Preference::SetSupportFeedback($values["SupportFeedback"]); - if(isset($values["Privacy"])){ - Application_Model_Preference::SetPrivacyPolicyCheck($values["Privacy"]); - } - // unset session - Zend_Session::namespaceUnset('referrer'); - } - else if ($values["Publicise"] == '1' && $form->isValid($values)) { - Application_Model_Preference::SetHeadTitle($values["stnName"], $this->view); - Application_Model_Preference::SetPhone($values["Phone"]); - Application_Model_Preference::SetEmail($values["Email"]); - Application_Model_Preference::SetStationWebSite($values["StationWebSite"]); - Application_Model_Preference::SetPublicise($values["Publicise"]); - - $form->Logo->receive(); - $imagePath = $form->Logo->getFileName(); - - Application_Model_Preference::SetStationCountry($values["Country"]); - Application_Model_Preference::SetStationCity($values["City"]); - Application_Model_Preference::SetStationDescription($values["Description"]); - Application_Model_Preference::SetStationLogo($imagePath); - Application_Model_Preference::SetSupportFeedback($values["SupportFeedback"]); - if(isset($values["Privacy"])){ - Application_Model_Preference::SetPrivacyPolicyCheck($values["Privacy"]); - } - // unset session - Zend_Session::namespaceUnset('referrer'); - }else{ - $logo = Application_Model_Preference::GetStationLogo(); - if($logo){ - $this->view->logoImg = $logo; - } - $this->view->dialog = $form; - $this->view->headScript()->appendFile($baseUrl.'/js/airtime/nowplaying/register.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); - } - }else{ - //popup if previous page was login - if($refer_sses->referrer == 'login' && Application_Model_Nowplaying::ShouldShowPopUp() - && !Application_Model_Preference::GetSupportFeedback() && $user->isAdmin()){ - - $form = new Application_Form_RegisterAirtime(); - - - $logo = Application_Model_Preference::GetStationLogo(); - if($logo){ - $this->view->logoImg = $logo; - } - $this->view->dialog = $form; - $this->view->headScript()->appendFile($baseUrl.'/js/airtime/nowplaying/register.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); - } - } - } - - public function getDataGridDataAction() - { - $viewType = $this->_request->getParam('view'); - $dateString = $this->_request->getParam('date'); - $this->view->entries = Application_Model_Nowplaying::GetDataGridData($viewType, $dateString); - - } -/* - public function livestreamAction() - { - //use bare bones layout (no header bar or menu) - $this->_helper->layout->setLayout('bare'); - } -*/ - - public function dayViewAction() - { - global $CC_CONFIG; - - $request = $this->getRequest(); - $baseUrl = $request->getBaseUrl(); - - $this->view->headScript()->appendFile($baseUrl.'/js/datatables/js/jquery.dataTables.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); - - //nowplayingdatagrid.js requires this variable, so that datePicker widget can be offset to server time instead of client time - $this->view->headScript()->appendScript("var timezoneOffset = ".date("Z")."; //in seconds"); - $this->view->headScript()->appendFile($baseUrl.'/js/airtime/nowplaying/nowplayingdatagrid.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); - - $this->view->headScript()->appendFile($baseUrl.'/js/airtime/nowplaying/dayview.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); - } - - public function remindmeAction() - { - // unset session - Zend_Session::namespaceUnset('referrer'); - Application_Model_Preference::SetRemindMeDate(); - die(); - } - - public function donotshowregistrationpopupAction() - { - // unset session - Zend_Session::namespaceUnset('referrer'); - die(); - } -} - - - - - - - - - diff --git a/airtime_mvc/application/controllers/PlaylistController.php b/airtime_mvc/application/controllers/PlaylistController.php index 695d42528..71cd752b6 100644 --- a/airtime_mvc/application/controllers/PlaylistController.php +++ b/airtime_mvc/application/controllers/PlaylistController.php @@ -75,11 +75,11 @@ class PlaylistController extends Zend_Controller_Action $this->view->pl = $pl; $this->view->id = $pl->getId(); - $this->view->html = $this->view->render('playlist/index.phtml'); + $this->view->html = $this->view->render('playlist/playlist.phtml'); unset($this->view->pl); } else { - $this->view->html = $this->view->render('playlist/index.phtml'); + $this->view->html = $this->view->render('playlist/playlist.phtml'); } } @@ -136,8 +136,6 @@ class PlaylistController extends Zend_Controller_Action $this->view->headScript()->appendFile($baseUrl.'/js/airtime/library/spl.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); $this->view->headLink()->appendStylesheet($baseUrl.'/css/playlist_builder.css?'.$CC_CONFIG['airtime_version']); - $this->_helper->viewRenderer->setResponseSegment('spl'); - try { if (isset($this->pl_sess->id)) { $pl = new Application_Model_Playlist($this->pl_sess->id); diff --git a/airtime_mvc/application/controllers/SearchController.php b/airtime_mvc/application/controllers/SearchController.php deleted file mode 100644 index d0792b58e..000000000 --- a/airtime_mvc/application/controllers/SearchController.php +++ /dev/null @@ -1,90 +0,0 @@ -addGroup($group_id, 1); - $group = $form->getSubForm('group_'.$group_id); - - return $group->__toString(); - } - - private function addFieldToGroup($group_id, $row_id) { - - $form = new Application_Form_AdvancedSearch(); - - $form->addGroup($group_id); - $group = $form->getSubForm('group_'.$group_id); - - $group->addRow($row_id); - - return $group->__toString(); - } - - public function init() - { - $ajaxContext = $this->_helper->getHelper('AjaxContext'); - $ajaxContext->addActionContext('newfield', 'json') - ->addActionContext('newgroup', 'json') - ->addActionContext('index', 'json') - ->addActionContext('display', 'json') - ->initContext(); - - $this->search_sess = new Zend_Session_Namespace("search"); - } - - public function indexAction() - { - $data = $this->_getParam('data'); - $form = new Application_Form_AdvancedSearch(); - - // Form has been submitted - $form->preValidation($data); - - //if (!$form->isValid($data)) { - //$this->view->form = $form->__toString(); - //return; - //} - - // valid form was submitted set as search criteria. - $this->search_sess->md = $data; - } - - public function displayAction() - { - - } - - public function newfieldAction() - { - $group_id = $this->_getParam('group', 1); - $row_id = $this->search_sess->next_row[$group_id]; - - $this->view->html = $this->addFieldToGroup($group_id, $row_id); - $this->view->row = $row_id; - - $this->search_sess->next_row[$group_id] = $row_id + 1; - } - - public function newgroupAction() - { - $group_id = $this->search_sess->next_group; - - $this->view->html = $this->addGroup($group_id); - - $this->search_sess->next_group = $group_id + 1; - $this->search_sess->next_row[$group_id] = 2; - } -} - - - - - - - diff --git a/airtime_mvc/application/controllers/ShowbuilderController.php b/airtime_mvc/application/controllers/ShowbuilderController.php index 598c3e829..d8ac343fd 100644 --- a/airtime_mvc/application/controllers/ShowbuilderController.php +++ b/airtime_mvc/application/controllers/ShowbuilderController.php @@ -43,9 +43,6 @@ class ShowbuilderController extends Zend_Controller_Action $this->view->headLink()->appendStylesheet($baseUrl.'/css/TableTools.css?'.$CC_CONFIG['airtime_version']); $this->view->headScript()->appendFile($this->view->baseUrl('/js/airtime/library/events/library_showbuilder.js?'.$CC_CONFIG['airtime_version']),'text/javascript'); - - $this->_helper->layout->setLayout('builder'); - $this->_helper->viewRenderer->setResponseSegment('dialog'); $user = Application_Model_User::GetCurrentUser(); @@ -97,76 +94,42 @@ class ShowbuilderController extends Zend_Controller_Action $this->view->headScript()->appendFile($baseUrl.'/js/airtime/nowplaying/register.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); } } - else { - //popup if previous page was login - if ($refer_sses->referrer == 'login' && Application_Model_Nowplaying::ShouldShowPopUp() - && !Application_Model_Preference::GetSupportFeedback() && $user->isAdmin()){ - - $form = new Application_Form_RegisterAirtime(); - - $logo = Application_Model_Preference::GetStationLogo(); - if ($logo) { - $this->view->logoImg = $logo; - } - $this->view->dialog = $form; - $this->view->headScript()->appendFile($baseUrl.'/js/airtime/nowplaying/register.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); - } - } - - $data = Application_Model_Preference::GetValue("nowplaying_screen", true); - if ($data != "") { - $settings = unserialize($data); - - if ($settings["library"] == "true") { - $this->view->headScript()->appendScript("AIRTIME.showLib = true;"); - } - } - - if (!$user->isGuest()) { - $this->_helper->actionStack('library', 'library'); - } - - $this->_helper->actionStack('builder', 'showbuilder'); - } - - public function contextMenuAction() - { - $id = $this->_getParam('id'); - $now = floatval(microtime(true)); - - $request = $this->getRequest(); - $baseUrl = $request->getBaseUrl(); - $menu = array(); + + //popup if previous page was login + if ($refer_sses->referrer == 'login' && Application_Model_Nowplaying::ShouldShowPopUp() + && !Application_Model_Preference::GetSupportFeedback() && $user->isAdmin()){ - $userInfo = Zend_Auth::getInstance()->getStorage()->read(); - $user = new Application_Model_User($userInfo->id); - - $item = CcScheduleQuery::create()->findPK($id); - $instance = $item->getCcShowInstances(); - - $menu["preview"] = array("name"=> "Preview"); - //select the cursor - $menu["selCurs"] = array("name"=> "Select Cursor"); - $menu["delCurs"] = array("name"=> "Remove Cursor"); - - if ($now < floatval($item->getDbEnds("U.u")) && $user->canSchedule($instance->getDbShowId())) { - - //remove/truncate the item from the schedule - $menu["del"] = array("name"=> "Delete", "icon" => "delete", "url" => "/showbuilder/schedule-remove"); - } - - $this->view->items = $menu; - } - - public function builderAction() { - - global $CC_CONFIG; - - $this->_helper->viewRenderer->setResponseSegment('builder'); - - $request = $this->getRequest(); - $baseUrl = $request->getBaseUrl(); - + $form = new Application_Form_RegisterAirtime(); + + $logo = Application_Model_Preference::GetStationLogo(); + if ($logo) { + $this->view->logoImg = $logo; + } + $this->view->dialog = $form; + $this->view->headScript()->appendFile($baseUrl.'/js/airtime/nowplaying/register.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); + } + + //determine whether to remove/hide/display the library. + $showLib = false; + $user = Application_Model_User::GetCurrentUser(); + if (!$user->isGuest()) { + $hideLib = false; + $data = Application_Model_Preference::GetValue("nowplaying_screen", true); + if ($data != "") { + $settings = unserialize($data); + + if ($settings["library"] == "true") { + $showLib = true; + } + } + } + else { + $hideLib = true; + } + $this->view->hideLib = $hideLib; + $this->view->showLib = $showLib; + + //populate date range form for show builder. $now = time(); $from = $request->getParam("from", $now); $to = $request->getParam("to", $now + (24*60*60)); @@ -194,14 +157,35 @@ class ShowbuilderController extends Zend_Controller_Action $this->view->headLink()->appendStylesheet($baseUrl.'/css/jquery.ui.timepicker.css?'.$CC_CONFIG['airtime_version']); $this->view->headLink()->appendStylesheet($baseUrl.'/css/showbuilder.css?'.$CC_CONFIG['airtime_version']); - - $user = Application_Model_User::GetCurrentUser(); - if (!$user->isGuest()) { - $this->view->toggleLib = true; + } + + public function contextMenuAction() + { + $id = $this->_getParam('id'); + $now = floatval(microtime(true)); + + $request = $this->getRequest(); + $baseUrl = $request->getBaseUrl(); + $menu = array(); + + $userInfo = Zend_Auth::getInstance()->getStorage()->read(); + $user = new Application_Model_User($userInfo->id); + + $item = CcScheduleQuery::create()->findPK($id); + $instance = $item->getCcShowInstances(); + + $menu["preview"] = array("name"=> "Preview"); + //select the cursor + $menu["selCurs"] = array("name"=> "Select Cursor"); + $menu["delCurs"] = array("name"=> "Remove Cursor"); + + if ($now < floatval($item->getDbEnds("U.u")) && $user->canSchedule($instance->getDbShowId())) { + + //remove/truncate the item from the schedule + $menu["del"] = array("name"=> "Delete", "icon" => "delete", "url" => "/showbuilder/schedule-remove"); } - else { - $this->view->toggleLib = false; - } + + $this->view->items = $menu; } public function builderDialogAction() { diff --git a/airtime_mvc/application/controllers/UsersettingsController.php b/airtime_mvc/application/controllers/UsersettingsController.php index ff273a7aa..cd5cb522a 100644 --- a/airtime_mvc/application/controllers/UsersettingsController.php +++ b/airtime_mvc/application/controllers/UsersettingsController.php @@ -12,6 +12,8 @@ class UsersettingsController extends Zend_Controller_Action ->addActionContext('set-library-datatable', 'json') ->addActionContext('get-timeline-datatable', 'json') ->addActionContext('set-timeline-datatable', 'json') + ->addActionContext('register', 'json') + ->addActionContext('remindme', 'json') ->initContext(); } @@ -65,4 +67,17 @@ class UsersettingsController extends Zend_Controller_Action $this->view->settings = unserialize($data); } } + + public function remindmeAction() + { + // unset session + Zend_Session::namespaceUnset('referrer'); + Application_Model_Preference::SetRemindMeDate(); + } + + public function donotshowregistrationpopupAction() + { + // unset session + Zend_Session::namespaceUnset('referrer'); + } } \ No newline at end of file diff --git a/airtime_mvc/application/forms/RegisterAirtime.php b/airtime_mvc/application/forms/RegisterAirtime.php index 4ca52e27c..d4df4d77c 100644 --- a/airtime_mvc/application/forms/RegisterAirtime.php +++ b/airtime_mvc/application/forms/RegisterAirtime.php @@ -7,7 +7,7 @@ class Application_Form_RegisterAirtime extends Zend_Form public function init() { - $this->setAction('/Nowplaying'); + $this->setAction('/Showbuilder'); $this->setMethod('post'); $country_list = Application_Model_Preference::GetCountryList(); diff --git a/airtime_mvc/application/layouts/scripts/builder.phtml b/airtime_mvc/application/layouts/scripts/builder.phtml deleted file mode 100644 index d3259ab62..000000000 --- a/airtime_mvc/application/layouts/scripts/builder.phtml +++ /dev/null @@ -1,35 +0,0 @@ -doctype() ?> - - - - headTitle() ?> - headScript() ?> - headLink() ?> - - - -
- - versionNotify(); - $sss = $this->SourceSwitchStatus(); - $scs = $this->SourceConnectionStatus(); - ?> - partial('partialviews/header.phtml', array("user" => $this->loggedInAs(), "is_trial"=>$this->isTrial(), "trial_remain"=> $this->trialRemaining(), - "live_dj_switch"=>$sss['live_dj'], "live_dj_connection"=>$scs['live_dj'], "master_dj_switch"=>$sss['master_dj'], "master_dj_connection"=>$scs['master_dj'], - "scheduled_play_switch"=>$sss['scheduled_play'])) ?> - -navigation()->menu()->setPartial($partial); ?> - -navigation()->menu() ?> -
- -
- -
layout()->builder ?>
-
- -layout()->dialog ?> - - - diff --git a/airtime_mvc/application/layouts/scripts/library.phtml b/airtime_mvc/application/layouts/scripts/library.phtml deleted file mode 100644 index d5a950090..000000000 --- a/airtime_mvc/application/layouts/scripts/library.phtml +++ /dev/null @@ -1,34 +0,0 @@ -doctype() ?> - - - - headTitle() ?> - headScript() ?> - headLink() ?> - google_analytics)?$this->google_analytics:"" ?> - - - -
- - versionNotify(); - $sss = $this->SourceSwitchStatus(); - $scs = $this->SourceConnectionStatus(); - ?> - partial('partialviews/header.phtml', array("user" => $this->loggedInAs(), "is_trial"=>$this->isTrial(), "trial_remain"=> $this->trialRemaining(), - "live_dj_switch"=>$sss['live_dj'], "live_dj_connection"=>$scs['live_dj'], "master_dj_switch"=>$sss['master_dj'], "master_dj_connection"=>$scs['master_dj'], - "scheduled_play_switch"=>$sss['scheduled_play'])) ?> - -navigation()->menu()->setPartial($partial); ?> - -navigation()->menu() ?> -
- -
- -
layout()->library ?>
-
layout()->spl ?>
-
- - diff --git a/airtime_mvc/application/layouts/scripts/search.phtml b/airtime_mvc/application/layouts/scripts/search.phtml deleted file mode 100644 index c3195b101..000000000 --- a/airtime_mvc/application/layouts/scripts/search.phtml +++ /dev/null @@ -1,21 +0,0 @@ -doctype() ?> - - - - headTitle() ?> - headScript() ?> - headLink() ?> - google_analytics)?$this->google_analytics:"" ?> - - -
partial('partialviews/header.phtml', array("user" => $this->loggedInAs())) ?>
- - -
- -
layout()->library ?>
-
layout()->spl ?>
-
- - - diff --git a/airtime_mvc/application/views/scripts/library/index.phtml b/airtime_mvc/application/views/scripts/library/index.phtml deleted file mode 100644 index e69de29bb..000000000 diff --git a/airtime_mvc/application/views/scripts/library/library.phtml b/airtime_mvc/application/views/scripts/library/library.phtml index 7cd7d3959..9bdb1c387 100644 --- a/airtime_mvc/application/views/scripts/library/library.phtml +++ b/airtime_mvc/application/views/scripts/library/library.phtml @@ -1,3 +1,2 @@ -
- +
\ No newline at end of file diff --git a/airtime_mvc/application/views/scripts/nowplaying/day-view.phtml b/airtime_mvc/application/views/scripts/nowplaying/day-view.phtml deleted file mode 100644 index 6b5c6de87..000000000 --- a/airtime_mvc/application/views/scripts/nowplaying/day-view.phtml +++ /dev/null @@ -1,4 +0,0 @@ -
- Now ViewDay View -
-
diff --git a/airtime_mvc/application/views/scripts/nowplaying/get-data-grid-data.phtml b/airtime_mvc/application/views/scripts/nowplaying/get-data-grid-data.phtml deleted file mode 100644 index ee1e82703..000000000 --- a/airtime_mvc/application/views/scripts/nowplaying/get-data-grid-data.phtml +++ /dev/null @@ -1,2 +0,0 @@ -entries; diff --git a/airtime_mvc/application/views/scripts/nowplaying/index.phtml b/airtime_mvc/application/views/scripts/nowplaying/index.phtml deleted file mode 100644 index 3a150a707..000000000 --- a/airtime_mvc/application/views/scripts/nowplaying/index.phtml +++ /dev/null @@ -1,5 +0,0 @@ -
- Now ViewDay View -
-
-dialog?> diff --git a/airtime_mvc/application/views/scripts/nowplaying/livestream.phtml b/airtime_mvc/application/views/scripts/nowplaying/livestream.phtml deleted file mode 100644 index 871cbb5e4..000000000 --- a/airtime_mvc/application/views/scripts/nowplaying/livestream.phtml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/airtime_mvc/application/views/scripts/playlist/index.phtml b/airtime_mvc/application/views/scripts/playlist/index.phtml index 18b818da4..e4e9991e7 100644 --- a/airtime_mvc/application/views/scripts/playlist/index.phtml +++ b/airtime_mvc/application/views/scripts/playlist/index.phtml @@ -1,55 +1,7 @@ - -pl)) : ?> - - - Playlist crossfade - - +
+ render('library/library.phtml') ?> +
-pl)) : ?> - - -
-

- pl->getName(); ?> -

-

length; ?>

-
- -
- View / edit description -
-
-
- -
- -
- - -
-
-
- - - -
-
-
    - render('playlist/update.phtml') ?> -
-
- - -
No open playlist
- +
+ render('playlist/playlist.phtml') ?> +
\ No newline at end of file diff --git a/airtime_mvc/application/views/scripts/playlist/playlist.phtml b/airtime_mvc/application/views/scripts/playlist/playlist.phtml new file mode 100644 index 000000000..a214727b7 --- /dev/null +++ b/airtime_mvc/application/views/scripts/playlist/playlist.phtml @@ -0,0 +1,55 @@ + +pl)) : ?> + + + Playlist crossfade + + + +pl)) : ?> + + +
+

+ pl->getName(); ?> +

+

length; ?>

+
+ +
+ View / edit description +
+
+
+ +
+ +
+ + +
+
+
+ + + +
+
+
    + render('playlist/update.phtml') ?> +
+
+ + +
No open playlist
+ \ No newline at end of file diff --git a/airtime_mvc/application/views/scripts/search/display.phtml b/airtime_mvc/application/views/scripts/search/display.phtml deleted file mode 100644 index e0b36e6d7..000000000 --- a/airtime_mvc/application/views/scripts/search/display.phtml +++ /dev/null @@ -1,6 +0,0 @@ -form; -echo var_dump($this->md); -?> - diff --git a/airtime_mvc/application/views/scripts/search/index.phtml b/airtime_mvc/application/views/scripts/search/index.phtml deleted file mode 100644 index dee2538d1..000000000 --- a/airtime_mvc/application/views/scripts/search/index.phtml +++ /dev/null @@ -1 +0,0 @@ -

View script for controller Forms and script/action name index
\ No newline at end of file diff --git a/airtime_mvc/application/views/scripts/search/newfield.phtml b/airtime_mvc/application/views/scripts/search/newfield.phtml deleted file mode 100644 index e0cbb61b3..000000000 --- a/airtime_mvc/application/views/scripts/search/newfield.phtml +++ /dev/null @@ -1 +0,0 @@ -

View script for controller Forms and script/action name newfield
\ No newline at end of file diff --git a/airtime_mvc/application/views/scripts/search/newgroup.phtml b/airtime_mvc/application/views/scripts/search/newgroup.phtml deleted file mode 100644 index 0dbc342f4..000000000 --- a/airtime_mvc/application/views/scripts/search/newgroup.phtml +++ /dev/null @@ -1 +0,0 @@ -

View script for controller Search and script/action name newgroup
\ No newline at end of file diff --git a/airtime_mvc/application/views/scripts/showbuilder/index.phtml b/airtime_mvc/application/views/scripts/showbuilder/index.phtml index f8dc512d7..fcd59da06 100644 --- a/airtime_mvc/application/views/scripts/showbuilder/index.phtml +++ b/airtime_mvc/application/views/scripts/showbuilder/index.phtml @@ -1 +1,23 @@ +hideLib): ?> +
showLib): ?> + style="display:none" + +> + render('library/library.phtml') ?> +
+ + +
+ hideLib && !$this->showLib): ?> +
+ +
+ + + sb_form; ?> +
+
+ + dialog ?> \ No newline at end of file diff --git a/airtime_mvc/public/js/airtime/nowplaying/register.js b/airtime_mvc/public/js/airtime/nowplaying/register.js index cd580443e..fc3b98a51 100644 --- a/airtime_mvc/public/js/airtime/nowplaying/register.js +++ b/airtime_mvc/public/js/airtime/nowplaying/register.js @@ -1,7 +1,7 @@ $(document).ready(function(){ function doNotShowPopup(){ - $.get("/Nowplaying/donotshowregistrationpopup"); + $.get("/Usersettings/donotshowregistrationpopup", {format:"json"}); } var dialog = $("#register_popup"); @@ -18,9 +18,10 @@ $(document).ready(function(){ id: "remind_me", text: "Remind me in 1 week", click: function() { - var url = '/Nowplaying/remindme'; + var url = '/Usersettings/remindme'; $.ajax({ url: url, + data: {format:"json"} }); $(this).dialog("close"); } diff --git a/airtime_mvc/public/js/airtime/showbuilder/main_builder.js b/airtime_mvc/public/js/airtime/showbuilder/main_builder.js index 3af9786b1..a94d6d66b 100644 --- a/airtime_mvc/public/js/airtime/showbuilder/main_builder.js +++ b/airtime_mvc/public/js/airtime/showbuilder/main_builder.js @@ -51,9 +51,9 @@ $(document).ready(function(){ AIRTIME.showbuilder.fnServerData.start = oRange.start; AIRTIME.showbuilder.fnServerData.end = oRange.end; - if (AIRTIME.showLib === true) { - $lib.show() - .width(Math.floor(screenWidth * 0.5)); + if ($lib.filter(':visible').length > 0) { + + $lib.width(Math.floor(screenWidth * 0.5)); $builder.width(Math.floor(screenWidth * 0.5)) .find("#sb_edit")