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

- removed "Allow override" checkbox from show live stream section.
- removed "auto enable live stream" checkbox from stream setting page.
- implemented authentication functionality of live dj source connection.
This commit is contained in:
James 2012-03-09 15:26:28 -05:00
parent efee025691
commit 540f262a77
14 changed files with 49 additions and 171 deletions

View file

@ -1,13 +1,5 @@
<fieldset>
<dl>
<dt id="allow_live_stream_override-label">
<label class="optional" for="allow_live_stream_override">
<?php echo $this->element->getElement('allow_live_stream_override')->getLabel() ?>
</label>
</dt>
<dd id="allow_live_stream_override-element">
<?php echo $this->element->getElement('allow_live_stream_override') ?>
</dd>
<dt id="cb_airtime_auth_override-label">
<label class="optional" for="cb_airtime_auth">
<?php echo $this->element->getElement('cb_airtime_auth')->getLabel() ?>

View file

@ -1,20 +1,6 @@
<fieldset class="padded stream-setting-global" style="margin-top: 15px">
<legend>Input Stream Settings</legend>
<dl class="zend_form">
<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): ?>
<li><?php echo $error; ?></li>
<?php endforeach; ?>
</ul>
<?php endif; ?>
</dd>
<dt id="master_username-label">
<label class="optional" for="master_username"><?php echo $this->element->getElement('master_username')->getLabel() ?> :
</label>