Mercurial > hg > nodescore
diff www/m/controls.html @ 11:0a8133490050
absorbed metronome.js .css into main css and client files
also some minor html5 and css changes
| author | tzara <rc-web@kiben.net> |
|---|---|
| date | Sat, 07 Jul 2012 07:10:56 +0000 |
| parents | 0e5543ccb8fb |
| children | e05eede75e0d |
line wrap: on
line diff
--- a/www/m/controls.html Fri Jul 06 10:48:15 2012 +0100 +++ b/www/m/controls.html Sat Jul 07 07:10:56 2012 +0000 @@ -5,15 +5,14 @@ <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/metronome.js"></script> - <script src="js/client.js"></script> + <script src="js/client.js"></script> <script src="js/controlseq.js"></script> </head> <body> <input type="hidden" id="group" value='1'> - <h1>Multicast Network Score Controls</h1> + <div class="page"> <div class="outermaster"> <div id="client_chronometer">00:00:00.0</div> <div class="metrocase"> @@ -23,13 +22,9 @@ <div id="metronome3"></div> </div> - <div> - <h2>Calculate Client Latencies</h2><br> - <input type="button" value="Get Latencies" onclick="getLatencies(1000);" /> - <h2 id="client_latency">0ms</h2> - </div> - - <h2>Magic Sequencer Monitor</h2><br> + + <div class="outersquare"> + <div> <p class="magicsquare" id="1magicsquare0"></p> <p class="magicsquare" id="1magicsquare1"></p> @@ -70,7 +65,7 @@ <p class="magicsquare" id="4magicsquare4"></p> <p class="magicsquare" id="4magicsquare5"></p> </div> - + <br><br> <br><br> @@ -79,17 +74,21 @@ <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> + -<a href="JavaScript:newPopup('http://nodescore.kiben.net:8889/msq/1.html');">client_1</a> -<a href="JavaScript:newPopup('http://nodescore.kiben.net:8889/msq/2.html');">client_2</a> -<a href="JavaScript:newPopup('http://nodescore.kiben.net:8889/msq/3.html');">client_3</a> -<a href="JavaScript:newPopup('http://nodescore.kiben.net:8889/msq/4.html');">client_4</a> - - </body>