Validator links no longer use referer, tag templates now use macros

33 files changed, 174 insertions, 373 deletions

diff --git a/project/templates/about.xhtml b/project/templates/about.xhtml
index a982b0d..e710323 100644
--- a/project/templates/about.xhtml
+++ b/project/templates/about.xhtml
@@ -7,6 +7,10 @@
 
 
 
+{%- block footer -%}{{ plain_footer ("about.xhtml") }}{%- endblock -%}
+
+
+
 {%- block style %}
     <link href="/css/about.css" rel="stylesheet" />
 {% endblock -%}
diff --git a/project/templates/adapad.xhtml b/project/templates/adapad.xhtml
index 7028db5..a87169a 100644
--- a/project/templates/adapad.xhtml
+++ b/project/templates/adapad.xhtml
@@ -7,6 +7,10 @@
 
 
 
+{%- block footer -%}{{ plain_footer ("adapad.xhtml") }}{%- endblock -%}
+
+
+
 {%- block content %}
 <h4>Adapad</h4>
 
diff --git a/project/templates/base_math.xhtml b/project/templates/base_math.xhtml
index 834c116..145f679 100644
--- a/project/templates/base_math.xhtml
+++ b/project/templates/base_math.xhtml
@@ -12,25 +12,26 @@
 
 
 
-{%- block footer %}
-        <a href="http://validator.w3.org/check?uri=referer">
+{%- macro math_footer(anchor) %}
+    {%- set linkto = general.baseurl ~ "/" ~ anchor %}
+        <a href="http://validator.w3.org/check?uri={{ linkto | e }}">
             <img src="/img/valid-xhtml11.png"
                  alt="Valid XHTML 1.1"
                  height="31"
                  width="88" />
         </a>
-        <a href="http://validator.w3.org/check?uri=referer">
+        <a href="http://validator.w3.org/check?uri={{ linkto | e }}">
             <img src="/img/valid-mathml20.png"
                  alt="Valid MathML 2.0"
                  height="31"
                  width="88" />
         </a>
-        <a href="http://jigsaw.w3.org/css-validator/check/referer">
+        <a href="http://jigsaw.w3.org/css-validator/validator?uri={{ linkto | e }}">
             <img src="/img/valid-css.png"
                  alt="Valid CSS"
                  height="31"
                  width="88" />
         </a>
-{%- endblock -%}
+{%- endmacro -%}
 
 
diff --git a/project/templates/base_plain.xhtml b/project/templates/base_plain.xhtml
index 454cc0e..b5e2da5 100644
--- a/project/templates/base_plain.xhtml
+++ b/project/templates/base_plain.xhtml
@@ -12,19 +12,20 @@
 
 
 
-{%- block footer %}
-        <a href="http://validator.w3.org/check?uri=referer">
+{%- macro plain_footer(anchor) %}
+    {%- set linkto = general.baseurl ~ "/" ~ anchor %}
+        <a href="http://validator.w3.org/check?uri={{ linkto | e }}">
             <img src="/img/valid-xhtml11.png"
                  alt="Valid XHTML 1.1"
                  height="31"
                  width="88" />
         </a>
-        <a href="http://jigsaw.w3.org/css-validator/check/referer">
+        <a href="http://jigsaw.w3.org/css-validator/validator?uri={{ linkto | e }}">
             <img src="/img/valid-css.png"
                  alt="Valid CSS"
                  height="31"
                  width="88" />
         </a>
-{%- endblock -%}
+{%- endmacro -%}
 
 
diff --git a/project/templates/deckconv.xhtml b/project/templates/deckconv.xhtml
index d02afc2..7424fff 100644
--- a/project/templates/deckconv.xhtml
+++ b/project/templates/deckconv.xhtml
@@ -7,6 +7,10 @@
 
 
 
+{%- block footer -%}{{ plain_footer ("deckconv.xhtml") }}{%- endblock -%}
+
+
+
 {%- block content %}
 <h4>Flashcard Deck Converter</h4>
 
diff --git a/project/templates/fltkada.xhtml b/project/templates/fltkada.xhtml
index fbc4a7b..4a4a85f 100644
--- a/project/templates/fltkada.xhtml
+++ b/project/templates/fltkada.xhtml
@@ -7,6 +7,10 @@
 
 
 
+{%- block footer -%}{{ plain_footer ("fltkada.xhtml") }}{%- endblock -%}
+
+
+
 {%- block content %}
 <h4>FLTK Ada Binding</h4>
 
