From 823e108635b738924cdbb5ee60d83eaa378b3c6c Mon Sep 17 00:00:00 2001
From: yomguy <>
Date: Mon, 8 Feb 2010 02:41:40 +0000
Subject: [PATCH] add logo, fix css

---
 css/telecaster.css            |  35 +++++++++++++++---------
 etc/telecaster_edcast_mp3.cfg |   4 +--
 img/logo_telecaster_wh.png    | Bin 0 -> 1334 bytes
 webview.py                    |  50 +++++++++++++++++++++-------------
 4 files changed, 55 insertions(+), 34 deletions(-)
 create mode 100644 img/logo_telecaster_wh.png

diff --git a/css/telecaster.css b/css/telecaster.css
index c307f05..e96d7bd 100644
--- a/css/telecaster.css
+++ b/css/telecaster.css
@@ -1,10 +1,18 @@
 
-div.header { background-color: #030250;
-             color: #FFFFFF;
+div.header {
+         background-color: #030250;
+         color: #FFFFFF;
 	     padding: 0.5em;
-	     line-height: 10px;
+	     height: 42px;
          font: 0.8125em/1em Verdana, sans-serif;
-         font-size: 1em;
+}
+
+div.title_main {
+        margin-left:42px;
+        margin-top:-26px;
+        padding: 0.em;
+        font-size: 1.5em;
+        /* text-decoration: underline; */
 }
 
 div.bg { background-color: #FFFFFF;
@@ -28,8 +36,8 @@ div.tools { background-color: #030250;
         font-size: 1em;
 	    border: 1px solid #FFFFFF;
 	    padding:0.5em;
-	    margin: 0;
-        height: 32px;
+	    margin: 1.5em 0em 0em 0em;
+        height: 35px;
 }
 
 div.colophon { background-color: transparent;
@@ -41,17 +49,18 @@ div.colophon { background-color: transparent;
 }
 
 div.colophon a { color: #000000;
-
 }
 
-div.title { background-color: #030250;
-             color: #FFFFFF;
-         padding: 0.5em;
-         line-height: 10px;
-         font: 0.8125em/1em Verdana, sans-serif;
+div.title {
+        background-color: #030250;
+        color: #FFFFFF;
+        padding: 0.5em;
+        line-height: 10px;
+        font: 0.8125em/1em Verdana, sans-serif;
 }
 
-div.hardware {     clear: both;
+div.hardware {
+    clear: both;
     font: 0.8125em/1em Verdana, sans-serif;
     color: #000000;
     font-size: 1em;
diff --git a/etc/telecaster_edcast_mp3.cfg b/etc/telecaster_edcast_mp3.cfg
index 53b4a18..84b5df8 100644
--- a/etc/telecaster_edcast_mp3.cfg
+++ b/etc/telecaster_edcast_mp3.cfg
@@ -41,6 +41,6 @@ LAMEPreset=0
 AACQuality=100
 AACCutoff=
 # Log Level 1 = LOG_ERROR, 2 = LOG_ERROR+LOG_WARNING, 3 = LOG_ERROR+LOG_WARNING+LOG_DEBUG
-LogLevel=3
+LogLevel=1
 # Log File
-LogFile=/tmp/streamTranscoder_1.log
+LogFile=/tmp/telecaster
diff --git a/img/logo_telecaster_wh.png b/img/logo_telecaster_wh.png
new file mode 100644
index 0000000000000000000000000000000000000000..d39bc682c347ab1dcddc62e0d8b0ff75f99e530b
GIT binary patch
literal 1334
zcmV-61<Cq}P)<h;3K|Lk000e1NJLTq001Ze001Zm1^@s6jQ+T700001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01Ybu01Ybvm~rf@00007bV*G`2igJ%
z0V)~F$KbgD00g#4L_t(o!@Zb)NS$RA$G`V_y?0S7ZEd+9^@p1>H*5w8Ljs4ySgW9t
zs6`OV*~Be}g0x@@MAHndp%}CoMYW*eU)4WB<z#~(%3o_MTJ1u!iK%POh4|yXpZ<BS
zynB1E_kFK-9e9v?&Uv2a>-(JZJl}HyfKrqqNxLO&mvpbB)sogo3P`#vX~g_JE$ItM
zS5w&};1l3_Nv}#Om$XjOB?DkY(wG@Y+F(Ymq(>y(E~!t_DM=qnn)AFP;AN}^-UeoX
z3&1Ntp2xYFz%JkfFa=x!o&y42=6l)TSzsFY6?g#%dIaV+?g5Sgv%vR2Zn8N`9dU-F
zHzn0cIx4AEQq19#C26Omd`WA~n3Xgt>58NuB%N`Ymn-SGq-~O(l62PZ5w8Tk2L1*f
zb=ZQyi@-O)JjrDe_y~B&u}%m$ZocMgevUW@d=5l`O%B`Rz)z$m7H|s4lk}i%%^qVb
z@(QrU1oKu$pua~Nq^YTC&bID;AZC)z(-(XmSO9k0bgO{VX#z)l-RkOUEX%ThYOh&*
zmx-67HeDDvn+|Y|jg5=o4jw#6EEc1xstP~XOfxV7tgz|cPY1Y$hK5BT6%`f4VlgT!
zD;IT=ijo0b3;Y9AI_|$^OKWTEO<yS*jcU)HJ&U@wwze5yO)`Kjz(te#0wN}hmo5GM
z{Y*|yx^CXl(GhohHyOa6f!A$@I?^Zu0|QJ<Ox(0_XJ@C~Wgf^+1Tfz?ZL=9Jqyl7Y
zY>XQ>Zn)ZphK3j)AD3lW>gwupb7@Wlu--i2ab=z#P%|?#)YsQXb8>PvN>VTwR6#+(
zhMu0D0jKZq@G#xo-HDbup9tWmz{ymOcY1o7!otG3IBj!|!-o$)<MR-5-2k33NfK9{
z@VZ)6Rn=RGzyS&b0_yGU?ezihF*krw$8G+l*P{)ELRrZ!+Vb-9l|BIObIuPMX8fm(
z;H>jPbO#3qwXm=-mCUcby?xpTWB<?IK}j=`R@ii&=y*6BmZ?9Ml+w~tKPAPS8^Cc>
z^u*<gmz4?&3l)h(HZNK51Oh54DGB=kc-al$U#1$1%cz%?GBYz(TU&cF5C{YlQu2%p
z)zs9K`2aZL#;ALMPi%qtlGliyot<UJjvWWwn7L(HYH4Z72E1nRJdo{{#WldFO}WO9
zNN+URvgqvW++SQ=9F9aH!K|#T+sewyR`vDu75M-M@NJ@tI?v^)ONj%{&(AOC$v)%;
zFevGwq~9g&vYq^~RJs76P$<<d#WhJEyBXpE{+Xm|Ntxz%kEHMP|4DPg)`+d{xb7gV
z+f99PtK~Nbi%&@T-!RW!rcHO~7K57tws@^c?ly&bqr<8D7J*xEX$mAQJD)UH%o8?U
zhG`t7Q?8kYQcBIE7V{-HI`n%@cWb%w3$WR1!^usVVfrpnm-x63_`uIaZj*5n(_udy
zu|$SD3@^L}>~yhjF-dhU*=q=VW%%ZuskH2pwcpw$9guWH(mM&L*!@ei--ab!U)Bxj
z;lJ1iT=m--P1o@1m~Aq7)*R~*KY_lS;kSvtQPRtjo|d#p(s@Zg8Xh-dN{6{LK7r@_
s0<_BmrhU8BboAFt`a{ygX#}|UUkd_MPe3rfBLDyZ07*qoM6N<$f{7_`)&Kwi

literal 0
HcmV?d00001

diff --git a/webview.py b/webview.py
index cb38f3b..f60303d 100644
--- a/webview.py
+++ b/webview.py
@@ -76,6 +76,8 @@ class WebView(FieldStorage):
         self.refresh = False
         self.refresh_value = 20
         self.uid = os.getuid()
+        self.casting = False
+        self.writing = False
 
     def header(self):
         # Required header that tells the browser how to render the HTML.
@@ -130,7 +132,8 @@ class WebView(FieldStorage):
         print "<BODY>"
         print "<div class=\"bg\">"
         print "<div class=\"header\">"
-        print "<H3>&nbsp;TeleCaster - L'enregistrement et la diffusion audio en direct par internet</H3>"
+        print "<img src=\"img/logo_telecaster_wh.png\">"
+        print "<div class=\"title_main\">&nbsp;TeleCaster - Audio Web Live Recording</div>"
         print "</div>"
 
     def colophon(self):
@@ -206,6 +209,17 @@ class WebView(FieldStorage):
         print "<td>%s</td></tr>" % ip_info
         print "<tr><td>Serveur JACK :</td>"
         print "<td>%s</td></tr>" % jackd_info
+        print "<td><div class=\"buttons\">"
+        if self.writing:
+            print "<button type=\"submit\" class=\"positive\"><img src=\"img/drive_add.png\" alt=\"\">Recording...</button>"
+        else:
+            print "<button type=\"submit\" class=\"negative\"><img src=\"img/drive_error.png\" alt=\"\">NOT Recording !</button>"
+        print "</div></td><td><div class=\"buttons\">"
+        if self.casting:
+            print "<button type=\"submit\" class=\"positive\"><img src=\"img/transmit_add.png\" alt=\"\">Diffusing...</button>"
+        else:
+            print "<button type=\"submit\" class=\"negative\"><img src=\"img/transmit_error.png\" alt=\"\">NOT Diffusing !</button>"
+        print "</div>"
         print "</table>"
         print "</div>"
 
@@ -213,6 +227,8 @@ class WebView(FieldStorage):
     def start_form(self, message=''):
         self.refresh = False
         self.header()
+        self.casting = False
+        self.writing = False
         self.hardware_data()
         print "<form method=\"post\" action=\""+self.url+"/telecaster/telecaster.py\" name=\"formulaire\">"
         print "<div class=\"main\">"
@@ -282,6 +298,8 @@ class WebView(FieldStorage):
         session = conference_dict['session']
         professor = conference_dict['professor']
         comment = conference_dict['comment']
+        self.writing = writing
+        self.casting = casting
         self.refresh = True
         self.header()
         self.hardware_data()
@@ -297,31 +315,25 @@ class WebView(FieldStorage):
         #print "<h5><a href=\""+self.url+":"+self.port+"/"+clean_string(self.title)+"_-_"+clean_string(department)+"_-_"+clean_string(conference)+"."+self.format+".m3u\">Cliquez ici pour &eacute;couter cette formation en direct</a></h5>"
         print "</div>"
 
-        print """<div class="rss" id="chan">
-                <b><div id="chan_description"></div></b><br>
-                <div id="chan_title"></div>
-                <div id="chan_link"></div>
-                <div id="chan_description"></div>
-                <a id="chan_image_link" href=""></a>
-                <div id="chan_items"></div>
-                <div id="chan_pubDate"></div>
-                <div id="chan_copyright"></div>
-            </div>"""
+        #print """<div class="rss" id="chan">
+                #<b><div id="chan_description"></div></b><br>
+                #<div id="chan_title"></div>
+                #<div id="chan_link"></div>
+                #<div id="chan_description"></div>
+                #<a id="chan_image_link" href=""></a>
+                #<div id="chan_items"></div>
+                #<div id="chan_pubDate"></div>
+                #<div id="chan_copyright"></div>
+            #</div>"""
 
         print "<div class=\"tools\">"
         print "<form method=\"post\" action=\""+self.url+"/telecaster/telecaster.py\">"
         print "<div class=\"buttons\">"
         print "<button type=\"submit\"><img src=\"img/arrow_refresh.png\" alt=\"\">Refresh</button>"
-        if writing:
-            print "<button type=\"submit\" class=\"positive\"><img src=\"img/drive_add.png\" alt=\"\">Recording...</button>"
-        else:
-            print "<button type=\"submit\" class=\"negative\"><img src=\"img/drive_error.png\" alt=\"\">NOT Recording !</button>"
-        if casting:
-            print "<button type=\"submit\" class=\"positive\"><img src=\"img/transmit_add.png\" alt=\"\">Diffusing...</button>"
-        else:
-            print "<button type=\"submit\" class=\"negative\"><img src=\"img/transmit_error.png\" alt=\"\">NOT Diffusing !</button>"
         print "<a href=\""+self.url+":"+self.port+"/"+clean_string(self.title)+"_-_"+clean_string(department)+"_-_"+clean_string(conference)+"."+self.format+".m3u\"><img src=\"img/control_play_blue.png\" alt=\"\">Play</a>"
         print "<button type=\"submit\" name=\"action\" value=\"stop\" class=\"negative\"><img src=\"img/cancel.png\" alt=\"\">Stop</button>"
+        print "<a href=\""+self.url+"/media/\"><img src=\"img/folder_go.png\" alt=\"\">Archives</a>"
+        print "<a href=\""+self.url+"/backup/\"><img src=\"img/bin.png\" alt=\"\">Trash</a>"
         print "</div>"
         print "</form>"
         print "</div>"
-- 
2.39.5