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

[matches/MCTX3420.git] / testing / MCTXWeb / public_html / pintest.html

diff --git a/testing/MCTXWeb/public_html/pintest.html b/testing/MCTXWeb/public_html/pintest.html
index 0944617..506d7c5 100644 (file)
--- a/testing/MCTXWeb/public_html/pintest.html
+++ b/testing/MCTXWeb/public_html/pintest.html
@@ -30,15 +30,6 @@
         });
         
         $(document).ready(function () {
-         //Set the welcome bar
-         var name = " " + (mctx.friendlyName ? mctx.friendlyName : "");
-         $("#welcome-container").text("Welcome"+ name + "!");
-         $("#content").css("display", "block");
-
-         $("#logout").click(function () {
-           $("#logout").logout();
-         });
-
          $("#gpio-menu").populateDropdown(mctx.pintest.gpios, "GPIO ");
          $("#pwm-menu").populateDropdown(mctx.pintest.pwms, "PWM ");
 
@@ -59,8 +50,6 @@
            }
          });
          $("#adc-controls").trigger("reset").setADCControl();
-
-         $("#errorlog").setErrorLog();
        });
       })
 
@@ -86,6 +75,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>
@@ -106,18 +96,21 @@
       </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 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="graph.html"><span>Experiment graphs</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 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="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">