Merge remote-tracking branch 'upstream/master' into dilatometer

[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 ff9b733..9513ce8 100644 (file)
--- a/testing/MCTXWeb/public_html/index.html
+++ b/testing/MCTXWeb/public_html/index.html
@@ -11,15 +11,6 @@
     <script type="text/javascript">
       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 + "!");
-         $("#logout-container").css("display", "block");
-         $("#logout").click(function () {
-           $("#logout").logout();
-         });
        });       
       }).always(function () {
         $(document).ready(function () {
@@ -49,6 +40,7 @@
           <div id="logout-container">
             <form action="#">
               <div>
+                <input type="button" id="change-password" value="Change password">
                 <input type="button" id="logout" value="Logout">
               </div>
             </form>
@@ -69,23 +61,23 @@
       </noscript>
 
       <div id="content">
+        <div class="widget" id="sidebar-show">&gt;</div>
         <div id="sidebar">
           <div class="widget">
+            <div id="sidebar-hide">&lt;</div>
             <div class="title">Navigation menu</div>
             <div id="sidebar-menu" class="nav-menu">
-            <ul>
-               <li><a href="index.html"><span>Home</span></a></li>
-               <li><a href="control.html"><span>Experiment control</span></a></li>
-               <li><a href="data.html"><span>Experiment data</span></a></li>
-               <li><a href="pintest.html"><span>Pin debugging</span></a></li>
-               <li class="last"><a href="help.html"><span>Help</span></a></li>
-            </ul>
+              <ul>
+                <li><a href="index.html"><span>Home</span></a></li>
+                <li><a href="control.html"><span>Experiment control</span></a></li>
+                <li><a href="graph.html"><span>Experiment graphs</span></a></li>
+                <li><a href="values.html"><span>Experiment data (live)</span></a></li>
+                <li><a href="data.html"><span>Experiment data</span></a></li>
+                <li><a href="pintest.html"><span>Pin debugging</span></a></li>
+                <li class="last"><a href="help.html"><span>Help</span></a></li>
+              </ul>
             </div>
           </div>
-          <div class="widget">
-            <div class="title">Help</div>
-
-          </div>
         </div>
         <!-- End sidebar -->
 
@@ -114,16 +106,16 @@
             <div class="title">System diagram</div>
             <img id="sbd" src="static/sbd4.png" class="centre" alt="System diagram" usemap="#sbd-map">
             <map name="sbd-map">
-              <area shape="rect" coords="8,72,105,118" href="#" alt="Client PC" title="You">
-              <area shape="rect" coords="176,72,275,118" href="#" alt="BBB">
-              <area shape="rect" coords="298,53,395,145" href="#" alt="Electronics">
-              <area shape="rect" coords="446,53,543,145" href="#" alt="Pneumatics">
-              <area shape="rect" coords="218,191,315,237" href="#" alt="Sensors">
-              <area shape="rect" coords="418,191,515,237" href="#" alt="Camera">
+              <area shape="rect" coords="8,72,105,118" href="https://github.com/szmoore/MCTX3420/wiki/System-Overview#control" target="_blank" alt="Client PC" title="You">
+              <area shape="rect" coords="176,72,275,118" href="https://github.com/szmoore/MCTX3420/wiki/Hardware:-BeagleBone" target="_blank" alt="BBB">
+              <area shape="rect" coords="298,53,395,145" href="https://github.com/szmoore/MCTX3420/wiki/System-Overview#electronics" target="_blank" alt="Electronics">
+              <area shape="rect" coords="446,53,543,145" href="https://github.com/szmoore/MCTX3420/wiki/System-Overview#pneumatics" target="_blank" alt="Pneumatics">
+              <area shape="rect" coords="218,191,315,237" href="https://github.com/szmoore/MCTX3420/wiki/System-Overview#sensors" target="_blank" alt="Sensors">
+              <area shape="rect" coords="418,191,515,237" href="https://github.com/szmoore/MCTX3420/wiki/Hardware:-Sensors#camera" target="_blank" alt="Camera">
               <area shape="rect" coords="218,237,315,285" href="#" alt="Strain Can">
               <area shape="rect" coords="418,237,515,285" href="#" alt="Explode Can" title="Won't happen">
-              <area shape="rect" coords="87,191,183,237" href="#" alt="Case" id="case-btn">
-              <area shape="rect" coords="87,257,183,303" href="#" alt="Mounting" id="mounting-btn">
+              <area shape="rect" coords="87,191,183,237" href="https://github.com/szmoore/MCTX3420/wiki/System-Overview#case" target="_blank" alt="Case" id="case-btn">
+              <area shape="rect" coords="87,257,183,303" href="https://github.com/szmoore/MCTX3420/wiki/Hardware:-Mounting" target="_blank" alt="Mounting" id="mounting-btn">
               <area shape="rect" coords="210,182,540,317" alt="Mounting Area" id="mounting-area">
               <area shape="poly" coords="172,27,548,27,548,317,212,317,212,156,172,156" alt="case Area" id="case-area">
             </map>