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

Merge branch 'fix/live-stream-source' of https://github.com/Robbt/libretime into Robbt-fix/live-stream-source

Browse source
This commit is contained in:
Robb Ebright 2017-03-14 19:22:32 -04:00
commit e873e0d8da
5 changed files with 216 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -15,8 +15,8 @@
<?php echo $this->element->getElement('master_username')->render() ?>
<span class="master_username_help_icon"></span>
<?php echo $this->element->getElement('master_password')->render() ?>
<?php echo $this->element->getElement("master_source_host")->render() ?>
<?php echo $this->element->getElement("master_source_port")->render() ?>
<?php echo $this->element->getElement("master_source_mount")->render() ?>
</fieldset>
@ -26,6 +26,7 @@
<p class="input-settings-inline-p">
<?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() ?>
<?php echo $this->element->getElement("show_source_mount")->render() ?>