refactoring ui

minineuron · Sep 12, 2012 · eac83e1 · eac83e1
1 parent f3d8952
commit eac83e1
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/www/htime.ms b/www/htime.ms
@@ -30,7 +30,6 @@ export class HumanTime {
     var ret = [];
     foreach (var v:i in VALS) {
       var amount = Math.floor(ms / v);
-      console.log(UNITS[i], ms / v, ms, v);
       ms -= amount * v;
       if (amount > 0 || i == 3) ret.push(amount + UNITS[i]);
     }

diff --git a/www/views/_services.jade b/www/views/_services.jade
@@ -2,7 +2,7 @@ table.table.table-condensed.table-bordered
   tr.success
     th Service
     th Sensor
-    th Status
+    th(colspan=2) Status
     th Pass/Total
     th Last Pass
     th Last Failure
@@ -22,6 +22,7 @@ table.table.table-condensed.table-bordered
         td(style="padding-left: 20px"): a(href="/services/#{sname}/sensors/#{name}?time=min")= name
         td
           != health(sensor.isHealthy)
+        td
           span.inlinesparkline= sensor.getAvgResponse('hour').join(',');
         td #{sensor.passCount}/#{sensor.totalCount}
         td= htime.humanizeAgo(sensor.lastPass);

diff --git a/www/views/sensor.jade b/www/views/sensor.jade
@@ -27,14 +27,10 @@ block content
     tr
       th Uptime
       td
-        | Total: #{sensor.getUpTime()}ms
-        if sensor.isHealthy
-          |  since #{(new Date).getTime() - sensor.lastChange}ms ago
+        | #{htime.humanize(sensor.getUpTime())}
       th Downtime
       td
-        | Total: #{sensor.getDownTime()}ms
-        unless sensor.isHealthy
-          |  since #{(new Date).getTime() - sensor.lastChange}ms ago
+        | #{htime.humanize(sensor.getDownTime())}
     tr
       td(colspan=4)= "Options: " + JSON.stringify(sensor.options);