Merge branch 'saas-dev' of https://github.com/sourcefabric/Airtime into saas-dev

airtime_mvc/application/forms/AddShowLiveStream.php

@@ -8,6 +8,7 @@ class Application_Form_AddShowLiveStream extends Zend_Form_SubForm
     {
         $cb_airtime_auth = new Zend_Form_Element_Checkbox("cb_airtime_auth");
         $cb_airtime_auth->setLabel(sprintf(_("Use %s Authentication:"), PRODUCT_NAME))
+                          ->setChecked(true)
                           ->setRequired(false);
         $this->addElement($cb_airtime_auth);
 
@@ -57,7 +58,7 @@ class Application_Form_AddShowLiveStream extends Zend_Form_SubForm
         $showSourceMount = new Zend_Form_Element_Text('show_source_mount');
         $showSourceMount->setAttrib('readonly', true)
             ->setLabel(_('Mount:'))
-            ->setValue(isset($showSourceParams["mount"])?$showSourceParams["mount"]:"");
+            ->setValue(isset($showSourceParams["path"])?$showSourceParams["path"]:"");
         $this->addElement($showSourceMount);
 
         $this->setDecorators(

airtime_mvc/application/views/scripts/form/add-show-live-stream.phtml

@@ -9,7 +9,7 @@
         <fieldset>
             <legend><?php echo _("Show Source") ?></legend>
             <p class="input-settings-inline-p">
-                <?php echo _("DJs can use these settings to connect and broadcast live during this show (with compatible software)") ?>
+                <?php echo _("DJs can use these settings to connect with compatible software and broadcast live during this show. Assign a DJ below.") ?>
             </p>
             <?php echo $this->element->getElement("show_source_host")->render() ?>
             <?php echo $this->element->getElement("show_source_port")->render() ?>

airtime_mvc/application/views/scripts/form/preferences_livestream.phtml

@@ -10,7 +10,7 @@
         <fieldset class="padded stream-setting-global" style="margin-top: 15px">
             <legend><?php echo _("Master Source") ?></legend>
             <p class="input-settings-inline-p">
-                <?php echo _("Use these settings in your broadcasting software to connect to Master Source") ?>
+                <?php echo _("Use these settings in your broadcasting software to stream live at any time.") ?>
             </p>
             <?php echo $this->element->getElement('master_username')->render() ?>
             <span class="master_username_help_icon"></span>
@@ -24,7 +24,7 @@
         <fieldset class="padded stream-setting-global" style="margin-top: 15px">
             <legend><?php echo _("Show Source") ?></legend>
             <p class="input-settings-inline-p">
-                <?php echo _("These settings allow DJs to connect to individual shows through Show Source") ?>
+                <?php echo _("DJs can use these settings in their broadcasting software to broadcast live only during shows assigned to them.") ?>
             </p>
             <?php echo $this->element->getElement("show_source_host")->render() ?>
             <?php echo $this->element->getElement("show_source_port")->render() ?>