From 46a0ff4a025134f6952f0ace81c5dfd166267a79 Mon Sep 17 00:00:00 2001
From: yomguy <>
Date: Fri, 4 Jun 2010 07:39:23 +0000
Subject: [PATCH] rename status infos, rounding skin

---
 css/telecaster.css |  8 +++++++-
 telecaster.py      |  2 +-
 webview.py         | 22 +++++++++++-----------
 3 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/css/telecaster.css b/css/telecaster.css
index e308509..95bb103 100644
--- a/css/telecaster.css
+++ b/css/telecaster.css
@@ -5,6 +5,9 @@ div.header {
 	     padding: 0.5em;
 	     height: 42px;
          font: 0.8125em/1em Verdana, sans-serif;
+         -moz-border-radius: 25px 0 0 0;
+         -webkit-border-radius: 25px 0 0 0;
+         border-radius: 25px 0 0 0;
 }
 
 div.title_main {
@@ -38,6 +41,9 @@ div.tools { background-color: #030250;
 	    padding:0.5em;
 	    margin: 1.5em 0em 0em 0em;
         height: 32px;
+        -moz-border-radius: 0 0 25px 0;
+        -webkit-border-radius: 0 0 25px 0;
+        border-radius: 0 0 25px 0;
 }
 
 div.colophon { background-color: transparent;
@@ -56,7 +62,7 @@ div.title {
         color: #FFFFFF;
         padding: 0.5em;
         line-height: 10px;
-        font: 0.8125em/1em Verdana, sans-serif;
+        font: 1em/1em Verdana, sans-serif;
 }
 
 div.hardware {
diff --git a/telecaster.py b/telecaster.py
index de0e593..c520c52 100755
--- a/telecaster.py
+++ b/telecaster.py
@@ -35,7 +35,7 @@
 # Author: Guillaume Pellerin <yomguy@parisson.com>
 """
 
-version = '0.3.8'
+version = '0.3.9'
 # Only for Unix and Linux systems
 
 import os
diff --git a/webview.py b/webview.py
index db645be..5891adb 100644
--- a/webview.py
+++ b/webview.py
@@ -162,9 +162,9 @@ class WebView(FieldStorage):
         print "</HTML>"
 
     def hardware_data(self):
-        jackd_pid = get_pid('jackd ', self.uid)
+        jackd_pid = get_pid('jackd', self.uid)
         if jackd_pid == []:
-            jackd_pid = get_pid('/usr/bin/jackdbus ', self.uid)
+            jackd_pid = get_pid('jackdbus', self.uid)
         self.acpi.update()
         self.power_state = self.acpi.charging_state()
         if self.power_state == 0:
@@ -188,28 +188,28 @@ class WebView(FieldStorage):
         else:
             percent = self.acpi.percent()
             if percent < 10:
-                batt_charge = '<span style=\"color: red\">'+str(percent)+' &#37;</span>'
+                batt_charge = '<span style=\"color: red\"><b>'+str(percent)+' &#37;</b></span>'
             else:
                 batt_charge = '<span style=\"color: green\">'+str(percent)+' &#37;</span>'
 
         if self.ip == 'localhost':
-            ip_info = '<span style=\"color: red\">'+self.ip+'</span>'
+            ip_info = '<span style=\"color: red\"><b>'+self.ip+'</b></span>'
         else:
             ip_info = '<span style=\"color: green\">'+self.ip+'</span>'
 
         if jackd_pid == []:
-            jackd_info = '<span style=\"color: red\">&eacute;teint</span>'
+            jackd_info = '<span style=\"color: red\"><b>OFF</b></span>'
         else:
-            jackd_info = '<span style=\"color: green\">d&eacute;marr&eacute; (jack)</span>'
+            jackd_info = '<span style=\"color: green\">On</span>'
 
         print "<div class=\"hardware\">"
-        print "<div class=\"title\">Informations mat&eacute;rielles</div>"
+        print "<div class=\"title\">Status</div>"
         print "<table class=\"hardware\">"
-        print "<tr><td>Alimentation</td><TD> : </TD>"
+        print "<tr><td>Power</td><TD> : </TD>"
         print "<td>%s</td></tr>" % power_info
         #print "<tr><td>Etat batterie :</td>"
         #print "<td>%s</td></tr>" % batt_info
-        print "<tr><td>Capacit&eacute; batterie</td><TD> : </TD>"
+        print "<tr><td>Battery charge</td><TD> : </TD>"
         print "<td>%s</td></tr>" % batt_charge
         #print "<tr><td>Estimation dur&eacute;e batterie :</td>"
         #print "<td>%s</td></tr>" % self.acpi.estimated_lifetime()
@@ -221,9 +221,9 @@ class WebView(FieldStorage):
             print "<tr><td>Temp core 2</td><TD> : </TD><td>%s</td></tr>" % self.acpi.temperature(1)
         except:
             pass
-        print "<tr><td>Addresse IP</td><TD> : </TD>"
+        print "<tr><td>IP address</td><TD> : </TD>"
         print "<td>%s</td></tr>" % ip_info
-        print "<tr><td>Serveur audio</td><TD> : </TD>"
+        print "<tr><td>JACK audio server</td><TD> : </TD>"
         print "<td>%s</td></tr>" % jackd_info
         print "<td><div class=\"buttons\">"
         if self.writing:
-- 
2.39.5