From e0132025a1df98f88b2415e9e5f75ce7304efb33 Mon Sep 17 00:00:00 2001
From: Jeremy Tan <jeremy@jx.tan.fake>
Date: Fri, 18 Oct 2013 21:57:10 +0800
Subject: [PATCH] Sort of make a start on control page Refactor other stuff in
 gui although this will probably be erased anyway

---
 testing/MCTXWeb/public_html/control.html      |  95 ++++++-----
 testing/MCTXWeb/public_html/data.html         |  26 +--
 testing/MCTXWeb/public_html/graph.html        | 149 ++++++++----------
 testing/MCTXWeb/public_html/help.html         |  23 +--
 testing/MCTXWeb/public_html/index.html        |  31 ++--
 testing/MCTXWeb/public_html/pintest.html      |  31 ++--
 .../public_html/static/OpenSansBold.ttf       | Bin 0 -> 17768 bytes
 .../MCTXWeb/public_html/static/mctx.graph.js  |  55 ++++---
 .../MCTXWeb/public_html/static/mctx.gui.js    |  30 ++++
 testing/MCTXWeb/public_html/static/style.css  |  80 +++++++++-
 10 files changed, 295 insertions(+), 225 deletions(-)
 create mode 100644 testing/MCTXWeb/public_html/static/OpenSansBold.ttf

diff --git a/testing/MCTXWeb/public_html/control.html b/testing/MCTXWeb/public_html/control.html
index f762019..9ba8021 100644
--- a/testing/MCTXWeb/public_html/control.html
+++ b/testing/MCTXWeb/public_html/control.html
@@ -15,25 +15,10 @@
     <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");
-         //$("#menu-container").populateNavbar();
-
-         $("#logout").click(function () {
-           $("#logout").logout();
-         });
-
          $("#main_controls").submit(function () {
            //Validate!
            return false;
          });
-
-         $("#errorlog").setErrorLog();
-         $("#strain-graphs").setStrainGraphs();
        });       
       })
 
@@ -79,32 +64,72 @@
       </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="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 -->
 
         <div id="main">
           <div class="widget">
-            <div class="title">Controls</div>
-            <b>Main controls</b>
-            <form id="main_controls" action="">
+            <div class="title">Experiment Status</div>
+            <table class="horizontal">
+              <tr>
+                <th>Experiment state</th>
+                <td id="state-exp">No experiment running.</td>
+              </tr>
+              <tr>
+                <th>Software status</th>
+                <td id="state-software"></td>
+              </tr>
+            </table>
+            <div class="bold">Error and warning messages</div>
+            <textarea id="errorlog" wrap="off" rows="4" cols="30" readonly>
+            </textarea>
+          </div>
+          
+          <div class="widget">
+            <div class="bold">Main controls</div>
+            <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>
+            
+            <div class="bold">Pressure controls</div>
+            <form id="pressure-controls" action="">
               <table>
                 <tr>
                   <td>Experiment name</td>
@@ -128,14 +153,6 @@
                 </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 -->
-            </div>
           </div>
         </div>
         <!-- End main content -->
diff --git a/testing/MCTXWeb/public_html/data.html b/testing/MCTXWeb/public_html/data.html
index 14f54a6..c4c2807 100644
--- a/testing/MCTXWeb/public_html/data.html
+++ b/testing/MCTXWeb/public_html/data.html
@@ -20,24 +20,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");
-          //$("#menu-container").populateNavbar();
-
-          $("#logout").click(function() {
-            $("#logout").logout();
-          });
-
-          $("#main_controls").submit(function() {
-            //Validate!
-            return false;
-          });
-
-          $("#errorlog").setErrorLog();
         });
       })
 
@@ -110,10 +92,12 @@
       </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">
+            <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>
@@ -124,10 +108,6 @@
               </ul>
             </div>
           </div>
-          <div class="widget">
-            <div class="title">Help</div>
-
-          </div>
         </div>
         <!-- End sidebar -->
 