diff --git a/project/templates/grasp.xhtml b/project/templates/grasp.xhtml
index e6deb41..5d8d237 100644
--- a/project/templates/grasp.xhtml
+++ b/project/templates/grasp.xhtml
@@ -7,6 +7,10 @@
 
 
 
+{%- block footer -%}{{ plain_footer ("grasp.xhtml") }}{%- endblock -%}
+
+
+
 {%- block content %}
 <h4>Grasp Interpreter</h4>
 
diff --git a/project/templates/index.xhtml b/project/templates/index.xhtml
index 09bc559..ef76465 100644
--- a/project/templates/index.xhtml
+++ b/project/templates/index.xhtml
@@ -7,6 +7,10 @@
 
 
 
+{%- block footer -%}{{ plain_footer ("index.xhtml") }}{%- endblock -%}
+
+
+
 {%- block style %}
     <link href="/css/index.css" rel="stylesheet" />
 {% endblock -%}
diff --git a/project/templates/integral.xhtml b/project/templates/integral.xhtml
index 8f2f33a..364ef0a 100644
--- a/project/templates/integral.xhtml
+++ b/project/templates/integral.xhtml
@@ -7,6 +7,10 @@
 
 
 
+{%- block footer -%}{{ math_footer ("integral.xhtml") }}{%- endblock -%}
+
+
+
 {%- block style %}
     <link href="/css/integral.css" rel="stylesheet" />
 {% endblock -%}
diff --git a/project/templates/links.xhtml b/project/templates/links.xhtml
index 5be9deb..23ec904 100644
--- a/project/templates/links.xhtml
+++ b/project/templates/links.xhtml
@@ -7,6 +7,10 @@
 
 
 
+{%- block footer -%}{{ plain_footer ("links.xhtml") }}{%- endblock -%}
+
+
+
 {%- block style %}
     <link href="/css/links.css" rel="stylesheet" />
 {% endblock -%}
diff --git a/project/templates/packrat.xhtml b/project/templates/packrat.xhtml
index defc9e8..0d1c2b7 100644
--- a/project/templates/packrat.xhtml
+++ b/project/templates/packrat.xhtml
@@ -7,6 +7,10 @@
 
 
 
+{%- block footer -%}{{ plain_footer ("packrat.xhtml") }}{%- endblock -%}
+
+
+
 {%- block content %}
 <h4>Packrat Parser Combinator Library</h4>
 
diff --git a/project/templates/sokoban.xhtml b/project/templates/sokoban.xhtml
index 5c08184..2d92bb4 100644
--- a/project/templates/sokoban.xhtml
+++ b/project/templates/sokoban.xhtml
@@ -7,6 +7,10 @@
 
 
 
+{%- block footer -%}{{ plain_footer ("sokoban.xhtml") }}{%- endblock -%}
+
+
+
 {%- block content %}
 <h4>Sokoban Clone</h4>
 
diff --git a/project/templates/steelman.xhtml b/project/templates/steelman.xhtml
index f724171..94a7721 100644
--- a/project/templates/steelman.xhtml
+++ b/project/templates/steelman.xhtml
@@ -7,6 +7,10 @@
 
 
 
+{%- block footer -%}{{ plain_footer ("steelman.xhtml") }}{%- endblock -%}
+
+
+
 {%- block style %}
     <link href="/css/steelman.css" rel="stylesheet" />
 {% endblock -%}
diff --git a/project/templates/stvcount.xhtml b/project/templates/stvcount.xhtml
index e475692..cd0aca2 100644
--- a/project/templates/stvcount.xhtml
+++ b/project/templates/stvcount.xhtml
@@ -7,6 +7,10 @@
 
 
 
+{%- block footer -%}{{ plain_footer ("stvcount.xhtml") }}{%- endblock -%}
+
+
+
 {%- block style %}
     <link href="/css/stvcount.css" rel="stylesheet" />
 {% endblock -%}
diff --git a/project/templates/sunset.xhtml b/project/templates/sunset.xhtml
index 765f570..2cde6b2 100644
--- a/project/templates/sunset.xhtml
+++ b/project/templates/sunset.xhtml
@@ -7,6 +7,10 @@
 
 
 
+{%- block footer -%}{{ plain_footer ("sunset.xhtml") }}{%- endblock -%}
+
+
+
 {%- block content %}
 <h4>Sunset License</h4>
 
diff --git a/project/templates/sydneyrail.xhtml b/project/templates/sydneyrail.xhtml
index de23d31..e15a1a0 100644
--- a/project/templates/sydneyrail.xhtml
+++ b/project/templates/sydneyrail.xhtml
@@ -7,6 +7,10 @@
 
 
 
