change sbd + header
authorJeremy Tan <[email protected]>
Mon, 7 Oct 2013 08:29:02 +0000 (16:29 +0800)
committerJeremy Tan <[email protected]>
Mon, 7 Oct 2013 08:29:02 +0000 (16:29 +0800)
testing/MCTXWeb/public_html/control.html
testing/MCTXWeb/public_html/index.html
testing/MCTXWeb/public_html/login.html
testing/MCTXWeb/public_html/pintest.html
testing/MCTXWeb/public_html/static/sbd4.png [new file with mode: 0644]
testing/MCTXWeb/public_html/static/style.css

index d410a89..0a27efc 100644 (file)
   </head>
   
   <body>
-    <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">
-        </a>
-        <span id="title">Exploding Cans</span>
-      </div>
-      <div id="rightnav">
-        <span id="welcome-container">
-        </span>
-        <span id="date">
-          <script type="text/javascript">getDate();</script>
-        </span>
-        <div id="logout-container">
-          <form action="#">
-            <div>
-              <input type="button" id="logout" value="Logout">
-            </div>
-          </form>
+    <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">
+          </a>
+          <span id="title">Exploding Cans</span>
+        </div>
+        <div id="rightnav">
+          <span id="welcome-container">
+          </span>
+          <span id="date">
+            <script type="text/javascript">getDate();</script>
+          </span>
+          <div id="logout-container">
+            <form action="#">
+              <div>
+                <input type="button" id="logout" value="Logout">
+              </div>
+            </form>
+          </div>
         </div>
+        <div class="clear"></div>
       </div>
-      <div class="clear"></div>
     </div>
     <!-- End header -->
     
-    <noscript>
-      <div class="widget centre">
-        <div class="title">JavaScript required</div>
-        This website requires JavaScript to function correctly.
-        Please enable JavaScript to use this site.
-      </div>
-    </noscript>
-    
-    <div id="content">
-      <div id="sidebar">
-        <div class="widget">
-          <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="pintest.html"><span>Pin debugging</span></a></li>
-             <li class="last"><a href="#"><span>Help</span></a></li>
-          </ul>
-          </div>
+    <div id="content-wrap">
+      <noscript>
+        <div class="widget centre">
+          <div class="title">JavaScript required</div>
+          This website requires JavaScript to function correctly.
+          Please enable JavaScript to use this site.
         </div>
-        <div class="widget">
-          <div class="title">Help</div>
-          
+      </noscript>
+
+      <div id="content">
+        <div id="sidebar">
+          <div class="widget">
+            <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="pintest.html"><span>Pin debugging</span></a></li>
+               <li class="last"><a href="#"><span>Help</span></a></li>
+            </ul>
+            </div>
+          </div>
+          <div class="widget">
+            <div class="title">Help</div>
+
+          </div>
         </div>
-      </div>
-      <!-- End sidebar -->
+        <!-- End sidebar -->
 
-      <div id="main">
-        <div class="widget">
-          <div class="title">Controls</div>
-          <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 id="main">
+          <div class="widget">
+            <div class="title">Controls</div>
+            <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>
+        <!-- End main content -->
       </div>
-      <!-- End main content -->
-      
     </div>
   </body>
 </html>
index b0b3de1..4ffacec 100644 (file)
   </head>
   
   <body>
-    <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">
-        </a>
-        <span id="title">Exploding Cans</span>
-      </div>
-      <div id="rightnav">
-        <span id="welcome-container">
-        </span>
-        <span id="date">
-          <script type="text/javascript">getDate();</script>
-        </span>
-        <div id="logout-container">
-          <form action="#">
-            <div>
-              <input type="button" id="logout" value="Logout">
-            </div>
-          </form>
+    <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">
+          </a>
+          <span id="title">Exploding Cans</span>
+        </div>
+        <div id="rightnav">
+          <span id="welcome-container">
+          </span>
+          <span id="date">
+            <script type="text/javascript">getDate();</script>
+          </span>
+          <div id="logout-container">
+            <form action="#">
+              <div>
+                <input type="button" id="logout" value="Logout">
+              </div>
+            </form>
+          </div>
         </div>
