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

CC-3160: Once Hardware dropdown is changed, stream information does not refresh 

-fixed
This commit is contained in:
Martin Konecny 2011-12-05 12:34:11 -05:00
parent beab24d068
commit 0440eb7539
2 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
airtime_mvc/application/views/scripts/form/stream-setting-form.phtml
View File

@ -2,30 +2,30 @@
$s_name = "s".$this->stream_number;
?>
<h3 class="collapsible-header <?php echo $this->stream_number == '1'?"close":""?>"><span class="arrow-icon"></span>Stream <?php echo $this->stream_number?></h3>
<div class="stream-setting-content" <?php echo $this->enabled == 0?'style="display: none;':''?> id="<?=$s_name?>-config">
<div class="stream-setting-content" <?php echo $this->enabled == 0?'style="display: none;':''?> id="<?php echo $s_name?>-config">
<fieldset class="padded">
<dl class="zend_form clearfix">
<dd id="<?=$s_name?>Liquidsoap-error-msg-element" class="liquidsoap_status">
<dd id="<?php echo $s_name?>Liquidsoap-error-msg-element" class="liquidsoap_status">
<?php echo $this->liquidsoap_error_msg?>
</dd>
<dt id="<?=$s_name?>Enabled-label">
<label for="<?=$s_name?>Enabled"><?php echo $this->element->getElement('enable')->getLabel() ?></label>
<dt id="<?php echo $s_name?>Enabled-label">
<label for="<?php echo $s_name?>Enabled"><?php echo $this->element->getElement('enable')->getLabel() ?></label>
</dt>
<dd id="<?=$s_name?>Enabled-element">
<dd id="<?php echo $s_name?>Enabled-element">
<?php echo $this->element->getElement('enable')?>
</dd>
<dt id="<?=$s_name?>Type-label">
<label for="<?=$s_name?>Type"><?php echo $this->element->getElement('type')->getLabel()?></label>
<dt id="<?php echo $s_name?>Type-label">
<label for="<?php echo $s_name?>Type"><?php echo $this->element->getElement('type')->getLabel()?></label>
</dt>
<dd id="<?=$s_name?>Type-element">
<dd id="<?php echo $s_name?>Type-element">
<?php echo $this->element->getElement('type')?>
</dd>
<dt id="<?=$s_name?>Bitrate-label">
<label for="<?=$s_name?>Bitrate"><?php echo $this->element->getElement('bitrate')->getLabel()?></label>
<dt id="<?php echo $s_name?>Bitrate-label">
<label for="<?php echo $s_name?>Bitrate"><?php echo $this->element->getElement('bitrate')->getLabel()?></label>
</dt>
<dd id="<?=$s_name?>Bitrate-element">
<dd id="<?php echo $s_name?>Bitrate-element">
<?php echo $this->element->getElement('bitrate')?>
</dd>
<dt id="outputServer-label">
@ -54,10 +54,10 @@
</ul>
<?php endif; ?>
</dd>
<dt id="<?=$s_name?>Output-label">
<label for="<?=$s_name?>Output"><?php echo $this->element->getElement('output')->getLabel()?></label>
<dt id="<?php echo $s_name?>Output-label">
<label for="<?php echo $s_name?>Output"><?php echo $this->element->getElement('output')->getLabel()?></label>
</dt>
<dd id="<?=$s_name?>Output-element">
<dd id="<?php echo $s_name?>Output-element">
<?php echo $this->element->getElement('output')?>
</dd>
@ -159,4 +159,4 @@
</dd>
</dl>
</fieldset>
</div>
</div>

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

@ -81,8 +81,8 @@ function checkLiquidsoapStatus(){
var json_obj = jQuery.parseJSON(json);
for(var i=0;i<json_obj.length;i++){
var obj = json_obj[i];
var id
var status
var id;
var status;
for(var key in obj){
if(key == "id"){
id = obj[key];
@ -91,15 +91,15 @@ function checkLiquidsoapStatus(){
status = obj[key];
}
}
var html
var html;
if(status == "OK"){
html = '<div class="stream-status status-good"><h3>Connected to the streaming server</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-disabled"><h3>The stream is disabled</h3></div>'
html = '<div class="stream-status status-disabled"><h3>The stream is disabled</h3></div>';
}else if(status == "waiting"){
html = '<div class="stream-status status-info"><h3>Getting information from the server...</h3></div>'
html = '<div class="stream-status status-info"><h3>Getting information from the server...</h3></div>';
}else{
html = '<div class="stream-status status-error"><h3>Can not connect to the streaming server</h3><p>'+status+'</p></div>'
html = '<div class="stream-status status-error"><h3>Can not connect to the streaming server</h3><p>'+status+'</p></div>';
}
$("#s"+id+"Liquidsoap-error-msg-element").html(html);
}
@ -175,4 +175,4 @@ $(document).ready(function() {
showErrorSections()
setInterval('checkLiquidsoapStatus()', 1000)
});
});