+{%- block footer -%}{{ plain_footer ("sydneyrail.xhtml") }}{%- endblock -%}
+
+
+
 {%- block content %}
 <h4>Sydney Rail Maps</h4>
 
diff --git a/project/templates/tags.xhtml b/project/templates/tags.xhtml
index b9e835a..f92c822 100644
--- a/project/templates/tags.xhtml
+++ b/project/templates/tags.xhtml
@@ -7,6 +7,10 @@
 
 
 
+{%- block footer -%}{{ plain_footer ("tags.xhtml") }}{%- endblock -%}
+
+
+
 {%- block style %}
     <link href="/css/tags.css" rel="stylesheet" />
 {% endblock -%}
diff --git a/project/templates/tags/application.xhtml b/project/templates/tags/application.xhtml
index 82c2a5f..421fa20 100644
--- a/project/templates/tags/application.xhtml
+++ b/project/templates/tags/application.xhtml
@@ -1,32 +1,10 @@
 
-{%- extends "base_plain.xhtml" -%}
+{%- extends "tags/base_tag.xhtml" -%}
 
 
 
-{%- block title -%}Application Tag{%- endblock -%}
-
-
-
-{%- block style %}
-    <link href="/css/index.css" rel="stylesheet" />
-{% endblock -%}
-
-
-
-{%- block content %}
-<h4>Tag: Application</h4>
-
-<ul class="index">
-    {%- for item in articles -%}
-        {%- if 'application' in item.taglist -%}
-        {%- if item.updated -%}{%- set postclass = "update" -%}{%- else -%}{%- set postclass = "post" -%}{%- endif -%}
-        {%- if item.updated -%}{%- set postverb = "Updated" -%}{%- else -%}{%- set postverb = "Posted" -%}{%- endif %}
-    <li><a href="{{ item.anchor }}">{{ item.title }}</a><br />
-        <span class="taglist">{{ item.taglist | join(", ") }}</span><br />
-        <span class="{{ postclass }}">({{ postverb }} {{ item.postdate }})</span></li>
-        {%- endif -%}
-    {%- endfor %}
-</ul>
-{% endblock -%}
+{%- block title -%}{{ tag_title ("Application") }}{%- endblock -%}
+{%- block content %}{{ tag_content ("Application") }}{% endblock -%}
+{%- block footer -%}{{ tag_footer ("application.xhtml") }}{%- endblock -%}
 
 
diff --git a/project/templates/tags/base_tag.xhtml b/project/templates/tags/base_tag.xhtml
new file mode 100644
index 0000000..a2c8b9f
--- /dev/null
+++ b/project/templates/tags/base_tag.xhtml
@@ -0,0 +1,43 @@
+
+{%- extends "base_plain.xhtml" -%}
+
+
+
+{%- macro tag_title(label) -%}{{ label | capitalize }} Tag{%- endmacro -%}
+
+
+
+{%- block style %}
+    <link href="/css/index.css" rel="stylesheet" />
+{% endblock -%}
+
+
+
+{%- macro tag_content(label) %}
+<h4>Tag: {{ label | capitalize }}</h4>
+
+<ul class="index">
+    {%- for item in articles -%}
+        {%- if label|lower in item.taglist -%}
+            {%- if item.updated -%}
+                {%- set postclass = "update" -%}
+                {%- set postverb = "Updated" -%}
+            {%- else -%}
+                {%- set postclass = "post" -%}
+                {%- set postverb = "Posted" -%}
+            {%- endif %}
+    <li><a href="{{ item.anchor }}">{{ item.title }}</a><br />
+        <span class="taglist">{{ item.taglist | join(", ") }}</span><br />
+        <span class="{{ postclass }}">({{ postverb }} {{ item.postdate }})</span></li>
+        {%- endif -%}
+    {%- endfor %}
+</ul>
+{% endmacro -%}
+
+
+
+{%- macro tag_footer(anchor) -%}
+    {{ plain_footer ('tags/' ~ anchor) }}
+{%- endmacro -%}
+
+
diff --git a/project/templates/tags/binding.xhtml b/project/templates/tags/binding.xhtml
index 794e595..b27a954 100644
--- a/project/templates/tags/binding.xhtml
+++ b/project/templates/tags/binding.xhtml
@@ -1,32 +1,10 @@
 
-{%- extends "base_plain.xhtml" -%}
+{%- extends "tags/base_tag.xhtml" -%}
 
 
 
