From a947306222f3ea928dd41e2c2f12664f1f1b73dd Mon Sep 17 00:00:00 2001
From: martin <martin@martin-ThinkPad-T410.(none)>
Date: Fri, 11 Mar 2011 13:56:13 -0500
Subject: [PATCH] CC-2002

GUI changes done
---
 application/models/Shows.php                    |   2 +-
 .../views/scripts/partialviews/header.phtml     |  16 ++++++++++------
 public/css/images/record_icon.png               | Bin 0 -> 1648 bytes
 public/js/playlist/playlist.js                  |   6 +++++-
 4 files changed, 16 insertions(+), 8 deletions(-)
 create mode 100644 public/css/images/record_icon.png

diff --git a/application/models/Shows.php b/application/models/Shows.php
index c36a987b2..976bb253f 100644
--- a/application/models/Shows.php
+++ b/application/models/Shows.php
@@ -737,7 +737,7 @@ class Show_DAL{
 		$date = $timestamp[0];
 		$time = $timestamp[1];
         
-        $sql = "SELECT si.starts as start_timestamp, si.ends as end_timestamp, s.name, s.id, si.id as instance_id"
+        $sql = "SELECT si.starts as start_timestamp, si.ends as end_timestamp, s.name, s.id, si.id as instance_id, si.record"
         ." FROM $CC_CONFIG[showInstances] si, $CC_CONFIG[showTable] s"
         ." WHERE si.show_id = s.id"
         ." AND si.starts <= TIMESTAMP '$timeNow'"
diff --git a/application/views/scripts/partialviews/header.phtml b/application/views/scripts/partialviews/header.phtml
index 2eea3063c..4905d0d10 100644
--- a/application/views/scripts/partialviews/header.phtml
+++ b/application/views/scripts/partialviews/header.phtml
@@ -9,13 +9,17 @@
     </div>
     <div class="text-row next-song"><strong>Next:</strong> <span id='next'></span> <span id='next-length'></span></div>
   </div>
-  <div class="show-block">
-    <div class="text-row">&nbsp;</div>
-    <div class="now-playing-info show"> <span id='playlist'></span> <span class="length" id="show-length"></span> </div>
-    <div class="progressbar">
-      <div class="progress-show" id='progress-show' style="width:0%;"></div>
+    <div class="show-block">
+      <div class="text-row">&nbsp;</div>
+      <div class="now-playing-info show">
+        <div class="recording-show" style="display: none;"></div>
+        <span id="playlist"></span>
+        <span class="lenght">00:00</span>
+      </div>
+      <div class="progressbar">
+        <div class="progress-show" id='progress-show' style="width:0%;"></div>
+      </div>
     </div>
-  </div>
   <div class="on-air-block">
     <div class="on-air-info off" id="on-air-info">ON AIR</div>
   </div>
diff --git a/public/css/images/record_icon.png b/public/css/images/record_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..5e468705b2240448eb7c7993fa006f781ac83ad9
GIT binary patch
literal 1648
zcmaJ?drT8|96yF}#(^@>z}Q@l0*WGiQs8cF5onR3?GWo)(K?UzfD_s)?ezhIj{<^*
z38JHliZUEn#!CiHK;m$SFab9-#<)}v4aQAiI>$tv?23T<W9*W<-y@&T=ll93w?9U_
z)_I}lLI41qg;D%ia&@=A3+9vG!Bsa;lgkH$Kt^oD69^-sMS(CS9*=@T6_SX?qKGmr
zwHxICfFp=WWQ0t#9#-HgDq_b_O)3q^1^`Z|NrNboQ38xd6EQWHGS+&D0%A%oMamY@
zMVbgS35!bCq8ro25=DBl0#Z^!c_7CGlL9J~KtPi!MXiHPT*{O#Oz!R1GzvHcA(FY2
zH%ZAvF<=C)ML{-|9-yEH(ZL`FmB9)O4h~)oGU*IDjn1Som;sDnn8k$Yba48ikkPct
z1UQx-IUS2UaVbdzp@C^MqtQq;vZ%N=k;Z@^$gaU;29SsVU7DIeOaW@0_lyD`)hV=?
zhQM$&XjeqyaXrDMkeR+IL8Y0MRqLkPL^h0OLNqi6m2NL-1}GB!KUAffMeB%I^liTX
zDXf#EX;4}$s>AhK1v$6`Z+j>W9HB)K0@q4#JY}YfF-bUq>ymH{7_pHJN-?z(H|nO)
zA`vW9>j*@xK!toRh2&E)ObH8uBO@VJL`WbM#$qr8^f0yn5`+i@42TagS#-t>myav-
zDpXC(aFuVl(41Vm5mXv7G9T4q22>fT#Z}-`!7w&=E<tnZO>>oV=Mp?8mqsQ-vyb&(
zW1hJpy<^|bnwC7w+8$MtUe}VQ&YFLt835iH7V^U+raO(Bdc{k^Tt-JH<cS7LwMSm|
z6-Reh#=Q7&PFQ%}6R(TUDZIV-U{3Dud)z<W$8SFB!8x6Gpvbx9+vA%JyIOWW-dAON
zM--J$JpH<IXVs-&YisLDSpBOyLo)7cTT}4;#Eul6xigLTIy5f3<H*hNMZneDh3g#x
z^_Q<6d<_~Fa2zf9=e(?ee%-PS?~Z<+CkLIKG61-}9>g5F5Dt8dJ+x-jWeA92T|ite
z-_CMQ0vocAwOiX=I-wBWCpo_EKJ$2mop}%4+>Q^(jqIiIWrG=a>Z<O`erx+Bc9bJ5
zQYj9*I^FZ}EmEw{yp1V;%5dLj+}82r{+85>=OlHxI^=9z=diSBNp9Q6JH1ib`$K=0
z2ijUJ=&9b4(sn=`zsxV++t#di*)sGpyt-!Xp%o<}OHSFf17^{18a+*WxwyqPe9bQ|
z$k0<5nq@0~U~U2*Pz!T|mK=^%R~upWp$Z58d$rjixwi}(>UkcGp3&U;aZNC<n<~yR
zw=Pb}9~&N5_XrHF%S#?X;@<r%UG5KFt9-Zp*ig~5!g8=>kb0&sC$J}Ld)Y~!Qqg;N
z$5^|F4p}*}=$pQeB+EIT{RtJTmnH8Ox+R)*)@a6npe9HzjrKcA6lJG6Mk=jk1xK{i
z+zsP->k8xcChKi~6||O0qe>brdnR9$R#tOsXkEThH6Gm)6%R-Bo?kThFwa<H3Y*1k
zwbfiFU&zDlOv6e^>C&$D$B(}&`lAu-kI3)pova%f-`ljpca2vi*x`Chxp?5xfMG||
z;+G@m6_R7+eXPRMBO|XWn;~qZnkznRllI+6UD+0+E^pv)j-D#m-P3bn)25s_YxKHD
zPG6mU4za(?+`9D@Go|S+b!-f0-)MAvdOa%hXX&kCslWemVfnd|iPvW01SYlKulE~Y
z{^IYGO*Wf<^0lVVu1s#ej-8j(W-_W$;r<M%GI#Qst9<gqba~w*?l2#)^q!CxKRY;P
O{|5*KVt#G-cJn`=(~39%

literal 0
HcmV?d00001

diff --git a/public/js/playlist/playlist.js b/public/js/playlist/playlist.js
index 434a19fdb..82f277d1c 100644
--- a/public/js/playlist/playlist.js
+++ b/public/js/playlist/playlist.js
@@ -165,9 +165,13 @@ function updatePlaybar(){
 
     /* Column 1 update */
     $('#playlist').text("Current Show:");
-    if (currentShow.length > 0)
+    if (currentShow.length > 0){
     	$('#playlist').text(currentShow[0].name);
 
+        var recElem = $('.recording-show');
+        currentShow[0].record ? recElem.show(): recElem.hide();
+    }
+
     $('#show-length').empty();
     if (currentShow.length > 0){
         $('#show-length').text(convertDateToHHMM(currentShow[0].showStartPosixTime) + " - " + convertDateToHHMM(currentShow[0].showEndPosixTime));