From 15c84ddfdb044364a13fae0a47fa111fe738c548 Mon Sep 17 00:00:00 2001 From: Yuchen Wang Date: Thu, 17 Nov 2011 23:25:46 -0500 Subject: [PATCH 1/3] CC-2950: Tell users if they are running an out-of-date version or not - changed default url to "http://airtime.sourcefabric.org" --- airtime_mvc/application/models/Preference.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/airtime_mvc/application/models/Preference.php b/airtime_mvc/application/models/Preference.php index 82b29e387..2307b458a 100644 --- a/airtime_mvc/application/models/Preference.php +++ b/airtime_mvc/application/models/Preference.php @@ -530,7 +530,7 @@ class Application_Model_Preference public static function GetLatestLink(){ $link = self::GetValue("latest_link"); if($link == null || strlen($link) == 0) { - return "http://www.sourcefabric.org/en/airtime/download/"; + return 'http://airtime.sourcefabric.org'; } else { return $link; } From 6b7d7646c956e6532f3b51b7b623df23db438369 Mon Sep 17 00:00:00 2001 From: James Date: Fri, 18 Nov 2011 11:18:35 -0500 Subject: [PATCH 2/3] CC-3062: Stream Setting: Status box is not working for shoutcast - fixed. added on_error and on_connect callback to shoutcast() --- python_apps/pypo/liquidsoap_scripts/ls_lib.liq | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/python_apps/pypo/liquidsoap_scripts/ls_lib.liq b/python_apps/pypo/liquidsoap_scripts/ls_lib.liq index 47c035700..d278d570b 100644 --- a/python_apps/pypo/liquidsoap_scripts/ls_lib.liq +++ b/python_apps/pypo/liquidsoap_scripts/ls_lib.liq @@ -143,7 +143,9 @@ def output_to(output_type, type, bitrate, host, port, pass, mount_point, url, de url = !url_ref, genre = !genre_ref, name = !description_ref, - user = !user_ref) + user = !user_ref, + on_error = on_error, + on_connect = on_connect) if bitrate == 24 then ignore(output.shoutcast(%mp3(bitrate = 24),s)) elsif bitrate == 32 then From e5ac2b75d4748b4db63b8f22965af92e1f11ff34 Mon Sep 17 00:00:00 2001 From: James Date: Fri, 18 Nov 2011 11:36:20 -0500 Subject: [PATCH 3/3] CC-3059: Record and Rebroadcast: not able to set rebroadcast too close to recorded show - fixed. - extra fix: layout was broken when error is displayed --- .../controllers/ScheduleController.php | 22 +++++++++++++++++++ airtime_mvc/public/css/styles.css | 1 - 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/airtime_mvc/application/controllers/ScheduleController.php b/airtime_mvc/application/controllers/ScheduleController.php index 3896aa594..1a75f27e7 100644 --- a/airtime_mvc/application/controllers/ScheduleController.php +++ b/airtime_mvc/application/controllers/ScheduleController.php @@ -730,6 +730,28 @@ class ScheduleController extends Zend_Controller_Action Application_Model_Schedule::createNewFormSections($this->view); $this->view->newForm = $this->view->render('schedule/add-show-form.phtml'); + }else{ + $this->view->what = $formWhat; + $this->view->when = $formWhen; + $this->view->repeats = $formRepeats; + $this->view->who = $formWho; + $this->view->style = $formStyle; + $this->view->rr = $formRecord; + $this->view->absoluteRebroadcast = $formAbsoluteRebroadcast; + $this->view->rebroadcast = $formRebroadcast; + $this->view->addNewShow = true; + + //the form still needs to be "update" since + //the validity test failed. + if ($data['add_show_id'] != -1){ + $this->view->addNewShow = false; + } + if (!$startDateModified){ + $formWhen->getElement('add_show_start_date')->setOptions(array('disabled' => true)); + } + + $this->view->form = $this->view->render('schedule/add-show-form.phtml'); + } }else{ $userInfo = Zend_Auth::getInstance()->getStorage()->read(); diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css index 45078cbed..022b26a26 100644 --- a/airtime_mvc/public/css/styles.css +++ b/airtime_mvc/public/css/styles.css @@ -1516,7 +1516,6 @@ div.success{ list-style-type:none; margin:0 0 8px 0; padding:0; - height:25px; display:block; } /*