Merge pull request #53 from jtanx/master
[matches/MCTX3420.git] / testing / MCTXWeb / public_html / index.html
index b735b78..9f2ab04 100644 (file)
@@ -8,26 +8,61 @@
     <![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">
-      $(document).ready(function () {
-        $("#menu-container").populateNavbar();
-        $("#cam1").setCamera();
-      });
+      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>
           <div class="item">
             <table class="status centre">
               <tr><th>Module</th> <th>State</th></tr>
-              <tr><td>Case interlock</td> <td>FAIL</td></tr>
+              <tr><td>Server API</td> <td>PASS</td></tr>
+              <tr><td>Enclosure interlock</td> <td>FAIL</td></tr>
               <tr><td>Pressure level</td> <td>PASS</td></tr>
             </table>
+            <hr>
+            Software mode: <span id="server_mode">off</span>
           </div>         
         </div>
         
         <div class="widget">
           <div class="title">Pressure controls</div>
-        </div>
-        
-        <div class="widget">
-          <div class="title">Login</div>
-          <div class="item">
-            <form 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="button" value="Submit"></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 -->
       <div id="main">
         <div class="widget">
           <div class="title">Dashboard</div>
-          
+          <!--<img class="centre" src="overview.png" alt="Overview">-->
+          <b>Main controls</b>
+          <form id="main_controls" action="">
+            <table>
+              <tr>
+                <td>Experiment name</td>
+                <td><input name="experiment_name" type="text"></td>
+              </tr>
+              <tr>
+                <td>Experiment mode</td>
+                <td>
+                  <input name="experiment_type" value="strain" type="radio"> Strain it
+                  <input name="experiment_type" value="explode" type="radio"> Explode it
+                </td>
+              </tr>
+              <tr>
+                <td>
+                </td>
+                <td align="right">
+                  <input type="submit" value="Start">
+                  <input type="submit" value="Pause">
+                  <input type="submit" value="Stop">
+                </td>
+              </tr>
+            </table>
+          </form>
+          <b>Error and warning messages</b><br>
+          <textarea id="errorlog" wrap="off" rows="4" cols="30" readonly></textarea>
         </div>
         
         <div class="widget">
           <div class="title">Strain gauges</div>
           <div id="strain-graphs" class="graph">
             <!-- Strain graph placeholder -->
-            <script type="text/javascript">
-              $("#strain-graphs").setStrainGraphs();
-            </script>
           </div>
         </div>
         
         <div class="widget">
-          <div class="title">Camera Dilatometer</div>
-          <img src="#" alt="Camera 1" id="cam1" class="centre">
+          <div class="title">Camera Feed</div>
+          <img src="" alt="Camera 1" id="cam1" class="centre">
         </div>
       </div>
       <!-- End main content -->

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