From 6618fded9d0ef11351f6571ca6081517db0d503e Mon Sep 17 00:00:00 2001 From: Simon Brooke Date: Tue, 22 Jul 2014 10:08:10 +0100 Subject: [PATCH] Substantial modification of how pages which are mainly generated content are handled. I had ended up with four '.html' files which were essentially identical. Also work on new editable parameters feature. --- resources/rulesets/iceage.txt | 2 -- resources/templates/about.html | 6 ------ resources/templates/base.html | 3 ++- resources/templates/home.html | 6 ------ resources/templates/world.html | 6 ------ src/mw_ui/routes/home.clj | 17 ++++++++++------- src/mw_ui/util.clj | 7 +++++++ 7 files changed, 19 insertions(+), 28 deletions(-) delete mode 100644 resources/templates/about.html delete mode 100644 resources/templates/home.html delete mode 100644 resources/templates/world.html diff --git a/resources/rulesets/iceage.txt b/resources/rulesets/iceage.txt index ca69fa9..b83d904 100644 --- a/resources/rulesets/iceage.txt +++ b/resources/rulesets/iceage.txt @@ -1,7 +1,5 @@ ## Ruleset which attempts to model retreat of ice after an iceage -if generation is less than 5 then state should be ice - ;; Limitations: because the rule language doesn't (yet) allow sophisticated ;; arithmetic, the ice retreats north to south (southern hemisphere). diff --git a/resources/templates/about.html b/resources/templates/about.html deleted file mode 100644 index 94f188b..0000000 --- a/resources/templates/about.html +++ /dev/null @@ -1,6 +0,0 @@ -{% extends "templates/base.html" %} -{% block content %} -
- {{content|safe}} -
-{% endblock %} diff --git a/resources/templates/base.html b/resources/templates/base.html index 6b208f3..1419ab8 100644 --- a/resources/templates/base.html +++ b/resources/templates/base.html @@ -16,13 +16,14 @@ var context = "{{servlet-context}}"; //]]> - +