diff --git a/tools/package-puzzles.py b/tools/package-puzzles.py index f4980a1..95fdbcd 100755 --- a/tools/package-puzzles.py +++ b/tools/package-puzzles.py @@ -31,10 +31,10 @@ def write_kv_pairs(ziphandle, filename, kv): filehandle.write("%s %s\n" % (key, kv[key])) filehandle.seek(0) ziphandle.writestr(filename, filehandle.read()) - + def escape(s): return s.replace('&', '&').replace('<', '<').replace('>', '>') - + def generate_html(ziphandle, puzzle, puzzledir, category, points, authors, files): html_content = io.StringIO() file_content = io.StringIO() @@ -50,7 +50,7 @@ def generate_html(ziphandle, puzzle, puzzledir, category, points, authors, files ''' ''') - + html_content.write( ''' @@ -77,7 +77,7 @@ def generate_html(ziphandle, puzzle, puzzledir, category, points, authors, files
Los Alamos National Laboratory US Department Of Energy - Sandia National Laboratories + Idaho National Laboratory
'''.format(category=category, points=points, body=puzzle.html_body(), file_content=file_content.getvalue(), authors=', '.join(authors))) @@ -118,7 +118,7 @@ def build_category(categorydir, outdir): hashmap = hashlib.sha1(category_seed) hashmap.update(str(puzzle.points).encode('utf-8')) puzzlehash = hashmap.hexdigest() - + mapping[puzzle.points] = puzzlehash answers[puzzle.points] = puzzle.answers summary[puzzle.points] = puzzle.summary @@ -149,9 +149,9 @@ def build_category(categorydir, outdir): zf.close() shutil.move(zipfileraw.name, zipfilename) - - -if __name__ == '__main__': + + +if __name__ == '__main__': parser = argparse.ArgumentParser(description='Build a category package') parser.add_argument('categorydirs', nargs='+', help='Directory of category source') parser.add_argument('outdir', help='Output directory') diff --git a/www/cgi-bin/koth.lua b/www/cgi-bin/koth.lua index 412d1b9..eb6c52d 100644 --- a/www/cgi-bin/koth.lua +++ b/www/cgi-bin/koth.lua @@ -43,7 +43,7 @@ function koth.page(title, body) print('
') print('Los Alamos National Laboratory') print('US Department Of Energy') - print('Sandia National Laboratories') + print('Idaho National Laboratory') print('
') print("") os.exit(0) diff --git a/www/credits.html b/www/credits.html index 55acf88..3d60d05 100644 --- a/www/credits.html +++ b/www/credits.html @@ -90,7 +90,7 @@ window.addEventListener("load", init);
Los Alamos National Laboratory US Department Of Energy - Sandia National Laboratories + Idaho National Laboratory
diff --git a/www/images/inl.png b/www/images/inl.png new file mode 100644 index 0000000..6584ddd Binary files /dev/null and b/www/images/inl.png differ diff --git a/www/index.html b/www/index.html index ffdc778..0c042ee 100644 --- a/www/index.html +++ b/www/index.html @@ -69,7 +69,7 @@
Los Alamos National Laboratory US Department Of Energy - Sandia National Laboratories + Idaho National Laboratory
diff --git a/www/register.html b/www/register.html index 1f94238..637013a 100644 --- a/www/register.html +++ b/www/register.html @@ -44,7 +44,7 @@
Los Alamos National Laboratory US Department Of Energy - Sandia National Laboratories + Idaho National Laboratory
diff --git a/www/scoring.html b/www/scoring.html index add1fd7..744b6bc 100644 --- a/www/scoring.html +++ b/www/scoring.html @@ -116,7 +116,7 @@
Los Alamos National Laboratory US Department Of Energy - Sandia National Laboratories + Idaho National Laboratory