fix status refresh

diff --git a/telecaster/htdocs/css/telecaster.css b/telecaster/htdocs/css/telecaster.css
index 3c8180a3d9926230183dfbb755f8be53e602fdb7..0100da5f2acd54a14ca260a1efb0da75ca46a964 100644 (file)
--- a/telecaster/htdocs/css/telecaster.css
+++ b/telecaster/htdocs/css/telecaster.css
@@ -240,4 +240,5 @@ table.hardware {
 
 .status {
     float: right;
+    padding: 5px;
     }
\ No newline at end of file

diff --git a/telecaster/htdocs/js/application.js b/telecaster/htdocs/js/application.js
index e116e019b50564adab6910c8f4f3ab40f01dcfc9..14b4d10f8bbe3790f13cad17cc4c5bc579bb9e0a 100644 (file)
--- a/telecaster/htdocs/js/application.js
+++ b/telecaster/htdocs/js/application.js
@@ -151,12 +151,14 @@ function server_status_callback(){
                      function(data){
                          var res = data.result;
                          var doc = document;
+                         s = '<table class="hardware">'
                          for(var i=0; i <res.length; i++){
                              var line = res[i];
-                             var wrapper = doc.getElementById('status_'+line.id);
-                             s = '<td><span class="'+line.class+'">'+line.value+'</span></td>';
-                             wrapper.innerHTML = s;
+                             s += '<tr><td>'+line.label+'</td><td>:</td><td><span class="'+line.class+'">'+line.value+'</span></td></tr>\n';
                          }
+                         s += '</table>'
+                         var wrapper = doc.getElementById('server_status_table_wrapper');
+                         wrapper.innerHTML = s;
                      },
                      function(){
                          var doc = document;

diff --git a/telecaster/templates/telecaster/base.html b/telecaster/templates/telecaster/base.html
index 20d825ba6e63c7aaa08937855c78d7a31740a64f..20bb91ef81711f30e6520e44e9f1d8a7717d49a4 100644 (file)
--- a/telecaster/templates/telecaster/base.html
+++ b/telecaster/templates/telecaster/base.html
@@ -43,18 +43,8 @@ server_status_callback();
 {% endblock video %}
 
 <div class="status" id="server_status_table_wrapper">
-<table class="hardware">
-<tr><td>Name</td><td id="status_name"></td></tr>
-<tr><td>IP address</td><td id="status_ip"></td></tr>
-<tr><td>Power</td><td id="status_acpi_state"></td></tr>
-<tr><td>Charge (%)</td><td id="status_acpi_percent"></td></tr>
-<tr><td>Temperature</td><td id="status_temperature"></td></tr>
-<tr><td>JACK server</td><td id="status_jack_state"></td></tr>
-<tr><td>Encoder</td><td id="status_encoder_state"></td></tr>
-<tr><td>Recorder</td><td id="status_writing"></td></tr>
-<tr><td>Broadcaster</td><td id="status_casting"></td></tr>
-</table>
 </div>
+
 </div>
 </div>
 {% endblock hardware %}

diff --git a/telecaster/tools/tools.py b/telecaster/tools/tools.py
index f3fabe7a01d234c1976ef7b98b872dbfe38f75d1..579ced5bda587f84bec507369d80bbf358d216e2 100644 (file)
--- a/telecaster/tools/tools.py
+++ b/telecaster/tools/tools.py
@@ -188,14 +188,14 @@ class Status(object):
     def to_dict(self):
         status = [
           {'id': 'acpi_state','class': 'default', 'value': self.acpi_states[self.acpi.charging_state()], 'label': 'Power'},
-          {'id': 'acpi_percent', 'class': 'default', 'value': str(self.acpi.percent()), 'label': 'Battery Charge'},
+          {'id': 'acpi_percent', 'class': 'default', 'value': str(self.acpi.percent()), 'label': 'Charge (%)'},
           {'id': 'temperature', 'class': 'default', 'value': self.temperature, 'label': 'Temperature'},
           {'id': 'jack_state', 'class': 'default', 'value': self.jacking, 'label': 'Jack server'},
           {'id': 'name', 'class': 'default', 'value': self.name, 'label': 'Name'},
           {'id': 'ip', 'class': 'default', 'value': self.ip, 'label': 'IP address'},
           {'id': 'encoder_state','class': 'default', 'value': self.writing, 'label': 'Encoder'},
-          {'id': 'casting', 'class': 'default', 'value': self.casting, 'label': 'Broadcasting'},
-          {'id': 'writing', 'class': 'default', 'value': self.writing, 'label': 'Recording'},
+          {'id': 'casting', 'class': 'default', 'value': self.casting, 'label': 'Broadcaster'},
+          {'id': 'writing', 'class': 'default', 'value': self.writing, 'label': 'Recorder'},
           ]
 
         for stat in status: