From: Jeremy Tan Date: Mon, 23 Sep 2013 07:46:33 +0000 (+0800) Subject: Update gui X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=c10b3c67e30d28905ea19253df696f562cf9efff;p=matches%2FMCTX3420.git Update gui --- diff --git a/testing/MCTXWeb/public_html/index.html b/testing/MCTXWeb/public_html/index.html index 3fd41c8..7061f8d 100644 --- a/testing/MCTXWeb/public_html/index.html +++ b/testing/MCTXWeb/public_html/index.html @@ -25,8 +25,9 @@ //Validate! return false; }); - $("#cam1").setCamera(); - $("#strain-graphs").setStrainGraphs(); + //$("#cam1").setCamera(); + //$("#strain-graphs").setStrainGraphs(); + $("#errorlog").setErrorLog(); }); @@ -106,7 +107,6 @@ - @@ -114,6 +114,8 @@ + Error and warning messages
+
@@ -125,7 +127,7 @@
Camera Feed
- Camera 1 + Camera 1
diff --git a/testing/MCTXWeb/public_html/static/mctx.gui.js b/testing/MCTXWeb/public_html/static/mctx.gui.js index 7c87c37..a9e8ae7 100644 --- a/testing/MCTXWeb/public_html/static/mctx.gui.js +++ b/testing/MCTXWeb/public_html/static/mctx.gui.js @@ -55,7 +55,7 @@ $.fn.populateSubmenu = function(header, items, translator) { var submenuHeader = $("
  • ").append($("", {text : header, href : "#"})); var submenu = $("