-{%- block title -%}Binding Tag{%- endblock -%}
-
-
-
-{%- block style %}
-    <link href="/css/index.css" rel="stylesheet" />
-{% endblock -%}
-
-
-
-{%- block content %}
-<h4>Tag: Binding</h4>
-
-<ul class="index">
-    {%- for item in articles -%}
-        {%- if 'binding' in item.taglist -%}
-        {%- if item.updated -%}{%- set postclass = "update" -%}{%- else -%}{%- set postclass = "post" -%}{%- endif -%}
-        {%- if item.updated -%}{%- set postverb = "Updated" -%}{%- else -%}{%- set postverb = "Posted" -%}{%- endif %}
-    <li><a href="{{ item.anchor }}">{{ item.title }}</a><br />
-        <span class="taglist">{{ item.taglist | join(", ") }}</span><br />
-        <span class="{{ postclass }}">({{ postverb }} {{ item.postdate }})</span></li>
-        {%- endif -%}
-    {%- endfor %}
-</ul>
-{% endblock -%}
+{%- block title -%}{{ tag_title ("Binding") }}{%- endblock -%}
+{%- block content -%}{{ tag_content ("Binding") }}{%- endblock -%}
+{%- block footer -%}{{ tag_footer ("binding.xhtml") }}{%- endblock -%}
 
 
diff --git a/project/templates/tags/compsci.xhtml b/project/templates/tags/compsci.xhtml
index 741cf51..cf2160b 100644
--- a/project/templates/tags/compsci.xhtml
+++ b/project/templates/tags/compsci.xhtml
@@ -1,32 +1,10 @@
 
-{%- extends "base_plain.xhtml" -%}
+{%- extends "tags/base_tag.xhtml" -%}
 
 
 
-{%- block title -%}Compsci Tag{%- endblock -%}
-
-
-
-{%- block style %}
-    <link href="/css/index.css" rel="stylesheet" />
-{% endblock -%}
-
-
-
-{%- block content %}
-<h4>Tag: Compsci</h4>
-
-<ul class="index">
-    {%- for item in articles -%}
-        {%- if 'compsci' in item.taglist -%}
-        {%- if item.updated -%}{%- set postclass = "update" -%}{%- else -%}{%- set postclass = "post" -%}{%- endif -%}
-        {%- if item.updated -%}{%- set postverb = "Updated" -%}{%- else -%}{%- set postverb = "Posted" -%}{%- endif %}
-    <li><a href="{{ item.anchor }}">{{ item.title }}</a><br />
-        <span class="taglist">{{ item.taglist | join(", ") }}</span><br />
-        <span class="{{ postclass }}">({{ postverb }} {{ item.postdate }})</span></li>
-        {%- endif -%}
-    {%- endfor %}
-</ul>
-{% endblock -%}
+{%- block title -%}{{ tag_title ("Compsci") }}{%- endblock -%}
+{%- block content %}{{ tag_content ("Compsci") }}{% endblock -%}
+{%- block footer -%}{{ tag_footer ("compsci.xhtml") }}{%- endblock -%}
 
 
diff --git a/project/templates/tags/copyright.xhtml b/project/templates/tags/copyright.xhtml
index dfe6295..d37a6e3 100644
--- a/project/templates/tags/copyright.xhtml
+++ b/project/templates/tags/copyright.xhtml
@@ -1,32 +1,10 @@
 
-{%- extends "base_plain.xhtml" -%}
+{%- extends "tags/base_tag.xhtml" -%}
 
 
 
-{%- block title -%}Copyright Tag{%- endblock -%}
-
-
-
-{%- block style %}
-    <link href="/css/index.css" rel="stylesheet" />
-{% endblock -%}
-
-
-
-{%- block content %}
-<h4>Tag: Copyright</h4>
-
-<ul class="index">
-    {%- for item in articles -%}
-        {%- if 'copyright' in item.taglist -%}
-        {%- if item.updated -%}{%- set postclass = "update" -%}{%- else -%}{%- set postclass = "post" -%}{%- endif -%}
-        {%- if item.updated -%}{%- set postverb = "Updated" -%}{%- else -%}{%- set postverb = "Posted" -%}{%- endif %}
-    <li><a href="{{ item.anchor }}">{{ item.title }}</a><br />
-        <span class="taglist">{{ item.taglist | join(", ") }}</span><br />
-        <span class="{{ postclass }}">({{ postverb }} {{ item.postdate }})</span></li>
-        {%- endif -%}
-    {%- endfor %}
-</ul>
-{% endblock -%}
+{%- block title -%}{{ tag_title ("Copyright") }}{%- endblock -%}
+{%- block content %}{{ tag_content ("Copyright") }}{% endblock -%}
+{%- block footer -%}{{ tag_footer ("copyright.xhtml") }}{%- endblock -%}
 
 
diff --git a/project/templates/tags/esoteric.xhtml b/project/templates/tags/esoteric.xhtml
index 917851c..015c0c2 100644
--- a/project/templates/tags/esoteric.xhtml
+++ b/project/templates/tags/esoteric.xhtml
@@ -1,32 +1,10 @@
 