+        <div class="clear"></div>
       </div>
-      <div class="clear"></div>
     </div>
     <!-- End header -->
     
-    <noscript>
-      <div class="widget centre">
-        <div class="title">JavaScript required</div>
-        This website requires JavaScript to function correctly.
-        Please enable JavaScript to use this site.
-      </div>
-    </noscript>
-    
-    <div id="content">
-      <div id="sidebar">
-        <div class="widget">
-          <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="pintest.html"><span>Pin debugging</span></a></li>
-             <li class="last"><a href="#"><span>Help</span></a></li>
-          </ul>
-          </div>
+    <div id="content-wrap">
+      <noscript>
+        <div class="widget centre">
+          <div class="title">JavaScript required</div>
+          This website requires JavaScript to function correctly.
+          Please enable JavaScript to use this site.
         </div>
-        <div class="widget">
-          <div class="title">Help</div>
-          
-        </div>
-      </div>
-      <!-- End sidebar -->
+      </noscript>
 
-      <div id="main">
-        <div class="widget">
-          <div class="title centre">Welcome</div>
-            <p>
-              Welcome to the MCTX3420 remote pressure vessel experiment site!
-            </p>
-            <p>
-              To explore how this system works, hover over the elements of the
-              system diagram below. Clicking each element will lead to a new
-              page that briefly describes that component of the system.
-            </p>
-            <p>
-              For the full documentation, see the project wiki at:
-              <a href="https://github.com/szmoore/MCTX3420/wiki">
-                https://github.com/szmoore/MCTX3420/wiki
-              </a>
-            </p>
-            <p>
-              To begin a new experiment, use the left navigation pane.
-            </p>
+      <div id="content">
+        <div id="sidebar">
+          <div class="widget">
+            <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="pintest.html"><span>Pin debugging</span></a></li>
+               <li class="last"><a href="#"><span>Help</span></a></li>
+            </ul>
+            </div>
+          </div>
+          <div class="widget">
+            <div class="title">Help</div>
+
+          </div>
         </div>
