Merge pull request #53 from jtanx/master

[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 f7ff692..9f2ab04 100644 (file)
--- a/testing/MCTXWeb/public_html/index.html
+++ b/testing/MCTXWeb/public_html/index.html
@@ -14,33 +14,55 @@
      <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 () {
-        $("#menu-container").populateNavbar();
-        $("#login").submit(function () {
-          $("#login").login();
-          return false;
-        });
-        
-        $("#main_controls").submit(function () {
-          //Validate!
-          return false;
-        });
-        //$("#cam1").setCamera();
-        //$("#strain-graphs").setStrainGraphs();
-        $("#errorlog").setErrorLog();
-      });
+      runBeforeLoad().done(function () {
+        $(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 + "!");
+         //$("#menu-container").populateNavbar();
+
+         $("#logout").click(function () {
+           $("#logout").logout();
+         });
+
+         $("#main_controls").submit(function () {
+           //Validate!
+           return false;
+         });
+
+         $("#errorlog").setErrorLog();
+       });       
+      })
+
      </script>
    </head>
    
    <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">
+        </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>
@@ -69,25 +91,6 @@
              <input type="submit" value="Submit">
            </form>
          </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>
-        </div>
        </div>
        <!-- End sidebar -->