diff --git a/airtime_mvc/application/forms/AddShowAutoPlaylist.php b/airtime_mvc/application/forms/AddShowAutoPlaylist.php
index bb4cead12..c987480b2 100644
--- a/airtime_mvc/application/forms/AddShowAutoPlaylist.php
+++ b/airtime_mvc/application/forms/AddShowAutoPlaylist.php
@@ -15,7 +15,7 @@ class Application_Form_AddShowAutoPlaylist extends Zend_Form_SubForm
// Add autoplaylist checkbox element
$this->addElement('checkbox', 'add_show_has_autoplaylist', array(
- 'label' => _('Auto Schedule Playlist ?'),
+ 'label' => _('Add Autoloading Playlist ?'),
'required' => false,
'class' => 'input_text',
'decorators' => array('ViewHelper')
@@ -29,7 +29,7 @@ class Application_Form_AddShowAutoPlaylist extends Zend_Form_SubForm
$this->addElement($autoPlaylistSelect);
// Add autoplaylist checkbox element
$this->addElement('checkbox', 'add_show_autoplaylist_repeat', array(
- 'label' => _('Repeat AutoPlaylist Until Show is Full ?'),
+ 'label' => _('Repeat Playlist Until Show is Full ?'),
'required' => false,
'class' => 'input_text',
'decorators' => array('ViewHelper')
diff --git a/airtime_mvc/application/views/scripts/form/add-show-autoplaylist.phtml b/airtime_mvc/application/views/scripts/form/add-show-autoplaylist.phtml
index 5d5eda5f6..a694866a8 100644
--- a/airtime_mvc/application/views/scripts/form/add-show-autoplaylist.phtml
+++ b/airtime_mvc/application/views/scripts/form/add-show-autoplaylist.phtml
@@ -7,9 +7,11 @@
element->getElement('add_show_has_autoplaylist') ?>
+
+
More information"); ?>
autoplaylist; ?>
diff --git a/airtime_mvc/public/css/add-show.css b/airtime_mvc/public/css/add-show.css
index 772c49007..371c471c3 100644
--- a/airtime_mvc/public/css/add-show.css
+++ b/airtime_mvc/public/css/add-show.css
@@ -85,6 +85,9 @@ label.wrapp-label input[type="checkbox"] {
#schedule-add-show fieldset dd input[type="checkbox"] {
margin-top: 6px;
}
+#schedule-show-auto input[type="checkbox"] {
+ margin-left: 6px;
+}
#add_show_day_check-element.block-display {
margin-bottom: 15px;
diff --git a/airtime_mvc/public/css/radio-page/custom.css b/airtime_mvc/public/css/radio-page/custom.css
new file mode 100644
index 000000000..5e138b105
--- /dev/null
+++ b/airtime_mvc/public/css/radio-page/custom.css
@@ -0,0 +1,15 @@
+#schedule_iframe, .tab_content {
+ color: #fff;
+ text-align: center;
+ width: 770px;
+ max-width: 770px;
+ margin: -70px auto 0px -380px;
+ height: calc(100vh - 200px) !important;
+ padding: 10px;
+ padding-left: 10px;
+ margin-bottom: -100px;
+ padding-top: 50px;
+ position: absolute;
+ left: 50%;
+ overflow: hidden;
+}
\ No newline at end of file
diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css
index e9e8ac4ff..cfcd3f51c 100644
--- a/airtime_mvc/public/css/styles.css
+++ b/airtime_mvc/public/css/styles.css
@@ -210,8 +210,9 @@ img.logo
display:inline-block; zoom:1;
width:14px; height:14px;
background:url(images/icon_info.png) 0 0 no-repeat;
- top:2px; right:7px; left: 3px;
+ left: 3px;
line-height:16px !important;
+ vertical-align: text-top;
}
/* Clearfix */
@@ -2888,7 +2889,6 @@ dt.block-display.info-block {
text-align:center;
letter-spacing:-.3px;
text-shadow: rgba(248,248,248,.3) 0 1px 0, rgba(0,0,0,.8) 0 -1px 0;
- rgba(51,51,51,.9)
}
.error-content p {
color: #acacac;
diff --git a/airtime_mvc/public/js/airtime/schedule/add-show.js b/airtime_mvc/public/js/airtime/schedule/add-show.js
index 130c684a8..4d9a8417b 100644
--- a/airtime_mvc/public/js/airtime/schedule/add-show.js
+++ b/airtime_mvc/public/js/airtime/schedule/add-show.js
@@ -310,17 +310,6 @@ function setAddShowEvents(form) {
$(this).blur();
form.find("#add_show_playlist_dropdown").toggle();
form.find("#add_show_autoplaylist_repeat").toggle();
-
- var checkBoxSelected = false;
-
- //must switch rebroadcast displays
- if(form.find("#add_show_has_autoplaylist").attr('checked')) {
- form.find("#add_show_playlist_dropdown").show();
- form.find("#add_show_autoplaylist_repeat").show();
- }
- else {
- form.find("#add_show_playlist_downdown").hide();
- }
});
form.find("#add_show_repeats").click(function(){
@@ -491,6 +480,27 @@ function setAddShowEvents(form) {
at: "right center"
}
});
+
+ form.find(".show_autoplaylist_help_icon").qtip({
+ content: {
+ text: $.i18n._("Autoloading playlists' contents are added to shows one hour before the show airs. More information")
+ },
+ hide: {
+ delay: 500,
+ fixed: true
+ },
+ style: {
+ border: {
+ width: 0,
+ radius: 4
+ },
+ classes: "ui-tooltip-dark ui-tooltip-rounded"
+ },
+ position: {
+ my: "left bottom",
+ at: "right center"
+ }
+ });
form.find(".airtime_auth_help_icon").qtip({
content: {