diff --git a/airtime_mvc/application/common/Billing.php b/airtime_mvc/application/common/Billing.php index 0baa56104..5a28aff8c 100644 --- a/airtime_mvc/application/common/Billing.php +++ b/airtime_mvc/application/common/Billing.php @@ -109,7 +109,7 @@ class Billing $result = self::makeRequest($credentials["url"], $query_string); //XXX: Debugging / local testing - if ($_SERVER['SERVER_NAME'] == "airtime.localhost") { + if ($_SERVER['SERVER_NAME'] == "localhost") { $_SERVER['SERVER_NAME'] = "bananas.airtime.pro"; } diff --git a/airtime_mvc/application/forms/SmartBlockCriteria.php b/airtime_mvc/application/forms/SmartBlockCriteria.php index a0f6d861c..4c307cdb9 100644 --- a/airtime_mvc/application/forms/SmartBlockCriteria.php +++ b/airtime_mvc/application/forms/SmartBlockCriteria.php @@ -127,9 +127,9 @@ class Application_Form_SmartBlockCriteria extends Zend_Form_SubForm { if (!isset($this->sortOptions)) { $this->sortOptions = array( - "random" => _("random"), - "newest" => _("newest"), - "oldest" => _("oldest") + "random" => _("Randomly"), + "newest" => _("Newest"), + "oldest" => _("Oldest") ); } return $this->sortOptions; @@ -176,7 +176,7 @@ class Application_Form_SmartBlockCriteria extends Zend_Form_SubForm } $spType = new Zend_Form_Element_Radio('sp_type'); - $spType->setLabel(_('Set smart block type:')) + $spType->setLabel(_('Type:')) ->setDecorators(array('viewHelper')) ->setMultiOptions(array( 'static' => _('Static'), @@ -294,7 +294,7 @@ class Application_Form_SmartBlockCriteria extends Zend_Form_SubForm $repeatTracks = new Zend_Form_Element_Checkbox('sp_repeat_tracks'); $repeatTracks->setDecorators(array('viewHelper')) - ->setLabel(_('Allow Repeat Tracks:')); + ->setLabel(_('Allow Repeated Tracks:')); if (isset($storedCrit["repeat_tracks"])) { $repeatTracks->setChecked($storedCrit["repeat_tracks"]["value"] == 1?true:false); } @@ -303,6 +303,7 @@ class Application_Form_SmartBlockCriteria extends Zend_Form_SubForm $sort = new Zend_Form_Element_Select('sp_sort_options'); $sort->setAttrib('class', 'sp_input_select') ->setDecorators(array('viewHelper')) + ->setLabel(_("Sort Tracks:")) ->setMultiOptions($this->getSortOptions()); if (isset($storedCrit["sort"])) { $sort->setValue($storedCrit["sort"]["value"]); @@ -320,7 +321,7 @@ class Application_Form_SmartBlockCriteria extends Zend_Form_SubForm $limitValue = new Zend_Form_Element_Text('sp_limit_value'); $limitValue->setAttrib('class', 'sp_input_text_limit') - ->setLabel(_('Limit to')) + ->setLabel(_('Limit to:')) ->setDecorators(array('viewHelper')); $this->addElement($limitValue); if (isset($storedCrit["limit"])) { 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 ca85d3e2e..3b111c6b9 100644 --- a/airtime_mvc/application/views/scripts/form/smart-block-criteria.phtml +++ b/airtime_mvc/application/views/scripts/form/smart-block-criteria.phtml @@ -1,10 +1,12 @@
-
+
+
+
element->getElement('sp_type')->getValue(); foreach ($this->element->getElement('sp_type')->getMultiOptions() as $radio) : ?> @@ -16,7 +18,52 @@
- + +
+ +
+
+ element->getElement('sp_repeat_tracks')?> + element->getElement("sp_repeat_tracks")->hasErrors()) : ?> + element->getElement("sp_repeat_tracks")->getMessages() as $error): ?> + + + + + + +
+ +
+ +
+
+ element->getElement('sp_sort_options') ?> + element->getElement("sp_sort_options")->hasErrors()) : ?> + element->getElement("sp_sort_options")->getMessages() as $error): ?> + + + + + +
+ +
+ +
+
+ element->getElement('sp_limit_value')?> + element->getElement('sp_limit_options') ?> + element->getElement("sp_limit_value")->hasErrors()) : ?> + element->getElement("sp_limit_value")->getMessages() as $error): ?> + + + + + +
+ +
criteriasLength; $i++) { // modRowMap holds the number of modifier rows for each criteria element @@ -44,19 +91,19 @@ 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;"':""?>>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): ?> @@ -69,42 +116,6 @@
- -
- element->getElement('sp_repeat_tracks')->getLabel() ?> - element->getElement('sp_repeat_tracks')?> - element->getElement("sp_repeat_tracks")->hasErrors()) : ?> - element->getElement("sp_repeat_tracks")->getMessages() as $error): ?> - - - - - - -
-
- Sort tracks by - element->getElement('sp_sort_options') ?> - element->getElement("sp_sort_options")->hasErrors()) : ?> - element->getElement("sp_sort_options")->getMessages() as $error): ?> - - - - - -
-
- element->getElement('sp_limit_value')->getLabel() ?> - element->getElement('sp_limit_value')?> - element->getElement('sp_limit_options') ?> - element->getElement("sp_limit_value")->hasErrors()) : ?> - element->getElement("sp_limit_value")->getMessages() as $error): ?> - - - - - -
showPoolCount) { ?>
@@ -137,12 +148,3 @@
- -
-
- element->getElement('generate_button');?> -
-
- element->getElement('shuffle_button');?> -
-
diff --git a/airtime_mvc/application/views/scripts/playlist/playlist.phtml b/airtime_mvc/application/views/scripts/playlist/playlist.phtml index 9eab3d802..9d9e067bc 100644 --- a/airtime_mvc/application/views/scripts/playlist/playlist.phtml +++ b/airtime_mvc/application/views/scripts/playlist/playlist.phtml @@ -10,54 +10,60 @@ if (isset($this->obj)) { -
-

- escape($this->obj->getName()); ?> -

-

length; ?>

-
+ -
-
+
+
+ +
+
+ +
+
- +
-
-
- -
-
- -
-
- "> - - -
-
- form; ?> - + +
+

length); ?>

+

+
+ +
+
+ "> + + +
+
+ +
+
+
+ + + -
+
diff --git a/airtime_mvc/application/views/scripts/playlist/smart-block.phtml b/airtime_mvc/application/views/scripts/playlist/smart-block.phtml index 017c2e656..3cda37419 100644 --- a/airtime_mvc/application/views/scripts/playlist/smart-block.phtml +++ b/airtime_mvc/application/views/scripts/playlist/smart-block.phtml @@ -10,55 +10,70 @@ if (isset($this->obj)) { -
-

- - unsavedName)) echo $this->unsavedName; - else echo $this->escape($this->obj->getName()); - ?> - -

