From 7c08afd343e19c35151fc614611151033b7f2ad1 Mon Sep 17 00:00:00 2001 From: Vasudev Kamath Date: Sun, 7 May 2017 19:58:39 +0530 Subject: More fine tuning of template Allow smooth navigation and move redundant information to base.html. --- templates/article.html | 8 ++------ templates/base.html | 17 ++++++++++++----- templates/categories.html | 1 + templates/category.html | 1 + templates/index.html | 7 +------ templates/tag.html | 6 ++++++ templates/tags.html | 3 +-- 7 files changed, 24 insertions(+), 19 deletions(-) diff --git a/templates/article.html b/templates/article.html index 630323b..e00ffdc 100644 --- a/templates/article.html +++ b/templates/article.html @@ -1,10 +1,6 @@ {% extends "base.html" %} -{% block menu %} - | Home | - {% for p in PAGES %} - | {{p.title}} | - {% endfor %} -{% endblock %} +{% block title %} {{ article.title}} {%endblock title %} +{% block home %} | Home | {% endblock %} {% block article %}

{{ article.title |striptags }}

diff --git a/templates/base.html b/templates/base.html index 75ef425..e1dd592 100644 --- a/templates/base.html +++ b/templates/base.html @@ -36,11 +36,18 @@ -
- +
+ {% block article %} {% endblock %} {% block page %} diff --git a/templates/categories.html b/templates/categories.html index e29be0c..dcdf3b8 100644 --- a/templates/categories.html +++ b/templates/categories.html @@ -1,4 +1,5 @@ {% extends "base.html" %} +{% block home %} | Home | {% endblock %} {% block content %}
    {% for category, articles in categories %} diff --git a/templates/category.html b/templates/category.html index 4e6fd24..e30f3ec 100644 --- a/templates/category.html +++ b/templates/category.html @@ -1,4 +1,5 @@ {% extends "index.html" %} +{% block home %} | Home | {% endblock %} {% block content_title %}

    Articles in the {{ category }} category

    {% endblock %} diff --git a/templates/index.html b/templates/index.html index 429020e..98e5f15 100644 --- a/templates/index.html +++ b/templates/index.html @@ -1,11 +1,6 @@ {% extends "base.html" %} -{% block menu %} - {% for p in PAGES %} - | {{p.title}} | - {% endfor %} -

    Home

    -{% endblock %} {% block content %} +

    Random Ramblings

    {% block content_title %}

    All articles

    diff --git a/templates/tag.html b/templates/tag.html index e69de29..b2cda7a 100644 --- a/templates/tag.html +++ b/templates/tag.html @@ -0,0 +1,6 @@ +{% extends "index.html" %} +{% block title %} {{SITENAME}} - Tag {{tag}} {% endblock %} +{% block home %} | Home | {% endblock %} +{% block content_title %} +

    Articles in the {{ tag }} tag

    +{% endblock %} diff --git a/templates/tags.html b/templates/tags.html index b5d1482..d38c107 100644 --- a/templates/tags.html +++ b/templates/tags.html @@ -1,7 +1,6 @@ {% extends "base.html" %} - {% block title %}{{ SITENAME }} - Tags{% endblock %} - +{% block home %} | Home | {% endblock %} {% block content %}

    Tags for {{ SITENAME }}

    {%- for tag, articles in tags|sort %} -- cgit v1.2.3