Remove jQuery-UI

[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 b735b78..f7ff692 100644 (file)
--- a/testing/MCTXWeb/public_html/index.html
+++ b/testing/MCTXWeb/public_html/index.html
@@ -8,13 +8,26 @@
     <![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();
+        $("#login").submit(function () {
+          $("#login").login();
+          return false;
+        });
+        
+        $("#main_controls").submit(function () {
+          //Validate!
+          return false;
+        });
+        //$("#cam1").setCamera();
+        //$("#strain-graphs").setStrainGraphs();
+        $("#errorlog").setErrorLog();
       });
     </script>
   </head>
@@ -40,24 +53,37 @@
           <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>
+          <form action="#">
+            Pressure level <input type="text" name="pressurelevel"><br>
+            <input type="submit" value="Submit">
+          </form>
         </div>
         
         <div class="widget">
           <div class="title">Login</div>
           <div class="item">
-            <form action="#">
+            <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="button" value="Submit"></td></tr>
+                <tr>
+                  <td></td>
+                  <td>
+                    <input type="submit" value="Submit">
+                    <input type="checkbox" name="force"> Force
+                  </td>
+                </tr>
               </table>
             </form>
           </div>
@@ -68,22 +94,46 @@
       <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 -->