# HG changeset patch # User tzara # Date 1345639888 0 # Node ID ea8d61c851c07f9bd1ad3e868e1f5898f6d8215c # Parent 1b8d0935b749ef266b2b21ccb06d55a49d526d2b added chat server and more work on interface diff -r 1b8d0935b749 -r ea8d61c851c0 nodescore.js --- a/nodescore.js Sun Aug 19 22:29:24 2012 +0000 +++ b/nodescore.js Wed Aug 22 12:51:28 2012 +0000 @@ -40,6 +40,31 @@ io.set('log level', 1); // reduce loggingi io.sockets.on('connection', function (socket) { + socket.on('nickname', function (nick, fn) { + if (nicknames[nick]) { + fn(true); + } else { + fn(false); + nicknames[nick] = socket.nickname = nick; + socket.broadcast.emit('announcement', nick + ' connected'); + io.sockets.emit('nicknames', nicknames); + } + }); + + + socket.on('disconnect', function(client) { + + if (!socket.nickname) return; + + delete nicknames[socket.nickname]; + socket.broadcast.emit('announcement', socket.nickname + ' disconnected'); + socket.broadcast.emit('nicknames', nicknames); + }); + + + socket.on('user message', function (msg) { + socket.broadcast.emit('user message', socket.nickname, msg); + }); //////////////////////////////////////////// // metronome //////////////////////////////////////////// @@ -144,8 +169,6 @@ var tock = setInterval(function(){ - - if (ztime >= 0 ){ // basic unit is still the second/1000ms - change this to tempoms? no i dont think so @@ -153,29 +176,33 @@ //////////////////////////////////////////// var counter = ztime/1000 - socket.emit('counterText', seq.voice, seq.counter, counter); + socket.broadcast.emit('counterText', seq.voice, seq.counter, counter); if (counter > 0 && counter <= outcount ) { - socket.broadcast.emit('countinFromServer', seq.voice, counter, "","", "white", "transparent"); + socket.broadcast.emit('countinFromServer', seq.voice, counter, "","stop in:", "red", "transparent"); + socket.broadcast.emit('counterText', seq.voice, seq.counter, counter); } // remove displayed number with " " at end of both countin/out if (counter == 0 ) { - - socket.broadcast.emit('countinFromServer', seq.voice, " ", "","", "white","transparent"); + socket.broadcast.emit('counterText', seq.voice, seq.counter, counter); + socket.broadcast.emit('countinFromServer', seq.voice, "///", "//","/", "green","transparent"); } - if (counter > (totaltime)-incount && counter <= totaltime ) { - socket.broadcast.emit('countinFromServer', seq.voice, counter-(totaltime-incount), "","", "red","gray"); + if (counter > (totaltime)-incount && counter <= totaltime ) { + + socket.broadcast.emit('countinFromServer', seq.voice, counter-(totaltime-incount), "","play in:", "green","black"); + socket.broadcast.emit('counterText', seq.voice, seq.counter, counter); } if (counter == (totaltime)-incount ) { - socket.broadcast.emit('countinFromServer', seq.voice, " ", "","", "red","gray"); + socket.broadcast.emit('countinFromServer', seq.voice, "+", "","playing..", "green","black"); + socket.broadcast.emit('counterText', seq.voice, seq.counter, counter); } // push out the pulse to metronome - + socket.broadcast.emit('counterText', seq.voice, seq.counter, counter); seq.metrobeat = (seq.metrobeat+1)%seq.beatsinbar ; socket.broadcast.emit('metroPulse', tempoms, seq.voice,seq.metrobeat); socket.emit('metroPulse', tempoms, seq.voice,seq.metrobeat); @@ -185,7 +212,8 @@ // flip the page if (ztime == 0){ - socket.emit('counterText', seq.voice, seq.counter, " "); + socket.broadcast.emit('counterText', seq.voice, seq.counter, counter); + //socket.emit('counterText', seq.voice, seq.counter, " "); seq.counter = (seq.counter + 1) % seq.durations.length socket.broadcast.emit("pageFlipfromserver", seq.voice, unit, time, seq.mm,seq.counter); // socket.emit("pageFlipfromserver", seq.voice, unit, time, seq.mm,seq.counter); @@ -193,12 +221,16 @@ step(seq); } - if (ztime < 0){} + if (ztime < 0){ + socket.broadcast.emit('counterText', seq.voice, seq.counter, counter); + } + // decrement the time ztime -= 1000 + socket.broadcast.emit('counterText', seq.voice, seq.counter, counter); }, tempoms) - + }; // socket.on('stopSeq', function () { @@ -261,7 +293,6 @@ so maybe latency is irrelevant in this context - we just need to stagger signals according to encoding decoding times.. hmmm */ - // periodically broadcast a ping @@ -300,10 +331,10 @@ serverTime(1000); socket.on('disconnect', function(client) { - console.log(client + " is gone..." ) + console.log(socket.nickname + " is gone..." ) clearInterval(st); }); - + }); diff -r 1b8d0935b749 -r ea8d61c851c0 www/m/css/chat.css --- a/www/m/css/chat.css Sun Aug 19 22:29:24 2012 +0000 +++ b/www/m/css/chat.css Wed Aug 22 12:51:28 2012 +0000 @@ -1,58 +1,31 @@ -#nicknames { - position: relative; - background-color: #666; - padding: 6px 6px 6px; - font: 15px Helvetica; -} - -.nickname-set #nickname { - display: none; -} - #chat, #nickname, - #messages { - width: 300px; - background-color: white; - z-index: 2; + width: 350px; } - #chat { - left: 700px; - top: 500px; - border: 1px solid #ccc; - background-color: white; - font: 12px Helvetica; - position: absolute; - z-index: 2; - opacity:0.5; + position: relative; + border: 0px solid #ccc; + background: black; + border-radius: 15px; } - -#chatclient { - right: 2px; - border: 1px solid #ccc; - background-color: black; -# width: 300px; - font: 12px Helvetica; - position: absolute; - bottom:50px; -} - #nickname, #connecting { - position: relative; - height: 210px; - width: 300px; - color: #666; + position: absolute; + height: 185px; + z-index: 100; + left: 0; + top: 0; + background: black; + text-align: center; + width: 350px; + font: 15px Georgia; + color: white; display: block; - top:150px; - font: 12px Helvetica; } - #nickname .wrap, #connecting .wrap { - padding-top: 10px; + padding-top: 60px; } #nickname input { border: 1px solid #ccc; @@ -74,71 +47,65 @@ display: none; } #messages { - height: 100px; + height: 160px; + !background: #eee; + background: black; } - #messages em { - text-shadow: 0 1px 0 #fff; - color: #999; + !text-shadow: 0 1px 0 #fff; + !color: #999; + color: white; } - #messages p { padding: 0; margin: 0; - font: 12px Helvetica, Arial; - padding: 5px 10px; - color:light-gray; - background: white; + font: 11px Helvetica, Arial; + padding: 0px 10px; + color: white; } #messages p b { display: inline-block; padding-right: 10px; - color:black; - background: white; + color: white; } #messages p:nth-child(even) { - background: white; - color: gray; + !background: #fafafa; + background: black; + color: white; } - +#messages #nicknames { + background: black; + padding: 2px 4px 4px; + font: 11px Helvetica; + color: white; +} #messages #nicknames span { color: #000; - color: blue; + color: white; } #messages #nicknames b { display: inline-block; - color: blue; - background: #999; - padding: 3px 6px; + background: black; margin-right: 5px; - -webkit-border-radius: 10px; - -moz-border-radius: 10px; - border-radius: 10px; - text-shadow: 0 1px 0 #666; + color: yellow; } #messages #lines { - height: 80px; + height: 140px; overflow: auto; - overflow-x:hidden; + overflow-x: hidden; overflow-y: auto; - background-color: white; - font-size: 18px; - color: black; } #messages #lines::-webkit-scrollbar { width: 6px; height: 6px; - color: blue; } #messages #lines::-webkit-scrollbar-button:start:decrement, #messages #lines ::-webkit-scrollbar-button:end:increment { display: block; height: 10px; - color: blue; } #messages #lines::-webkit-scrollbar-button:vertical:increment { background-color: #fff; - color: blue; } #messages #lines::-webkit-scrollbar-track-piece { background-color: #fff; @@ -148,33 +115,83 @@ height: 50px; background-color: #ccc; -webkit-border-radius: 3px; - color: blue; } #messages #lines::-webkit-scrollbar-thumb:horizontal { width: 50px; background-color: #fff; -webkit-border-radius: 3px; - color: black; } #send-message { - background: #fff; + background: gray; position: relative; + border-radius:5px; } #send-message input { - height: 30px; - line-height: 30px; + border: none; + height: 20px; + padding: 0 0px; + line-height: 20px; vertical-align: middle; - width: 300px; - border: 1px solid #ccc; - background-color:white; - color: black; - font: 15px Helvetica, Arial; + width: 330px; + background:gray; + color: yellow; + border-radius:5px; } #send-message input:focus { outline: 0; } -#send-message button { - position: absolute; - top: 5px; +#send-message button { + position: absolute; + top: 3px; right: 5px; +} +button { + margin: 0; + -webkit-user-select: none; + -moz-user-select: none; + user-select: none; + display: inline-block; + text-decoration: none; + background: #43a1f7; + background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #43a1f7), color-stop(1, #377ad0)); + background: -webkit-linear-gradient(top, #43a1f7 0%, #377ad0 100%); + background: -moz-linear-gradient(top, #43a1f7 0%, #377ad0 100%); + background: linear-gradient(top, #43a1f7 0%, #377ad0 100%); + border: 1px solid #2e70c4; + -webkit-border-radius: 16px; + -moz-border-radius: 16px; + border-radius: 16px; + color: #fff; + font-family: "lucida grande", sans-serif; + font-size: 11px; + font-weight: normal; + line-height: 1; + !padding: 3px 10px 5px 10px; + text-align: center; + text-shadow: 0 -1px 1px #2d6dc0; +} +button:hover, +button.hover { + background: darker; + background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #43a1f7), color-stop(1, #2e70c4)); + background: -webkit-linear-gradient(top, #43a1f7 0%, #2e70c4 100%); + background: -moz-linear-gradient(top, #43a1f7 0%, #2e70c4 100%); + background: linear-gradient(top, #43a1f7 0%, #2e70c4 100%); + border: 1px solid #2e70c4; + cursor: pointer; + text-shadow: 0 -1px 1px #2c6bbb; +} +button:active, +button.active { + background: #2e70c4; + border: 1px solid #2e70c4; + border-bottom: 1px solid #2861aa; + text-shadow: 0 -1px 1px #2b67b5; +} +button:focus, +button.focus { + outline: none; + -webkit-box-shadow: 0 1px 0 0 rgba(255,255,255,0.40), 0 0 4px 0 #377ad0; + -moz-box-shadow: 0 1px 0 0 rgba(255,255,255,0.40), 0 0 4px 0 #377ad0; + box-shadow: 0 1px 0 0 rgba(255,255,255,0.40), 0 0 4px 0 #377ad0; } \ No newline at end of file diff -r 1b8d0935b749 -r ea8d61c851c0 www/m/css/nodescore.css --- a/www/m/css/nodescore.css Sun Aug 19 22:29:24 2012 +0000 +++ b/www/m/css/nodescore.css Wed Aug 22 12:51:28 2012 +0000 @@ -63,7 +63,7 @@ #comms{ border-radius: 15px; height: 180px; - width: 550px; + width: 350px; margin: 0px; border: 1px solid gray; position: absolute; @@ -71,6 +71,37 @@ left: 14px; padding: 5px 5px 5px 5px ; color: black; + +} + +#midcomms{ + font-size: 3em; + font-weight:bolder; + !display:inline; + text-align:center; + border-radius: 15px; + height: 180px; + width: 180px; + margin: 0px; + border: 1px solid gray; + position: absolute; + bottom: 80px; + left: 380px; + padding: 5px 5px 5px 5px ; + color: black; +} +#totalcountdown { + font-size: 0.6em; + color:white; + position:absolute; + bottom: 0px; + text-align:center; + width:100%; +} +#count { + font-size: 3em; + background:transparent; + } #preview{ @@ -119,7 +150,7 @@ border-radius: 15px; margin: 0px; width: 100%; -!height: 768px; +height: 440px; } .magicsquare { @@ -239,8 +270,8 @@ border-radius: 15px; position: absolute; width: 100%; height: 90%; - background-color:gray; - font-size: 36em; + background-color:black; + font-size: 16em; font-weight:bolder; display:inline; text-align:center; diff -r 1b8d0935b749 -r ea8d61c851c0 www/m/ctrl.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/www/m/ctrl.html Wed Aug 22 12:51:28 2012 +0000 @@ -0,0 +1,139 @@ + + + + + + + + + + + + + + + + + + + + +
+

