diff --git a/res/BadGirl.swf b/res/BadGirl.swf new file mode 100644 index 0000000..029f84a Binary files /dev/null and b/res/BadGirl.swf differ diff --git a/res/FasterFaster.swf b/res/FasterFaster.swf new file mode 100644 index 0000000..53f9ebc Binary files /dev/null and b/res/FasterFaster.swf differ diff --git a/res/HolyShot.swf b/res/HolyShot.swf new file mode 100644 index 0000000..8b91385 Binary files /dev/null and b/res/HolyShot.swf differ diff --git a/res/Ouch.swf b/res/Ouch.swf new file mode 100644 index 0000000..2e543d2 Binary files /dev/null and b/res/Ouch.swf differ diff --git a/res/Pow.swf b/res/Pow.swf new file mode 100644 index 0000000..5415073 Binary files /dev/null and b/res/Pow.swf differ diff --git a/res/Zounds.swf b/res/Zounds.swf new file mode 100644 index 0000000..8df8f9c Binary files /dev/null and b/res/Zounds.swf differ diff --git a/res/scoreboard.css b/res/scoreboard.css index 35ca55a..c017101 100644 --- a/res/scoreboard.css +++ b/res/scoreboard.css @@ -69,7 +69,7 @@ body { } /* Jammer indicators */ -.jammer { +#jammer-a, #jammer-b { font-family: monospace; position: absolute; bottom: 0em; @@ -150,7 +150,7 @@ body { /* - * States timers can be in + * States timers can be in */ #jam.paused, #period.paused { color: #aaf; @@ -169,37 +169,17 @@ body { /* * Notices */ -#notice div { - display: none; - - background: silver; - border: solid white 10px; - border-radius: 90px; - - font-size: 150%; - font-family: Magenta, sans-serif; - font-weight: normal; - text-align: center; - opacity: 0.9; - +#notice { position: absolute; bottom: 1.3em; left: 50%; - width: 3em; - margin-left: -1.5em; -} -#notice .active { - display: inherit; - -moz-animation-duration: 0.5s; - -moz-animation-name: grow; - -moz-animation-iteration-count: infinite; - -moz-animation-direction: alternate; -} - -@-moz-keyframes grow { - 0% {color: red;} - 50% {color: yellow;} - 75% {color: blue;} - 100% {color: magenta;} + width: 4em; + height: 3em; + margin-left: -2em; +} + +#notice embed { + width: 100%; + height: 100%; } diff --git a/res/scoreboard.js b/res/scoreboard.js index ff9f764..de0fa29 100644 --- a/res/scoreboard.js +++ b/res/scoreboard.js @@ -29,7 +29,7 @@ tenths = true; /* State names */ var SETUP = 0; // !P 30:00 !J 2:00 -var JAM = 1; // P J 2:00 +var JAM = 1; // P J 2:00 var LINEUP = 2; // P J 1:00 var TIMEOUT = 3; // !P J 1:00 @@ -183,7 +183,7 @@ function transition(newstate) { // Reset lead jammer indicators e("jammer-a").className = ""; - e("jammer-b").className = ""; + e("jammer-b").className = ""; } @@ -191,30 +191,35 @@ function transition(newstate) { /*********************************** * Notices */ + +var notices = [ + false, + '', + '', + '', + '', + '', + '', +]; + var notice_timer; -function notice_expire(n) { - var p = document.getElementById("notice-vanish"); - var pClassName = ""; +function notice_expire() { + var c = document.getElementById("notice"); - for (var i = 0; i < 10; i += 1) { - var e = document.getElementById("notice-" + i); - - if (! e) continue; - if (i == n) { - e.className = "active"; - pClassName = "notice"; - } else { - e.className = ""; - } - } - if (p) p.className = pClassName; + c.innerHTML = ""; } function notice(n) { - clearTimeout(notice_timer); - notice_timer = setTimeout(function() {notice_expire()}, 8000); - notice_expire(n); + var c = document.getElementById("notice"); + + if (notices[n]) { + c.innerHTML = notices[n]; + clearTimeout(notice_timer); + notice_timer = setTimeout(function() {notice_expire()}, 8000); + } else { + notice_expire(); + } } function e(id) { diff --git a/scoreboard.html b/scoreboard.html index 0d2829e..86936e7 100644 --- a/scoreboard.html +++ b/scoreboard.html @@ -54,10 +54,6 @@
-
Power Jam
-
Grand Slam
-
Ouch
-
OMG