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

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
parent 46a87ea534 aafd53b456
commit 129feb573b
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
airtime_mvc/application/forms/StreamSettingSubForm.php
View File

@ -155,7 +155,7 @@ class Application_Form_StreamSettingSubForm extends Zend_Form_SubForm{
}
$this->addElement($user);
$liquidsopa_error_msg = "Getting infomation from the server..";
$liquidsopa_error_msg = '<div class="stream-status status-info"><h3>Getting information from the server...</h3></div>';
$this->setDecorators(array(
array('ViewScript', array('viewScript' => 'form/stream-setting-form.phtml', "stream_number"=>$stream_number, "liquidsoap_error_msg"=>$liquidsopa_error_msg))

5
airtime_mvc/application/views/scripts/form/stream-setting-form.phtml
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">

6
airtime_mvc/public/css/styles.css
View File

@ -1095,6 +1095,10 @@ h2#scheduled_playlist_name span {
width:60%;
}
.simple-formblock .liquidsoap_status{
width: 95%;
}
.simple-formblock dd.block-display {
width: 100%;
}
@ -2425,4 +2429,4 @@ dd .stream-status {
}
.status-disabled h3 {
color:#646664;
}
}

4
airtime_mvc/public/js/airtime/preferences/streamsetting.js
View File

@ -90,9 +90,9 @@ function checkLiquidsoapStatus(){
}
var html
if(status == "OK"){
html = '<div class="stream-status status-good"><h3>Streaming server connection is working</h3></div>'
html = '<div class="stream-status status-good"><h3>Connected to the streaming server</h3></div>'
}else if(status == "N/A"){
html = '<div class="stream-status status-error"><h3>Cannot connect to the streaming server</h3><p>This stream is disabled</p></div>'
html = '<div class="stream-status status-disabled"><h3>The stream is disabled</h3></div>'
}else{
html = '<div class="stream-status status-error"><h3>Can not connect to the streaming server</h3><p>'+status+'</p></div>'
}