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

CC-3224: "On-the-fly" stream rebroadcasting

Browse source 
- web interface
- auth script for liquidsoap
- DB changes
This commit is contained in:
James 2012-02-21 17:58:05 -05:00
parent 701ed82f40
commit 48bb19d758
26 changed files with 650 additions and 101 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -8,21 +8,31 @@
<dd id="allow_live_stream_override-element">
<?php echo $this->element->getElement('allow_live_stream_override') ?>
</dd>
<dt id="security_setting1_override-label">
<label class="optional" for="security_setting1">
<?php echo $this->element->getElement('security_setting1')->getLabel() ?>
<dt id="cb_airtime_auth_override-label">
<label class="optional" for="cb_airtime_auth">
<?php echo $this->element->getElement('cb_airtime_auth')->getLabel() ?>
<span class='info-tooltip'>
<span>
<?php echo $this->element->getElement('cb_airtime_auth')->getDescription() ?>
</span>
</span>
</label>
</dt>
<dd id="security_setting1_override-element">
<?php echo $this->element->getElement('security_setting1') ?>
<dd id="cb_airtime_auth_override-element">
<?php echo $this->element->getElement('cb_airtime_auth') ?>
</dd>
<dt id="security_setting2_override-label">
<label class="optional" for="security_setting2">
<?php echo $this->element->getElement('security_setting2')->getLabel() ?>
<dt id="cb_custom_auth_override-label">
<label class="optional" for="cb_custom_auth">
<?php echo $this->element->getElement('cb_custom_auth')->getLabel() ?>
<span class='info-tooltip'>
<span>
<?php echo $this->element->getElement('cb_custom_auth')->getDescription() ?>
</span>
</span>
</label>
</dt>
<dd id="security_setting2_override-element">
<?php echo $this->element->getElement('security_setting2') ?>
<dd id="cb_custom_auth_override-element">
<?php echo $this->element->getElement('cb_custom_auth') ?>
</dd>
@ -54,6 +64,12 @@
</ul>
<?php endif; ?>
</dd>
<dt id="Connection_URL-label">
<label for="outputStreamURL">Connection URL: </label>
</dt>
<dd id="Connection_URL-element">
<span id="stream_url"><?php echo $this->connection_url; ?></span>
</dd>
</dl>
</fieldset>

6
airtime_mvc/application/views/scripts/form/preferences.phtml
View file

@ -2,12 +2,6 @@
<?php echo $this->element->getSubform('preferences_general') ?>
<h3 class="collapsible-header" id="livestream-heading"><span class="arrow-icon"></span>On-the-fly Live Stream Settings</h3>
<div class="collapsible-content" id="livestream-settings" style="display: none;">
<?php echo $this->element->getSubform('preferences_livestream') ?>
</div>
<h3 class="collapsible-header" id="soundcloud-heading"><span class="arrow-icon"></span>SoundCloud Settings</h3>
<div class="collapsible-content" id="soundcloud-settings" style="display: none;">

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

@ -1,10 +1,12 @@
<fieldset class="padded">
<fieldset class="padded stream-setting-global" style="margin-top: 15px">
<legend>Input Stream Settings</legend>
<dl class="zend_form">
<dd id="auto_enable_live_stream-element" class="block-display" style=" margin:6px 0 10px 0">
<label class="optional" for="auto_enable_live_stream">
<?php echo $this->element->getElement('auto_enable_live_stream') ?>
<strong><?php echo $this->element->getElement('auto_enable_live_stream')->getLabel() ?></strong>
<dt id="auto_enable_live_stream-label">
<label class="optional" for="auto_enable_live_stream"><?php echo $this->element->getElement('auto_enable_live_stream')->getLabel() ?> :
</label>
</dt>
<dd id="auto_enable_live_stream-element">
<?php echo $this->element->getElement('auto_enable_live_stream') ?>
<?php if($this->element->getElement('auto_enable_live_stream')->hasErrors()) : ?>
<ul class='errors'>
<?php foreach($this->element->getElement('auto_enable_live_stream')->getMessages() as $error): ?>
@ -13,11 +15,11 @@
</ul>
<?php endif; ?>
</dd>
<dt id="master_username-label" class="block-display">
<dt id="master_username-label">
<label class="optional" for="master_username"><?php echo $this->element->getElement('master_username')->getLabel() ?> :
</label>
</dt>
<dd id="master_username-element" class="block-display">
<dd id="master_username-element">
<?php echo $this->element->getElement('master_username') ?>
<?php if($this->element->getElement('master_username')->hasErrors()) : ?>
<ul class='errors'>
@ -27,11 +29,11 @@
</ul>
<?php endif; ?>
</dd>
<dt id="master_password-label" class="block-display">
<dt id="master_password-label">
<label class="optional" for="master_password"><?php echo $this->element->getElement('master_password')->getLabel() ?> :
</label>
</dt>
<dd id="master_password-element" class="block-display">
<dd id="master_password-element">
<?php echo $this->element->getElement('master_password') ?>
<?php if($this->element->getElement('master_password')->hasErrors()) : ?>
<ul class='errors'>