-        <div class="widget">
-          <div class="title">System diagram</div>
-          <img id="sbd" src="static/sbd.png" class="centre" alt="System diagram" usemap="#sbd-map">
-          <map name="sbd-map">
-            <area shape="rect" coords="78,44,178,94" href="#" alt="Client PC" title="You">
-            <area shape="rect" coords="238,44,338,94" href="#" alt="BBB">
-            <area shape="rect" coords="398,44,498,94" href="#" alt="Electronics">
-            <area shape="rect" coords="238,104,338,154" href="#" alt="Pneumatics">
-            <area shape="rect" coords="128,184,228,234" href="#" alt="Sensors">
-            <area shape="rect" coords="348,184,448,234" href="#" alt="Camera">
-            <area shape="rect" coords="128,238,228,288" href="#" alt="Strain Can">
-            <area shape="rect" coords="348,238,448,288" href="#" alt="Explode Can" title="Won't happen">
-            <area shape="rect" coords="13,206,113,231" href="#" alt="Enclosure" id="enclosure-btn">
-            <area shape="rect" coords="13,240,113,265" href="#" alt="Mounting" id="mounting-btn">
-            <area shape="rect" coords="116,175,457,294" alt="Mounting Area" id="mounting-area">
-            <area shape="poly" coords="230,30,524,30,524,294,115,294,115,100,230,100,230,30" alt="Enclosure Area" id="enclosure-area">
-          </map>
-          <script type="text/javascript" src="static/jquery.maphilight.min.js">
-            
-          </script>
-          <script type="text/javascript">
-            $("#sbd").maphilight({
-              fillOpacity: 0.4,
-              strokeColor: '000000',
-              strokeOpacity: 0.7
-            });
-            
-            $.fn.hilightToggle = function (on) {
-              var data = $(this).data("maphilight") || {};
-              data.neverOn = !on;
-              $(this).data("maphilight", data);
-              return this;
-            };
-            
-            $("#mounting-area").hilightToggle(false);
-            $("#enclosure-area").hilightToggle(false);
-            
-            $("#mounting-btn").mouseover(function () {
-              $("#mounting-area").hilightToggle(true).mouseover();
-            }).mouseout(function () {
+        <!-- End sidebar -->
+
+        <div id="main">
+          <div class="widget">
+            <div class="title centre">Welcome</div>
+              <p>
+                Welcome to the MCTX3420 remote pressure vessel experiment site!
+              </p>
+              <p>
+                To explore how this system works, hover over the elements of the
+                system diagram below. Clicking each element will lead to a new
+                page that briefly describes that component of the system.
+              </p>
+              <p>
+                For the full documentation, see the project wiki at:
+                <a href="https://github.com/szmoore/MCTX3420/wiki">
+                  https://github.com/szmoore/MCTX3420/wiki
+                </a>
+              </p>
+              <p>
+                To begin a new experiment, use the left navigation pane.
+              </p>
+          </div>
+          <div class="widget">
+            <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="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="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>
+            <script type="text/javascript" src="static/jquery.maphilight.min.js">
+
+            </script>
+            <script type="text/javascript">
+              $("#sbd").maphilight({
+                fillOpacity: 0.4,
+                strokeColor: '000000',
+                strokeOpacity: 0.7
+              });
+
+              $.fn.hilightToggle = function (on) {
+                var data = $(this).data("maphilight") || {};
+                data.neverOn = !on;
+                $(this).data("maphilight", data);
+                return this;
+              };
+
               $("#mounting-area").hilightToggle(false);
-            });
+              $("#case-area").hilightToggle(false);
+
+              $("#mounting-btn").mouseover(function () {
+                $("#mounting-area").hilightToggle(true).mouseover();
+              }).mouseout(function () {
+                $("#mounting-area").hilightToggle(false);
+              });
+
+              $("#case-btn").mouseover(function () {
+                $("#case-area").hilightToggle(true).mouseover();
+              }).mouseout(function () {
+                $("#case-area").hilightToggle(false);
+              });
+
+            </script>
             
-            $("#enclosure-btn").mouseover(function () {
-              $("#enclosure-area").hilightToggle(true).mouseover();
-            }).mouseout(function () {
-              $("#enclosure-area").hilightToggle(false);
-            });
-          
-          </script>
+            <div class="clear"></div>
+          </div>
         </div>
-      </div>
+    </div>
       <!-- End main content -->
     </div>
   </body>
index c833e12..c19dd73 100644 (file)
   </head>
   
   <body>
-    <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">
-        </a>
-        <span id="title">Exploding Cans</span>
+    <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">
+          </a>
+          <span id="title">Exploding Cans</span>
+        </div>
+        <div id="rightnav">
+          <span id="date">
+            <script type="text/javascript">getDate();</script>
+          </span>
+        </div>
+        <div class="clear"></div>
       </div>
-      <div id="rightnav">
-        <span id="date">
-          <script type="text/javascript">getDate();</script>
-        </span>
-      </div>
-      <div class="clear"></div>
     </div>
     <!-- End header -->
     
-    <div id="login-container">
-     <div class="widget">
-         <form id="login" action="#">
-           <p>
-             <label>
-               Username<br>
-               <input name="username" type="text">
-             </label>
-           </p>
-           <p>
-             <label>
-               Password<br>
-               <input name="pass" type="password">
-             </label>             
-           </p>
-           <p style="float:left; margin:0;">
-             <a href="#">Forgotten password?</a>
-           </p>
-           <p style="float:right; margin:0;">
-             <input type="submit" value="Log In">
-           </p>
-           <p id="result">
-             &nbsp;
-           </p>
-          </form>
-     </div>
+    <div id="content-wrap">
+      <div id="login-container">
+       <div class="widget">
+           <form id="login" action="#">
+             <p>
+               <label>
+                 Username<br>
+                 <input name="username" type="text">
+               </label>
+             </p>
+             <p>
+               <label>
+                 Password<br>
+                 <input name="pass" type="password">
+               </label>             
+             </p>
+             <p style="float:left; margin:0;">
+               <a href="#">Forgotten password?</a>
+             </p>
+             <p style="float:right; margin:0;">
+               <input type="submit" value="Log In">
+             </p>
+             <p id="result">
+               &nbsp;
+             </p>
+            </form>
+       </div>
+      </div>
     </div>
   </body>
 </html>
