X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=testing%2FMCTXWeb%2Fpublic_html%2Flogin.html;h=c833e127baa28bb123185c9cd01e291e821948c8;hb=53c04ad0c9cfdf6fbebd7efbc829b9da3e22921e;hp=92279882c18ef04616efc4c777940824febbadcb;hpb=bb0959bbec05c36ab1118ddefc4894faf28f0fa0;p=matches%2FMCTX3420.git

diff --git a/testing/MCTXWeb/public_html/login.html b/testing/MCTXWeb/public_html/login.html
index 9227988..c833e12 100644
--- a/testing/MCTXWeb/public_html/login.html
+++ b/testing/MCTXWeb/public_html/login.html
@@ -3,19 +3,19 @@
   <head>
     <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>
-    <![endif]-->
     <script type="text/javascript" src="static/jquery-1.10.1.min.js"></script>
-    <script type="text/javascript" src="static/jquery.flot.min.js"></script>
-    <script type="text/javascript" src="static/base64.js"></script>
     <script type="text/javascript" src="static/mctx.gui.js"></script>
     
     <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(true);
+      
       $(document).ready(function () {
-        
+        $("#login").submit(function () {
+          $("#login").login();
+          return false;
+        });
       });
     </script>
   </head>
@@ -38,9 +38,9 @@
     </div>
     <!-- End header -->
     
-    <div id="login">
+    <div id="login-container">
      <div class="widget">
-         <form id="login2" action="#">
+         <form id="login" action="#">
            <p>
              <label>
                Username<br>
@@ -59,6 +59,9 @@
            <p style="float:right; margin:0;">
              <input type="submit" value="Log In">
            </p>
+           <p id="result">
+             &nbsp;
+           </p>
           </form>
      </div>
     </div>
