From 6229ca46d5442f5d7d94ac42a06d2220f191f969 Mon Sep 17 00:00:00 2001
From: James <james@sourcefabric-DX4840.(none)>
Date: Tue, 15 Nov 2011 16:27:23 -0500
Subject: [PATCH] CC-2959: Stream Setting: Status box design for each stream

- integrated new status boxes
---
 airtime_mvc/application/forms/StreamSettingSubForm.php      | 2 +-
 .../views/scripts/form/stream-setting-form.phtml            | 5 +----
 airtime_mvc/public/css/styles.css                           | 6 +++++-
 airtime_mvc/public/js/airtime/preferences/streamsetting.js  | 4 ++--
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/airtime_mvc/application/forms/StreamSettingSubForm.php b/airtime_mvc/application/forms/StreamSettingSubForm.php
index 70e28a7ba..ad12ebe67 100644
--- a/airtime_mvc/application/forms/StreamSettingSubForm.php
+++ b/airtime_mvc/application/forms/StreamSettingSubForm.php
@@ -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))
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 07f8bf9bc..5417b35a6 100644
--- a/airtime_mvc/application/views/scripts/form/stream-setting-form.phtml
+++ b/airtime_mvc/application/views/scripts/form/stream-setting-form.phtml
@@ -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">
diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css
index 04fc58027..45078cbed 100644
--- a/airtime_mvc/public/css/styles.css
+++ b/airtime_mvc/public/css/styles.css
@@ -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;
-}
\ No newline at end of file
+}
diff --git a/airtime_mvc/public/js/airtime/preferences/streamsetting.js b/airtime_mvc/public/js/airtime/preferences/streamsetting.js
index 09cc06529..bf29514c2 100644
--- a/airtime_mvc/public/js/airtime/preferences/streamsetting.js
+++ b/airtime_mvc/public/js/airtime/preferences/streamsetting.js
@@ -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>'
             }