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

CC-2068:Now playing should use Title/Creator, not Song/Artist

Browse source 
- fixed
- removed some unnecessary code.
This commit is contained in:
james 2011-07-06 13:56:27 -04:00
parent 947647ed89
commit a8546e289e
2 changed files with 3 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

39
airtime_mvc/application/controllers/NowplayingController.php
View file

@ -21,7 +21,6 @@ class NowplayingController extends Zend_Controller_Action
$this->view->headScript()->appendFile($baseUrl.'/js/airtime/nowplaying/nowplayingdatagrid.js','text/javascript'); $this->view->headScript()->appendFile($baseUrl.'/js/airtime/nowplaying/nowplayingdatagrid.js','text/javascript');
$this->view->headScript()->appendFile($baseUrl.'/js/airtime/nowplaying/nowview.js','text/javascript'); $this->view->headScript()->appendFile($baseUrl.'/js/airtime/nowplaying/nowview.js','text/javascript');
//popup if previous page was login
$refer_sses = new Zend_Session_Namespace('referrer'); $refer_sses = new Zend_Session_Namespace('referrer');
$userInfo = Zend_Auth::getInstance()->getStorage()->read(); $userInfo = Zend_Auth::getInstance()->getStorage()->read();
$user = new User($userInfo->id); $user = new User($userInfo->id);
@ -56,6 +55,7 @@ class NowplayingController extends Zend_Controller_Action
$this->view->headScript()->appendFile($baseUrl.'/js/airtime/nowplaying/register.js','text/javascript'); $this->view->headScript()->appendFile($baseUrl.'/js/airtime/nowplaying/register.js','text/javascript');
} }
}else{ }else{
//popup if previous page was login
if($refer_sses->referrer == 'login' && Application_Model_Nowplaying::ShouldShowPopUp() if($refer_sses->referrer == 'login' && Application_Model_Nowplaying::ShouldShowPopUp()
&& !Application_Model_Preference::GetSupportFeedback() && $user->isAdmin()){ && !Application_Model_Preference::GetSupportFeedback() && $user->isAdmin()){
$logo = Application_Model_Preference::GetStationLogo(); $logo = Application_Model_Preference::GetStationLogo();
@ -92,43 +92,6 @@ class NowplayingController extends Zend_Controller_Action
$this->view->headScript()->appendFile($baseUrl.'/js/airtime/nowplaying/dayview.js','text/javascript'); $this->view->headScript()->appendFile($baseUrl.'/js/airtime/nowplaying/dayview.js','text/javascript');
} }
/*public function registerAction(){
//$request = $this->getRequest();
//$baseUrl = $request->getBaseUrl();
//$this->view->headScript()->appendFile($baseUrl.'/js/airtime/preferences/preferences.js','text/javascript');
$form = new Application_Form_RegisterAirtime();
/*if ($request->isPost()) {
$values = $request->getPost();
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"]);
// unset session
Zend_Session::namespaceUnset('referrer');
}
}else
$logo = Application_Model_Preference::GetStationLogo();
if($logo){
$this->view->logoImg = $logo;
}
$this->view->dialog = $form->render($this->view);
//}
}*/
public function remindmeAction() public function remindmeAction()
{ {
// unset session // unset session

4
airtime_mvc/public/js/airtime/nowplaying/nowplayingdatagrid.js
View file

@ -64,8 +64,8 @@ var columns = [{"sTitle": "type", "bVisible":false},
{"sTitle":"Start"}, {"sTitle":"Start"},
{"sTitle":"End"}, {"sTitle":"End"},
{"sTitle":"Duration"}, {"sTitle":"Duration"},
{"sTitle":"Song"}, {"sTitle":"Title"},
{"sTitle":"Artist"}, {"sTitle":"Creator"},
{"sTitle":"Album"}, {"sTitle":"Album"},
{"sTitle":"Playlist"}, {"sTitle":"Playlist"},
{"sTitle":"Show"}, {"sTitle":"Show"},