From: yomguy <> Date: Mon, 8 Feb 2010 02:41:40 +0000 (+0000) Subject: add logo, fix css X-Git-Tag: 0.9~274 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=823e108635b738924cdbb5ee60d83eaa378b3c6c;p=telecaster-client.git add logo, fix css --- 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 0000000..d39bc68 Binary files /dev/null and b/img/logo_telecaster_wh.png differ 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 "" print "

" print "" def colophon(self): @@ -206,6 +209,17 @@ class WebView(FieldStorage): print "%s" % ip_info print "Serveur JACK :" print "%s" % jackd_info + print "

" + if self.writing: + print "" + else: + print "" + print "

" + if self.casting: + print "" + else: + print "" + print "

" print "" print "

" @@ -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 "

" print "

" @@ -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 "

Cliquez ici pour écouter cette formation en direct

" print "

" - print """

-

-

- -

""" + #print """

+ #

+ #

+ #

+ # + #

+ #

""" print "

" print "" print "

" print "" - if writing: - print "" - else: - print "" - if casting: - print "" - else: - print "" print " $\"\"$ Play" print "" + print " $\"\"$ Archives" + print " $\"\"$ Trash" print "

" print "" print "

TeleCaster - L'enregistrement et la diffusion audio en direct par internet

Cliquez ici pour écouter cette formation en direct