-{%- extends "base_plain.xhtml" -%}
+{%- extends "tags/base_tag.xhtml" -%}
 
 
 
-{%- block title -%}Esoteric Tag{%- endblock -%}
-
-
-
-{%- block style %}
-    <link href="/css/index.css" rel="stylesheet" />
-{% endblock -%}
-
-
-
-{%- block content %}
-<h4>Tag: Esoteric</h4>
-
-<ul class="index">
-    {%- for item in articles -%}
-        {%- if 'esoteric' in item.taglist -%}
-        {%- if item.updated -%}{%- set postclass = "update" -%}{%- else -%}{%- set postclass = "post" -%}{%- endif -%}
-        {%- if item.updated -%}{%- set postverb = "Updated" -%}{%- else -%}{%- set postverb = "Posted" -%}{%- endif %}
-    <li><a href="{{ item.anchor }}">{{ item.title }}</a><br />
-        <span class="taglist">{{ item.taglist | join(", ") }}</span><br />
-        <span class="{{ postclass }}">({{ postverb }} {{ item.postdate }})</span></li>
-        {%- endif -%}
-    {%- endfor %}
-</ul>
-{% endblock -%}
+{%- block title -%}{{ tag_title ("Esoteric") }}{%- endblock -%}
+{%- block content %}{{ tag_content ("Esoteric") }}{% endblock -%}
+{%- block footer -%}{{ tag_footer ("esoteric.xhtml") }}{%- endblock -%}
 
 
diff --git a/project/templates/tags/language.xhtml b/project/templates/tags/language.xhtml
index 7669da9..801ed77 100644
--- a/project/templates/tags/language.xhtml
+++ b/project/templates/tags/language.xhtml
@@ -1,32 +1,10 @@
 
-{%- extends "base_plain.xhtml" -%}
+{%- extends "tags/base_tag.xhtml" -%}
 
 
 
-{%- block title -%}Language Tag{%- endblock -%}
-
-
-
-{%- block style %}
-    <link href="/css/index.css" rel="stylesheet" />
-{% endblock -%}
-
-
-
-{%- block content %}
-<h4>Tag: Language</h4>
-
-<ul class="index">
-    {%- for item in articles -%}
-        {%- if 'language' in item.taglist -%}
-        {%- if item.updated -%}{%- set postclass = "update" -%}{%- else -%}{%- set postclass = "post" -%}{%- endif -%}
-        {%- if item.updated -%}{%- set postverb = "Updated" -%}{%- else -%}{%- set postverb = "Posted" -%}{%- endif %}
-    <li><a href="{{ item.anchor }}">{{ item.title }}</a><br />
-        <span class="taglist">{{ item.taglist | join(", ") }}</span><br />
-        <span class="{{ postclass }}">({{ postverb }} {{ item.postdate }})</span></li>
-        {%- endif -%}
-    {%- endfor %}
-</ul>
-{% endblock -%}
+{%- block title -%}{{ tag_title ("Language") }}{%- endblock -%}
+{%- block content %}{{ tag_content ("Language") }}{% endblock -%}
+{%- block footer -%}{{ tag_footer ("language.xhtml") }}{%- endblock -%}
 
 
diff --git a/project/templates/tags/legal.xhtml b/project/templates/tags/legal.xhtml
index 1d97d7a..109e751 100644
--- a/project/templates/tags/legal.xhtml
+++ b/project/templates/tags/legal.xhtml
@@ -1,32 +1,10 @@
 
-{%- extends "base_plain.xhtml" -%}
+{%- extends "tags/base_tag.xhtml" -%}
 
 
 