index 10310c7..fbc9411 100644 (file)
   </head>
   
   <body>
-    <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">
-        </a>
-        <span id="title">BBB Pin test (debug only)</span>
-      </div>
-      <div id="rightnav">
-        <span id="welcome-container">
-        </span>
-        <span id="date">
-          <script type="text/javascript">getDate();</script>
-        </span>
-        <div id="logout-container">
-          <form action="#">
-            <div>
-              <input type="button" id="logout" value="Logout">
-            </div>
-          </form>
+    <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">
+          </a>
+          <span id="title">BBB Pin test (debug only)</span>
         </div>
+        <div id="rightnav">
+          <span id="welcome-container">
+          </span>
+          <span id="date">
+            <script type="text/javascript">getDate();</script>
+          </span>
+          <div id="logout-container">
+            <form action="#">
+              <div>
+                <input type="button" id="logout" value="Logout">
+              </div>
+            </form>
+          </div>
+        </div>
+        <div class="clear"></div>
       </div>
-      <div class="clear"></div>
     </div>
     <!-- End header -->
     
-    <div id="content">
-      <div id="sidebar">
-        <div class="widget">
-          <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="pintest.html"><span>Pin debugging</span></a></li>
-             <li class="last"><a href="#"><span>Help</span></a></li>
-          </ul>
-          </div>
-        </div>
-        <div class="widget">
-          <div class="title">Info</div>
-          <p>This test page gives control over the BBB's pins.
-          Select a pin that you wish to use from the relevant drop-down
-          menu and click 'Go'.</p>
-          <p>A new widget will appear with controls relevant to that pin.</p>
-          <p>Make sure to check the error log to see if something goes wrong.</p>
-        </div>
-        <div class="widget">
-          <div class="title">Pin out diagram</div>
-          <p>To see the pin out diagram of the BBB, click <a href="pinout-table.pdf" target="_blank">here</a>.</p>
-        </div>
-        <div class="widget">
-          <div class="title">Export/Unexport?</div>
-          <p>
-            To export/unexport a pin means to enable/disable it. Apart from the obvious
-            use case, sometimes this can be required if you use two PWM channels
-            that share the same frequency base.
-          </p>
-          <p>
-            You won't be able to change
-            the frequency until you unexport one of them.
-          </p>
-        </div>
-        <div class="widget">
-          <div class="title">PWM explained</div>
-          <p>The frequency must be a decimal number greater than 0.</p>
-          <p>
-            The duty cycle describes the proportion of off/on time per period.
-            This number is specified as a ratio, with values ranging from 0 to 1.
-          </p>
-          <p>
-            The polarity determines if the duty represents the 'active
-            high' or 'active low' portion. By default, the duty cycle
-            represents the 'active high' portion.
-          </p>
+    <div id="content-wrap">
+      <noscript>
+        <div class="widget centre">
+          <div class="title">JavaScript required</div>
+          This website requires JavaScript to function correctly.
+          Please enable JavaScript to use this site.
         </div>
