Mercurial > hg > nodescore

changeset 19:a56434dee146

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
toggleable divs and clean up
author tzara <rc-web@kiben.net>
date Mon, 09 Jul 2012 19:18:47 +0100
parents 6ad0cde69558
children 9daa1ac0af33
files www/m/5.html www/m/controls.html www/m/css/nodescore.css www/m/js/nodescore-client.js
diffstat 4 files changed, 43 insertions(+), 34 deletions(-) [+]
line wrap: on
line diff
--- a/www/m/5.html	Mon Jul 09 11:02:42 2012 +0100
+++ b/www/m/5.html	Mon Jul 09 19:18:47 2012 +0100
@@ -2,14 +2,9 @@
 <html>
 <head>
   <link href="css/nodescore.css" rel="stylesheet">
-  <link href="css/slider.css" rel="stylesheet">
   <link href="css/chat.css" rel="stylesheet">
   <script src="js/jquery-1.7.1.min.js"></script>  
-  <script src="js/jquery.scrollTo-min.js"></script>
-  <script src="js/jquery.serialScroll-min.js"></script>
-  <script src="js/ini.js"></script>
   <script src="/socket.io/socket.io.js"></script>
-  <script src="js/countin.js"></script>
   <script src="js/nodescore-client.js"></script>
 </head>
 
@@ -18,7 +13,7 @@
   <input type="hidden" id="group" value='1'>
  
   <div class="outermaster"> 
-    <div class="metrocase">
+    <div class="metrocase" id="metro">
 	<div id="metronome0"></div>
 	<div id="metronome1"></div>
 	<div id="metronome2"></div>
--- a/www/m/controls.html	Mon Jul 09 11:02:42 2012 +0100
+++ b/www/m/controls.html	Mon Jul 09 19:18:47 2012 +0100
@@ -10,7 +10,6 @@
 
   <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">
@@ -57,6 +56,7 @@
 	    <p class="magicsquare" id="4magicsquare4"></p>
 	    <p class="magicsquare" id="4magicsquare5"></p>
 	  </div>
+	</div>
 	  <br><br><br><br>      <br><br><br><br>
 	  
 	  <input type="button" value="START" onclick="startSeq();" />
@@ -64,7 +64,7 @@
 	  <input type="button" value="RESET" onclick="resetSeq();" />
 	  
 	  <br><br>
-	</div>
+
 
       <div class="latencies">	
 	<h2>Latency:</h2>
@@ -75,7 +75,7 @@
       
 
 
-</div>
+
       
 
 
--- a/www/m/css/nodescore.css	Mon Jul 09 11:02:42 2012 +0100
+++ b/www/m/css/nodescore.css	Mon Jul 09 19:18:47 2012 +0100
@@ -56,18 +56,30 @@
     right: 0px;
 }
 
-
 .outersquare{
-    height: 300px;
-    width: 385px;
+    height: 400px;
+    width: 685px;
     border: 1px solid blue;
     position: absolute;
-    top: 100px;
-    left: 400px;
+    top: 150px;
+    left: 0px;
     padding: 1px 1px 1px 1px ;
     background-color: black;
 }
 
+.magicsquare {
+    border: 1px solid yellow;
+    padding: 2px 2px 2px 2px;
+    background: blue;
+    width: 100px;
+    height: 90px;
+    border-radius: 20px;
+    float: left;
+    color: black;
+    font-size: 7em;    
+    text-align: center;
+}​
+
 .latencies{
     height: 90px;
     width: 200px;
@@ -76,11 +88,9 @@
     float: right;
     top: 15%;
     padding: 5px 5px 5px 5px ;
-    background-color: blue;
-    
+    background-color: blue;    
 }
 
-
 .metrocase {
     position: absolute;
     top: 10px;
@@ -138,22 +148,8 @@
     height: 800px;
 }
 
-.magicsquare {
-    border: 2px solid white;
-    padding: 1px 1px 1px 1 px;
-    background: blue;
-    width: 60px;
-    height: 60px;
-    border-radius: 10px;
-    float: left;
-    color: black;
-    font-size: 4em;    
-    text-align: center;
-}​
 
-#disp {
 
-}
 
 #content-txt {
 //   padding: 2px 2px 2px 2px;
--- a/www/m/js/nodescore-client.js	Mon Jul 09 11:02:42 2012 +0100
+++ b/www/m/js/nodescore-client.js	Mon Jul 09 19:18:47 2012 +0100
@@ -98,11 +98,29 @@
 }
 
 $(document).keypress(function(e){
+    // "space  bar" for next unit preview
     var checkWebkitandIE=(e.which==32 ? 1 : 0);
     var checkMoz=(e.which==32 ? 1 : 0);
-    if (checkWebkitandIE || checkMoz) {
-	toggle_visibility('preview')
-	}   
+    // "m" button for metronome
+    var mcheckWebkitandIE=(e.which==109 ? 1 : 0);
+    var mcheckMoz=(e.which==109 ? 1 : 0);
+    // "s" button for stopwatch/chronometer
+    var ccheckWebkitandIE=(e.which==115 ? 1 : 0);
+    var ccheckMoz=(e.which==115 ? 1 : 0);
+
+  // "h" button for hideall
+    var hcheckWebkitandIE=(e.which==104 ? 1 : 0);
+    var hcheckMoz=(e.which==104 ? 1 : 0);
+
+    console.log(e.which);
+    if (checkWebkitandIE || checkMoz) { toggle_visibility('preview') }   
+    if (mcheckWebkitandIE || mcheckMoz) { toggle_visibility('metro') }   
+    if (ccheckWebkitandIE || ccheckMoz) { toggle_visibility('client_chronometer') }   
+    if (hcheckWebkitandIE || hcheckMoz) { 
+	toggle_visibility('client_chronometer') 
+	toggle_visibility('metro') 
+	toggle_visibility('preview') 
+}
     });
 
 ////////////////////////////////////////////////