Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

This commit is contained in:
Yuchen Wang 2011-11-15 16:38:00 -05:00
commit 129feb573b
4 changed files with 9 additions and 8 deletions

View file

@ -5,10 +5,7 @@
<div class="stream-setting-content" <?php echo $this->stream_number != '1'?'style="display: none;':''?> id="<?=$s_name?>-config">
<fieldset class="padded">
<dl class="zend_form clearfix">
<dt id="<?=$s_name?>Liquidsoap-error-msg-label">
<label>Liquidsoap Status: </label>
</dt>
<dd id="<?=$s_name?>Liquidsoap-error-msg-element">
<dd id="<?=$s_name?>Liquidsoap-error-msg-element" class="liquidsoap_status">
<?php echo $this->liquidsoap_error_msg?>
</dd>
<dt id="<?=$s_name?>Enabled-label">