-      </div>
-      <!-- End sidebar -->
-
-      <div id="main">
-        <div class="widget">
-          <div class="title">Dashboard</div>
-          <table>
-            <tr>
-              <td>
-                GPIO <select id="gpio-menu"></select>
-                <input type="button" id="gpio-go" value="Go">
-              </td>
-              <td>
-                PWM <select id="pwm-menu"></select>
-                <input type="button" id="pwm-go" value="Go">
-              </td>
-            </tr>
-          </table>
-            
-          <div class="sub-title">Error log</div>
-          <textarea id="errorlog" wrap="off" rows="4" cols="30" readonly></textarea>
+      </noscript>
+      
+      <div id="content">
+        <div id="sidebar">
+          <div class="widget">
+            <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="pintest.html"><span>Pin debugging</span></a></li>
+               <li class="last"><a href="#"><span>Help</span></a></li>
+            </ul>
+            </div>
+          </div>
+          <div class="widget">
+            <div class="title">Info</div>
+            <p>This test page gives control over the BBB's pins.
+            Select a pin that you wish to use from the relevant drop-down
+            menu and click 'Go'.</p>
+            <p>A new widget will appear with controls relevant to that pin.</p>
+            <p>Make sure to check the error log to see if something goes wrong.</p>
+          </div>
+          <div class="widget">
+            <div class="title">Pin out diagram</div>
+            <p>To see the pin out diagram of the BBB, click <a href="pinout-table.pdf" target="_blank">here</a>.</p>
+          </div>
+          <div class="widget">
+            <div class="title">Export/Unexport?</div>
+            <p>
+              To export/unexport a pin means to enable/disable it. Apart from the obvious
+              use case, sometimes this can be required if you use two PWM channels
+              that share the same frequency base.
+            </p>
+            <p>
+              You won't be able to change
+              the frequency until you unexport one of them.
+            </p>
+          </div>
+          <div class="widget">
+            <div class="title">PWM explained</div>
+            <p>The frequency must be a decimal number greater than 0.</p>
+            <p>
+              The duty cycle describes the proportion of off/on time per period.
+              This number is specified as a ratio, with values ranging from 0 to 1.
+            </p>
+            <p>
+              The polarity determines if the duty represents the 'active
+              high' or 'active low' portion. By default, the duty cycle
+              represents the 'active high' portion.
+            </p>
+          </div>
         </div>
+        <!-- End sidebar -->
 
-        <div class="widget">
-          <div class="title">Analogue input (ADC)</div>
-          <form class="controls" action="#" id="adc-controls">
-            <table class="centre">
+        <div id="main">
+          <div class="widget">
+            <div class="title">Dashboard</div>
+            <table>
               <tr>
-                <td>AIN</td><th>0</th><th>1</th><th>2</th><th>3</th>
-                <th>4</th><th>5</th><th>6</th><th>7</th>
-              </tr>
-              <tr>
-                <td>Value</td>
-                <td><input name="0" type="text" readonly></td>
-                <td><input name="1" type="text" readonly></td>
-                <td><input name="2" type="text" readonly></td>
-                <td><input name="3" type="text" readonly></td>
-                <td><input name="4" type="text" readonly></td>
-                <td><input name="5" type="text" readonly></td>
-                <td><input name="6" type="text" readonly></td>
-                <td><input name="7" type="text" readonly></td>
-              </tr>
-              <tr>
-                <td>Export</td>
-                <td><input name="0" type="checkbox"></td>
-                <td><input name="1" type="checkbox"></td>
-                <td><input name="2" type="checkbox"></td>
-                <td><input name="3" type="checkbox"></td>
-                <td><input name="4" type="checkbox"></td>
-                <td><input name="5" type="checkbox"></td>
-                <td><input name="6" type="checkbox"></td>
-                <td><input name="7" type="checkbox"></td>
+                <td>
+                  GPIO <select id="gpio-menu"></select>
+                  <input type="button" id="gpio-go" value="Go">
+                </td>
+                <td>
+                  PWM <select id="pwm-menu"></select>
+                  <input type="button" id="pwm-go" value="Go">
+                </td>
               </tr>
             </table>
