From 5503ebc6e5a3e16c2ac910501dfb805ee694bcc6 Mon Sep 17 00:00:00 2001
From: James <james@sourcefabric-DX4840.(none)>
Date: Thu, 10 Nov 2011 15:54:38 -0500
Subject: [PATCH 1/3] SAAS-35: "Trial Period" box

- done
---
 .../views/helpers/TrialRemaining.php          |  2 +-
 .../views/scripts/partialviews/header.phtml   | 22 +++++++++++--------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/airtime_mvc/application/views/helpers/TrialRemaining.php b/airtime_mvc/application/views/helpers/TrialRemaining.php
index baa1ac9e2..64a703a1c 100644
--- a/airtime_mvc/application/views/helpers/TrialRemaining.php
+++ b/airtime_mvc/application/views/helpers/TrialRemaining.php
@@ -11,6 +11,6 @@ class Airtime_View_Helper_TrialRemaining extends Zend_View_Helper_Abstract
         if($interval->format('%R') == '-'){
             return "Trial expired.";
         }
-        return $interval->format('%a days');
+        return $interval->format('%a');
     }
 }
diff --git a/airtime_mvc/application/views/scripts/partialviews/header.phtml b/airtime_mvc/application/views/scripts/partialviews/header.phtml
index 019f1dd4a..78daae413 100644
--- a/airtime_mvc/application/views/scripts/partialviews/header.phtml
+++ b/airtime_mvc/application/views/scripts/partialviews/header.phtml
@@ -32,19 +32,23 @@
   </div>
     <div class="listen-control-block"> 
         <a class="" href="#"><span>Listen</span></a> 
-    </div> 
-  <?php if($this->is_trial){?>
-  <div class="trial-info-block">
-    <ul>
-      <li>Trial remaining</li>
-      <li><?php echo $this->trial_remain?></li>
-    </ul>
-  </div>
-  <?php }?>
+    </div>
   <div class="personal-block">
     <ul>
       <li><span class="name"><?php echo $this->user ?></span> | <a href="/Login/logout">Logout</a></li>
     </ul>
   </div>
+  <?php if($this->is_trial){?>
+  <div class="trial-box">
+      <p>Your Trial expires in</p>
+      <div class="trial-box-calendar">
+           <span class="trial-box-calendar-white"><?php echo $this->trial_remain?></span>
+           <div class="trial-box-calendar-gray">days</div>
+      </div>
+      <div class="trial-box-button">
+            <a title="Purchase your copy of Airtime" href="#">Keep going on</a>
+      </div>
+  </div>
+  <?php }?> 
 </div>
 <div id="jquery_jplayer_1" class="jp-jplayer" style="width:0px; height:0px;"></div>

From 8d3d14860d21daa19789693d1d54066e9a1d38dd Mon Sep 17 00:00:00 2001
From: James <james@sourcefabric-DX4840.(none)>
Date: Thu, 10 Nov 2011 16:32:56 -0500
Subject: [PATCH 2/3] CC-2959: Stream Setting: Status box design for each
 stream

- integration with new status box design
---
 .../public/js/airtime/preferences/streamsetting.js   | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/airtime_mvc/public/js/airtime/preferences/streamsetting.js b/airtime_mvc/public/js/airtime/preferences/streamsetting.js
index a97df38ca..d4198868f 100644
--- a/airtime_mvc/public/js/airtime/preferences/streamsetting.js
+++ b/airtime_mvc/public/js/airtime/preferences/streamsetting.js
@@ -86,7 +86,15 @@ function checkLiquidsoapStatus(){
                     status = obj[key];
                 }
             }
-            $("#s"+id+"Liquidsoap-error-msg-element").html(status);
+            var html
+            if(status == "OK"){
+                html = '<div class="stream-status status-good"><h3>Streaming server connection is working</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>'
+            }else{
+                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);
         }
     });
 }
@@ -150,6 +158,6 @@ $(document).ready(function() {
     })
     
     showErrorSections()
-    setInterval('checkLiquidsoapStatus()', 5000)
+    setInterval('checkLiquidsoapStatus()', 7000)
     
 });
\ No newline at end of file

From 03a81e642e07535da2c489c7ed4b216bf9272292 Mon Sep 17 00:00:00 2001
From: James <james@sourcefabric-DX4840.(none)>
Date: Thu, 10 Nov 2011 16:36:17 -0500
Subject: [PATCH 3/3] CC-2438: Add a button to listen to the stream immediately

- moved listen button under the "ON AIR"
---
 .../application/views/scripts/partialviews/header.phtml       | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/airtime_mvc/application/views/scripts/partialviews/header.phtml b/airtime_mvc/application/views/scripts/partialviews/header.phtml
index 78daae413..41c3053aa 100644
--- a/airtime_mvc/application/views/scripts/partialviews/header.phtml
+++ b/airtime_mvc/application/views/scripts/partialviews/header.phtml
@@ -22,6 +22,7 @@
     </div>
   <div class="on-air-block">
     <div class="on-air-info off" id="on-air-info">ON AIR</div>
+    <a href="#" class="listen-control-button"><span>Listen</span></a>
   </div>
   <div class="time-info-block">
     <ul>
@@ -30,9 +31,6 @@
       <li class="time-zone"><span id="time-zone"></span></li>
     </ul>
   </div>
-    <div class="listen-control-block"> 
-        <a class="" href="#"><span>Listen</span></a> 
-    </div>
   <div class="personal-block">
     <ul>
       <li><span class="name"><?php echo $this->user ?></span> | <a href="/Login/logout">Logout</a></li>