Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
drigato 2015-07-09 10:35:05 -04:00
parent 5ec3684ea6 d2ca10294f
commit 7c927dcb31
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
airtime_mvc/application/forms/AddShowLiveStream.php
View File

@ -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 = new Zend_Form_Element_Checkbox("cb_airtime_auth");
$cb_airtime_auth->setLabel(sprintf(_("Use %s Authentication:"), PRODUCT_NAME)) $cb_airtime_auth->setLabel(sprintf(_("Use %s Authentication:"), PRODUCT_NAME))
->setChecked(true)
->setRequired(false); ->setRequired(false);
$this->addElement($cb_airtime_auth); $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 = new Zend_Form_Element_Text('show_source_mount');
$showSourceMount->setAttrib('readonly', true) $showSourceMount->setAttrib('readonly', true)
->setLabel(_('Mount:')) ->setLabel(_('Mount:'))
->setValue(isset($showSourceParams["mount"])?$showSourceParams["mount"]:""); ->setValue(isset($showSourceParams["path"])?$showSourceParams["path"]:"");
$this->addElement($showSourceMount); $this->addElement($showSourceMount);
$this->setDecorators( $this->setDecorators(

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

@ -9,7 +9,7 @@
<fieldset> <fieldset>
<legend><?php echo _("Show Source") ?></legend> <legend><?php echo _("Show Source") ?></legend>
<p class="input-settings-inline-p"> <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> </p>
<?php echo $this->element->getElement("show_source_host")->render() ?> <?php echo $this->element->getElement("show_source_host")->render() ?>
<?php echo $this->element->getElement("show_source_port")->render() ?> <?php echo $this->element->getElement("show_source_port")->render() ?>

4
airtime_mvc/application/views/scripts/form/preferences_livestream.phtml
View File

@ -10,7 +10,7 @@
<fieldset class="padded stream-setting-global" style="margin-top: 15px"> <fieldset class="padded stream-setting-global" style="margin-top: 15px">
<legend><?php echo _("Master Source") ?></legend> <legend><?php echo _("Master Source") ?></legend>
<p class="input-settings-inline-p"> <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> </p>
<?php echo $this->element->getElement('master_username')->render() ?> <?php echo $this->element->getElement('master_username')->render() ?>
<span class="master_username_help_icon"></span> <span class="master_username_help_icon"></span>
@ -24,7 +24,7 @@
<fieldset class="padded stream-setting-global" style="margin-top: 15px"> <fieldset class="padded stream-setting-global" style="margin-top: 15px">
<legend><?php echo _("Show Source") ?></legend> <legend><?php echo _("Show Source") ?></legend>
<p class="input-settings-inline-p"> <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> </p>
<?php echo $this->element->getElement("show_source_host")->render() ?> <?php echo $this->element->getElement("show_source_host")->render() ?>
<?php echo $this->element->getElement("show_source_port")->render() ?> <?php echo $this->element->getElement("show_source_port")->render() ?>