-{%- block title -%}Legal Tag{%- endblock -%}
-
-
-
-{%- block style %}
-    <link href="/css/index.css" rel="stylesheet" />
-{% endblock -%}
-
-
-
-{%- block content %}
-<h4>Tag: Legal</h4>
-
-<ul class="index">
-    {%- for item in articles -%}
-        {%- if 'legal' in item.taglist -%}
-        {%- if item.updated -%}{%- set postclass = "update" -%}{%- else -%}{%- set postclass = "post" -%}{%- endif -%}
-        {%- if item.updated -%}{%- set postverb = "Updated" -%}{%- else -%}{%- set postverb = "Posted" -%}{%- endif %}
-    <li><a href="{{ item.anchor }}">{{ item.title }}</a><br />
-        <span class="taglist">{{ item.taglist | join(", ") }}</span><br />
-        <span class="{{ postclass }}">({{ postverb }} {{ item.postdate }})</span></li>
-        {%- endif -%}
-    {%- endfor %}
-</ul>
-{% endblock -%}
+{%- block title -%}{{ tag_title ("Legal") }}{%- endblock -%}
+{%- block content %}{{ tag_content ("Legal") }}{% endblock -%}
+{%- block footer -%}{{ tag_footer ("legal.xhtml") }}{%- endblock -%}
 
 
diff --git a/project/templates/tags/library.xhtml b/project/templates/tags/library.xhtml
index 3f9c2fc..e3a47c5 100644
--- a/project/templates/tags/library.xhtml
+++ b/project/templates/tags/library.xhtml
@@ -1,32 +1,10 @@
 
-{%- extends "base_plain.xhtml" -%}
+{%- extends "tags/base_tag.xhtml" -%}
 
 
 
-{%- block title -%}Library Tag{%- endblock -%}
-
-
-
-{%- block style %}
-    <link href="/css/index.css" rel="stylesheet" />
-{% endblock -%}
-
-
-
-{%- block content %}
-<h4>Tag: Library</h4>
-
-<ul class="index">
-    {%- for item in articles -%}
-        {%- if 'library' in item.taglist -%}
-        {%- if item.updated -%}{%- set postclass = "update" -%}{%- else -%}{%- set postclass = "post" -%}{%- endif -%}
-        {%- if item.updated -%}{%- set postverb = "Updated" -%}{%- else -%}{%- set postverb = "Posted" -%}{%- endif %}
-    <li><a href="{{ item.anchor }}">{{ item.title }}</a><br />
-        <span class="taglist">{{ item.taglist | join(", ") }}</span><br />
-        <span class="{{ postclass }}">({{ postverb }} {{ item.postdate }})</span></li>
-        {%- endif -%}
-    {%- endfor %}
-</ul>
-{% endblock -%}
+{%- block title -%}{{ tag_title ("Library") }}{%- endblock -%}
+{%- block content %}{{ tag_content ("Library") }}{% endblock -%}
+{%- block footer -%}{{ tag_footer ("library.xhtml") }}{%- endblock -%}
 
 
diff --git a/project/templates/tags/maps.xhtml b/project/templates/tags/maps.xhtml
index 8fe15e5..c61e928 100644
--- a/project/templates/tags/maps.xhtml
+++ b/project/templates/tags/maps.xhtml
@@ -1,32 +1,10 @@
 
-{%- extends "base_plain.xhtml" -%}
+{%- extends "tags/base_tag.xhtml" -%}
 
 
 
-{%- block title -%}Maps Tag{%- endblock -%}
-
-
-
-{%- block style %}
-    <link href="/css/index.css" rel="stylesheet" />
-{% endblock -%}
-
-
-
-{%- block content %}
-<h4>Tag: Maps</h4>
-
-<ul class="index">
-    {%- for item in articles -%}
-        {%- if 'maps' in item.taglist -%}
-        {%- if item.updated -%}{%- set postclass = "update" -%}{%- else -%}{%- set postclass = "post" -%}{%- endif -%}
-        {%- if item.updated -%}{%- set postverb = "Updated" -%}{%- else -%}{%- set postverb = "Posted" -%}{%- endif %}
-    <li><a href="{{ item.anchor }}">{{ item.title }}</a><br />
-        <span class="taglist">{{ item.taglist | join(", ") }}</span><br />
-        <span class="{{ postclass }}">({{ postverb }} {{ item.postdate }})</span></li>
-        {%- endif -%}
-    {%- endfor %}
-</ul>
-{% endblock -%}
+{%- block title -%}{{ tag_title ("Maps") }}{%- endblock -%}
+{%- block content %}{{ tag_content ("Maps") }}{% endblock -%}
+{%- block footer -%}{{ tag_footer ("maps.xhtml") }}{%- endblock -%}
 
 
diff --git a/project/templates/tags/mathematics.xhtml b/project/templates/tags/mathematics.xhtml
index 4441004..38a0022 100644
--- a/project/templates/tags/mathematics.xhtml
+++ b/project/templates/tags/mathematics.xhtml
@@ -1,32 +1,10 @@
 
