]> git.parisson.com Git - telecaster-server.git/commitdiff
projects / telecaster-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 569965d)
add logo, fix css
authoryomguy <>
Mon, 8 Feb 2010 02:41:40 +0000 (02:41 +0000)
committeryomguy <>
Mon, 8 Feb 2010 02:41:40 +0000 (02:41 +0000)
css/telecaster.css patch | blob | history
etc/telecaster_edcast_mp3.cfg patch | blob | history
img/logo_telecaster_wh.png [new file with mode: 0644] patch | blob
webview.py patch | blob | history

diff --git a/css/telecaster.css b/css/telecaster.css
index c307f054700dc76f8f190e5c1a735ead8804f6b0..e96d7bd666f7424bc8bc7d7bf47fbbb19efc0282 100644 (file)
--- 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 53b4a189468422e94fa21787fd4df8447d079d0f..84b5df808eca1d7dd9cc6ba26f9fe39380770ae1 100644 (file)
--- 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 (file)
index 0000000..d39bc68
Binary files /dev/null and b/img/logo_telecaster_wh.png differ
diff --git a/webview.py b/webview.py
index cb38f3be6571968775ff8a35e628ac55eda5d5ae..f60303d0d0c123d97ad994b5d89f4d3fcbb6bd16 100644 (file)
--- 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>"
Unnamed repository; edit this file 'description' to name the repository.