Integrate gui login with server code

[matches/MCTX3420.git] / testing / MCTXWeb / public_html / index.html
diff --git a/testing/MCTXWeb/public_html/index.html b/testing/MCTXWeb/public_html/index.html

index 7061f8d..7a62aa2 100644 (file)
--- a/testing/MCTXWeb/public_html/index.html
+++ b/testing/MCTXWeb/public_html/index.html
@@ -14,19 +14,23 @@
      <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();
        $(document).ready(function () {
-        $("#menu-container").populateNavbar();
+        //$("#menu-container").populateNavbar();
          $("#login").submit(function () {
            $("#login").login();
            return false;
          });
          
+        $("#logout").click(function () {
+          $("#logout").logout();
+        });
+        
          $("#main_controls").submit(function () {
            //Validate!
            return false;
          });
-        //$("#cam1").setCamera();
-        //$("#strain-graphs").setStrainGraphs();
+        
          $("#errorlog").setErrorLog();
        });
      </script>
@@ -34,13 +38,29 @@
    
    <body>
      <div id="header">
-      <span id="title">Exploding Cans</span>
+      <div id="leftnav">
+        <a href="http://www.uwa.edu.au/" target="_blank">
+          <img alt = "The University of Western Australia"
+          src="static/uwacrest-text.png">
+        </a>
+        <span id="title">Exploding Cans</span>
+      </div>
        <div id="rightnav">
          <div id="menu-container" class="nav-menu">
          </div>
+        <span id="welcome-container">
+          Welcome, Joe Bloggs!
+        </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>
@@ -64,25 +84,10 @@
          
          <div class="widget">
            <div class="title">Pressure controls</div>
-        </div>
-        
-        <div class="widget">
-          <div class="title">Login</div>
-          <div class="item">
-            <form id="login" action="#">
-              <table class="centre">
-                <tr><td>Username</td><td><input name="username" type="text"></td></tr>
-                <tr><td>Password</td><td><input name="pass" type="password"></td></tr>
-                <tr>
-                  <td></td>
-                  <td>
-                    <input type="submit" value="Submit">
-                    <input type="checkbox" name="force"> Force
-                  </td>
-                </tr>
-              </table>
-            </form>
-          </div>
+          <form action="#">
+            Pressure level <input type="text" name="pressurelevel"><br>
+            <input type="submit" value="Submit">
+          </form>
          </div>
        </div>
        <!-- End sidebar -->
@@ -110,6 +115,8 @@
                  </td>
                  <td align="right">
                    <input type="submit" value="Start">
+                  <input type="submit" value="Pause">
+                  <input type="submit" value="Stop">
                  </td>
                </tr>
              </table>