-{%- extends "base_plain.xhtml" -%}
+{%- extends "tags/base_tag.xhtml" -%}
 
 
 
-{%- block title -%}Mathematics Tag{%- endblock -%}
-
-
-
-{%- block style %}
-    <link href="/css/index.css" rel="stylesheet" />
-{% endblock -%}
-
-
-
-{%- block content %}
-<h4>Tag: Mathematics</h4>
-
-<ul class="index">
-    {%- for item in articles -%}
-        {%- if 'mathematics' in item.taglist -%}
-        {%- if item.updated -%}{%- set postclass = "update" -%}{%- else -%}{%- set postclass = "post" -%}{%- endif -%}
-        {%- if item.updated -%}{%- set postverb = "Updated" -%}{%- else -%}{%- set postverb = "Posted" -%}{%- endif %}
-    <li><a href="{{ item.anchor }}">{{ item.title }}</a><br />
-        <span class="taglist">{{ item.taglist | join(", ") }}</span><br />
-        <span class="{{ postclass }}">({{ postverb }} {{ item.postdate }})</span></li>
-        {%- endif -%}
-    {%- endfor %}
-</ul>
-{% endblock -%}
+{%- block title -%}{{ tag_title ("Mathematics") }}{%- endblock -%}
+{%- block content %}{{ tag_content ("Mathematics") }}{% endblock -%}
+{%- block footer -%}{{ tag_footer ("mathematics.xhtml") }}{%- endblock -%}
 
 
diff --git a/project/templates/tags/politics.xhtml b/project/templates/tags/politics.xhtml
index 7cc490f..15fd2a9 100644
--- a/project/templates/tags/politics.xhtml
+++ b/project/templates/tags/politics.xhtml
@@ -1,32 +1,10 @@
 
-{%- extends "base_plain.xhtml" -%}
+{%- extends "tags/base_tag.xhtml" -%}
 
 
 
-{%- block title -%}Politics Tag{%- endblock -%}
-
-
-
-{%- block style %}
-    <link href="/css/index.css" rel="stylesheet" />
-{% endblock -%}
-
-
-
-{%- block content %}
-<h4>Tag: Politics</h4>
-
-<ul class="index">
-    {%- for item in articles -%}
-        {%- if 'politics' in item.taglist -%}
-        {%- if item.updated -%}{%- set postclass = "update" -%}{%- else -%}{%- set postclass = "post" -%}{%- endif -%}
-        {%- if item.updated -%}{%- set postverb = "Updated" -%}{%- else -%}{%- set postverb = "Posted" -%}{%- endif %}
-    <li><a href="{{ item.anchor }}">{{ item.title }}</a><br />
-        <span class="taglist">{{ item.taglist | join(", ") }}</span><br />
-        <span class="{{ postclass }}">({{ postverb }} {{ item.postdate }})</span></li>
-        {%- endif -%}
-    {%- endfor %}
-</ul>
-{% endblock -%}
+{%- block title -%}{{ tag_title ("Politics") }}{%- endblock -%}
+{%- block content %}{{ tag_content ("Politics") }}{% endblock -%}
+{%- block footer -%}{{ tag_footer ("politics.xhtml") }}{%- endblock -%}
 
 
diff --git a/project/templates/tags/programming.xhtml b/project/templates/tags/programming.xhtml
index d4ca315..d5a0035 100644
--- a/project/templates/tags/programming.xhtml
+++ b/project/templates/tags/programming.xhtml
@@ -1,32 +1,10 @@
 
-{%- extends "base_plain.xhtml" -%}
+{%- extends "tags/base_tag.xhtml" -%}
 
 
 
