Another round of API URL and UI tweaks.

fdoperezi · Oct 9, 2014 · 1a6a92d · 1a6a92d
1 parent 04b2395
commit 1a6a92d
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 52 deletions.
diff --git a/lib/resources/watermeter/index.html b/lib/resources/watermeter/index.html
diff --git a/lib/resources/watermeter/perfbar.html b/lib/resources/watermeter/perfbar.html
diff --git a/lib/resources/watermeter/perfbar.js b/lib/resources/watermeter/perfbar.js
@@ -18,9 +18,11 @@ function saturate0(value) {
 }
 
 function appendBody(str) {
-    var h = document.body.innerHTML;
+    var el = document.getElementById("perfbarContainer");
+
+    var h = el.innerHTML;
     h = h + str;
-    document.body.innerHTML = h;
+    el.innerHTML = h;
     // console.log("document.body.innerHTML: " + h);
 }
 
@@ -317,13 +319,11 @@ function initializeNode(nodeIdx, nodeName, nodePort) {
                 }
 
                 var legend = "" +
-                    "<div>" +
-                    "<br/>" +
-                    "[Legend]" +
-                    "<br/>" +
-                    "Each bar represents one CPU." +
+                    "<div style='max-width: 300px;'>" +
                     "<br/>" +
-                    "<table>" +
+                    "<h3>Legend</h3>" +
+                    "<p>Each bar represents one CPU.</p>" +
+                    "<table class='table'>" +
                     "  <tr><td>Blue:</td><td>idle time</td></tr>" +
                     "  <tr><td>Green:</td><td>user time</td></tr>" +
                     "  <tr><td>Red:</td><td>system time</td></tr>" +

diff --git a/src/main/java/water/api/RequestServer.java b/src/main/java/water/api/RequestServer.java
@@ -139,7 +139,7 @@ public enum API_VERSION {
     Request.addToNavbar(registerRequest(new JStack()),      "Stack Dump",               "Admin");
     Request.addToNavbar(registerRequest(new LogView()),     "Inspect Log",              "Admin");
     Request.addToNavbar(registerRequest(new NetworkTest()), "Network Test",             "Admin");
-    Request.addToNavbar(registerRequest(new WaterMeter()),  "Water Meter",              "Admin");
+    Request.addToNavbar(registerRequest(new WaterMeterPerfbar()),  "Water Meter (Perfbar)",    "Admin");
     Request.addToNavbar(registerRequest(new Shutdown()),    "Shutdown",                 "Admin");
 
     // Help and Tutorials
@@ -258,7 +258,7 @@ public enum API_VERSION {
     registerRequest(new ModelMetrics());
 
     // WaterMeter support APIs
-    registerRequest(new WaterMeter.WaterMeterCpuTicks());
+    registerRequest(new WaterMeterPerfbar.WaterMeterCpuTicks());
   }
 
   /**

diff --git a/src/main/java/water/api/WaterMeter.java → ...ain/java/water/api/WaterMeterPerfbar.java b/src/main/java/water/api/WaterMeter.java → ...ain/java/water/api/WaterMeterPerfbar.java
@@ -8,9 +8,15 @@
 /**
  * Redirect to water meter page.
  */
-public class WaterMeter extends HTMLOnlyRequest {
+public class WaterMeterPerfbar extends HTMLOnlyRequest {
   protected String build(Response response) {
-    return "<meta http-equiv=\"refresh\" content=\"0; url=watermeter/index.html\">";
+    return "" +
+            "<div class='container' id='perfbarContainer'>" +
+            "<script>" +
+            "var PB_LINEOFTEXT_BACKGROUND_COLOR = \"#fff\";" +
+            "</script>" +
+            "<script src=\"watermeter/perfbar.js\"></script>" +
+            "</div>";
   }
 
   public static class WaterMeterCpuTicks extends JSONOnlyRequest {