From: Jeremy Tan <jeremy@jx.tan.fake>
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();
       });
     </script>
   </head>
@@ -106,7 +107,6 @@
               </tr>
               <tr>
                 <td>
-                  
                 </td>
                 <td align="right">
                   <input type="submit" value="Start">
@@ -114,6 +114,8 @@
               </tr>
             </table>
           </form>
+          <b>Error and warning messages</b><br>
+          <textarea id="errorlog" wrap="off" rows="4" cols="30" readonly></textarea>
         </div>
         
         <div class="widget">
@@ -125,7 +127,7 @@
         
         <div class="widget">
           <div class="title">Camera Feed</div>
-          <img src="#" alt="Camera 1" id="cam1" class="centre">
+          <img src="" alt="Camera 1" id="cam1" class="centre">
         </div>
       </div>
       <!-- End main content -->
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 = $("<li/>").append($("<a/>", {text : header, href : "#"}));
   var submenu = $("<ul/>", {"class" : "submenu"});
   
-  for (item in items) {
+  for (var item in items) {
     var info = translator(item, items);
     submenu.append($("<li/>").append(
           $("<a/>", {text : info.text, 
@@ -92,7 +92,7 @@ $.fn.populateNavbar = function () {
  * @returns {$.fn}
  */
 $.fn.setCamera = function () {
-  var url = mctx.api + "image";
+  var url = mctx.api + "image";  //http://beaglebone/api/image
   var update = true;
 
   //Stop updating if we can't retrieve an image!
@@ -178,4 +178,20 @@ $.fn.login = function () {
     mctx.has_control = false;
     alert("no");
   });
+};
+
+$.fn.setErrorLog = function () {
+  var url = mctx.api + "errorlog";
+  var outdiv = this;
+  
+  var updater = function () {
+    $.ajax({url : url}).done(function (data) {
+      outdiv.text(data);
+      setTimeout(updater, 1000);
+    }).fail(function (jqXHR) {
+      outdiv.text("Failed to retrieve the error log.");
+    });
+  };
+  
+  updater();
 };
\ No newline at end of file
diff --git a/testing/MCTXWeb/public_html/static/style.css b/testing/MCTXWeb/public_html/static/style.css
index 63c9895..35680ca 100644
--- a/testing/MCTXWeb/public_html/static/style.css
+++ b/testing/MCTXWeb/public_html/static/style.css
@@ -146,4 +146,11 @@ input[type="text"], input[type="password"] {
 /** Hack **/
 .clear {
   clear: both;
+}
+
+#errorlog {
+  overflow: auto;
+  max-width: 100%;
+  width: 100%;
+  height: 6em;
 }
\ No newline at end of file