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/configs/navigation.php
View file

@ -23,7 +23,7 @@ $pages = array(
'resource' => 'plupload'
),
array(
'label' => 'Playlist Builder',
'label' => 'Library',
'module' => 'default',
'controller' => 'Playlist',
'action' => 'index',

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']();

5
airtime_mvc/application/forms/SmartBlockCriteria.php
View file

@ -100,7 +100,7 @@ class Application_Form_SmartBlockCriteria extends Zend_Form_SubForm
$spType = new Zend_Form_Element_Radio('sp_type');
$spType->setLabel('Set smart playlist type:')
$spType->setLabel('Set smart block type:')
->setDecorators(array('viewHelper'))
->setMultiOptions(array(
'static' => 'Static',
@ -229,6 +229,9 @@ class Application_Form_SmartBlockCriteria extends Zend_Form_SubForm
$this->addElement($limitValue);
if (isset($storedCrit["limit"])) {
$limitValue->setValue($storedCrit["limit"]["value"]);
} else {
// setting default to 1 hour
$limitValue->setValue(1);
}
//getting block content candidate count that meets criteria

2
airtime_mvc/application/models/StoredFile.php
View file

@ -731,7 +731,7 @@ class Application_Model_StoredFile
$row['audioFile'] = $row['id'];
$row['image'] = '<img title="Webstream preview" src="/css/images/record_icon.png">';
} else if ($type == "bl") {
$row['image'] = '<img title="Smart Playlist" src="/css/images/delete.png">';
$row['image'] = '<img title="Smart Block" src="/css/images/delete.png">';
}
}

6
airtime_mvc/application/views/scripts/form/smart-block-criteria.phtml
View file

@ -1,6 +1,6 @@
<form id="smart-playlist-form" method="post" action="">
<fieldset class='toggle <?php echo $this->openOption ? "" : "closed"?>' id='smart_playlist_options'>
<legend style='cursor: pointer;'><span class='ui-icon ui-icon-triangle-2-n-s'></span>Smart Playlist Options</legend>
<form id="smart-block-form" method="post" action="">
<fieldset class='toggle <?php echo $this->openOption ? "" : "closed"?>' id='smart_block_options'>
<legend style='cursor: pointer;'><span class='ui-icon ui-icon-triangle-2-n-s'></span>Smart Block Options</legend>
<dl class='zend_form'>
<div id='sp-success' class='success' style='display:none'></div>
<dd id='sp_type-element'>