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

Merge branch 'saas-dev' into saas-stream-settings

Browse source 
Conflicts:
	airtime_mvc/application/models/Preference.php
This commit is contained in:
Duncan Sommerville 2015-07-10 10:29:38 -04:00
commit 37ed35f5b2
16 changed files with 94 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -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() ?>

3
airtime_mvc/application/views/scripts/form/preferences_general.phtml
View file

@ -37,5 +37,8 @@
<?php echo $this->element->getElement('thirdPartyApi')->render() ?>
<?php echo $this->element->getElement('radioPageLoginButton')->renderViewHelper() ?>
<?php echo $this->element->getElement('radioPageLoginButton')->renderLabel() ?>
</dl>
</fieldset>

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">
<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() ?>

10
airtime_mvc/application/views/scripts/index/index.phtml
View file

@ -24,12 +24,14 @@ document.getElementById(id).width= (newwidth) + "px";
echo "<a href='#' class='logo'><img src='data:image/png;base64," . $this->stationLogo . "'></a>";
} ?>
<div class="login-btn">
<a href="/login" target="_parent">
<?php if ($this->displayLoginButton) {
echo "<div class='login-btn'>
<a href='/login' target='_parent'>
<span>Login</span>
<span class="login-img"></span>
<span class='login-img'></span>
</a>
</div>
</div>";
}?>
<div id="tab-1" class="schedule tab_content current">
<iframe onLoad="autoResize('schedule_iframe');" id="schedule_iframe" height="300px" scrolling="yes" frameborder="0" src=<?php echo $this->stationUrl."embed/weekly-program?style=premium"?>></iframe>