-{%- block title -%}Programming Tag{%- endblock -%}
-
-
-
-{%- block style %}
-    <link href="/css/index.css" rel="stylesheet" />
-{% endblock -%}
-
-
-
-{%- block content %}
-<h4>Tag: Programming</h4>
-
-<ul class="index">
-    {%- for item in articles -%}
-        {%- if 'programming' in item.taglist -%}
-        {%- if item.updated -%}{%- set postclass = "update" -%}{%- else -%}{%- set postclass = "post" -%}{%- endif -%}
-        {%- if item.updated -%}{%- set postverb = "Updated" -%}{%- else -%}{%- set postverb = "Posted" -%}{%- endif %}
-    <li><a href="{{ item.anchor }}">{{ item.title }}</a><br />
-        <span class="taglist">{{ item.taglist | join(", ") }}</span><br />
-        <span class="{{ postclass }}">({{ postverb }} {{ item.postdate }})</span></li>
-        {%- endif -%}
-    {%- endfor %}
-</ul>
-{% endblock -%}
+{%- block title -%}{{ tag_title ("Programming") }}{%- endblock -%}
+{%- block content %}{{ tag_content ("Programming") }}{% endblock -%}
+{%- block footer -%}{{ tag_footer ("programming.xhtml") }}{%- endblock -%}
 
 
diff --git a/project/templates/tags/transport.xhtml b/project/templates/tags/transport.xhtml
index 0881d37..d5d3c3c 100644
--- a/project/templates/tags/transport.xhtml
+++ b/project/templates/tags/transport.xhtml
@@ -1,32 +1,10 @@
 
-{%- extends "base_plain.xhtml" -%}
+{%- extends "tags/base_tag.xhtml" -%}
 
 
 
-{%- block title -%}Transport Tag{%- endblock -%}
-
-
-
-{%- block style %}
-    <link href="/css/index.css" rel="stylesheet" />
-{% endblock -%}
-
-
-
-{%- block content %}
-<h4>Tag: Transport</h4>
-
-<ul class="index">
-    {%- for item in articles -%}
-        {%- if 'transport' in item.taglist -%}
-        {%- if item.updated -%}{%- set postclass = "update" -%}{%- else -%}{%- set postclass = "post" -%}{%- endif -%}
-        {%- if item.updated -%}{%- set postverb = "Updated" -%}{%- else -%}{%- set postverb = "Posted" -%}{%- endif %}
-    <li><a href="{{ item.anchor }}">{{ item.title }}</a><br />
-        <span class="taglist">{{ item.taglist | join(", ") }}</span><br />
-        <span class="{{ postclass }}">({{ postverb }} {{ item.postdate }})</span></li>
-        {%- endif -%}
-    {%- endfor %}
-</ul>
-{% endblock -%}
+{%- block title -%}{{ tag_title ("Transport") }}{%- endblock -%}
+{%- block content %}{{ tag_content ("Transport") }}{% endblock -%}
+{%- block footer -%}{{ tag_footer ("transport.xhtml") }}{%- endblock -%}
 
 
diff --git a/project/templates/tags/videogames.xhtml b/project/templates/tags/videogames.xhtml
index ea820a8..2f87308 100644
--- a/project/templates/tags/videogames.xhtml
+++ b/project/templates/tags/videogames.xhtml
@@ -1,32 +1,10 @@
 
-{%- extends "base_plain.xhtml" -%}
+{%- extends "tags/base_tag.xhtml" -%}
 
 
 
-{%- block title -%}Videogames Tag{%- endblock -%}
-
-
-
-{%- block style %}
-    <link href="/css/index.css" rel="stylesheet" />
-{% endblock -%}
-
-
-
-{%- block content %}
-<h4>Tag: Videogames</h4>
-
-<ul class="index">
-    {%- for item in articles -%}
-        {%- if 'videogames' in item.taglist -%}
-        {%- if item.updated -%}{%- set postclass = "update" -%}{%- else -%}{%- set postclass = "post" -%}{%- endif -%}
-        {%- if item.updated -%}{%- set postverb = "Updated" -%}{%- else -%}{%- set postverb = "Posted" -%}{%- endif %}
-    <li><a href="{{ item.anchor }}">{{ item.title }}</a><br />
-        <span class="taglist">{{ item.taglist | join(", ") }}</span><br />
-        <span class="{{ postclass }}">({{ postverb }} {{ item.postdate }})</span></li>
-        {%- endif -%}
-    {%- endfor %}
-</ul>
-{% endblock -%}
+{%- block title -%}{{ tag_title ("Videogames") }}{%- endblock -%}
+{%- block content %}{{ tag_content ("Videogames") }}{% endblock -%}
+{%- block footer -%}{{ tag_footer ("videogames.xhtml") }}{%- endblock -%}
 
 
diff --git a/project/templates/thue2a.xhtml b/project/templates/thue2a.xhtml
index 03d1fe7..3e035e1 100644
--- a/project/templates/thue2a.xhtml
+++ b/project/templates/thue2a.xhtml
@@ -7,6 +7,10 @@
 
 
 
+{%- block footer -%}{{ plain_footer ("thue2a.xhtml") }}{%- endblock -%}
+
+
+
 {%- block content %}
 <h4>Thue Version 2a</h4>