X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=html_generator.py;h=7227eae30f754c8ca3914fce6257e2890f85eeb4;hb=c143928ee9e6b76d710a210690077337f3f19e7c;hp=7d2c318fbd09293fccec6e371c1f1b76ade0efd9;hpb=7d560553537d040a217e5467008bee5afd9f6aa9;p=turbot-web
diff --git a/html_generator.py b/html_generator.py
index 7d2c318..7227eae 100644
--- a/html_generator.py
+++ b/html_generator.py
@@ -22,8 +22,6 @@ import sys
WEBROOT = "/srv/halibut.cworth.org/www"
-website = "https://halibut.cworth.org/"
-#change this if we're using AWS or some other subdomain instead
def hunt_file(hunt, name):
"""Return a path file 'name' within the given hunt.
@@ -183,7 +181,7 @@ def overview(hunt, puzzles, rounds):
expanding += [
'
\n'.format(i, status),
'
x\n',
- '
{}
\n'.format(link(website + filename_from_name(rnd) + "_round.html", rnd)),
+ '
{}
\n'.format(link(hunt_file(hunt, filename_from_name(rnd)) + "_round.html", rnd)),
'
\n',
' \n',
' Puzzle | \n',
@@ -197,12 +195,12 @@ def overview(hunt, puzzles, rounds):
meta = ''
if puzzle['status'] == 'solved':
expanding += ['
\n',
- ' {} | \n'.format(link(website + filename_from_name(puzzle['name']) + ".html", puzzle['name']+meta)),
- ' {} | \n'.format(puzzle['solution']),
+ ' {} | \n'.format(link(hunt_file(hunt, filename_from_name(puzzle['name'])) + ".html", puzzle['name']+meta)),
+ ' {} | \n'.format(", ".join(puzzle['solution']).upper()),
'
\n']
else:
expanding += [' \n',
- ' {} | \n'.format(link(website + filename_from_name(puzzle['name']) + ".html", puzzle['name']+meta)),
+ ' {} | \n'.format(link(hunt_file(hunt, filename_from_name(puzzle['name'])) + ".html", puzzle['name']+meta)),
' | \n',
'
\n']
expanding.append('
\n')
@@ -212,10 +210,11 @@ def overview(hunt, puzzles, rounds):
end = ['