From 0440eb753913cc21d1835d74529735f932fdf92b Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin@localhost.localdomain>
Date: Mon, 5 Dec 2011 12:34:11 -0500
Subject: [PATCH] CC-3160: Once Hardware dropdown is changed, stream
 information does not refresh

-fixed
---
 .../scripts/form/stream-setting-form.phtml    | 30 +++++++++----------
 .../js/airtime/preferences/streamsetting.js   | 16 +++++-----
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/airtime_mvc/application/views/scripts/form/stream-setting-form.phtml b/airtime_mvc/application/views/scripts/form/stream-setting-form.phtml
index b033c72d5..5de236fe6 100644
--- a/airtime_mvc/application/views/scripts/form/stream-setting-form.phtml
+++ b/airtime_mvc/application/views/scripts/form/stream-setting-form.phtml
@@ -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>
\ No newline at end of file
+        </div>
diff --git a/airtime_mvc/public/js/airtime/preferences/streamsetting.js b/airtime_mvc/public/js/airtime/preferences/streamsetting.js
index 832baf47f..681bf43c0 100644
--- a/airtime_mvc/public/js/airtime/preferences/streamsetting.js
+++ b/airtime_mvc/public/js/airtime/preferences/streamsetting.js
@@ -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)
     
-});
\ No newline at end of file
+});