From 14bc27111585d652a7285f34ad69ab19fd859877 Mon Sep 17 00:00:00 2001 From: Neale Pickett Date: Wed, 6 Jun 2018 12:52:19 +0000 Subject: [PATCH] More readable team names --- tools/fetch.py | 9 ++++++--- www/style.css | 3 ++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/tools/fetch.py b/tools/fetch.py index 901a1c8..5ff4198 100755 --- a/tools/fetch.py +++ b/tools/fetch.py @@ -3,13 +3,15 @@ import requests import zipfile -url = "https://puzzles.cyberfire.training/foundry/" +instance = "foundry" + +url = "https://puzzles.cyberfire.training/{}/".format(instance) url = url.rstrip("/") r = requests.get(url + "/puzzles.json") puzzles = r.json() -zf = zipfile.ZipFile("/tmp/foundry.zip", "w") +zf = zipfile.ZipFile("/tmp/{}.zip".format(instance), "w") for cat, entries in puzzles.items(): if cat == "wopr": continue @@ -25,5 +27,6 @@ for cat, entries in puzzles.items(): for fn in files: path = "{}/{}/{}".format(cat, points, fn) - data = requests.get(u).content + furl="{}/{}/{}/{}".format(url, cat, dn, fn) + data = requests.get(furl).content zf.writestr(path, data) diff --git a/www/style.css b/www/style.css index 957f366..d820e35 100644 --- a/www/style.css +++ b/www/style.css @@ -230,7 +230,8 @@ nav li + li:before { #scoreboard .teamname { font-size: 133%; - color: #D84B6E; + color: white; + text-shadow: 0 0 0.2em black; opacity: 0.8; position: absolute; right: 1em;