diff --git a/airtime_mvc/application/configs/navigation.php b/airtime_mvc/application/configs/navigation.php index 878920901..4d63196fa 100644 --- a/airtime_mvc/application/configs/navigation.php +++ b/airtime_mvc/application/configs/navigation.php @@ -23,7 +23,7 @@ $pages = array( 'resource' => 'plupload' ), array( - 'label' => 'Playlist Builder', + 'label' => 'Library', 'module' => 'default', 'controller' => 'Playlist', 'action' => 'index', diff --git a/airtime_mvc/application/controllers/ApiController.php b/airtime_mvc/application/controllers/ApiController.php index 622d87700..b41129b51 100644 --- a/airtime_mvc/application/controllers/ApiController.php +++ b/airtime_mvc/application/controllers/ApiController.php @@ -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)) { diff --git a/airtime_mvc/application/controllers/LibraryController.php b/airtime_mvc/application/controllers/LibraryController.php index 94a214fef..79f95ba4f 100644 --- a/airtime_mvc/application/controllers/LibraryController.php +++ b/airtime_mvc/application/controllers/LibraryController.php @@ -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"); } } } diff --git a/airtime_mvc/application/controllers/PlaylistController.php b/airtime_mvc/application/controllers/PlaylistController.php index 539e677bf..91ad684d7 100644 --- a/airtime_mvc/application/controllers/PlaylistController.php +++ b/airtime_mvc/application/controllers/PlaylistController.php @@ -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'](); diff --git a/airtime_mvc/application/forms/SmartBlockCriteria.php b/airtime_mvc/application/forms/SmartBlockCriteria.php index 0e1952ea3..f23885414 100644 --- a/airtime_mvc/application/forms/SmartBlockCriteria.php +++ b/airtime_mvc/application/forms/SmartBlockCriteria.php @@ -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 diff --git a/airtime_mvc/application/models/StoredFile.php b/airtime_mvc/application/models/StoredFile.php index 67d2883a0..7b06455ff 100644 --- a/airtime_mvc/application/models/StoredFile.php +++ b/airtime_mvc/application/models/StoredFile.php @@ -731,7 +731,7 @@ class Application_Model_StoredFile $row['audioFile'] = $row['id']; $row['image'] = ''; } else if ($type == "bl") { - $row['image'] = ''; + $row['image'] = ''; } } diff --git a/airtime_mvc/application/views/scripts/form/smart-block-criteria.phtml b/airtime_mvc/application/views/scripts/form/smart-block-criteria.phtml index 2559d20f6..8bd96a93e 100644 --- a/airtime_mvc/application/views/scripts/form/smart-block-criteria.phtml +++ b/airtime_mvc/application/views/scripts/form/smart-block-criteria.phtml @@ -1,6 +1,6 @@ -
-
-Smart Playlist Options + +
+Smart Block Options
diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css index 06c3c4da2..cb54d5554 100644 --- a/airtime_mvc/public/css/styles.css +++ b/airtime_mvc/public/css/styles.css @@ -499,7 +499,7 @@ table.library-get-file-md.table-small{ /***** LIBRARY QTIP METADATA SPECIFIC STYLES END *****/ -/***** SMART PLAYLIST SPECIFIC STYLES BEGIN *****/ +/***** SMART BLOCK SPECIFIC STYLES BEGIN *****/ .sp-invisible{ visibility: hidden; } @@ -580,7 +580,7 @@ input.input_text.sp_extra_input_text{ .sp-closed{ border-width: 0 0 0 !important; } -/***** SMART PLAYLIST SPECIFIC STYLES END *****/ +/***** SMART BLOCK SPECIFIC STYLES END *****/ label { font-size:13px; diff --git a/airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js b/airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js index 08865bef9..0137154f8 100644 --- a/airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js +++ b/airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js @@ -138,7 +138,7 @@ var AIRTIME = (function(AIRTIME){ if (aMediaIds.length > 0) { AIRTIME.playlist.fnAddItems(aMediaIds, undefined, 'after'); } else { - alert('You can only add tracks to smart playlists.'); + alert('You can only add tracks to smart blocks.'); } }); diff --git a/airtime_mvc/public/js/airtime/library/library.js b/airtime_mvc/public/js/airtime/library/library.js index 124b81e4a..653d11997 100644 --- a/airtime_mvc/public/js/airtime/library/library.js +++ b/airtime_mvc/public/js/airtime/library/library.js @@ -547,7 +547,7 @@ var AIRTIME = (function(AIRTIME) { .append('') .append('') .append('') - .append('') + .append('') .append('') .end() .change(function(ev){ diff --git a/airtime_mvc/public/js/airtime/library/spl.js b/airtime_mvc/public/js/airtime/library/spl.js index 5a820bb32..577987284 100644 --- a/airtime_mvc/public/js/airtime/library/spl.js +++ b/airtime_mvc/public/js/airtime/library/spl.js @@ -355,7 +355,7 @@ var AIRTIME = (function(AIRTIME){ setCueEvents(); setFadeEvents(); - // functions in smart_playlistbuilder.js + // functions in smart_blockbuilder.js setupUI(); appendAddButton(); appendModAddButton(); @@ -909,7 +909,7 @@ var AIRTIME = (function(AIRTIME){ ignoreRightClick: true, items: { "sp": {name: "New Playlist", callback: AIRTIME.playlist.fnNew}, - "sb": {name: "New Smart Playlist", callback: AIRTIME.playlist.fnNewBlock}, + "sb": {name: "New Smart Block", callback: AIRTIME.playlist.fnNewBlock}, "ws": {name: "New Webstream", callback: AIRTIME.playlist.fnWsNew} } }); diff --git a/airtime_mvc/public/js/airtime/playlist/smart_playlistbuilder.js b/airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js similarity index 95% rename from airtime_mvc/public/js/airtime/playlist/smart_playlistbuilder.js rename to airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js index b1402f63a..00b55e7df 100644 --- a/airtime_mvc/public/js/airtime/playlist/smart_playlistbuilder.js +++ b/airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js @@ -1,9 +1,9 @@ $(document).ready(function() { - setSmartPlaylistEvents(); + setSmartBlockEvents(); }); -function setSmartPlaylistEvents() { - var form = $('#smart-playlist-form'); +function setSmartBlockEvents() { + var form = $('#smart-block-form'); /********** ADD CRITERIA ROW **********/ form.find('.criteria_add').live('click', function(){ @@ -245,7 +245,7 @@ function getRowIndex(ele) { * remains at the criteria row */ function appendModAddButton() { - var divs = $('#smart-playlist-form').find('div select[name^="sp_criteria_modifier"]').parent(':visible'); + var divs = $('#smart-block-form').find('div select[name^="sp_criteria_modifier"]').parent(':visible'); $.each(divs, function(i, div){ if (i > 0) { /* If the criteria field is hidden we know it is a modifier row @@ -269,7 +269,7 @@ function appendModAddButton() { * We need to do this everytime a row gets deleted */ function reindexElements() { - var divs = $('#smart-playlist-form').find('div select[name^="sp_criteria_field"]').parent(), + var divs = $('#smart-block-form').find('div select[name^="sp_criteria_field"]').parent(), index = 0, modIndex = 0; $.each(divs, function(i, div){ @@ -302,7 +302,7 @@ function reindexElements() { } function buttonClickAction(clickType, url){ - var data = $('#smart-playlist-form').serializeArray(), + var data = $('#smart-block-form').serializeArray(), obj_id = $('input[id="obj_id"]').val(); enableLoadingIcon(); @@ -407,7 +407,7 @@ function disableAndHideExtraField(valEle, index) { } function sizeTextBoxes(ele, classToRemove, classToAdd) { - var form = $('#smart-playlist-form'); + var form = $('#smart-block-form'); if (ele.hasClass(classToRemove)) { ele.removeClass(classToRemove).addClass(classToAdd); } @@ -453,30 +453,30 @@ function callback(data, type) { if (type == 'shuffle' || type == 'generate') { AIRTIME.playlist.fnOpenPlaylist(json); - var form = $('#smart-playlist-form'); + var form = $('#smart-block-form'); if (json.result == "0") { if (type == 'shuffle') { - form.find('.success').text('Smart playlist shuffled'); + form.find('.success').text('Smart block shuffled'); } else if (type == 'generate') { - form.find('.success').text('Smart playlist generated and saved'); + form.find('.success').text('Smart block generated and saved'); //redraw library table so the length gets updated dt.fnStandingRedraw(); } form.find('.success').show(); } - form.find('#smart_playlist_options').removeClass("closed"); + form.find('#smart_block_options').removeClass("closed"); } else { AIRTIME.playlist.fnOpenPlaylist(json); - var form = $('#smart-playlist-form'); + var form = $('#smart-block-form'); if (json.result == "0") { - $('#sp-success-saved').text('Smart playlist saved'); + $('#sp-success-saved').text('Smart block saved'); $('#sp-success-saved').show(); //redraw library table so the length gets updated var dt = $('table[id="library_display"]').dataTable(); dt.fnStandingRedraw(); } - form.find('#smart_playlist_options').removeClass("closed"); + form.find('#smart_block_options').removeClass("closed"); } setTimeout(removeSuccessMsg, 5000); } @@ -490,7 +490,7 @@ function removeSuccessMsg() { function appendAddButton() { var add_button = "" + ""; - var rows = $('#smart_playlist_options'), + var rows = $('#smart_block_options'), enabled = rows.find('select[name^="sp_criteria_field"]:enabled'); rows.find('.criteria_add').remove();