From 0aed55352172fc5981e5f92b791f3a91df778c9e Mon Sep 17 00:00:00 2001 From: Procrat Date: Tue, 29 Apr 2014 23:14:53 +0100 Subject: [PATCH 1/2] Modified the scripts for use with the surfaces --- manual-count/database.sql | 2 ++ manual-count/resetdb.sh | 3 +++ manual-count/script.js | 2 +- manual-count/style.css | 4 ++-- 4 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 manual-count/resetdb.sh diff --git a/manual-count/database.sql b/manual-count/database.sql index e236779..6f714e9 100644 --- a/manual-count/database.sql +++ b/manual-count/database.sql @@ -2,6 +2,8 @@ -- Database: `urenloop` -- +DROP TABLE IF EXISTS `teams`, `laps`; + CREATE TABLE `teams` ( `id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY , `name` VARCHAR( 255 ) NOT NULL , diff --git a/manual-count/resetdb.sh b/manual-count/resetdb.sh new file mode 100644 index 0000000..4a62c43 --- /dev/null +++ b/manual-count/resetdb.sh @@ -0,0 +1,3 @@ +#! /bin/sh + +mysql urenloop -p < database.sql diff --git a/manual-count/script.js b/manual-count/script.js index 5f8b76b..32251d4 100644 --- a/manual-count/script.js +++ b/manual-count/script.js @@ -1,5 +1,5 @@ var DELAY = 30; // delay to prevent accidental double taps -var BUTTONS_PER_VIEW = 7; +var BUTTONS_PER_VIEW = 9 var error = ''; // Detect local storage diff --git a/manual-count/style.css b/manual-count/style.css index d9359e9..1a60344 100644 --- a/manual-count/style.css +++ b/manual-count/style.css @@ -34,13 +34,13 @@ h1 { #buttonHolder { /* TODO: determine width @media-queries */ - width: 984px; /* Portrait: 740px; */ + width: 1200px; /* Portrait: 740px; */ margin: 40px auto 0; padding: 0; } #buttonHolder > li { list-style: none; - width: 200px; height: 180px; + width: 190px; height: 180px; margin: 0 12px 36px; padding: 10px; display: block; float: left; text-align: center; From 7e791181302fe5b266b39106726ec7e7a95fec46 Mon Sep 17 00:00:00 2001 From: Tom Naessens Date: Wed, 30 Apr 2014 00:56:24 +0200 Subject: [PATCH 2/2] Last minute change in djs --- boxxy/content/dj-contest.html | 19 +++++++++---------- site/index.html | 4 ++-- tools/dj-ratings/dj-ratings.hs | 19 +++++++++---------- 3 files changed, 20 insertions(+), 22 deletions(-) diff --git a/boxxy/content/dj-contest.html b/boxxy/content/dj-contest.html index 008eb85..ca4ca0a 100644 --- a/boxxy/content/dj-contest.html +++ b/boxxy/content/dj-contest.html @@ -2,20 +2,19 @@
- - - - - + + + +
10u30Vyncue (1)
11u30Snap-ah (2)
12u30DJ Plancke (3)
13u30Bouclé (4)
14u30Bassick (5)
15u30Bollé (6)
12u30DJ Plancke (2)
13u30Bouclé (3)
14u30Bassick (4)
15u30Bollé (5)
- - - - - + + + + +
16u30G-Danza (7)
17u30B-tech (8)
18u30Pulp Mixion (9)
19u30Tous les deux (10)
20u30Sennen (11)
16u30Snap-ah (6)
17u30B-tech (7)
18u30Pulp Mixion (8)
19u30Tous les deux (9)
20u30Sennen (10)
diff --git a/site/index.html b/site/index.html index 3ad594f..13023b8 100644 --- a/site/index.html +++ b/site/index.html @@ -390,8 +390,8 @@

DJ-contest

- - + + diff --git a/tools/dj-ratings/dj-ratings.hs b/tools/dj-ratings/dj-ratings.hs index f3c53c6..8e000af 100755 --- a/tools/dj-ratings/dj-ratings.hs +++ b/tools/dj-ratings/dj-ratings.hs @@ -25,16 +25,15 @@ djs2014 :: [Dj] djs2014 = -- TODO add a base rating by us? [ Dj "Vyncue" 1 (Time 10 30) (Time 11 30) - , Dj "Snap-ah" 2 (Time 11 30) (Time 12 30) - , Dj "DJ Plancke" 3 (Time 12 30) (Time 13 30) - , Dj "Bouclé" 4 (Time 13 30) (Time 14 30) - , Dj "Bassick" 5 (Time 14 30) (Time 15 30) - , Dj "Bollé" 6 (Time 15 30) (Time 16 30) - , Dj "G-Danza" 7 (Time 16 30) (Time 17 30) - , Dj "B-tech" 8 (Time 17 30) (Time 18 30) - , Dj "Pulp Mixion" 9 (Time 18 30) (Time 19 30) - , Dj "Tous les deux" 10 (Time 19 30) (Time 20 30) - , Dj "Sennen" 11 (Time 20 30) (Time 21 30) + , Dj "DJ Plancke" 2 (Time 12 30) (Time 13 30) + , Dj "Bouclé" 3 (Time 13 30) (Time 14 30) + , Dj "Bassick" 4 (Time 14 30) (Time 15 30) + , Dj "Bollé" 5 (Time 15 30) (Time 16 30) + , Dj "Snap-ah" 6 (Time 16 30) (Time 17 30) + , Dj "B-tech" 7 (Time 17 30) (Time 18 30) + , Dj "Pulp Mixion" 8 (Time 18 30) (Time 19 30) + , Dj "Tous les deux" 9 (Time 19 30) (Time 20 30) + , Dj "Sennen" 10 (Time 20 30) (Time 21 30) ]
Programma DJ-contest
10u30Vyncue16u30G-Danza
11u30Snap-ah17u30B-tech
10u30Vyncue16u30Snap-ah
11u30/17u30B-tech
12u30DJ Plancke18u30Pulp Mixion
13u30Bouclé19u30Tous les deux
14u30Bassick20u30Sennen