diff --git a/testing/MCTXWeb/public_html/graph.html b/testing/MCTXWeb/public_html/graph.html
index be942bf..7b86842 100644
--- a/testing/MCTXWeb/public_html/graph.html
+++ b/testing/MCTXWeb/public_html/graph.html
@@ -8,40 +8,31 @@
     <![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/mctx.gui.js"></script>
     <script type="text/javascript" src="static/mctx.graph.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">
-      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 () {
+      runBeforeLoad().done(function() {
+        $(document).ready(function() {
+        
+        }).always(function() {
+        $(document).ready(function() {
           $("#graph-controls").setDevices();
         });
       });
 
     </script>
   </head>
-  
+
   <body>
     <div id="header-wrap">
       <div id="header">
         <div id="leftnav">
           <a href="http://www.uwa.edu.au/" target="_blank">
             <img alt = "The University of Western Australia"
-            src="static/uwacrest-text.png">
+                 src="static/uwacrest-text.png">
           </a>
           <span id="title">Exploding Cans</span>
         </div>
@@ -63,7 +54,7 @@
       </div>
     </div>
     <!-- End header -->
-    
+
     <div id="content-wrap">
       <noscript>
         <div class="widget centre">
@@ -74,18 +65,20 @@
       </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="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>
+              <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>
           </div>
         </div>
@@ -94,66 +87,64 @@
         <div id="main">
           <div class="widget">
             <div class="title">Graph</div>
-              <div id="graph" class="plot">
-              
-              </div>
-              <!-- graph placeholder -->
-              <!--<div id="graph" class="plot">
-                
-              </div>-->
+            <!-- graph placeholder -->
+            <div id="graph" class="plot"></div>
           </div>
           <div class="widget" id="graph-controls">
-              <!--<div class="title">Visualise</div>-->
-              <b>X-Axis</b>
-                <form id="xaxis" class="change">
-                  <input type="radio" name="xaxis" alt="time" id="time" checked="checked">
-                  <label for="time">time</label>
-                </form>
-                <b>Y-Axis</b>
-                <form id="yaxis" class="change">  </form>
-                <!--b>Right Y-Axis</b>
-                <form id="y2axis" onChange=$("#graph").setGraph()> <input type="radio" name="y2axis" value="none" id="none" checked="yes">none</form>-->
+            <!--<div class="title">Visualise</div>-->
+            <b>X-Axis</b>
+            <form id="xaxis" class="change">
+              <input type="radio" name="xaxis" alt="time" id="time" checked="checked">
+              <label for="time">time</label>
+            </form>
+            <b>Y-Axis</b>
+            <form id="yaxis" class="change">  </form>
+            <!--b>Right Y-Axis</b>
+            <form id="y2axis" onChange=$("#graph").setGraph()> <input type="radio" name="y2axis" value="none" id="none" checked="yes">none</form>-->
 
-                <div> 
-                  <form id="time_range" class="change">
-                    <p> 
-                        Time of Last Update <input type="text" value="" id="current_time" disabled>
-                        Start Time <input type="text" value="" id="start_time"> 
-                        End Time <input type="text" value="" id="end_time">
-                    </p>
-                </form>
-                </div>
-                <input type="button" value="Run" id="graph-run" onClick="$('#graph-run').runButton()">
-                <input type="button" value="Open New Graph" disabled>
-                <input type="button" value="Save Graph Image" id="saveimage">
-                <input type="button" value="Dump Raw Data" disabled>
-                <script>
-                  $("#saveimage").click(function () {
-                    $("canvas").each(function () {
-                      var image = new Image();
-                      
-                      window.open(this.toDataURL("image/png"));
-                      $("#graph-controls").append(image);
-                    });
-                  });
-                </script>
-            </div>
-        
-        <!-- TODO: Put this on its own page? 
-          <div class="widget">
-              <div class="title">Controls</div>
-              <form id="controls">
-                <p>Mode: <input type="radio" name="mode" value="normal">Normal
-                      <input type="radio" name="mode" value="explode">EXPLODE! </p>
-                Filename: <input type="text"> 
-                <input type="button" value="Stop" id="stopstart">
-                <input type="button" value="Pause" id="runpause">
-                <input type="button" value="Load">
+            <div> 
+              <form id="time_range" class="change">
+                <p> 
+                  Time of Last Update <input type="text" value="" id="current_time" disabled>
+                  Start Time <input type="text" value="" id="start_time"> 
+                  End Time <input type="text" value="" id="end_time">
+                </p>
               </form>
+            </div>
+            <input type="button" value="Run" id="graph-run" onClick="$('#graph-run').runButton()">
+            <input type="button" value="Open New Graph" disabled>
+            <input type="button" value="Save Graph Image" id="saveimage">
+            <input type="button" value="Dump Raw Data" disabled>
+            <script>
+              $("#saveimage").click(function() {
+                $("canvas").each(function() {
+                  var image = new Image();
+
+                  window.open(this.toDataURL("image/png"));
+                  $("#graph-controls").append(image);
+                });
+              });
+            </script>
+            
+            <div id="status-text">&nbsp;</div>
           </div>
+          
+
+          <!-- TODO: Put this on its own page? 
+            <div class="widget">
+                <div class="title">Controls</div>
+                <form id="controls">
+                  <p>Mode: <input type="radio" name="mode" value="normal">Normal
+                        <input type="radio" name="mode" value="explode">EXPLODE! </p>
+                  Filename: <input type="text"> 
+                  <input type="button" value="Stop" id="stopstart">
+                  <input type="button" value="Pause" id="runpause">
+                  <input type="button" value="Load">
+                </form>
+            </div>
           -->
         </div>
-    </div>
+      </div>
       <!-- End main content -->
     </div>
   </body>
diff --git a/testing/MCTXWeb/public_html/help.html b/testing/MCTXWeb/public_html/help.html
index cad8b0a..5760c4e 100644
--- a/testing/MCTXWeb/public_html/help.html
+++ b/testing/MCTXWeb/public_html/help.html
@@ -11,24 +11,7 @@
     <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");
-          //$("#menu-container").populateNavbar();
-
-          $("#logout").click(function() {
-            $("#logout").logout();
-          });
-
-          $("#main_controls").submit(function() {
-            //Validate!
-            return false;
-          });
-
-          $("#errorlog").setErrorLog();
+          
         });
       })
 
