From 7876c2efa6de701d951cfb07ebd70f1248893c0c Mon Sep 17 00:00:00 2001 From: Katharina Fey Date: Mon, 22 Jan 2018 22:20:24 +0100 Subject: Using the same components for title-text --- crumbs/templates/base.html | 29 +++++----------------- crumbs/templates/components/header.html | 12 ---------- crumbs/templates/components/html_head.html | 18 ++++++++++++++ crumbs/templates/components/title_text.html | 8 ++++++- crumbs/templates/home.html | 37 +++++++---------------------- 5 files changed, 39 insertions(+), 65 deletions(-) delete mode 100644 crumbs/templates/components/header.html create mode 100644 crumbs/templates/components/html_head.html diff --git a/crumbs/templates/base.html b/crumbs/templates/base.html index 69ecd4b..dfe7139 100755 --- a/crumbs/templates/base.html +++ b/crumbs/templates/base.html @@ -1,21 +1,8 @@ - - - {% block title %}{{ SITENAME }}{% endblock title %} - - - - - - - - - - - - - + {% with type='base' %} + {% include "components/html_head.html" %} + {% endwith %}

@@ -23,13 +10,9 @@

- # ~ - Fun - Memory - Violations - ▁ -

+ {% with title_type='page-title' %} + {% include "components/title_text.html" %} + {% endwith %} {% for title, link in MENUITEMS %} diff --git a/crumbs/templates/components/header.html b/crumbs/templates/components/header.html deleted file mode 100644 index 2d811d8..0000000 --- a/crumbs/templates/components/header.html +++ /dev/null @@ -1,12 +0,0 @@ - - - {% block title %}{{ SITENAME }}{% endblock title %} - - - - - - - - - diff --git a/crumbs/templates/components/html_head.html b/crumbs/templates/components/html_head.html new file mode 100644 index 0000000..3499ffa --- /dev/null +++ b/crumbs/templates/components/html_head.html @@ -0,0 +1,18 @@ + + + {{ SITENAME }} + + {% if type == 'home' %} + + + {% else %} + + + + {% endif %} + + + + + + \ No newline at end of file diff --git a/crumbs/templates/components/title_text.html b/crumbs/templates/components/title_text.html index a86a77d..e0fda8c 100644 --- a/crumbs/templates/components/title_text.html +++ b/crumbs/templates/components/title_text.html @@ -1,7 +1,13 @@ -

+ {% if title_type == 'title' %} +

+ {% endif %} # ~ Fun Memory Violations ▁ + {% if title_type == 'title' %} +

+ {% endif %}

diff --git a/crumbs/templates/home.html b/crumbs/templates/home.html index 5106d4b..bb8f24a 100755 --- a/crumbs/templates/home.html +++ b/crumbs/templates/home.html @@ -1,20 +1,8 @@ - - - {{ SITENAME }} - - - - - - - - - - - - + {% with type='home' %} + {% include "components/html_head.html" %} + {% endwith %} @@ -34,20 +22,11 @@ {% endif %} {% endfor %}

- - - - - -

- # ~ - Fun - Memory - Violations - ▁ -

+ + {% with title_type='title' %} + {% include "components/title_text.html" %} + {% endwith %} + {% include "components/super_gay.html" %} -- cgit v1.2.3