From: Jeremy Tan <jeremy@jx.tan.fake>
Date: Thu, 24 Oct 2013 11:50:50 +0000 (+0800)
Subject: fix some gui stuff
X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=396dd52f485f5e89eb5fba80e68711af41eeebd4;hp=c0f2a81316e9135c85e0d9aaf46aeea4e851e156;p=matches%2FMCTX3420.git

fix some gui stuff
---

diff --git a/testing/MCTXWeb/public_html/login.html b/testing/MCTXWeb/public_html/login.html
index c19dd73..774034a 100644
--- a/testing/MCTXWeb/public_html/login.html
+++ b/testing/MCTXWeb/public_html/login.html
@@ -43,7 +43,7 @@
     <div id="content-wrap">
       <div id="login-container">
        <div class="widget">
-           <form id="login" action="#">
+           <form id="login" action="#" method="post">
              <p>
                <label>
                  Username<br>
diff --git a/testing/MCTXWeb/public_html/static/mctx.gui.js b/testing/MCTXWeb/public_html/static/mctx.gui.js
index c64f3c4..1007510 100644
--- a/testing/MCTXWeb/public_html/static/mctx.gui.js
+++ b/testing/MCTXWeb/public_html/static/mctx.gui.js
@@ -125,6 +125,24 @@ function runBeforeLoad(isLoginPage) {
         } else {
             mctx.friendlyName = data.user_name;
         }
+        
+        $(document).ready(function () {
+          //Show the content!
+          $("#content").css("display", "block");
+          
+          //Set the welcome bar
+          var name = " " + (mctx.friendlyName ? mctx.friendlyName : "");
+          $("#welcome-container").text("Welcome"+ name + "!");
+          $("#logout-container").css("display", "block");
+          //$("#menu-container").populateNavbar();
+
+          $("#logout").click(function () {
+            $("#logout").logout();
+          });
+          
+          //Enable the error log, if present
+          $("#errorlog").setErrorLog();
+        });
     }).fail(function (jqHXR) {
         if (mctx.debug) {
             debugLog("Failed to ident server. Is API running?")
@@ -152,74 +170,6 @@ $.fn.populateNavMenu = function() {
     return this;
 }
 
-/**
-* Sets the camera autoupdater
-* Obsolete?
-* @returns {$.fn}
-*/
-$.fn.setCamera = function () {
-    var url = mctx.api + "image";  //http://beaglebone/api/image
-    var update = true;
-
-    //Stop updating if we can't retrieve an image!
-    this.error(function() {
-        update = false;
-    });
-
-    var parent = this;
-
-    var updater = function() {
-        if (!update) {
-            alert("Cam fail");
-            parent.attr("src", "");
-            return;
-        }
-        
-        parent.attr("src", url + "#" + (new Date()).getTime());
-        
-        setTimeout(updater, 10000);
-    };
-
-    updater();
-    return this;
-};
-
-/**
-* Sets the strain graphs to graph stuff. Obsolete?
-* @returns {$.fn}
-*/
-$.fn.setStrainGraphs = function () {
-    var sensor_url = mctx.api + "sensors";
-    var graphdiv = this;
-
-    var updater = function () {
-        var time_limit = mctx.strain_gauges.time_limit;
-        var responses = new Array(mctx.strain_gauges.ids.length);
-        
-        for (var i = 0; i < mctx.strain_gauges.ids.length; i++) {
-            var parameters = {id : i, start_time: -time_limit};
-            responses[i] = $.ajax({url : sensor_url, data : parameters});
-        }
-        
-        $.when.apply(this, responses).then(function () {
-            var data = new Array(arguments.length);
-            for (var i = 0; i < arguments.length; i++) {
-                var raw_data = arguments[i][0].data;
-                var pruned_data = [];
-                var step = ~~(raw_data.length/100);
-                for (var j = 0; j < raw_data.length; j += step)
-                pruned_data.push(raw_data[j]); 
-                data[i] = pruned_data;
-            }
-            $.plot(graphdiv, data);
-            setTimeout(updater, 1000);
-        }, function () {debugLog("It crashed");});
-    };
-
-    updater();
-    return this;
-};
-
 /**
 * Performs a login attempt.
 * @returns The AJAX object of the login request */
@@ -308,39 +258,25 @@ $.fn.checkStatus = function(data) {
     $(this).text(data.description).removeClass("pass").addClass("fail");
     return false;
   }
+  $(this).removeClass("fail");
   return true;
 };
 
 $(document).ready(function () {
-  //Show the content!
-  $("#content").css("display", "block");
-  
-  //Set the welcome bar
-  var name = " " + (mctx.friendlyName ? mctx.friendlyName : "");
-  $("#welcome-container").text("Welcome"+ name + "!");
-  $("#logout-container").css("display", "block");
-  //$("#menu-container").populateNavbar();
-
-  $("#logout").click(function () {
-    $("#logout").logout();
-  });
-  
-  //Enable the error log, if present
-  $("#errorlog").setErrorLog();
-  
   //Enable the hide/show clicks
   $("#sidebar-hide").click(function () {
-    $("#sidebar").css("display", "none");
-    $("#sidebar-show").css("display", "inherit");
+    $("#sidebar").hide();
+    $("#sidebar-show").show();
     return this;
   });
 
   $("#sidebar-show").click(function () {
-    $("#sidebar-show").css("display", "none");
-    $("#sidebar").css("display", "inherit");
+    $("#sidebar-show").hide();
+    $("#sidebar").show();
     return this;
   });
 });
+
 $(document).ajaxError(function (event, jqXHR) {
     //console.log("AJAX query failed with: " + jqXHR.status + " (" + jqXHR.statusText + ")");
 });
\ No newline at end of file