From d640c7bd637fa07150bbdaba17bcdcc8d24c676b Mon Sep 17 00:00:00 2001 From: Jedidiah Barber Date: Fri, 26 Nov 2021 20:41:39 +1300 Subject: Refactored base templates --- project/templates/about.xhtml | 2 +- project/templates/adapad.xhtml | 2 +- project/templates/base.xhtml | 6 ++---- project/templates/base_math.xhtml | 37 ++++++-------------------------- project/templates/base_plain.xhtml | 13 +++++++++++ project/templates/deckconv.xhtml | 2 +- project/templates/fltkada.xhtml | 2 +- project/templates/grasp.xhtml | 2 +- project/templates/index.xhtml | 2 +- project/templates/links.xhtml | 2 +- project/templates/packrat.xhtml | 2 +- project/templates/sokoban.xhtml | 2 +- project/templates/steelman.xhtml | 2 +- project/templates/stvcount.xhtml | 2 +- project/templates/sunset.xhtml | 2 +- project/templates/sydneyrail.xhtml | 2 +- project/templates/tags.xhtml | 2 +- project/templates/tags/application.xhtml | 2 +- project/templates/tags/binding.xhtml | 2 +- project/templates/tags/compsci.xhtml | 2 +- project/templates/tags/copyright.xhtml | 2 +- project/templates/tags/esoteric.xhtml | 2 +- project/templates/tags/language.xhtml | 2 +- project/templates/tags/legal.xhtml | 2 +- project/templates/tags/library.xhtml | 2 +- project/templates/tags/maps.xhtml | 2 +- project/templates/tags/mathematics.xhtml | 2 +- project/templates/tags/politics.xhtml | 2 +- project/templates/tags/programming.xhtml | 2 +- project/templates/tags/transport.xhtml | 2 +- project/templates/tags/videogames.xhtml | 2 +- project/templates/thue2a.xhtml | 2 +- 32 files changed, 51 insertions(+), 63 deletions(-) create mode 100644 project/templates/base_plain.xhtml diff --git a/project/templates/about.xhtml b/project/templates/about.xhtml index 8eef5e4..a982b0d 100644 --- a/project/templates/about.xhtml +++ b/project/templates/about.xhtml @@ -1,5 +1,5 @@ -{%- extends "base.xhtml" -%} +{%- extends "base_plain.xhtml" -%} diff --git a/project/templates/adapad.xhtml b/project/templates/adapad.xhtml index 542feaf..7028db5 100644 --- a/project/templates/adapad.xhtml +++ b/project/templates/adapad.xhtml @@ -1,5 +1,5 @@ -{%- extends "base.xhtml" -%} +{%- extends "base_plain.xhtml" -%} diff --git a/project/templates/base.xhtml b/project/templates/base.xhtml index a05e26b..4258f12 100644 --- a/project/templates/base.xhtml +++ b/project/templates/base.xhtml @@ -1,8 +1,6 @@ - - +{% block doctype -%} +{%- endblock %} {% block title %}{% endblock %} diff --git a/project/templates/base_math.xhtml b/project/templates/base_math.xhtml index 3b5be69..fb6f429 100644 --- a/project/templates/base_math.xhtml +++ b/project/templates/base_math.xhtml @@ -1,36 +1,13 @@ - + +{%- extends "base.xhtml" -%} + + + +{%- block doctype -%} - - - {% block title %}{% endblock %} - - -{%- block style -%} {%- endblock -%} - - -
-

Jedidiah Barber's Personal Site

