diff --git a/airtime_mvc/application/forms/SmartBlockCriteria.php b/airtime_mvc/application/forms/SmartBlockCriteria.php index e8cff6815..59c375bf7 100644 --- a/airtime_mvc/application/forms/SmartBlockCriteria.php +++ b/airtime_mvc/application/forms/SmartBlockCriteria.php @@ -244,7 +244,7 @@ class Application_Form_SmartBlockCriteria extends Zend_Form_SubForm } $generate = new Zend_Form_Element_Button('generate_button'); - $generate->setAttrib('class', 'ui-button ui-state-default sp-button'); + $generate->setAttrib('class', 'btn btn-small'); $generate->setAttrib('title', 'Generate playlist content and save criteria'); $generate->setIgnore(true); $generate->setLabel('Generate'); @@ -252,7 +252,7 @@ class Application_Form_SmartBlockCriteria extends Zend_Form_SubForm $this->addElement($generate); $shuffle = new Zend_Form_Element_Button('shuffle_button'); - $shuffle->setAttrib('class', 'ui-button ui-state-default sp-button'); + $shuffle->setAttrib('class', 'btn btn-small'); $shuffle->setAttrib('title', 'Shuffle playlist content'); $shuffle->setIgnore(true); $shuffle->setLabel('Shuffle'); 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 445832e2f..d1a16eaf4 100644 --- a/airtime_mvc/application/views/scripts/form/smart-block-criteria.phtml +++ b/airtime_mvc/application/views/scripts/form/smart-block-criteria.phtml @@ -1,7 +1,15 @@
Smart Block Options -
+
+
+
+ element->getElement('generate_button') ?> +
+
+ element->getElement('shuffle_button') ?> +
+
- - element->getElement('generate_button') ?> - element->getElement('shuffle_button') ?>
-
+
criteriasLength; $i++) {?> modRowMap[$i]; $j++) {?>
0) && ($this->element->getElement("sp_criteria_field_".$i."_".$j)->getAttrib('disabled') == 'disabled')) { echo 'style=display:none'; } ?>> element->getElement("sp_criteria_field_".$i."_".$j) ?> - - + + element->getElement("sp_criteria_modifier_".$i."_".$j) ?> element->getElement("sp_criteria_value_".$i."_".$j) ?> element->getElement("sp_criteria_extra_".$i."_".$j)->getAttrib("disabled") == "disabled"?'style="display:none;"':""?>> to element->getElement('sp_criteria_extra_'.$i."_".$j) ?> - - + + + -
element->getElement("sp_criteria_field_".$i."_".$j)->hasErrors()) : ?> element->getElement("sp_criteria_field_".$i."_".$j)->getMessages() as $error): ?> diff --git a/airtime_mvc/application/views/scripts/library/index.phtml b/airtime_mvc/application/views/scripts/library/index.phtml index 6f1d9dcbf..dcc7cde95 100644 --- a/airtime_mvc/application/views/scripts/library/index.phtml +++ b/airtime_mvc/application/views/scripts/library/index.phtml @@ -2,7 +2,7 @@ render('library/library.phtml') ?>
-
+
type == 'block') { echo $this->render('playlist/smart-block.phtml'); } else if ($this->type == 'playlist') { diff --git a/airtime_mvc/application/views/scripts/playlist/playlist.phtml b/airtime_mvc/application/views/scripts/playlist/playlist.phtml index 8ca2af991..b85ee2d92 100644 --- a/airtime_mvc/application/views/scripts/playlist/playlist.phtml +++ b/airtime_mvc/application/views/scripts/playlist/playlist.phtml @@ -4,16 +4,33 @@ if (isset($this->obj)) { $count = count($contents); } ?> - +
+
+ + +
obj)) : ?> - - "> - Playlist crossfade - +
+ +
+
+ +
+
+ "> + Playlist crossfade + +
+
obj)) : ?> - diff --git a/airtime_mvc/application/views/scripts/playlist/smart-block.phtml b/airtime_mvc/application/views/scripts/playlist/smart-block.phtml index 9c37dfffa..136f9084a 100644 --- a/airtime_mvc/application/views/scripts/playlist/smart-block.phtml +++ b/airtime_mvc/application/views/scripts/playlist/smart-block.phtml @@ -4,14 +4,31 @@ if (isset($this->obj)) { $count = count($contents); } ?> - +
+
+ + +
obj)) : ?> - - "> - Playlist crossfade - - +
+ +
+
+ +
+
+ "> + Playlist crossfade + +
+
obj)) : ?> diff --git a/airtime_mvc/application/views/scripts/webstream/webstream.phtml b/airtime_mvc/application/views/scripts/webstream/webstream.phtml index 876ee841c..a91d8eb91 100644 --- a/airtime_mvc/application/views/scripts/webstream/webstream.phtml +++ b/airtime_mvc/application/views/scripts/webstream/webstream.phtml @@ -1,7 +1,20 @@ - +
+
+ + +
obj)) : ?> - +
+ +
+
obj)) : ?> @@ -36,7 +49,7 @@
- +
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 cc9d6596b..17aa3bb4e 100644 --- a/airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js +++ b/airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js @@ -16,9 +16,9 @@ var AIRTIME = (function(AIRTIME) { } if (check === true) { - AIRTIME.button.enableButton("icon-plus", true); + AIRTIME.button.enableButton("btn-group #library-plus", true); } else { - AIRTIME.button.disableButton("icon-plus", true); + AIRTIME.button.disableButton("btn-group #library-plus", true); } }; @@ -109,7 +109,7 @@ var AIRTIME = (function(AIRTIME) { .find('.icon-plus').parent() .click(function() { - if (AIRTIME.button.isDisabled('icon-plus') === true) { + if (AIRTIME.button.isDisabled('btn-group #library-plus') === true) { return; } diff --git a/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js b/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js index 1e10fd7a4..7bddd8049 100644 --- a/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js +++ b/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js @@ -16,9 +16,9 @@ var AIRTIME = (function(AIRTIME) { } if (check === true) { - AIRTIME.button.enableButton("icon-plus", true); + AIRTIME.button.enableButton("btn-group #library-plus", true); } else { - AIRTIME.button.disableButton("icon-plus", true); + AIRTIME.button.disableButton("btn-group #library-plus", true); } }; @@ -121,7 +121,7 @@ var AIRTIME = (function(AIRTIME) { .click( function() { - if (AIRTIME.button.isDisabled('icon-plus') === true) { + if (AIRTIME.button.isDisabled('btn-group #library-plus') === true) { return; } diff --git a/airtime_mvc/public/js/airtime/library/library.js b/airtime_mvc/public/js/airtime/library/library.js index 24800133a..64e7e3591 100644 --- a/airtime_mvc/public/js/airtime/library/library.js +++ b/airtime_mvc/public/js/airtime/library/library.js @@ -110,7 +110,7 @@ var AIRTIME = (function(AIRTIME) { "" + "") .append("
" + - "" + "
") diff --git a/airtime_mvc/public/js/airtime/library/spl.js b/airtime_mvc/public/js/airtime/library/spl.js index 11d5221c6..07b5ad3d8 100644 --- a/airtime_mvc/public/js/airtime/library/spl.js +++ b/airtime_mvc/public/js/airtime/library/spl.js @@ -943,6 +943,7 @@ var AIRTIME = (function(AIRTIME){ }; mod.init = function() { + /* $.contextMenu({ selector: '#spl_new, #ws_new', trigger: "left", @@ -953,6 +954,10 @@ var AIRTIME = (function(AIRTIME){ "ws": {name: "New Webstream", callback: AIRTIME.playlist.fnWsNew} } }); + */ + $('#lib-new-pl').live('click', function(){AIRTIME.playlist.fnNew();}); + $('#lib-new-bl').live('click', function(){AIRTIME.playlist.fnNewBlock();}); + $('#lib-new-ws').live('click', function(){AIRTIME.playlist.fnWsNew();}); /* $pl.delegate("#spl_new", {"click": AIRTIME.playlist.fnNew});*/ diff --git a/airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js b/airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js index 0e591e117..ca085fa87 100644 --- a/airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js +++ b/airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js @@ -6,7 +6,7 @@ function setSmartBlockEvents() { var form = $('#smart-block-form'); /********** ADD CRITERIA ROW **********/ - form.find('.criteria_add').live('click', function(){ + form.find('#criteria_add').live('click', function(){ var div = $('dd[id="sp_criteria-element"]').children('div:visible:last').next(); @@ -52,7 +52,7 @@ function setSmartBlockEvents() { sizeTextBoxes(newRowVal, 'sp_extra_input_text', 'sp_input_text'); //remove the 'criteria add' button from new modifier row - newRow.find('.criteria_add').remove(); + newRow.find('#criteria_add').remove(); $(this).parent().after(newRow); reindexElements(); @@ -490,12 +490,12 @@ function removeSuccessMsg() { } function appendAddButton() { - var add_button = "" + - ""; + var add_button = "" + + ""; var rows = $('#smart_block_options'), enabled = rows.find('select[name^="sp_criteria_field"]:enabled'); - rows.find('.criteria_add').remove(); + rows.find('#criteria_add').remove(); if (enabled.length > 1) { rows.find('select[name^="sp_criteria_field"]:enabled:last')