-          </form>
-        </div>
-        
-        <div class="widget" id="gpio-container">
-          <div class="title">GPIO controls</div>
-        </div>
-        
-        <div class="widget" id="pwm-container">
-          <div class="title">PWM controls</div>
+
+            <div class="sub-title">Error log</div>
+            <textarea id="errorlog" wrap="off" rows="4" cols="30" readonly></textarea>
+          </div>
+
+          <div class="widget">
+            <div class="title">Analogue input (ADC)</div>
+            <form class="controls" action="#" id="adc-controls">
+              <table class="centre">
+                <tr>
+                  <td>AIN</td><th>0</th><th>1</th><th>2</th><th>3</th>
+                  <th>4</th><th>5</th><th>6</th><th>7</th>
+                </tr>
+                <tr>
+                  <td>Value</td>
+                  <td><input name="0" type="text" readonly></td>
+                  <td><input name="1" type="text" readonly></td>
+                  <td><input name="2" type="text" readonly></td>
+                  <td><input name="3" type="text" readonly></td>
+                  <td><input name="4" type="text" readonly></td>
+                  <td><input name="5" type="text" readonly></td>
+                  <td><input name="6" type="text" readonly></td>
+                  <td><input name="7" type="text" readonly></td>
+                </tr>
+                <tr>
+                  <td>Export</td>
+                  <td><input name="0" type="checkbox"></td>
+                  <td><input name="1" type="checkbox"></td>
+                  <td><input name="2" type="checkbox"></td>
+                  <td><input name="3" type="checkbox"></td>
+                  <td><input name="4" type="checkbox"></td>
+                  <td><input name="5" type="checkbox"></td>
+                  <td><input name="6" type="checkbox"></td>
+                  <td><input name="7" type="checkbox"></td>
+                </tr>
+              </table>
+            </form>
+          </div>
+
+          <div class="widget" id="gpio-container">
+            <div class="title">GPIO controls</div>
+          </div>
+
+          <div class="widget" id="pwm-container">
+            <div class="title">PWM controls</div>
+          </div>
         </div>
+        <!-- End main content -->
       </div>
-      <!-- End main content -->
     </div>
   </body>
 </html>
diff --git a/testing/MCTXWeb/public_html/static/sbd4.png b/testing/MCTXWeb/public_html/static/sbd4.png
new file mode 100644 (file)
index 0000000..04a2688
Binary files /dev/null and b/testing/MCTXWeb/public_html/static/sbd4.png differ
index 2ff0cb1..1dd3718 100644 (file)
@@ -5,16 +5,12 @@
     url("OpenSans.eot");
 }
 
-/** Limit max width and auto-center content **/
-html  {
-  max-width: 1280px;
-  margin: 0 auto;
-}
-
 body {
   font-family: "Open Sans", "Lucida Grande","Lucida Sans",Verdana,Arial;
   font-size: 13px;
   background-color: #F5F5F5;
+  margin: 0;
+  padding: 0;
 }
 
 hr {
@@ -114,18 +110,21 @@ input[type="text"]:focus, input[type="password"]:focus {
   box-shadow: 0 0 2px #BBBBBB;
 }
 
-#header {
+#header-wrap {
   background-color: #2a2a2a;
-  border-top: 0.8em solid #1188DD;
+  border-top: 0.3em solid #1188DD;
   color: #f2f2f2;
-  padding: 1.5em 2em;
-  margin-top: -1em;
   margin-bottom: 1em;
   box-shadow: 0 0 0.5em #444444;
-  border-radius: 4px;
   transition: all 0.2s ease 0s;
 }
 
+#header {
+  padding: 1.5em 2em;
+  max-width: 1280px;
+  margin: 0 auto;
+}
+
 #header input[type="button"], #header input[type="submit"] {
   background-color: #808080;
   border: 1px solid #808080;
@@ -184,8 +183,14 @@ input[type="text"]:focus, input[type="password"]:focus {
   font-size: 12px;
 }
 
-#content  {
+#content-wrap {
   padding: 1em 2em;
+  max-width: 1280px;
+  margin: 1em auto;
+}
+
+#content  {
   /*display: none;  Enable in non-debug mode*/
 }
 

UCC git Repository :: git.ucc.asn.au