git.ucc.asn.au / matches / MCTX3420.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 86e68ea)
Update gui
authorJeremy Tan <[email protected]>
Sat, 5 Oct 2013 10:49:57 +0000 (18:49 +0800)
committerJeremy Tan <[email protected]>
Sat, 5 Oct 2013 10:49:57 +0000 (18:49 +0800)
testing/MCTXWeb/public_html/index.html patch | blob | history
testing/MCTXWeb/public_html/pintest.html patch | blob | history
testing/MCTXWeb/public_html/static/style.css patch | blob | history

diff --git a/testing/MCTXWeb/public_html/index.html b/testing/MCTXWeb/public_html/index.html
index 0862180..9f2ab04 100644 (file)
--- a/testing/MCTXWeb/public_html/index.html
+++ b/testing/MCTXWeb/public_html/index.html
@@ -14,7 +14,7 @@
     <link rel="stylesheet" type="text/css" href="static/style.css">
     <link rel="stylesheet" type="text/css" href="static/nav-menu.css">
     <script type="text/javascript">
-      runBeforeLoad().always(function () {
+      runBeforeLoad().done(function () {
         $(document).ready(function () {
          //Show the content!
          $("#content").css("display", "block");
diff --git a/testing/MCTXWeb/public_html/pintest.html b/testing/MCTXWeb/public_html/pintest.html
index 921ec8d..55f0e64 100644 (file)
--- a/testing/MCTXWeb/public_html/pintest.html
+++ b/testing/MCTXWeb/public_html/pintest.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html>
   <head>
-    <title>BeagleBone Black Pin Test</title>
+    <title>MCTX3420 Web Interface</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <!--[if lte IE 8]>
       <script language="javascript" type="text/javascript" src="static/excanvas.min.js"></script>
@@ -15,23 +15,54 @@
     <link rel="stylesheet" type="text/css" href="static/style.css">
     <link rel="stylesheet" type="text/css" href="static/nav-menu.css">
     <script type="text/javascript">
-      $(document).ready(function () {
-        $("#errorlog").setErrorLog();
-        $("#gpio-menu").populateDropdown(mctx.pintest.gpios, "GPIO ");
-        $("#pwm-menu").populateDropdown(mctx.pintest.pwms, "PWM ");
-        
-        $("#gpio-go").click(function () {
-          if ($("#gpio-menu").val()) {
-            $("#gpio-container").exportGPIO($("#gpio-menu"));
-          }
-        });
-        $("#pwm-go").click(function () {
-          if ($("#pwm-menu").val()) {
-            $("#pwm-container").exportPWM($("#pwm-menu"));
-          }
+      runBeforeLoad().done(function () {
+        //Ensure stuff is unloaded before leaving the page
+        $(window).unload(function(){
+          $("#adc-controls").find("input[type='checkbox']")
+          .each(function () {
+            if ($(this).is(":checked")) {
+              $(this).trigger("click");
+            }
+          });
+          $("#gpio-container").find("input[name='unexport']")
+          .each(function () {
+            $(this).trigger("click");
+          });
+          $("#pwm-container").find("input[name='unexport']")
+          .each(function () {
+            $(this).trigger("click");
+          });
         });
-        $("#adc-controls").trigger("reset").setADCControl();
-      });
+        
+        $(document).ready(function () {
+         //Set the welcome bar
+         var name = " " + (mctx.friendlyName ? mctx.friendlyName : "");
+         $("#welcome-container").text("Welcome"+ name + "!");
+         $("#content").css("display", "block");
+
+         $("#logout").click(function () {
+           $("#logout").logout();
+         });
+
+         $("#gpio-menu").populateDropdown(mctx.pintest.gpios, "GPIO ");
+         $("#pwm-menu").populateDropdown(mctx.pintest.pwms, "PWM ");
+
+         $("#gpio-go").click(function () {
+           if ($("#gpio-menu").val()) {
+             $("#gpio-container").exportGPIO($("#gpio-menu"));
+           }
+         });
+         $("#pwm-go").click(function () {
+           if ($("#pwm-menu").val()) {
+             $("#pwm-container").exportPWM($("#pwm-menu"));
+           }
+         });
+         $("#adc-controls").trigger("reset").setADCControl();
+
+         $("#errorlog").setErrorLog();
+       });
+      })
+
     </script>
   </head>
   
@@ -42,14 +73,23 @@
           <img alt = "The University of Western Australia"
           src="static/uwacrest-text.png">
         </a>
-        <span id="title">BBB pin test</span>
+        <span id="title">BBB Pin test (debug only)</span>
       </div>
       <div id="rightnav">
         <div id="menu-container" class="nav-menu">
         </div>
+        <span id="welcome-container">
+        </span>
         <span id="date">
           <script type="text/javascript">getDate();</script>
         </span>
+        <div id="logout-container">
+          <form action="#">
+            <div>
+              <input type="button" id="logout" value="Logout">
+            </div>
+          </form>
+        </div>
       </div>
       <div class="clear"></div>
     </div>
diff --git a/testing/MCTXWeb/public_html/static/style.css b/testing/MCTXWeb/public_html/static/style.css
index 0a21ecd..18a6b8e 100644 (file)
--- a/testing/MCTXWeb/public_html/static/style.css
+++ b/testing/MCTXWeb/public_html/static/style.css
@@ -176,7 +176,7 @@ input[type="text"]:focus, input[type="password"]:focus {
 
 #content  {
   padding: 1em 2em;
-  /* display: none;  Enable in non-debug mode*/
+  /*display: none;  Enable in non-debug mode*/
 }
 
 #sidebar{
Repository for MCTX3420 2013 Project, Team 4

UCC git Repository :: git.ucc.asn.au