From 4077858c8e37391a311747d903f983bbb7d864d9 Mon Sep 17 00:00:00 2001 From: James Date: Wed, 13 Jun 2012 12:46:26 -0400 Subject: [PATCH] CC-3927: Should automatically switch back to Master/Show stream if there is a connection interruption - chaning label and description text --- airtime_mvc/application/forms/LiveStreamingPreferences.php | 2 +- airtime_mvc/public/js/airtime/preferences/streamsetting.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/airtime_mvc/application/forms/LiveStreamingPreferences.php b/airtime_mvc/application/forms/LiveStreamingPreferences.php index cbedf9547..2b0bb85b3 100644 --- a/airtime_mvc/application/forms/LiveStreamingPreferences.php +++ b/airtime_mvc/application/forms/LiveStreamingPreferences.php @@ -17,7 +17,7 @@ class Application_Form_LiveStreamingPreferences extends Zend_Form_SubForm // automatic switch off $auto_transition = new Zend_Form_Element_Checkbox("auto_transition"); - $auto_transition->setLabel("Auto Source Transition") + $auto_transition->setLabel("Auto Switch Off") ->setValue(Application_Model_Preference::GetAutoTransition()) ->setDecorators(array('ViewHelper')); $this->addElement($auto_transition); diff --git a/airtime_mvc/public/js/airtime/preferences/streamsetting.js b/airtime_mvc/public/js/airtime/preferences/streamsetting.js index 3ecf3eff6..43a1f8b86 100644 --- a/airtime_mvc/public/js/airtime/preferences/streamsetting.js +++ b/airtime_mvc/public/js/airtime/preferences/streamsetting.js @@ -292,7 +292,7 @@ $(document).ready(function() { $("#auto_transition_help").qtip({ content: { - text: "Check this box to allow automatic transitions between sources. If enabled, Airtime will fallback to the next available source upon current (Master or Show) source failure. The fallback hierarchy is Master Source > Show Source > Scheduled Play." + text: "Check this box to automatically switch off Master/Show source upon source disconnection." }, hide: { delay: 500,