From 4b8944f221fe4e6f43c99f34f2e3546ff5a6883c Mon Sep 17 00:00:00 2001
From: Albert Santoni <albert.santoni@sourcefabric.org>
Date: Thu, 9 Jul 2015 09:22:49 -0400
Subject: [PATCH 1/2] Improved explanation for live streaming form

---
 .../views/scripts/form/preferences_livestream.phtml           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/airtime_mvc/application/views/scripts/form/preferences_livestream.phtml b/airtime_mvc/application/views/scripts/form/preferences_livestream.phtml
index 0c9393aea..9bf28c0b8 100644
--- a/airtime_mvc/application/views/scripts/form/preferences_livestream.phtml
+++ b/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() ?>

From d2ca10294fc40930732c76146f0ed0e1eb056678 Mon Sep 17 00:00:00 2001
From: Albert Santoni <albert.santoni@sourcefabric.org>
Date: Thu, 9 Jul 2015 10:18:21 -0400
Subject: [PATCH 2/2] Two Add Show form bugfixes

* Fixed the Show Source mount name not showing up in Add Show form
* Use Airtime Authenticaiton by default
---
 airtime_mvc/application/forms/AddShowLiveStream.php            | 3 ++-
 .../application/views/scripts/form/add-show-live-stream.phtml  | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/airtime_mvc/application/forms/AddShowLiveStream.php b/airtime_mvc/application/forms/AddShowLiveStream.php
index 3718aa7d6..57066db0b 100644
--- a/airtime_mvc/application/forms/AddShowLiveStream.php
+++ b/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(
diff --git a/airtime_mvc/application/views/scripts/form/add-show-live-stream.phtml b/airtime_mvc/application/views/scripts/form/add-show-live-stream.phtml
index fd2cbcc77..5707d9ed9 100644
--- a/airtime_mvc/application/views/scripts/form/add-show-live-stream.phtml
+++ b/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() ?>