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

CC-4256: Smart Playlist: change name to smart block and etc

Browse source 
- done
This commit is contained in:
James 2012-08-20 17:17:48 -04:00
parent 2438325445
commit a24da9e324
12 changed files with 36 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

2
airtime_mvc/application/controllers/ApiController.php
View file

@ -349,7 +349,7 @@ class ApiController extends Zend_Controller_Action
$result = Application_Model_Schedule::UpdateMediaPlayedStatus($media_id);
//set a 'last played' timestamp for media item
//needed for smart playlists
//needed for smart blocks
try {
$file_id = Application_Model_Schedule::GetFileId($media_id);
if (!is_null($file_id)) {

2
airtime_mvc/application/controllers/LibraryController.php
View file

@ -60,7 +60,7 @@ class LibraryController extends Zend_Controller_Action
if ($this->obj_sess->type === "playlist") {
$menu["pl_add"] = array("name"=> "Add to Playlist", "icon" => "add-playlist", "icon" => "copy");
} else if ($this->obj_sess->type === "block") {
$menu["pl_add"] = array("name"=> "Add to Smart Playlist", "icon" => "add-playlist", "icon" => "copy");
$menu["pl_add"] = array("name"=> "Add to Smart Block", "icon" => "add-playlist", "icon" => "copy");
}
}
}

8
airtime_mvc/application/controllers/PlaylistController.php
View file

@ -152,12 +152,12 @@ class PlaylistController extends Zend_Controller_Action
}
private function wrongTypeToBlock($obj) {
$this->view->error = "You can only add tracks to smart playlists.";
$this->view->error = "You can only add tracks to smart block.";
$this->createFullResponse($obj);
}
private function wrongTypeToPlaylist($obj) {
$this->view->error = "You can only add tracks and smart playlists to playlists.";
$this->view->error = "You can only add tracks and smart blocks to playlists.";
$this->createFullResponse($obj);
}
@ -188,7 +188,7 @@ class PlaylistController extends Zend_Controller_Action
$this->view->headLink()->appendStylesheet($baseUrl.'/css/datatables/css/ColReorder.css?'.$CC_CONFIG['airtime_version']);
$this->view->headScript()->appendFile($baseUrl.'/js/airtime/library/spl.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
$this->view->headScript()->appendFile($baseUrl.'/js/airtime/playlist/smart_playlistbuilder.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
$this->view->headScript()->appendFile($baseUrl.'/js/airtime/playlist/smart_blockbuilder.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
$this->view->headLink()->appendStylesheet($baseUrl.'/css/playlist_builder.css?'.$CC_CONFIG['airtime_version']);
try {
@ -229,7 +229,7 @@ class PlaylistController extends Zend_Controller_Action
$name = 'Untitled Playlist';
if ($type == 'block') {
$name = 'Untitled Smart Playlist';
$name = 'Untitled Smart Block';
}
$obj = new $objInfo['className']();