From 5ec3684ea6f970eac27a8247db7e81dab212849e Mon Sep 17 00:00:00 2001 From: drigato Date: Thu, 9 Jul 2015 10:34:48 -0400 Subject: [PATCH 1/9] CSS fix onradio page schedule widget Widen width or show time and name columns on mobile phones --- airtime_mvc/public/css/embed/weekly-schedule-widget-basic.css | 4 ++-- airtime_mvc/public/css/embed/weekly-schedule-widget.css | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/airtime_mvc/public/css/embed/weekly-schedule-widget-basic.css b/airtime_mvc/public/css/embed/weekly-schedule-widget-basic.css index a74d276a7..b7f484e83 100644 --- a/airtime_mvc/public/css/embed/weekly-schedule-widget-basic.css +++ b/airtime_mvc/public/css/embed/weekly-schedule-widget-basic.css @@ -217,11 +217,11 @@ background: rgba(53, 53, 53, 1.0); @media (max-width: 400px) { .schedule_item div.time_grid { - width: 90%; + width: 95%; } .schedule_item div.name_grid { - width: 90%; + width: 95%; } } diff --git a/airtime_mvc/public/css/embed/weekly-schedule-widget.css b/airtime_mvc/public/css/embed/weekly-schedule-widget.css index 59c460860..8151a99d8 100644 --- a/airtime_mvc/public/css/embed/weekly-schedule-widget.css +++ b/airtime_mvc/public/css/embed/weekly-schedule-widget.css @@ -167,11 +167,11 @@ body { @media (max-width: 400px) { .schedule_item div.time_grid { - width: 90%; + width: 95%; } .schedule_item div.name_grid { - width: 90%; + width: 95%; } } From 1b3a9f6e6af6f0f293dce77a0dc8065e3b875cb7 Mon Sep 17 00:00:00 2001 From: drigato Date: Thu, 9 Jul 2015 12:18:21 -0400 Subject: [PATCH 2/9] SAAS-924: Cannot edit repeating show if first instance has ended Reverted old behaviour where we set the show start and end date/time to the next repeating instance start and end. --- .../application/services/ShowFormService.php | 34 ++++++++++++++----- 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/airtime_mvc/application/services/ShowFormService.php b/airtime_mvc/application/services/ShowFormService.php index 92ffa4907..24c66e3ef 100644 --- a/airtime_mvc/application/services/ShowFormService.php +++ b/airtime_mvc/application/services/ShowFormService.php @@ -155,19 +155,14 @@ class Application_Service_ShowFormService if ($ccShowDay->isShowStartInPast()) { //for a non-repeating show, we should never allow user to change the start time. //for a repeating show, we should allow because the form works as repeating template form - $form->disableStartDateAndTime(); - - // Removing this - if there is no future instance, this will throw an error. - // If there is a future instance, then we get a WHEN block representing the next instance - // which may be confusing. - /*if (!$ccShowDay->isRepeating()) { + if (!$ccShowDay->isRepeating()) { $form->disableStartDateAndTime(); } else { list($showStart, $showEnd) = $this->getNextFutureRepeatShowTime(); if ($this->hasShowStarted($showStart)) { $form->disableStartDateAndTime(); } - }*/ + } } $form->populate( @@ -183,6 +178,29 @@ class Application_Service_ShowFormService return $showStart; } + public function getNextFutureRepeatShowTime() + { + $ccShowInstance = CcShowInstancesQuery::create() + ->filterByDbShowId($this->ccShow->getDbId()) + ->filterByDbModifiedInstance(false) + ->filterByDbStarts(gmdate("Y-m-d H:i:s"), Criteria::GREATER_THAN) + ->orderByDbStarts() + ->findOne(); + + if (!$ccShowInstance) { + return null; + } + + $starts = new DateTime($ccShowInstance->getDbStarts(), new DateTimeZone("UTC")); + $ends = new DateTime($ccShowInstance->getDbEnds(), new DateTimeZone("UTC")); + $showTimezone = $this->ccShow->getFirstCcShowDay()->getDbTimezone(); + + $starts->setTimezone(new DateTimeZone($showTimezone)); + $ends->setTimezone(new DateTimeZone($showTimezone)); + + return array($starts, $ends); + } + private function populateInstanceFormWhen($form) { $ccShowInstance = CcShowInstancesQuery::create()->findPk($this->instanceId); @@ -437,7 +455,7 @@ class Application_Service_ShowFormService $ccShowInstance = CcShowInstancesQuery::create() ->filterByDbShowId($this->ccShow->getDbId()) ->filterByDbModifiedInstance(false) - ->filterByDbStarts(gmdate("Y-m-d"), Criteria::GREATER_EQUAL) + ->filterByDbStarts(gmdate("Y-m-d H:i:s"), Criteria::GREATER_EQUAL) ->orderByDbStarts() ->findOne(); From 0601bd675e8317a87535f05f7eb5e7cbce692cff Mon Sep 17 00:00:00 2001 From: drigato Date: Thu, 9 Jul 2015 14:38:44 -0400 Subject: [PATCH 3/9] SAAS-939: Add option to preferences to display login button on radio page --- .../application/controllers/IndexController.php | 2 ++ .../application/controllers/PreferenceController.php | 1 + airtime_mvc/application/forms/GeneralPreferences.php | 11 +++++++++++ airtime_mvc/application/models/Preference.php | 9 +++++++++ .../views/scripts/form/preferences_general.phtml | 3 +++ .../application/views/scripts/index/index.phtml | 10 ++++++---- 6 files changed, 32 insertions(+), 4 deletions(-) diff --git a/airtime_mvc/application/controllers/IndexController.php b/airtime_mvc/application/controllers/IndexController.php index 56d239e5c..32e4a17a1 100644 --- a/airtime_mvc/application/controllers/IndexController.php +++ b/airtime_mvc/application/controllers/IndexController.php @@ -27,6 +27,8 @@ class IndexController extends Zend_Controller_Action $this->view->stationUrl = Application_Common_HTTPHelper::getStationUrl(); + $this->view->displayLoginButton = Application_Model_Preference::getRadioPageDisplayLoginButton(); + } public function mainAction() diff --git a/airtime_mvc/application/controllers/PreferenceController.php b/airtime_mvc/application/controllers/PreferenceController.php index 5803d3223..39b7a8613 100644 --- a/airtime_mvc/application/controllers/PreferenceController.php +++ b/airtime_mvc/application/controllers/PreferenceController.php @@ -47,6 +47,7 @@ class PreferenceController extends Zend_Controller_Action Application_Model_Preference::SetDefaultLocale($values["locale"]); Application_Model_Preference::SetDefaultTimezone($values["timezone"]); Application_Model_Preference::SetWeekStartDay($values["weekStartDay"]); + Application_Model_Preference::setRadioPageDisplayLoginButton($values["radioPageLoginButton"]); $logoUploadElement = $form->getSubForm('preferences_general')->getElement('stationLogo'); $logoUploadElement->receive(); diff --git a/airtime_mvc/application/forms/GeneralPreferences.php b/airtime_mvc/application/forms/GeneralPreferences.php index aa2906d82..ff3cf4118 100644 --- a/airtime_mvc/application/forms/GeneralPreferences.php +++ b/airtime_mvc/application/forms/GeneralPreferences.php @@ -136,6 +136,17 @@ class Application_Form_GeneralPreferences extends Zend_Form_SubForm $week_start_day->setMultiOptions($this->getWeekStartDays()); $week_start_day->setValue(Application_Model_Preference::GetWeekStartDay()); $this->addElement($week_start_day); + + $radioPageLoginButton = new Zend_Form_Element_Checkbox("radioPageLoginButton"); + $radioPageLoginButton->setDecorators(array( + 'ViewHelper', + 'Errors', + 'Label' + )); + $radioPageLoginButton->addDecorator('Label', array("class" => "enable-tunein")); + $radioPageLoginButton->setLabel(_("Display login button on your Radio Page?")); + $radioPageLoginButton->setValue(Application_Model_Preference::getRadioPageDisplayLoginButton()); + $this->addElement($radioPageLoginButton); } private function getWeekStartDays() diff --git a/airtime_mvc/application/models/Preference.php b/airtime_mvc/application/models/Preference.php index 5c1e7c889..6143058ba 100644 --- a/airtime_mvc/application/models/Preference.php +++ b/airtime_mvc/application/models/Preference.php @@ -1512,4 +1512,13 @@ class Application_Model_Preference self::setValue("task_manager_lock", $value); } + public static function getRadioPageDisplayLoginButton() + { + return self::getValue("radio_page_display_login_button"); + } + + public static function setRadioPageDisplayLoginButton($value) + { + self::setValue("radio_page_display_login_button", $value); + } } diff --git a/airtime_mvc/application/views/scripts/form/preferences_general.phtml b/airtime_mvc/application/views/scripts/form/preferences_general.phtml index 614416765..77f4201f5 100644 --- a/airtime_mvc/application/views/scripts/form/preferences_general.phtml +++ b/airtime_mvc/application/views/scripts/form/preferences_general.phtml @@ -37,5 +37,8 @@ element->getElement('thirdPartyApi')->render() ?> + element->getElement('radioPageLoginButton')->renderViewHelper() ?> + element->getElement('radioPageLoginButton')->renderLabel() ?> + diff --git a/airtime_mvc/application/views/scripts/index/index.phtml b/airtime_mvc/application/views/scripts/index/index.phtml index a8467757f..7940ec812 100644 --- a/airtime_mvc/application/views/scripts/index/index.phtml +++ b/airtime_mvc/application/views/scripts/index/index.phtml @@ -24,12 +24,14 @@ document.getElementById(id).width= (newwidth) + "px"; echo ""; } ?> - "; + }?>
From 670395bb2e782329690dbb64f27751f5524736c8 Mon Sep 17 00:00:00 2001 From: drigato Date: Thu, 9 Jul 2015 15:16:54 -0400 Subject: [PATCH 4/9] SAAS-939: Add option to preferences to display login button on radio page Change option to ON by default --- airtime_mvc/application/controllers/IndexController.php | 6 +++++- airtime_mvc/application/forms/GeneralPreferences.php | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/airtime_mvc/application/controllers/IndexController.php b/airtime_mvc/application/controllers/IndexController.php index 32e4a17a1..08c17b186 100644 --- a/airtime_mvc/application/controllers/IndexController.php +++ b/airtime_mvc/application/controllers/IndexController.php @@ -27,7 +27,11 @@ class IndexController extends Zend_Controller_Action $this->view->stationUrl = Application_Common_HTTPHelper::getStationUrl(); - $this->view->displayLoginButton = Application_Model_Preference::getRadioPageDisplayLoginButton(); + $displayRadioPageLoginButtonValue = Application_Model_Preference::getRadioPageDisplayLoginButton(); + if ($displayRadioPageLoginButtonValue == "") { + $displayRadioPageLoginButtonValue = true; + } + $this->view->displayLoginButton = $displayRadioPageLoginButtonValue; } diff --git a/airtime_mvc/application/forms/GeneralPreferences.php b/airtime_mvc/application/forms/GeneralPreferences.php index ff3cf4118..94230e667 100644 --- a/airtime_mvc/application/forms/GeneralPreferences.php +++ b/airtime_mvc/application/forms/GeneralPreferences.php @@ -143,9 +143,13 @@ class Application_Form_GeneralPreferences extends Zend_Form_SubForm 'Errors', 'Label' )); + $displayRadioPageLoginButtonValue = Application_Model_Preference::getRadioPageDisplayLoginButton(); + if ($displayRadioPageLoginButtonValue == "") { + $displayRadioPageLoginButtonValue = true; + } $radioPageLoginButton->addDecorator('Label', array("class" => "enable-tunein")); $radioPageLoginButton->setLabel(_("Display login button on your Radio Page?")); - $radioPageLoginButton->setValue(Application_Model_Preference::getRadioPageDisplayLoginButton()); + $radioPageLoginButton->setValue($displayRadioPageLoginButtonValue); $this->addElement($radioPageLoginButton); } From 238bb15793c90184d52b806399e456f2a1e907d0 Mon Sep 17 00:00:00 2001 From: Albert Santoni Date: Thu, 9 Jul 2015 22:32:34 -0400 Subject: [PATCH 5/9] SAAS-941: Liquidsoap fails to start for stations with the substrings true/false in their names --- python_apps/pypo/liquidsoap/generate_liquidsoap_cfg.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python_apps/pypo/liquidsoap/generate_liquidsoap_cfg.py b/python_apps/pypo/liquidsoap/generate_liquidsoap_cfg.py index 7e98a47a9..4f104c62c 100644 --- a/python_apps/pypo/liquidsoap/generate_liquidsoap_cfg.py +++ b/python_apps/pypo/liquidsoap/generate_liquidsoap_cfg.py @@ -20,7 +20,7 @@ def generate_liquidsoap_config(ss): str_buffer = "%s = %s\n" % (key, int(value)) except ValueError: try: # Is it a boolean? - if "true" in value or "false" in value: + if value=="true" or value=="false": str_buffer = "%s = %s\n" % (key, value.lower()) else: raise ValueError() # Just drop into the except below From c44035c27db1a61f357de407ecd963ac9d8fa0b7 Mon Sep 17 00:00:00 2001 From: drigato Date: Fri, 10 Jul 2015 09:08:19 -0400 Subject: [PATCH 6/9] SAAS-938: Long track metadata messes up player bar on the radio page --- .../public/css/radio-page/premium_player.css | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/airtime_mvc/public/css/radio-page/premium_player.css b/airtime_mvc/public/css/radio-page/premium_player.css index 81583d31e..f36306135 100644 --- a/airtime_mvc/public/css/radio-page/premium_player.css +++ b/airtime_mvc/public/css/radio-page/premium_player.css @@ -39,6 +39,7 @@ body { .on_air { display: inline-block; margin-left: 40px; + width: 65% } .bottom_bar p.now_playing { @@ -47,11 +48,19 @@ body { font-weight: 300; float: left; margin: 28px 0px; + width: 100%; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; } .bottom_bar p.now_playing span { display: block; font-weight: 100; + width: 100%; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; } .bottom_bar .button { @@ -88,6 +97,30 @@ body { float: right; } +@media (max-width: 1230px) { + .on_air { + width: 60%; + } +} + +@media (max-width: 1075px) { + .on_air { + width: 55%; + } +} + +@media (max-width: 960px) { + .on_air { + width: 50%; + } +} + +@media (max-width: 850px) { + .on_air { + width: 45%; + } +} + @media (max-width: 780px) { .bottom_bar { height: 80px; @@ -122,6 +155,7 @@ body { left: 0px; right: 0px; padding-top: 40px; + width: 100%; background: rgba(0,0,0,0); background: -moz-linear-gradient(top, rgba(0,0,0,0) 0%, rgba(0,0,0,1) 69%, rgba(0,0,0,1) 100%); background: -webkit-gradient(left top, left bottom, color-stop(0%, rgba(0,0,0,0)), color-stop(69%, rgba(0,0,0,1)), color-stop(100%, rgba(0,0,0,1))); From e4720b59921657b10380f5074b2e2a7e2fc19829 Mon Sep 17 00:00:00 2001 From: Duncan Sommerville Date: Fri, 10 Jul 2015 10:27:28 -0400 Subject: [PATCH 7/9] Remove incorrect sql in 2.5.14 upgrade --- .../controllers/upgrade_sql/airtime_2.5.14/upgrade.sql | 1 - 1 file changed, 1 deletion(-) diff --git a/airtime_mvc/application/controllers/upgrade_sql/airtime_2.5.14/upgrade.sql b/airtime_mvc/application/controllers/upgrade_sql/airtime_2.5.14/upgrade.sql index 3a5362ca1..218a74096 100644 --- a/airtime_mvc/application/controllers/upgrade_sql/airtime_2.5.14/upgrade.sql +++ b/airtime_mvc/application/controllers/upgrade_sql/airtime_2.5.14/upgrade.sql @@ -1,4 +1,3 @@ -ALTER TABLE cc_pref ALTER COLUMN subjid SET NULL; ALTER TABLE cc_pref ALTER COLUMN subjid SET DEFAULT NULL; CREATE UNIQUE INDEX cc_pref_key_idx ON cc_pref (keystr) WHERE subjid IS NULL; ANALYZE cc_pref; \ No newline at end of file From 721cd5a31bbfdbc880c07d7caa4c05f0f5f9c43d Mon Sep 17 00:00:00 2001 From: drigato Date: Mon, 13 Jul 2015 09:04:49 -0400 Subject: [PATCH 8/9] SAAS-924: Cannot edit repeating show if first instance has ended Added safeguard in case we don't find a future show instance --- airtime_mvc/application/services/ShowFormService.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/airtime_mvc/application/services/ShowFormService.php b/airtime_mvc/application/services/ShowFormService.php index 24c66e3ef..8af6a78fa 100644 --- a/airtime_mvc/application/services/ShowFormService.php +++ b/airtime_mvc/application/services/ShowFormService.php @@ -158,7 +158,11 @@ class Application_Service_ShowFormService if (!$ccShowDay->isRepeating()) { $form->disableStartDateAndTime(); } else { - list($showStart, $showEnd) = $this->getNextFutureRepeatShowTime(); + $showStartAndEnd = $this->getNextFutureRepeatShowTime(); + if (!is_null($showStartAndEnd)) { + $showStart = $showStartAndEnd["starts"]; + $showEnd = $showStartAndEnd["ends"]; + } if ($this->hasShowStarted($showStart)) { $form->disableStartDateAndTime(); } @@ -198,7 +202,7 @@ class Application_Service_ShowFormService $starts->setTimezone(new DateTimeZone($showTimezone)); $ends->setTimezone(new DateTimeZone($showTimezone)); - return array($starts, $ends); + return array("starts" => $starts, "ends" => $ends); } private function populateInstanceFormWhen($form) From 6d883d2fa4599c16c34121939e29944f7be7d6f9 Mon Sep 17 00:00:00 2001 From: Duncan Sommerville Date: Mon, 13 Jul 2015 13:23:24 -0400 Subject: [PATCH 9/9] Fix Add Show button bug and update styling --- airtime_mvc/public/css/add-show.css | 176 ++++++++++++------ airtime_mvc/public/css/styles.css | 39 ---- .../public/js/airtime/schedule/add-show.js | 42 +++-- .../schedule/full-calendar-functions.js | 2 + 4 files changed, 138 insertions(+), 121 deletions(-) diff --git a/airtime_mvc/public/css/add-show.css b/airtime_mvc/public/css/add-show.css index 9a0a5a5b4..c9cce1869 100644 --- a/airtime_mvc/public/css/add-show.css +++ b/airtime_mvc/public/css/add-show.css @@ -1,21 +1,21 @@ #schedule-add-show, #fullcalendar_show_display { - float: left; + float: left; } #schedule-add-show { - font-size: 12px; - /*width: 25%;*/ - width:310px; + font-size: 12px; + /*width: 25%;*/ + width: 310px; } #schedule-add-show textarea { - width: 99%; - height: 80px; + width: 99%; + height: 80px; } #fullcalendar_show_display { - width: 60%; + width: 60%; } #schedule-add-show .ui-tabs-panel { @@ -23,16 +23,16 @@ } #schedule-add-show fieldset { - padding:8px; - margin-bottom:8px; + padding: 8px; + margin-bottom: 8px; } #schedule-add-show dl { - padding:8px; - margin-bottom:8px; - margin:0; - padding:0; - width:100%; + padding: 8px; + margin-bottom: 8px; + margin: 0; + padding: 0; + width: 100%; } #schedule-add-show dd { @@ -52,67 +52,67 @@ margin: 0; padding: 4px 0; text-align: left; - min-width:103px; - clear:left; + min-width: 103px; + clear: left; } #schedule-add-show dt.big { - min-width:130px; + min-width: 130px; } #schedule-add-show dt.block-display, #schedule-add-show dd.block-display { - display:block; - float:none; - margin-left:0; - padding-left:0; + display: block; + float: none; + margin-left: 0; + padding-left: 0; } #schedule-add-show dt label { - padding-right:0; + padding-right: 0; } .wrapp-label { - padding:0; - height:16px; - display:block; - line-height:18px; + padding: 0; + height: 16px; + display: block; + line-height: 18px; } label.wrapp-label input[type="checkbox"] { - float:left; - margin:-1px 2px 0 0; + float: left; + margin: -1px 2px 0 0; } #schedule-add-show fieldset:last-child { - margin-bottom:0; + margin-bottom: 0; } #schedule-add-show fieldset dd input[type="checkbox"] { - margin-top:2px; + margin-top: 2px; } -#add_show_day_check-element.block-display { - margin-bottom:15px; - margin-top:7px; +#add_show_day_check-element.block-display { + margin-bottom: 15px; + margin-top: 7px; } #add_show_day_check-element.block-display label.wrapp-label { - font-size:12px; - float:left; - margin-right:10px; + font-size: 12px; + float: left; + margin-right: 10px; } #add_show_name-element .input_text { - /*width:99%;*/ + /*width:99%;*/ } #schedule-add-show-overlap { - border: 1px solid #c83f3f; - background: #c6b4b4; - margin-top:8px; - padding:8px; - color:#902d2d; - display:none; + border: 1px solid #c83f3f; + background: #c6b4b4; + margin-top: 8px; + padding: 8px; + color: #902d2d; + display: none; } #add_show_hosts-element { @@ -121,38 +121,90 @@ label.wrapp-label input[type="checkbox"] { overflow: auto; } -#add_show_start_time, #add_show_end_time { - width: 54px; - margin-left:10px; +#add_show_start_time, #add_show_end_time { + width: 54px; + margin-left: 10px; } -#add_show_end_date_no_repeat, #add_show_start_date { - width: 89px; +#add_show_end_date_no_repeat, #add_show_start_date { + width: 89px; } -#add_show_duration { - background: #AAAAAA; - cursor: default; - width: 65px; +#add_show_duration { + background: #AAAAAA; + cursor: default; + width: 65px; } [id^=add_show_instance_description] { - display: none; + display: none; } -#add_show_logo_current, +#add_show_logo_current, #add_show_logo_preview { border: 1px solid #5b5b5b; - -webkit-box-shadow: 0px 0px 2px 1px rgba(48,48,48,1); - -moz-box-shadow: 0px 0px 2px 1px rgba(48,48,48,1); - box-shadow: 0px 0px 2px 1px rgba(48,48,48,1); - width: 200px; - height: 200px; - display: none; - cursor: default; + -webkit-box-shadow: 0px 0px 2px 1px rgba(48, 48, 48, 1); + -moz-box-shadow: 0px 0px 2px 1px rgba(48, 48, 48, 1); + box-shadow: 0px 0px 2px 1px rgba(48, 48, 48, 1); + width: 200px; + height: 200px; + display: none; + cursor: default; } #add_show_logo_current_remove { display: none; - height: 28px; + height: 28px; } + +.add-button { + cursor: pointer; +} + +.add-button { + border: 1px solid #5b5b5b; + background-color: #767676; + background: -moz-linear-gradient(top, #868686 0, #6e6e6e 100%); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #868686), color-stop(100%, #6e6e6e)); + color: #ffffff; + margin:0; + font-size:12px; + font-weight:bold; + padding:4px 12px 4px 22px; + text-decoration:none; + /*text-shadow: #000 0px -1px;*/ + display:block; + float:left; + position:relative; +} +.add-button:hover { + border: 1px solid #000000; + background-color: #353535; + background: -moz-linear-gradient(top, #353535 0, #000000 100%); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #353535), color-stop(100%, #000000)); + color: #ffffff; +} +.add-button span { + position:absolute; + top:3px; + left:3px; + height:16px; + width:16px; + display:block; + background:url(redmond/images/ui-icons_ffffff_256x240.png) no-repeat; +} +/*.add-button:hover span {*/ + /*background:url(redmond/images/ui-icons_ff5d1a_256x240.png) no-repeat;*/ +/*}*/ +.add-button span.add-icon { + background-position: -32px -129px; +} + +.add-button[disabled] { + cursor: auto; + color: #e7e7e7; + border: 1px solid #a1a1a1; + background-color: #b1b1b1; + background: -moz-linear-gradient(top, #c7c7c7 0, #c7c7c7 100%); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #c7c7c7), color-stop(100%, #c7c7c7)); +} \ No newline at end of file diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css index d9031f095..fad4eff17 100644 --- a/airtime_mvc/public/css/styles.css +++ b/airtime_mvc/public/css/styles.css @@ -1901,44 +1901,6 @@ span.errors.sp-errors{ height:38px; } -.add-button, .ui-widget-content a.add-button { - border: 1px solid #242424; - background-color: #353535; - background: -moz-linear-gradient(top, #494949 0, #353535 100%); - background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #494949), color-stop(100%, #353535)); - color: #ffffff; - margin:0; - font-size:12px; - font-weight:bold; - padding:4px 12px 4px 22px; - text-decoration:none; - text-shadow: #000 0px -1px; - display:block; - float:left; - position:relative; -} -.add-button:hover, .ui-widget-content a.add-button:hover { - border: 1px solid #000000; - background-color: #353535; - background: -moz-linear-gradient(top, #353535 0, #000000 100%); - background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #353535), color-stop(100%, #000000)); - color: #ffffff; -} -.add-button span { - position:absolute; - top:3px; - left:3px; - height:16px; - width:16px; - display:block; - background:url(redmond/images/ui-icons_ffffff_256x240.png) no-repeat; -} -.add-button:hover span { - background:url(redmond/images/ui-icons_ff5d1a_256x240.png) no-repeat; -} -.add-button span.add-icon { - background-position: -32px -128px; -} /*---//////////////////// NOW PLAYING COLORS ////////////////////---*/ .playing-song, .datatable tr.playing-song:hover td { @@ -1958,7 +1920,6 @@ span.errors.sp-errors{ color:#FFF; } - /*---//////////////////// END NOW PLAYING COLORS ////////////////////---*/ .icon-link, .ui-widget-content a.icon-link { color: #646464; diff --git a/airtime_mvc/public/js/airtime/schedule/add-show.js b/airtime_mvc/public/js/airtime/schedule/add-show.js index a5804dbc5..5c67d1999 100644 --- a/airtime_mvc/public/js/airtime/schedule/add-show.js +++ b/airtime_mvc/public/js/airtime/schedule/add-show.js @@ -31,24 +31,26 @@ function openAddShowForm() { } } -function makeAddShowButton(){ - $('.fc-header-left') - .append('') - .append(''+$.i18n._("Show")+'') - .find('span.fc-button:last > a') - .click(function(){ - openAddShowForm(); - removeAddShowButton(); - }); +function makeAddShowButton() { + if($('.add-button').length === 0) { + $('.fc-header-left') + .append('') + .append('' + + '' + + ''); + } } -function removeAddShowButton(){ - var aTag = $('.fc-header-left') - .find("span.fc-button:last > a"); +function showForm() { + openAddShowForm(); + toggleAddShowButton(); +} - var span = aTag.parent(); - span.prev().remove(); - span.remove(); +function toggleAddShowButton(){ + var aTag = $('.add-button'); + aTag.prop('disabled', function(i, v) { return !v; }); } //$el is DOM element #add-show-form @@ -79,11 +81,11 @@ function closeAddShowForm(event) { windowResize(); $.get(baseUrl+"Schedule/get-form", {format:"json"}, function(json) { - + redrawAddShowForm($el, json.form); }); - makeAddShowButton(); + toggleAddShowButton(); } //dateText mm-dd-yy @@ -162,7 +164,7 @@ function beginEditShow(data){ } redrawAddShowForm($("#add-show-form"), data.newForm); - removeAddShowButton(); + toggleAddShowButton(); openAddShowForm(); } @@ -777,20 +779,20 @@ function setAddShowEvents(form) { .fullCalendar('render'); $addShowForm.hide(); + toggleAddShowButton(); $.get(baseUrl+"Schedule/get-form", {format:"json"}, function(json){ redrawAddShowForm($addShowForm, json.form); }); - makeAddShowButton(); } else { redrawAddShowForm($addShowForm, json.newForm); scheduleRefetchEvents(json); $addShowForm.hide(); + toggleAddShowButton(); } /* CC-6062: Resize the window to avoid stretching the last column */ windowResize(); makeAddShowButton(); - } }); }); diff --git a/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js b/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js index f51b7d8fe..a5ccf184d 100644 --- a/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js +++ b/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js @@ -110,6 +110,8 @@ function dayClick(date, allDay, jsEvent, view){ $("#schedule-show-when").show(); openAddShowForm(); + makeAddShowButton(); + toggleAddShowButton(); } } }