Merge pull request #42 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 3fd41c8..f7ff692 100644 (file)
--- a/testing/MCTXWeb/public_html/index.html
+++ b/testing/MCTXWeb/public_html/index.html
@@ -25,8 +25,9 @@
           //Validate!
           return false;
         });
-        $("#cam1").setCamera();
-        $("#strain-graphs").setStrainGraphs();
+        //$("#cam1").setCamera();
+        //$("#strain-graphs").setStrainGraphs();
+        $("#errorlog").setErrorLog();
       });
     </script>
   </head>
@@ -63,6 +64,10 @@
         
         <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">
@@ -106,14 +111,17 @@
               </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">
@@ -125,7 +133,7 @@
         
         <div class="widget">
           <div class="title">Camera Feed</div>
-          <img src="#" alt="Camera 1" id="cam1" class="centre">
+          <img src="" alt="Camera 1" id="cam1" class="centre">
         </div>
       </div>
       <!-- End main content -->