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 a9269f8..7a62aa2 100644 (file)
--- a/testing/MCTXWeb/public_html/index.html
+++ b/testing/MCTXWeb/public_html/index.html
@@ -14,6 +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();
       $(document).ready(function () {
         //$("#menu-container").populateNavbar();
         $("#login").submit(function () {
@@ -21,12 +22,15 @@
           return false;
         });
         
+        $("#logout").click(function () {
+          $("#logout").logout();
+        });
+        
         $("#main_controls").submit(function () {
           //Validate!
           return false;
         });
-        //$("#cam1").setCamera();
-        //$("#strain-graphs").setStrainGraphs();
+        
         $("#errorlog").setErrorLog();
       });
     </script>
@@ -53,7 +57,7 @@
         <div id="logout-container">
           <form action="#">
             <div>
-              <input type="button" name="logout" value="Logout">
+              <input type="button" id="logout" value="Logout">
             </div>
           </form>
         </div>
@@ -85,26 +89,6 @@
             <input type="submit" value="Submit">
           </form>
         </div>
-        
-        <!--Todo get rid of this and make a separate login page-->
-        <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>
-        </div>
       </div>
       <!-- End sidebar -->