l i v e :

+
+
+
+
+

+

+

+

+

+

+
+



+
+

+

+

+

+

+

+
+



+
+

+

+

+

+

+

+
+



+
+

+

+

+

+

+

+
+
+







+ + + + + +

+ + +
+ +
+
+
+
+

Please type in your nickname and press enter.

+ +

Nickname already in use

+
+
+
+
Connecting to socket.io server
+
+
+
+
+
+
+ + +
+
+
+ +
+
+
+ +
+ +
+
+
+
+
+
+ +
GROUP: 1
+
Latency: 0ms
+
+
00:00:00.0
+ +
+ + + + + + + + + + diff -r 1b8d0935b749 -r ea8d61c851c0 www/m/js/nodescore-client.js --- a/www/m/js/nodescore-client.js Sun Aug 19 22:29:24 2012 +0000 +++ b/www/m/js/nodescore-client.js Wed Aug 22 12:51:28 2012 +0000 @@ -19,7 +19,7 @@ $(".metrocase > div").each(function(){$(this).stop()}); $(".metrocase > div").each(function(){$(this).css('background-color', beatcolor)}); $(".metrocase > div").each(function(){$(this).text(" ")}); - $(".metrocase > div").each(function(){$(this).animate({opacity: 0.6}, + $(".metrocase > div").each(function(){$(this).animate({opacity: 1}, 50, function() { $(this).animate({opacity:0.0}); } ); @@ -57,19 +57,35 @@ function countinClient(groupID, currentseconds,mm,text,colour,background){ var groupPage=document.getElementById('group').value if (groupID == groupPage) { - document.getElementById("countinnumber").style.visibility="visible"; - document.getElementById("countinnumber").style.visibility="visible"; - $("#countinnumber").text(currentseconds); - $("#countinnumber").css('background-color', background); + document.getElementById("count").style.visibility="visible"; + document.getElementById("count").style.visibility="visible"; + + $("#counttitle").text(text); + $("#count").text(currentseconds); + //$("#cnt").text(currentseconds); + + $("#count").css('background-color', background); - document.getElementById("countinnumber").style.color=colour; + document.getElementById("count").style.color=colour; - if ( currentseconds == 0) { - document.getElementById("countinnumber").style.visibility='hidden'; - } +// if ( currentseconds == 0) { + //document.getElementById("midcomms").style.visibility='hidden'; +// } + }} +///////////////////////////////////////////////// + +///////////////////////////////////////////////// +// countdown to change + +socket.on("counterText", counterText); +function counterText(groupID, currentseconds,text){ + var groupPage=document.getElementById('group').value + if (groupID == groupPage) { + console.log() + $("#totalcountdown").text(text); }} -///////////////////////////////////////////////// +/////////////////////////////////////// function pageFlip(unit) { console.log("flipping page:"+ unit); @@ -77,7 +93,6 @@ } - ///////////////////////////////////////////////// // call the fancy jquery functions @@ -112,7 +127,8 @@ //////////////////////////////////////////////// -/* +/* commented out for now as interferes with chat +need to introduce metakey...manyana... not so usefull anyway really... keyboard controls +++++++++++++++++++++++++ @@ -122,7 +138,7 @@ s to toggle visibilty of stopwatch h to hide all above -*/ + function toggle_visibility(id) { var e = document.getElementById(id); @@ -158,6 +174,8 @@ } }); +*/ + //////////////////////////////////////////////// // this needs to have a variable to define the websocket // otherwise we will pings from all sockets connected @@ -177,4 +195,64 @@ function getLatencies(x) { socket.emit("getLatencies", x); } -////////////////////////////////////////////// \ No newline at end of file +////////////////////////////////////////////// + + +socket.on('connect', function () { + $('#chat').addClass('connected'); +}); + +socket.on('announcement', function (msg) { + $('#lines').append($('

').append($('').text(msg))); +}); + +socket.on('nicknames', function (nicknames) { + $('#nicknames').empty().append($('Online: ')); + for (var i in nicknames) { + $('#nicknames').append($('').text(nicknames[i])); + } +}); + +socket.on('user message', message); +socket.on('reconnect', function () { + $('#lines').remove(); + message('System', 'Reconnected to the server'); +}); + +socket.on('reconnecting', function () { + message('System', 'Attempting to re-connect to the server'); +}); + +socket.on('error', function (e) { + message('System', e ? e : 'A unknown error occurred'); +}); + +function message (from, msg) { + $('#lines').append($('

').append($('').text(from), msg)); +} + +// dom manipulation +$(function () { + $('#set-nickname').submit(function (ev) { + socket.emit('nickname', $('#nick').val(), function (set) { + if (!set) { + clear(); + return $('#chat').addClass('nickname-set'); + } + $('#nickname-err').css('visibility', 'visible'); + }); + return false; + }); + + $('#send-message').submit(function () { + message('me', $('#message').val()); + socket.emit('user message', $('#message').val()); + clear(); + $('#lines').get(0).scrollTop = 10000000; + return false; + }); + + function clear () { + $('#message').val('').focus(); + }; +}); \ No newline at end of file diff -r 1b8d0935b749 -r ea8d61c851c0 www/m/score.html --- a/www/m/score.html Sun Aug 19 22:29:24 2012 +0000 +++ b/www/m/score.html Wed Aug 22 12:51:28 2012 +0000 @@ -8,6 +8,8 @@ + + @@ -20,7 +22,36 @@

l i v e :

-
+ +
+
+
+
+

LOGIN:

+ +

Nickname already in use

+
+
+
+
Connecting to socket.io server
+
+
+
+
+
+
+ + +
+
+
+ +
+

...

+

...

+
...
+
+
diff -r 1b8d0935b749 -r ea8d61c851c0 www/m/svg/12_7_1.svg --- a/www/m/svg/12_7_1.svg Sun Aug 19 22:29:24 2012 +0000 +++ b/www/m/svg/12_7_1.svg Wed Aug 22 12:51:28 2012 +0000 @@ -1,29 +1,61 @@ - + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + 8va - - - - - + + + + + + + + 12 diff -r 1b8d0935b749 -r ea8d61c851c0 www/m/svg/13_6_2.svg --- a/www/m/svg/13_6_2.svg Sun Aug 19 22:29:24 2012 +0000 +++ b/www/m/svg/13_6_2.svg Wed Aug 22 12:51:28 2012 +0000 @@ -1,30 +1,65 @@ - + - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + 8va - - - - - + + + + + + + + + 13 diff -r 1b8d0935b749 -r ea8d61c851c0 www/m/svg/14_1_1.svg --- a/www/m/svg/14_1_1.svg Sun Aug 19 22:29:24 2012 +0000 +++ b/www/m/svg/14_1_1.svg Wed Aug 22 12:51:28 2012 +0000 @@ -1,27 +1,48 @@ - + - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + 14 - diff -r 1b8d0935b749 -r ea8d61c851c0 www/m/svg/15_0_2.svg --- a/www/m/svg/15_0_2.svg Sun Aug 19 22:29:24 2012 +0000 +++ b/www/m/svg/15_0_2.svg Wed Aug 22 12:51:28 2012 +0000 @@ -1,24 +1,45 @@ - + - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + 15 diff -r 1b8d0935b749 -r ea8d61c851c0 www/m/svg/16_2_2.svg --- a/www/m/svg/16_2_2.svg Sun Aug 19 22:29:24 2012 +0000 +++ b/www/m/svg/16_2_2.svg Wed Aug 22 12:51:28 2012 +0000 @@ -1,19 +1,33 @@ - + - - - - - - + + + + + + + + + + - - + + + + + + + + 16 diff -r 1b8d0935b749 -r ea8d61c851c0 www/m/svg/17_3_1.svg --- a/www/m/svg/17_3_1.svg Sun Aug 19 22:29:24 2012 +0000 +++ b/www/m/svg/17_3_1.svg Wed Aug 22 12:51:28 2012 +0000 @@ -1,19 +1,28 @@ - + - - - - - - + + + + + + - - + + + + + + + + 17 diff -r 1b8d0935b749 -r ea8d61c851c0 www/m/svg/18_4_2.svg --- a/www/m/svg/18_4_2.svg Sun Aug 19 22:29:24 2012 +0000 +++ b/www/m/svg/18_4_2.svg Wed Aug 22 12:51:28 2012 +0000 @@ -1,22 +1,47 @@ - + - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + 18 diff -r 1b8d0935b749 -r ea8d61c851c0 www/m/svg/19_5_1.svg --- a/www/m/svg/19_5_1.svg Sun Aug 19 22:29:24 2012 +0000 +++ b/www/m/svg/19_5_1.svg Wed Aug 22 12:51:28 2012 +0000 @@ -1,22 +1,47 @@ - + - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + 19 diff -r 1b8d0935b749 -r ea8d61c851c0 www/m/svg/20_5_0.svg --- a/www/m/svg/20_5_0.svg Sun Aug 19 22:29:24 2012 +0000 +++ b/www/m/svg/20_5_0.svg Wed Aug 22 12:51:28 2012 +0000 @@ -1,28 +1,53 @@ - + - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - + + + + 8vb - - - - - + + + + + + + + + 20 diff -r 1b8d0935b749 -r ea8d61c851c0 www/m/svg/21_4_3.svg --- a/www/m/svg/21_4_3.svg Sun Aug 19 22:29:24 2012 +0000 +++ b/www/m/svg/21_4_3.svg Wed Aug 22 12:51:28 2012 +0000 @@ -1,24 +1,59 @@ - + - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + 21 diff -r 1b8d0935b749 -r ea8d61c851c0 www/m/svg/22_3_0.svg --- a/www/m/svg/22_3_0.svg Sun Aug 19 22:29:24 2012 +0000 +++ b/www/m/svg/22_3_0.svg Wed Aug 22 12:51:28 2012 +0000 @@ -1,34 +1,61 @@ - + - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + 8va - - - - - + + + + + + + + + + 22 - diff -r 1b8d0935b749 -r ea8d61c851c0 www/m/svg/23_2_3.svg --- a/www/m/svg/23_2_3.svg Sun Aug 19 22:29:24 2012 +0000 +++ b/www/m/svg/23_2_3.svg Wed Aug 22 12:51:28 2012 +0000 @@ -1,31 +1,50 @@ - + - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - + + + 8vb - - - - + + + + + + + + 23 - diff -r 1b8d0935b749 -r ea8d61c851c0 www/m/svg/24_0_3.svg --- a/www/m/svg/24_0_3.svg Sun Aug 19 22:29:24 2012 +0000 +++ b/www/m/svg/24_0_3.svg Wed Aug 22 12:51:28 2012 +0000 @@ -1,33 +1,55 @@ - + - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - + + + 8va - - - - - + + + + + + + + + 24 - diff -r 1b8d0935b749 -r ea8d61c851c0 www/m/svg/25_1_0.svg --- a/www/m/svg/25_1_0.svg Sun Aug 19 22:29:24 2012 +0000 +++ b/www/m/svg/25_1_0.svg Wed Aug 22 12:51:28 2012 +0000 @@ -1,26 +1,58 @@ - + - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + 25 - diff -r 1b8d0935b749 -r ea8d61c851c0 www/m/svg/26_6_3.svg --- a/www/m/svg/26_6_3.svg Sun Aug 19 22:29:24 2012 +0000 +++ b/www/m/svg/26_6_3.svg Wed Aug 22 12:51:28 2012 +0000 @@ -1,19 +1,26 @@ - + - - - - - - + + + + + + + - - + + + + + + 26 diff -r 1b8d0935b749 -r ea8d61c851c0 www/m/svg/27_7_0.svg --- a/www/m/svg/27_7_0.svg Sun Aug 19 22:29:24 2012 +0000 +++ b/www/m/svg/27_7_0.svg Wed Aug 22 12:51:28 2012 +0000 @@ -1,21 +1,33 @@ - + - - - - - - + + + + + + + + + - - + + + + + + + + 27 diff -r 1b8d0935b749 -r ea8d61c851c0 www/m/svg/28_7_7.svg --- a/www/m/svg/28_7_7.svg Sun Aug 19 22:29:24 2012 +0000 +++ b/www/m/svg/28_7_7.svg Wed Aug 22 12:51:28 2012 +0000 @@ -1,19 +1,31 @@ - + - - - - - - + + + + + + + + - - + + + + + + + + 28 diff -r 1b8d0935b749 -r ea8d61c851c0 www/m/svg/29_6_4.svg --- a/www/m/svg/29_6_4.svg Sun Aug 19 22:29:24 2012 +0000 +++ b/www/m/svg/29_6_4.svg Wed Aug 22 12:51:28 2012 +0000 @@ -1,30 +1,51 @@ - + - - - - - - - + + + + + + + + + + + + + + + + + + - - + + + 8vb - - - - + + + + + + + + + + 29 - diff -r 1b8d0935b749 -r ea8d61c851c0 www/m/svg/30_1_7.svg --- a/www/m/svg/30_1_7.svg Sun Aug 19 22:29:24 2012 +0000 +++ b/www/m/svg/30_1_7.svg Wed Aug 22 12:51:28 2012 +0000 @@ -1,28 +1,37 @@ - + - - - - - - + + + + + + + - + + + + 8va - - - - - + + + + + + + 30 diff -r 1b8d0935b749 -r ea8d61c851c0 www/m/svg/31_0_4.svg --- a/www/m/svg/31_0_4.svg Sun Aug 19 22:29:24 2012 +0000 +++ b/www/m/svg/31_0_4.svg Wed Aug 22 12:51:28 2012 +0000 @@ -1,22 +1,33 @@ - + - - - - - - + + + + + + + + - - + + + + + + + + 31 - diff -r 1b8d0935b749 -r ea8d61c851c0 www/m/svg/32_2_4.svg --- a/www/m/svg/32_2_4.svg Sun Aug 19 22:29:24 2012 +0000 +++ b/www/m/svg/32_2_4.svg Wed Aug 22 12:51:28 2012 +0000 @@ -1,25 +1,48 @@ - + - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + 32 - diff -r 1b8d0935b749 -r ea8d61c851c0 www/m/svg/33_3_7.svg --- a/www/m/svg/33_3_7.svg Sun Aug 19 22:29:24 2012 +0000 +++ b/www/m/svg/33_3_7.svg Wed Aug 22 12:51:28 2012 +0000 @@ -1,26 +1,36 @@ - + - - - - - - + + + + + + + + - + + + 8vb - - - - - + + + + + + + + 33 diff -r 1b8d0935b749 -r ea8d61c851c0 www/m/svg/34_4_4.svg --- a/www/m/svg/34_4_4.svg Sun Aug 19 22:29:24 2012 +0000 +++ b/www/m/svg/34_4_4.svg Wed Aug 22 12:51:28 2012 +0000 @@ -1,32 +1,44 @@ - + - - - - - - - + + + + + + + + + + + - + + + 8va - - - - - + + + + + + + + + 34 - diff -r 1b8d0935b749 -r ea8d61c851c0 www/m/svg/35_5_7.svg --- a/www/m/svg/35_5_7.svg Sun Aug 19 22:29:24 2012 +0000 +++ b/www/m/svg/35_5_7.svg Wed Aug 22 12:51:28 2012 +0000 @@ -1,23 +1,38 @@ - + - - - - - - - - + + + + + + + + + + + + + - - + + + + + + + + 35 diff -r 1b8d0935b749 -r ea8d61c851c0 www/m/svg/36_5_6.svg --- a/www/m/svg/36_5_6.svg Sun Aug 19 22:29:24 2012 +0000 +++ b/www/m/svg/36_5_6.svg Wed Aug 22 12:51:28 2012 +0000 @@ -1,24 +1,49 @@ - + - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + 36 diff -r 1b8d0935b749 -r ea8d61c851c0 www/m/svg/37_4_5.svg --- a/www/m/svg/37_4_5.svg Sun Aug 19 22:29:24 2012 +0000 +++ b/www/m/svg/37_4_5.svg Wed Aug 22 12:51:28 2012 +0000 @@ -1,19 +1,30 @@ - + - - - - - - + + + + + + + - - + + + + + + + + 37 diff -r 1b8d0935b749 -r ea8d61c851c0 www/m/svg/38_3_6.svg --- a/www/m/svg/38_3_6.svg Sun Aug 19 22:29:24 2012 +0000 +++ b/www/m/svg/38_3_6.svg Wed Aug 22 12:51:28 2012 +0000 @@ -1,19 +1,31 @@ - + - - - - - - + + + + + + + + - - + + + + + + + + 38 diff -r 1b8d0935b749 -r ea8d61c851c0 www/m/svg/39_2_5.svg --- a/www/m/svg/39_2_5.svg Sun Aug 19 22:29:24 2012 +0000 +++ b/www/m/svg/39_2_5.svg Wed Aug 22 12:51:28 2012 +0000 @@ -1,21 +1,46 @@ - + - - - - - - + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + 39 diff -r 1b8d0935b749 -r ea8d61c851c0 www/m/svg/40_0_5.svg --- a/www/m/svg/40_0_5.svg Sun Aug 19 22:29:24 2012 +0000 +++ b/www/m/svg/40_0_5.svg Wed Aug 22 12:51:28 2012 +0000 @@ -1,28 +1,44 @@ - + - - - - - - - - + + + + + + + + + + + + + + + + - + + + 8vb - - - - - + + + + + + + + 40 diff -r 1b8d0935b749 -r ea8d61c851c0 www/m/svg/41_1_6.svg --- a/www/m/svg/41_1_6.svg Sun Aug 19 22:29:24 2012 +0000 +++ b/www/m/svg/41_1_6.svg Wed Aug 22 12:51:28 2012 +0000 @@ -1,23 +1,48 @@ - + - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + 41 diff -r 1b8d0935b749 -r ea8d61c851c0 www/m/svg/42_6_5.svg --- a/www/m/svg/42_6_5.svg Sun Aug 19 22:29:24 2012 +0000 +++ b/www/m/svg/42_6_5.svg Wed Aug 22 12:51:28 2012 +0000 @@ -1,23 +1,49 @@ - + - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + 42 diff -r 1b8d0935b749 -r ea8d61c851c0 www/m/svg/43_7_6.svg --- a/www/m/svg/43_7_6.svg Sun Aug 19 22:29:24 2012 +0000 +++ b/www/m/svg/43_7_6.svg Wed Aug 22 12:51:28 2012 +0000 @@ -1,34 +1,49 @@ - + - - - - - - - - - + + + + + + + + + + + + + + + - - + + + + 8va - - - - + + + + + + + + 43 - diff -r 1b8d0935b749 -r ea8d61c851c0 www/m/svg/44_7_5.svg --- a/www/m/svg/44_7_5.svg Sun Aug 19 22:29:24 2012 +0000 +++ b/www/m/svg/44_7_5.svg Wed Aug 22 12:51:28 2012 +0000 @@ -1,26 +1,42 @@ - + - - - - - - - - + + + + + + + + + + + + + + + + - - + + + + + + + + 44 - diff -r 1b8d0935b749 -r ea8d61c851c0 www/m/svg/45_6_6.svg --- a/www/m/svg/45_6_6.svg Sun Aug 19 22:29:24 2012 +0000 +++ b/www/m/svg/45_6_6.svg Wed Aug 22 12:51:28 2012 +0000 @@ -1,24 +1,37 @@ - + - - - - - - - - - + + + + + + + + + + + + + - - + + + + + + + + 45 diff -r 1b8d0935b749 -r ea8d61c851c0 www/m/svg/46_1_5.svg --- a/www/m/svg/46_1_5.svg Sun Aug 19 22:29:24 2012 +0000 +++ b/www/m/svg/46_1_5.svg Wed Aug 22 12:51:28 2012 +0000 @@ -1,28 +1,65 @@ - + - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + 46 - diff -r 1b8d0935b749 -r ea8d61c851c0 www/m/svg/47_0_6.svg --- a/www/m/svg/47_0_6.svg Sun Aug 19 22:29:24 2012 +0000 +++ b/www/m/svg/47_0_6.svg Wed Aug 22 12:51:28 2012 +0000 @@ -1,26 +1,42 @@ - + - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - + + + + + + + + 47 - diff -r 1b8d0935b749 -r ea8d61c851c0 www/m/svg/48_2_6.svg --- a/www/m/svg/48_2_6.svg Sun Aug 19 22:29:24 2012 +0000 +++ b/www/m/svg/48_2_6.svg Wed Aug 22 12:51:28 2012 +0000 @@ -1,33 +1,40 @@ - + - - - - - - - - + + + + + + + + + - + + + 8va - - - - - + + + + + + + + 48 - diff -r 1b8d0935b749 -r ea8d61c851c0 www/m/svg/49_3_5.svg --- a/www/m/svg/49_3_5.svg Sun Aug 19 22:29:24 2012 +0000 +++ b/www/m/svg/49_3_5.svg Wed Aug 22 12:51:28 2012 +0000 @@ -1,31 +1,41 @@ - + - - - - - - + + + + + + + + + - - + + + 8va - - - - + + + + + + + + + 49 - diff -r 1b8d0935b749 -r ea8d61c851c0 www/m/svg/50_4_6.svg --- a/www/m/svg/50_4_6.svg Sun Aug 19 22:29:24 2012 +0000 +++ b/www/m/svg/50_4_6.svg Wed Aug 22 12:51:28 2012 +0000 @@ -1,31 +1,52 @@ - + - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - + + + 8vb - - - - + + + + + + + + 50 - diff -r 1b8d0935b749 -r ea8d61c851c0 www/m/svg/51_5_5.svg --- a/www/m/svg/51_5_5.svg Sun Aug 19 22:29:24 2012 +0000 +++ b/www/m/svg/51_5_5.svg Wed Aug 22 12:51:28 2012 +0000 @@ -1,29 +1,51 @@ - + - - - - - - + + + + + + + + + + + + + + + + + + + + - + + + 8vb - - - - - + + + + + + + + + 51 - diff -r 1b8d0935b749 -r ea8d61c851c0 www/m/svg/52_5_4.svg --- a/www/m/svg/52_5_4.svg Sun Aug 19 22:29:24 2012 +0000 +++ b/www/m/svg/52_5_4.svg Wed Aug 22 12:51:28 2012 +0000 @@ -1,19 +1,28 @@ - + - - - - - - + + + + + + - - + + + + + + + + 52 diff -r 1b8d0935b749 -r ea8d61c851c0 www/m/svg/53_4_7.svg --- a/www/m/svg/53_4_7.svg Sun Aug 19 22:29:24 2012 +0000 +++ b/www/m/svg/53_4_7.svg Wed Aug 22 12:51:28 2012 +0000 @@ -1,26 +1,46 @@ - + - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + 53 - diff -r 1b8d0935b749 -r ea8d61c851c0 www/m/svg/54_3_4.svg --- a/www/m/svg/54_3_4.svg Sun Aug 19 22:29:24 2012 +0000 +++ b/www/m/svg/54_3_4.svg Wed Aug 22 12:51:28 2012 +0000 @@ -1,22 +1,43 @@ - + - - - - - - - + + + + + + + + + + + + + + + + + + + - - + + + + + + + + 54 diff -r 1b8d0935b749 -r ea8d61c851c0 www/m/svg/55_2_7.svg --- a/www/m/svg/55_2_7.svg Sun Aug 19 22:29:24 2012 +0000 +++ b/www/m/svg/55_2_7.svg Wed Aug 22 12:51:28 2012 +0000 @@ -1,22 +1,34 @@ - + - - - - - - + + + + + + + + + - - + + + + + + + + + 55 - diff -r 1b8d0935b749 -r ea8d61c851c0 www/m/svg/56_0_7.svg --- a/www/m/svg/56_0_7.svg Sun Aug 19 22:29:24 2012 +0000 +++ b/www/m/svg/56_0_7.svg Wed Aug 22 12:51:28 2012 +0000 @@ -1,27 +1,51 @@ - + - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + 56 - diff -r 1b8d0935b749 -r ea8d61c851c0 www/m/svg/57_1_4.svg --- a/www/m/svg/57_1_4.svg Sun Aug 19 22:29:24 2012 +0000 +++ b/www/m/svg/57_1_4.svg Wed Aug 22 12:51:28 2012 +0000 @@ -1,26 +1,33 @@ - + - - - - - - + + + + + + + + - + + + 8vb - - - - - + + + + + + 57 diff -r 1b8d0935b749 -r ea8d61c851c0 www/m/svg/58_6_7.svg --- a/www/m/svg/58_6_7.svg Sun Aug 19 22:29:24 2012 +0000 +++ b/www/m/svg/58_6_7.svg Wed Aug 22 12:51:28 2012 +0000 @@ -1,33 +1,44 @@ - + - - - - - - - - + + + + + + + + + + + + - - + + + 8va - - - - + + + + + + + + 58 - diff -r 1b8d0935b749 -r ea8d61c851c0 www/m/svg/59_7_4.svg --- a/www/m/svg/59_7_4.svg Sun Aug 19 22:29:24 2012 +0000 +++ b/www/m/svg/59_7_4.svg Wed Aug 22 12:51:28 2012 +0000 @@ -1,24 +1,52 @@ - + - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + 59 diff -r 1b8d0935b749 -r ea8d61c851c0 www/m/svg/60_7_3.svg --- a/www/m/svg/60_7_3.svg Sun Aug 19 22:29:24 2012 +0000 +++ b/www/m/svg/60_7_3.svg Wed Aug 22 12:51:28 2012 +0000 @@ -1,29 +1,50 @@ - + - - - - - - + + + + + + + + + + + + + + + + - - + + + 8vb - - - - + + + + + + + + + + 60 - diff -r 1b8d0935b749 -r ea8d61c851c0 www/m/svg/61_6_0.svg --- a/www/m/svg/61_6_0.svg Sun Aug 19 22:29:24 2012 +0000 +++ b/www/m/svg/61_6_0.svg Wed Aug 22 12:51:28 2012 +0000 @@ -1,28 +1,65 @@ - + - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + 61 - diff -r 1b8d0935b749 -r ea8d61c851c0 www/m/svg/62_1_3.svg --- a/www/m/svg/62_1_3.svg Sun Aug 19 22:29:24 2012 +0000 +++ b/www/m/svg/62_1_3.svg Wed Aug 22 12:51:28 2012 +0000 @@ -1,19 +1,30 @@ - + - - - - - - + + + + + + + - - + + + + + + + + 62 diff -r 1b8d0935b749 -r ea8d61c851c0 www/m/svg/63_0_0.svg --- a/www/m/svg/63_0_0.svg Sun Aug 19 22:29:24 2012 +0000 +++ b/www/m/svg/63_0_0.svg Wed Aug 22 12:51:28 2012 +0000 @@ -1,27 +1,51 @@ - + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - + + + 8vb - - - - - + + + + + + + + 63 diff -r 1b8d0935b749 -r ea8d61c851c0 www/m/svg/64_2_0.svg --- a/www/m/svg/64_2_0.svg Sun Aug 19 22:29:24 2012 +0000 +++ b/www/m/svg/64_2_0.svg Wed Aug 22 12:51:28 2012 +0000 @@ -1,23 +1,44 @@ - + - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + 64 diff -r 1b8d0935b749 -r ea8d61c851c0 www/m/svg/65_3_3.svg --- a/www/m/svg/65_3_3.svg Sun Aug 19 22:29:24 2012 +0000 +++ b/www/m/svg/65_3_3.svg Wed Aug 22 12:51:28 2012 +0000 @@ -1,24 +1,66 @@ - + - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + 65 diff -r 1b8d0935b749 -r ea8d61c851c0 www/m/svg/66_4_0.svg --- a/www/m/svg/66_4_0.svg Sun Aug 19 22:29:24 2012 +0000 +++ b/www/m/svg/66_4_0.svg Wed Aug 22 12:51:28 2012 +0000 @@ -1,19 +1,26 @@ - + - - - - - - + + + + + - - + + + + + + + + 66 diff -r 1b8d0935b749 -r ea8d61c851c0 www/m/svg/67_5_3.svg --- a/www/m/svg/67_5_3.svg Sun Aug 19 22:29:24 2012 +0000 +++ b/www/m/svg/67_5_3.svg Wed Aug 22 12:51:28 2012 +0000 @@ -1,34 +1,67 @@ - + - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + 8va - - - - - + + + + + + + + + 67 - diff -r 1b8d0935b749 -r ea8d61c851c0 www/m/svg/68_5_2.svg --- a/www/m/svg/68_5_2.svg Sun Aug 19 22:29:24 2012 +0000 +++ b/www/m/svg/68_5_2.svg Wed Aug 22 12:51:28 2012 +0000 @@ -1,25 +1,38 @@ - + - - - - - - - + + + + + + + + + + + + + - - + + + + + + + + 68 - diff -r 1b8d0935b749 -r ea8d61c851c0 www/m/svg/69_4_1.svg --- a/www/m/svg/69_4_1.svg Sun Aug 19 22:29:24 2012 +0000 +++ b/www/m/svg/69_4_1.svg Wed Aug 22 12:51:28 2012 +0000 @@ -1,31 +1,55 @@ - + - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - + + + + 8vb - - - - + + + + + + + + + 69 - diff -r 1b8d0935b749 -r ea8d61c851c0 www/m/svg/70_3_2.svg --- a/www/m/svg/70_3_2.svg Sun Aug 19 22:29:24 2012 +0000 +++ b/www/m/svg/70_3_2.svg Wed Aug 22 12:51:28 2012 +0000 @@ -1,29 +1,38 @@ - + - - - - - - + + + + + + + + - - + + + 8vb - - - - + + + + + + + + + 70 - diff -r 1b8d0935b749 -r ea8d61c851c0 www/m/svg/71_2_1.svg --- a/www/m/svg/71_2_1.svg Sun Aug 19 22:29:24 2012 +0000 +++ b/www/m/svg/71_2_1.svg Wed Aug 22 12:51:28 2012 +0000 @@ -1,31 +1,58 @@ - + - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + 8va - - - - - + + + + + + + + + 71 diff -r 1b8d0935b749 -r ea8d61c851c0 www/m/svg/72_0_1.svg --- a/www/m/svg/72_0_1.svg Sun Aug 19 22:29:24 2012 +0000 +++ b/www/m/svg/72_0_1.svg Wed Aug 22 12:51:28 2012 +0000 @@ -1,24 +1,59 @@ - + - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + 72 diff -r 1b8d0935b749 -r ea8d61c851c0 www/m/svg/73_1_2.svg --- a/www/m/svg/73_1_2.svg Sun Aug 19 22:29:24 2012 +0000 +++ b/www/m/svg/73_1_2.svg Wed Aug 22 12:51:28 2012 +0000 @@ -1,34 +1,58 @@ - + - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - + + + 8va - - - - - + + + + + + + + + 73 - diff -r 1b8d0935b749 -r ea8d61c851c0 www/m/svg/74_6_1.svg --- a/www/m/svg/74_6_1.svg Sun Aug 19 22:29:24 2012 +0000 +++ b/www/m/svg/74_6_1.svg Wed Aug 22 12:51:28 2012 +0000 @@ -1,24 +1,36 @@ - + - - - - - - + + + + + + + + + + + - - + + + + + + + + 74 - diff -r 1b8d0935b749 -r ea8d61c851c0 www/m/svg/75_7_2.svg --- a/www/m/svg/75_7_2.svg Sun Aug 19 22:29:24 2012 +0000 +++ b/www/m/svg/75_7_2.svg Wed Aug 22 12:51:28 2012 +0000 @@ -1,22 +1,30 @@ - + - - - - - - + + + + + + + - - + + + + + + + + 75 - diff -r 1b8d0935b749 -r ea8d61c851c0 www/m/thumbs/1.png Binary file www/m/thumbs/1.png has changed diff -r 1b8d0935b749 -r ea8d61c851c0 www/m/thumbs/2.png Binary file www/m/thumbs/2.png has changed diff -r 1b8d0935b749 -r ea8d61c851c0 www/m/thumbs/3.png Binary file www/m/thumbs/3.png has changed diff -r 1b8d0935b749 -r ea8d61c851c0 www/m/thumbs/4.png Binary file www/m/thumbs/4.png has changed diff -r 1b8d0935b749 -r ea8d61c851c0 www/m/thumbs/5.png Binary file www/m/thumbs/5.png has changed