diff -r 6ad0cde69558 -r a56434dee146 www/m/controls.html --- 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 @@ -

00:00:00.0

@@ -57,6 +56,7 @@

@@ -64,7 +64,7 @@

-

Latency:

@@ -75,7 +75,7 @@ -

+ diff -r 6ad0cde69558 -r a56434dee146 www/m/css/nodescore.css --- 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; diff -r 6ad0cde69558 -r a56434dee146 www/m/js/nodescore-client.js --- 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') +} }); ////////////////////////////////////////////////