Mercurial > hg > nodescore

diff www/m/controls.html @ 16:e05eede75e0d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
some cleaning up of html css js
author tzara <rc-web@kiben.net>
date Sun, 08 Jul 2012 23:57:13 +0100
parents 0a8133490050
children a56434dee146
line wrap: on
line diff
--- a/www/m/controls.html	Sun Jul 08 23:56:26 2012 +0100
+++ b/www/m/controls.html	Sun Jul 08 23:57:13 2012 +0100
@@ -2,88 +2,80 @@
 <html>
   <head>
     <link href="css/nodescore.css" rel="stylesheet">
-    <link href="css/metronome.css" rel="stylesheet">
     <script src="js/jquery-1.7.1.min.js"></script>
     <script src="/socket.io/socket.io.js"></script>
-     <script src="js/client.js"></script>
+     <script src="js/nodescore-client.js"></script>
     <script src="js/controlseq.js"></script>
   </head>
-  <body>  
 
-  <input type="hidden" id="group" value='1'>
+  <body onload="getLatencies(500);">  
+    <input type="hidden" id="group" value='1'>
+    <div class="page">
+      <div class="outermaster">
+	<div id="client_chronometer">00:00:00.0</div>
+	<div class="metrocase">
+	  <div id="metronome0"></div>
+	  <div id="metronome1"></div>
+	  <div id="metronome2"></div>
+	  <div id="metronome3"></div>
+	</div>
+	
+	
+	<div class="outersquare">      
+	  <div>
+	    <p class="magicsquare" id="1magicsquare0"></p>
+	    <p class="magicsquare" id="1magicsquare1"></p>
+	    <p class="magicsquare" id="1magicsquare2"></p>
+	    <p class="magicsquare" id="1magicsquare3"></p>
+	    <p class="magicsquare" id="1magicsquare4"></p>
+	    <p class="magicsquare" id="1magicsquare5"></p>
+	  </div>
+	  <br><br><br><br>
+	  <div>
+	    <p class="magicsquare" id="2magicsquare0"></p>
+	    <p class="magicsquare" id="2magicsquare1"></p>
+	    <p class="magicsquare" id="2magicsquare2"></p>
+	    <p class="magicsquare" id="2magicsquare3"></p>
+	    <p class="magicsquare" id="2magicsquare4"></p>
+	    <p class="magicsquare" id="2magicsquare5"></p>
+	  </div>
+	  <br><br><br><br>
+	  <div>
+	    <p class="magicsquare" id="3magicsquare0"></p>
+	    <p class="magicsquare" id="3magicsquare1"></p>
+	    <p class="magicsquare" id="3magicsquare2"></p>
+	    <p class="magicsquare" id="3magicsquare3"></p>
+	    <p class="magicsquare" id="3magicsquare4"></p>
+	    <p class="magicsquare" id="3magicsquare5"></p>
+	  </div>
+	  <br><br><br><br>
+	  <div>
+	    <p class="magicsquare" id="4magicsquare0"></p>
+	    <p class="magicsquare" id="4magicsquare1"></p>
+	    <p class="magicsquare" id="4magicsquare2"></p>
+	    <p class="magicsquare" id="4magicsquare3"></p>
+	    <p class="magicsquare" id="4magicsquare4"></p>
+	    <p class="magicsquare" id="4magicsquare5"></p>
+	  </div>
+	  <br><br><br><br>      <br><br><br><br>
+	  
+	  <input type="button" value="START" onclick="startSeq();" />
+	  <input type="button" value="STOP" onclick="stopSeq();" />
+	  <input type="button" value="RESET" onclick="resetSeq();" />
+	  
+	  <br><br>
+	</div>
 
-  <div class="page">
-    <div class="outermaster">
-      <div id="client_chronometer">00:00:00.0</div>
-      <div class="metrocase">
-	<div id="metronome0"></div>
-	<div id="metronome1"></div>
-	<div id="metronome2"></div>
-	<div id="metronome3"></div>
-      </div>
+      <div class="latencies">	
+	<h2>Latency:</h2>
+	<h1 id="client_latency">0ms</h2>
+</div>
+
+      </div>	
       
 
-    <div class="outersquare">
-      
-      <div>
-	<p class="magicsquare" id="1magicsquare0"></p>
-	<p class="magicsquare" id="1magicsquare1"></p>
-	<p class="magicsquare" id="1magicsquare2"></p>
-	<p class="magicsquare" id="1magicsquare3"></p>
-	<p class="magicsquare" id="1magicsquare4"></p>
-	<p class="magicsquare" id="1magicsquare5"></p>
-      </div>
-      
-      <br><br>      <br><br>
-      
-      <div>
-	<p class="magicsquare" id="2magicsquare0"></p>
-	<p class="magicsquare" id="2magicsquare1"></p>
-	<p class="magicsquare" id="2magicsquare2"></p>
-	<p class="magicsquare" id="2magicsquare3"></p>
-	<p class="magicsquare" id="2magicsquare4"></p>
-	<p class="magicsquare" id="2magicsquare5"></p>
-      </div>
-      
-      <br><br>      <br><br>
-      <div>
-	<p class="magicsquare" id="3magicsquare0"></p>
-	<p class="magicsquare" id="3magicsquare1"></p>
-	<p class="magicsquare" id="3magicsquare2"></p>
-	<p class="magicsquare" id="3magicsquare3"></p>
-	<p class="magicsquare" id="3magicsquare4"></p>
-	<p class="magicsquare" id="3magicsquare5"></p>
-      </div>
-      
-      <br><br>      <br><br>
-      
-      <div>
-	<p class="magicsquare" id="4magicsquare0"></p>
-	<p class="magicsquare" id="4magicsquare1"></p>
-	<p class="magicsquare" id="4magicsquare2"></p>
-	<p class="magicsquare" id="4magicsquare3"></p>
-	<p class="magicsquare" id="4magicsquare4"></p>
-	<p class="magicsquare" id="4magicsquare5"></p>
-      </div>
 
-      <br><br>      <br><br>
-      
-
-      <input type="button" value="START" onclick="startSeq();" />
-      <input type="button" value="STOP" onclick="stopSeq();" />
-      <input type="button" value="RESET" onclick="resetSeq();" />
-
-      <br><br>
-    </div>
-      
-      <div class="latencies">
-	<h2>Calculate Client Latencies</h2><br>
-	<input type="button" value="Get Latencies" onclick="getLatencies(1000);" />
-	<h2 id="client_latency">0ms</h2>
-      </div>
-    </div>
-
-    </div>
+</div>