-
-
- -
-
-
-{% block content -%} -{%- endblock %} -
-
-
- - + diff --git a/project/templates/base_plain.xhtml b/project/templates/base_plain.xhtml new file mode 100644 index 0000000..0f26e40 --- /dev/null +++ b/project/templates/base_plain.xhtml @@ -0,0 +1,13 @@ + +{%- extends "base.xhtml" -%} + + + +{%- block doctype -%} + + +{%- endblock -%} + + diff --git a/project/templates/deckconv.xhtml b/project/templates/deckconv.xhtml index ee8abd5..d02afc2 100644 --- a/project/templates/deckconv.xhtml +++ b/project/templates/deckconv.xhtml @@ -1,5 +1,5 @@ -{%- extends "base.xhtml" -%} +{%- extends "base_plain.xhtml" -%} diff --git a/project/templates/fltkada.xhtml b/project/templates/fltkada.xhtml index f68ea27..fbc4a7b 100644 --- a/project/templates/fltkada.xhtml +++ b/project/templates/fltkada.xhtml @@ -1,5 +1,5 @@ -{%- extends "base.xhtml" -%} +{%- extends "base_plain.xhtml" -%} diff --git a/project/templates/grasp.xhtml b/project/templates/grasp.xhtml index 5afc4b7..e6deb41 100644 --- a/project/templates/grasp.xhtml +++ b/project/templates/grasp.xhtml @@ -1,5 +1,5 @@ -{%- extends "base.xhtml" -%} +{%- extends "base_plain.xhtml" -%} diff --git a/project/templates/index.xhtml b/project/templates/index.xhtml index 1026136..09bc559 100644 --- a/project/templates/index.xhtml +++ b/project/templates/index.xhtml @@ -1,5 +1,5 @@ -{%- extends "base.xhtml" -%} +{%- extends "base_plain.xhtml" -%} diff --git a/project/templates/links.xhtml b/project/templates/links.xhtml index 991810b..5be9deb 100644 --- a/project/templates/links.xhtml +++ b/project/templates/links.xhtml @@ -1,5 +1,5 @@ -{%- extends "base.xhtml" -%} +{%- extends "base_plain.xhtml" -%} diff --git a/project/templates/packrat.xhtml b/project/templates/packrat.xhtml index ee33b41..defc9e8 100644 --- a/project/templates/packrat.xhtml +++ b/project/templates/packrat.xhtml @@ -1,5 +1,5 @@ -{%- extends "base.xhtml" -%} +{%- extends "base_plain.xhtml" -%} diff --git a/project/templates/sokoban.xhtml b/project/templates/sokoban.xhtml index 0ce990a..5c08184 100644 --- a/project/templates/sokoban.xhtml +++ b/project/templates/sokoban.xhtml @@ -1,5 +1,5 @@ -{%- extends "base.xhtml" -%} +{%- extends "base_plain.xhtml" -%} diff --git a/project/templates/steelman.xhtml b/project/templates/steelman.xhtml index 11136cf..f724171 100644 --- a/project/templates/steelman.xhtml +++ b/project/templates/steelman.xhtml @@ -1,5 +1,5 @@ -{%- extends "base.xhtml" -%} +{%- extends "base_plain.xhtml" -%} diff --git a/project/templates/stvcount.xhtml b/project/templates/stvcount.xhtml index 2cb3dda..e475692 100644 --- a/project/templates/stvcount.xhtml +++ b/project/templates/stvcount.xhtml @@ -1,5 +1,5 @@ -{%- extends "base.xhtml" -%} +{%- extends "base_plain.xhtml" -%} diff --git a/project/templates/sunset.xhtml b/project/templates/sunset.xhtml index ab4389d..765f570 100644 --- a/project/templates/sunset.xhtml +++ b/project/templates/sunset.xhtml @@ -1,5 +1,5 @@ -{%- extends "base.xhtml" -%} +{%- extends "base_plain.xhtml" -%} diff --git a/project/templates/sydneyrail.xhtml b/project/templates/sydneyrail.xhtml index c5873e2..de23d31 100644 --- a/project/templates/sydneyrail.xhtml +++ b/project/templates/sydneyrail.xhtml @@ -1,5 +1,5 @@ -{%- extends "base.xhtml" -%} +{%- extends "base_plain.xhtml" -%} diff --git a/project/templates/tags.xhtml b/project/templates/tags.xhtml index 42f3b5a..b9e835a 100644 --- a/project/templates/tags.xhtml +++ b/project/templates/tags.xhtml @@ -1,5 +1,5 @@ -{%- extends "base.xhtml" -%} +{%- extends "base_plain.xhtml" -%} diff --git a/project/templates/tags/application.xhtml b/project/templates/tags/application.xhtml index e8555c7..82c2a5f 100644 --- a/project/templates/tags/application.xhtml +++ b/project/templates/tags/application.xhtml @@ -1,5 +1,5 @@ -{%- extends "base.xhtml" -%} +{%- extends "base_plain.xhtml" -%} diff --git a/project/templates/tags/binding.xhtml b/project/templates/tags/binding.xhtml index 34d5b91..794e595 100644 --- a/project/templates/tags/binding.xhtml +++ b/project/templates/tags/binding.xhtml @@ -1,5 +1,5 @@ -{%- extends "base.xhtml" -%} +{%- extends "base_plain.xhtml" -%} diff --git a/project/templates/tags/compsci.xhtml b/project/templates/tags/compsci.xhtml index 7a269ef..741cf51 100644 --- a/project/templates/tags/compsci.xhtml +++ b/project/templates/tags/compsci.xhtml @@ -1,5 +1,5 @@ -{%- extends "base.xhtml" -%} +{%- extends "base_plain.xhtml" -%} diff --git a/project/templates/tags/copyright.xhtml b/project/templates/tags/copyright.xhtml index 9c23058..dfe6295 100644 --- a/project/templates/tags/copyright.xhtml +++ b/project/templates/tags/copyright.xhtml @@ -1,5 +1,5 @@ -{%- extends "base.xhtml" -%} +{%- extends "base_plain.xhtml" -%} diff --git a/project/templates/tags/esoteric.xhtml b/project/templates/tags/esoteric.xhtml index 14f75b4..917851c 100644 --- a/project/templates/tags/esoteric.xhtml +++ b/project/templates/tags/esoteric.xhtml @@ -1,5 +1,5 @@ -{%- extends "base.xhtml" -%} +{%- extends "base_plain.xhtml" -%} diff --git a/project/templates/tags/language.xhtml b/project/templates/tags/language.xhtml index f3193ca..7669da9 100644 --- a/project/templates/tags/language.xhtml +++ b/project/templates/tags/language.xhtml @@ -1,5 +1,5 @@ -{%- extends "base.xhtml" -%} +{%- extends "base_plain.xhtml" -%} diff --git a/project/templates/tags/legal.xhtml b/project/templates/tags/legal.xhtml index 71e30dd..1d97d7a 100644 --- a/project/templates/tags/legal.xhtml +++ b/project/templates/tags/legal.xhtml @@ -1,5 +1,5 @@ -{%- extends "base.xhtml" -%} +{%- extends "base_plain.xhtml" -%} diff --git a/project/templates/tags/library.xhtml b/project/templates/tags/library.xhtml index b73f7b5..3f9c2fc 100644 --- a/project/templates/tags/library.xhtml +++ b/project/templates/tags/library.xhtml @@ -1,5 +1,5 @@ -{%- extends "base.xhtml" -%} +{%- extends "base_plain.xhtml" -%} diff --git a/project/templates/tags/maps.xhtml b/project/templates/tags/maps.xhtml index ccccc34..8fe15e5 100644 --- a/project/templates/tags/maps.xhtml +++ b/project/templates/tags/maps.xhtml @@ -1,5 +1,5 @@ -{%- extends "base.xhtml" -%} +{%- extends "base_plain.xhtml" -%} diff --git a/project/templates/tags/mathematics.xhtml b/project/templates/tags/mathematics.xhtml index 6d16264..4441004 100644 --- a/project/templates/tags/mathematics.xhtml +++ b/project/templates/tags/mathematics.xhtml @@ -1,5 +1,5 @@ -{%- extends "base.xhtml" -%} +{%- extends "base_plain.xhtml" -%} diff --git a/project/templates/tags/politics.xhtml b/project/templates/tags/politics.xhtml index 8b2b1f9..7cc490f 100644 --- a/project/templates/tags/politics.xhtml +++ b/project/templates/tags/politics.xhtml @@ -1,5 +1,5 @@ -{%- extends "base.xhtml" -%} +{%- extends "base_plain.xhtml" -%} diff --git a/project/templates/tags/programming.xhtml b/project/templates/tags/programming.xhtml index 8307d65..d4ca315 100644 --- a/project/templates/tags/programming.xhtml +++ b/project/templates/tags/programming.xhtml @@ -1,5 +1,5 @@ -{%- extends "base.xhtml" -%} +{%- extends "base_plain.xhtml" -%} diff --git a/project/templates/tags/transport.xhtml b/project/templates/tags/transport.xhtml index b457d92..0881d37 100644 --- a/project/templates/tags/transport.xhtml +++ b/project/templates/tags/transport.xhtml @@ -1,5 +1,5 @@ -{%- extends "base.xhtml" -%} +{%- extends "base_plain.xhtml" -%} diff --git a/project/templates/tags/videogames.xhtml b/project/templates/tags/videogames.xhtml index 188f016..ea820a8 100644 --- a/project/templates/tags/videogames.xhtml +++ b/project/templates/tags/videogames.xhtml @@ -1,5 +1,5 @@ -{%- extends "base.xhtml" -%} +{%- extends "base_plain.xhtml" -%} diff --git a/project/templates/thue2a.xhtml b/project/templates/thue2a.xhtml index e729280..03d1fe7 100644 --- a/project/templates/thue2a.xhtml +++ b/project/templates/thue2a.xhtml @@ -1,5 +1,5 @@ -{%- extends "base.xhtml" -%} +{%- extends "base_plain.xhtml" -%} -- cgit