-

length; ?>

-
+ -
-
+
+
+ +
+
+ +
+
- +
form; ?> -
-
- -
-
- "> - - -
-
-
+ +
+

length); ?>

+

+ +
+ form->getElement('generate_button');?> +
+
+ form->getElement('shuffle_button');?> +
+
+ "> + + +
+
+ +
+
+
+ + + -
+
@@ -68,5 +83,5 @@ if (isset($this->obj)) {
-
+
diff --git a/airtime_mvc/public/css/dashboard.css b/airtime_mvc/public/css/dashboard.css index f8e3b7038..6308edd8c 100644 --- a/airtime_mvc/public/css/dashboard.css +++ b/airtime_mvc/public/css/dashboard.css @@ -385,6 +385,7 @@ li.ui-state-default { font-size: 14px; line-height: 24px; font-weight: normal; + text-align: right; } .sb-content fieldset label { @@ -415,6 +416,8 @@ li.ui-state-default { overflow-x: hidden; width: 100%; flex: 1 0 100%; + padding: 10px; + box-sizing: border-box; } .clearfix:after, .side_playlist li:after { @@ -425,7 +428,7 @@ li.ui-state-default { margin: 0; } -.spl-no-margin > div:last-child { +.spl-no-margin > div:first-child { margin-left: 0 !important; } @@ -437,7 +440,11 @@ li.ui-state-default { margin: 4px 0; min-height: 0; - padding: 0; + padding: 5px; + border: 1px solid #444; + border-radius: 3px; + box-sizing: border-box; + background-color: #111; } .spl_sortable .list-item-container { @@ -447,7 +454,8 @@ li.ui-state-default { .spl_empty { width: 100%; - color: white; + margin-top: 100px; + color: #efefef; text-align: center; font-size: 20px; diff --git a/airtime_mvc/public/css/playlist_builder.css b/airtime_mvc/public/css/playlist_builder.css index ba9417e93..480c9952d 100644 --- a/airtime_mvc/public/css/playlist_builder.css +++ b/airtime_mvc/public/css/playlist_builder.css @@ -28,12 +28,18 @@ height: 28px; margin: 0 7px 20px 0; }*/ -.side_playlist textarea { + +.playlist_editor dt { + float: left; +} + +.playlist_editor input, .playlist_editor textarea { width: 200px; + box-sizing: border-box; } .side_playlist textarea { - height: 100px; + height: 3.2em; } .spl_sortable { @@ -157,18 +163,23 @@ .side_playlist h4 { font-size: 15px; - margin: 8px 0 10px 0; + margin: 3px 8px 0px 0; padding: 0; color: #4f4f4f; font-weight: normal; - clear: both; - float: left; + float: right; } .side_playlist h3+h4 { margin: 0 0 11px 0; } +.btn-toolbar { + margin: 0; + padding: 5px; +} + + .spl_sortable div.big_play { display: block; width: 20px; @@ -458,13 +469,6 @@ padding: 0; } -.side_playlist .zend_form dt,.side_playlist .zend_form dd { - display: block; - float: none; - margin: 4px 0 0; - padding: 0; - width: 100%; -} .side_playlist .zend_form dd.buttons { margin-top: 8px; @@ -475,17 +479,37 @@ margin: 0 0 0 10px; } -.side_playlist .zend_form dt { - color: #5B5B5B; - font-weight: bold; - margin: 9px 0 0; - padding: 0 2px; -} - .side_playlist .zend_form dt:first-child { margin-top: 0; } +.side_playlist .zend_form dt { + width: 170px; +} + +.side_playlist .zend_form dd { + margin-bottom: 10px; +} +.search-criteria dt label.sp_label +{ + width: 150px; +} + +.search-criteria dt { + float: left; + clear: left; + width: 170px; +} + +.search-criteria dd { + margin: 0px; +} + +#sp_criteria-element { + clear: both; +} + +/* .side_playlist .zend_form dd textarea { background-color: #dddddd; border: 1px solid #5B5B5B; @@ -496,8 +520,7 @@ -moz-box-shadow: inset 0px 2px 2px rgba(0, 0, 0, 0.1); -webkit-box-shadow: inset 0px 2px 2px rgba(0, 0, 0, 0.1); box-shadow: inset 0px 2px 2px rgba(0, 0, 0, 0.1); - width: 99.7%; -} +}*/ .side_playlist fieldset { border: 1px solid #9a9a9a; @@ -526,9 +549,6 @@ fieldset>legend { background-image: url(redmond/images/ui-icons_454545_256x240.png); } -.side_playlist .zend_form input,.side_playlist .zend_form textarea { - width: auto; -} #fieldset-metadate_change { clear: both; diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css index 059de489b..66488cca3 100644 --- a/airtime_mvc/public/css/styles.css +++ b/airtime_mvc/public/css/styles.css @@ -569,9 +569,9 @@ input[type="text"]:focus, input[type="password"]:focus, textarea:focus, .input_t border: 1px solid #5b5b5b; box-shadow: 0 2px 2px rgba(0, 0, 0, 0.2) inset; font-size: 13px; - text-indent: 3px; padding: 5px; margin:0; + font-family: Arial, Helvetica, sans-serif; } .input_select, select { background-color: #DDDDDD; diff --git a/airtime_mvc/public/js/airtime/library/spl.js b/airtime_mvc/public/js/airtime/library/spl.js index fa2d4eccf..0f68a5e37 100644 --- a/airtime_mvc/public/js/airtime/library/spl.js +++ b/airtime_mvc/public/js/airtime/library/spl.js @@ -359,7 +359,7 @@ var AIRTIME = (function(AIRTIME){ //remove any newlines if user somehow snuck them in (easy to do if dragging/dropping text) nameElement.text(nameElement.text().replace("\n", "")); - var name = $pl.find(".playlist_name_display").text(); + var name = $pl.find(".playlist_name_display").val(); $(".nav.nav-tabs .active a > span.tab-name").text(name); } @@ -449,7 +449,7 @@ var AIRTIME = (function(AIRTIME){ pane = $(".editor_pane_wrapper:last"), name = json.type == "md" ? // file pane.append(json.html).find("#track_title").val() + $.i18n._(" - Metadata Editor") - : pane.append(json.html).find(".playlist_name_display").text(), + : pane.append(json.html).find(".playlist_name_display").val(), tab = "