@@ -66,10 +49,12 @@
 
     <div id="content-wrap">
       <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">
+            <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>
diff --git a/testing/MCTXWeb/public_html/index.html b/testing/MCTXWeb/public_html/index.html
index 77c7f75..b91db20 100644
--- 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 () {
@@ -69,24 +60,22 @@
       </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="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>
+              <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>
           </div>
-          <div class="widget">
-            <div class="title">Help</div>
-
-          </div>
         </div>
         <!-- End sidebar -->
 
diff --git a/testing/MCTXWeb/public_html/pintest.html b/testing/MCTXWeb/public_html/pintest.html
index 0944617..9372ee8 100644
--- 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();
        });
       })
 
@@ -106,18 +95,20 @@
       </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="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">
diff --git a/testing/MCTXWeb/public_html/static/OpenSansBold.ttf b/testing/MCTXWeb/public_html/static/OpenSansBold.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..277a47148a710e5941a4ee75df9e9d91a6ba22f3
GIT binary patch
literal 17768
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
SJO=Qy|MQ?Fdi>`H^Zy1do6Hgb

literal 0
HcmV?d00001

diff --git a/testing/MCTXWeb/public_html/static/mctx.graph.js b/testing/MCTXWeb/public_html/static/mctx.graph.js
index b91eab3..e79b6a8 100644
--- a/testing/MCTXWeb/public_html/static/mctx.graph.js
+++ b/testing/MCTXWeb/public_html/static/mctx.graph.js
@@ -97,6 +97,22 @@ $.fn.setDevices = function() {
   });
 };
 
+function setGraphStatus(on, failText) {
+  if (on) {
+    mctx.graph.running = true;
+    $("#status-text").html("&nbsp;");
+    $("#graph-run").text("Pause");
+  } else {
+    mctx.graph.running = false;
+    if (failText) {
+      $("#status-text").text(failText).addClass("fail");
+    } else {
+      $("#status-text").text("Graph stopped").removeClass("fail");
+    }
+    $("#graph-run").text("Run");
+  }
+}
+
 function graphUpdater() {
   var urls = {
     'sensors' : mctx.graph.api.sensors,
@@ -104,7 +120,6 @@ function graphUpdater() {
   }
   
   var updater = function () {
-    var time_limit = 20;
     var responses = [];
     var ctime =  $("#current_time");
     
@@ -115,17 +130,17 @@ function graphUpdater() {
     var devices = mctx.graph.devices;
     
     if (xaxis.size() < 1 || yaxis.size() < 1) {
-      mctx.graph.running = false;
+      setGraphStatus(false, "No x or y axis selected.");
       return;
     }
     
     $.each(devices, function(key, val) {
       if (val.urltype in urls) {
         var parameters = {id : val.id};
-        if (start_time != null) {
+        if (start_time !== null) {
           parameters.start_time = start_time;
         }
-        if (end_time != null) {
+        if (end_time !== null) {
           parameters.end_time = end_time;
         }
         responses.push($.ajax({url : urls[val.urltype], data : parameters})
@@ -153,14 +168,8 @@ function graphUpdater() {
           plot_data.push(devices[$(this).attr("alt")].data);
         } else {
           var result = []
-          dataMerge(devices[xaxis.attr("alt")].data, devices[$(this).attr("alt")].data, result);
-          /*
-          var astr = "[";
-          for (var i = 0; i < result.length; ++i)
-            astr += "[" + result[i][0] + "," + result[i][1] + "]" + ",";
-          astr += "]";
-          alert(astr);
-          */
+          dataMerge(devices[xaxis.attr("alt")].data, 
+                    devices[$(this).attr("alt")].data, result);
           plot_data.push(result);
         }
       });
@@ -176,10 +185,14 @@ function graphUpdater() {
       if (mctx.graph.running) {
         mctx.graph.timer = setTimeout(updater, 1000);
       }
-    }, function () {mctx.graph.running=false; alert("Graph crashed");});
+    }, function () {
+      setGraphStatus("Connection issue - graph stopped.");
+      //This will always happen when a user closes the page
+      //alert("Graph crashed"); 
+    });
   };
   
-  mctx.graph.running = true;
+  setGraphStatus(true);
   updater();
   return this;
 }
@@ -194,6 +207,7 @@ $.fn.setGraph = function () {
   var yaxis = $("#yaxis input[name=yaxis]:checked");
   if (xaxis.size() < 1 || yaxis.size() < 1) {
     //nothing to plot...
+    setGraphStatus(false, "No x or y axis selected.");
     return;
   }
   
@@ -227,6 +241,7 @@ $.fn.setGraph = function () {
   
   if (!mctx.graph.running) {
     $("#graph-run").val("Pause");
+    $("#status-text").text("")
     graphUpdater();
   }
   
@@ -234,14 +249,10 @@ $.fn.setGraph = function () {
 };
 
 $.fn.runButton = function() {
-  //alert($(this).val());
-  if ($(this).val() === "Run") {
-    $("#graph").setGraph();
-    $(this).val("Pause");
-  }
-  else {
-    mctx.graph.running = false;
+  if (mctx.graph.running) {
+    setGraphStatus(false);
     clearTimeout(mctx.graph.timer);
-    $(this).val("Run");
+  } else {
+    $("#graph").setGraph();
   }
 };
diff --git a/testing/MCTXWeb/public_html/static/mctx.gui.js b/testing/MCTXWeb/public_html/static/mctx.gui.js
index c609ef5..48737b5 100644
--- a/testing/MCTXWeb/public_html/static/mctx.gui.js
+++ b/testing/MCTXWeb/public_html/static/mctx.gui.js
@@ -284,6 +284,36 @@ $.fn.setErrorLog = function () {
     return this;
 };
 
+$(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");
+  //$("#menu-container").populateNavbar();
+
+  $("#logout").click(function () {
+    $("#logout").logout();
+  });
+  
+  //Enable the error log, if present
+  $("#errorlog").setErrorLog();
+  
+  //Enable the hide/show clicks
+  $("#sidebar-hide").click(function () {
+    $("#sidebar").css("display", "none");
+    $("#sidebar-show").css("display", "inherit");
+    return this;
+  });
+
+  $("#sidebar-show").click(function () {
+    $("#sidebar-show").css("display", "none");
+    $("#sidebar").css("display", "inherit");
+    return this;
+  });
+});
 $(document).ajaxError(function (event, jqXHR) {
     //console.log("AJAX query failed with: " + jqXHR.status + " (" + jqXHR.statusText + ")");
 });
\ No newline at end of file
diff --git a/testing/MCTXWeb/public_html/static/style.css b/testing/MCTXWeb/public_html/static/style.css
index 2b23426..b4736db 100644
--- a/testing/MCTXWeb/public_html/static/style.css
+++ b/testing/MCTXWeb/public_html/static/style.css
@@ -3,6 +3,13 @@
   font-family: "Open Sans";
   src: url("OpenSans.ttf"),
     url("OpenSans.eot");
+  font-weight: normal;
+}
+
+@font-face {
+  font-family: "Open Sans";
+  src: url("OpenSansBold.ttf");
+  font-weight: bold;
 }
 
 body {
@@ -56,6 +63,7 @@ div.centre {
   font-weight: bold;
 }
 
+/*
 table {
   border: none;
 }
@@ -69,6 +77,7 @@ table.status, table.status tr, table.status td {
     padding: 0.2em 0.75em;
 }
 
+
 td {
   padding: 0 0.5em;
 }
@@ -78,6 +87,36 @@ th {
   border-bottom: 1px solid gray;
 }
 
+*/
+
+table {
+  border-radius: 3px;
+  border: 1px solid #ccc;
+  border-collapse: collapse;
+  word-wrap: break-word;
+  line-height: 1.3em;
+  width: 100%;
+}
+
+td {
+  padding: 0.2em 0.5em;
+}
+
+table.centre {
+  margin: auto;
+  text-align: center;
+}
+
+table.horizontal {
+  line-height: 1.6em;
+}
+
+table.horizontal th {
+  border-right: 1px solid #ccc;
+  border-bottom: 0;
+  width: 20%;
+}
+
 img.centre {
   display: block;
   margin: auto;
@@ -121,7 +160,7 @@ input[type="text"]:focus, input[type="password"]:focus {
 
 #header {
   padding: 1.5em 2em;
-  max-width: 1280px;
+  /*max-width: 1920px;*/
   margin: 0 auto;
 }
 
@@ -185,7 +224,7 @@ input[type="text"]:focus, input[type="password"]:focus {
 
 #content-wrap {
   padding: 1em 2em;
-  max-width: 1280px;
+  /*max-width: 1920px;*/
   margin: 1em auto;
 }
 
@@ -197,12 +236,31 @@ input[type="text"]:focus, input[type="password"]:focus {
 #sidebar{
   float: left;
   width: 240px;
+  transition: all 0.2s ease 0s;
 }
 
 #sidebar .title {
   font-size: 20px;
 }
 
+#sidebar-hide {
+  border-bottom: 1px solid #CCCCCC;
+  border-left: 1px solid #CCCCCC;
+  cursor: pointer;
+  float: right;
+  height: 20px;
+  margin-right: -1.25em;
+  margin-top: -1em;
+  text-align: center;
+  width: 20px;
+}
+
+#sidebar-show {
+  float: left;
+  cursor: pointer;
+  display: none;
+}
+
 .justify {
   text-align: justify;
 }
@@ -219,6 +277,22 @@ input[type="text"]:focus, input[type="password"]:focus {
   margin-bottom: 0.25em;
 }
 
+/* Unused ?? */
+.sxs {
+  display: table;
+  table-layout: fixed;
+  width: 100%;
+  border-spacing: 0.5em;
+}
+
+.sxs div {
+  display: table-cell;
+}
+
+.right {
+  float: right;
+}
+
 .title {
   font-size: 24px;
   font-weight: bold;
@@ -264,6 +338,8 @@ input[type="text"]:focus, input[type="password"]:focus {
   max-width: 100%;
   width: 100%;
   height: 6em;
+  background-color: white;
+  border: 1px solid #ccc;
 }
 
 /** For login.html **/
-- 
2.20.1