Fix wrong body_class values in archives, authors, categories, pages a…

…nd tags templates (#104) * fix: correct body_class in archives, authors, categories, pages and tags HTML * Revert "fix: correct body_class in archives, authors, categories, pages and tags HTML" This reverts commit a1b5b25. * fix: delete useless modification and correct body_class in base.html * Changes in current_url for tags and categories --------- Co-authored-by: Arul <[email protected]>
arulrajnet · May 3, 2024 · ab26570 · ab26570
1 parent bc49578
commit ab26570
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 39 deletions.
diff --git a/templates/base.html b/templates/base.html
@@ -147,48 +147,55 @@
   {% endblock head %}
 
 </head>
-{% set body_class='home-template' %}
-{% set current_url='/' %}
-{% set current_title=SITENAME %}
-
-{% if article %}
-{% set body_class='post-template' %}
-{% set current_url='/'+article.url %}
-{% set current_title=article.title %}
-{% endif %}
 
-{% if tag %}
-{% set body_class='tag-template' %}
-{% set current_url='/'+tag.url %}
-{% set current_title='Tag '+tag.name %}
-{% endif %}
+{% if body_class %}
+  {% set body_class=body_class %}
 
-{% if category %}
-{% set body_class='category-template' %}
-{% set current_url='/'+category.url %}
-{% set current_title='Category '+category.name %}
-{% endif %}
+{% else %}
+  {% set body_class='home-template' %}
+  {% set current_url='/' %}
+  {% set current_title=SITENAME %}
 
-{% if page %}
-{% set body_class='page-template' %}
-{% set current_url='/'+page.url %}
-{% set current_title=page.title %}
-{% endif %}
+  {% if article %}
+  {% set body_class='post-template' %}
+  {% set current_url='/'+article.url %}
+  {% set current_title=article.title %}
+  {% endif %}
 
-{% if author %}
-{% set body_class='author-template' %}
-{% set current_url='/'+author.url %}
-{% set current_title='Author '+author.name %}
-{% endif %}
+  {% if tag %}
+  {% set body_class='tag-template' %}
+  {% set current_url='/'+tag.url %}
+  {% set current_title='Tag '+tag.name %}
+  {% endif %}
+
+  {% if category %}
+  {% set body_class='category-template' %}
+  {% set current_url='/'+category.url %}
+  {% set current_title='Category '+category.name %}
+  {% endif %}
+
+  {% if page %}
+  {% set body_class='page-template' %}
+  {% set current_url='/'+page.url %}
+  {% set current_title=page.title %}
+  {% endif %}
+
+  {% if author %}
+  {% set body_class='author-template' %}
+  {% set current_url='/'+author.url %}
+  {% set current_title='Author '+author.name %}
+  {% endif %}
+
+  {% if period and period_num %}
+  {% if period_num[2] %}
+    {% set current_url='/{0}/{1}/{2}/'.format(period_num[0],period_num[1],period_num[2]) %}
+  {% elif period_num[1] %}
+    {% set current_url='/{0}/{1}/'.format(period_num[0],period_num[1]) %}
+  {% elif period_num[0] %}
+    {% set current_url='/{0}/'.format(period_num[0]) %}
+  {% endif %}
+  {% endif %}
 
-{% if period and period_num %}
-{% if period_num[2] %}
-  {% set current_url='/{0}/{1}/{2}/'.format(period_num[0],period_num[1],period_num[2]) %}
-{% elif period_num[1] %}
-  {% set current_url='/{0}/{1}/'.format(period_num[0],period_num[1]) %}
-{% elif period_num[0] %}
-  {% set current_url='/{0}/'.format(period_num[0]) %}
-{% endif %}
 {% endif %}
 
 <body class="{{body_class}}">

diff --git a/templates/categories.html b/templates/categories.html
@@ -22,7 +22,7 @@
 
 {% if categories %}
 {% set body_class='categories-template' %}
-{% set current_url=CATEGORIES_URL %}
+{% set current_url='/'+CATEGORIES_URL %}
 {% set current_title=SITENAME+' - Categories' %}
 {% set current_display_title='Categories' %}
 {% endif %}

diff --git a/templates/tags.html b/templates/tags.html
@@ -22,7 +22,7 @@
 
 {% if tags %}
 {% set body_class='tags-template' %}
-{% set current_url=TAGS_URL %}
+{% set current_url='/'+TAGS_URL %}
 {% set current_title=SITENAME+' - Tags' %}
 {% set current_display_title='Tags' %}
 {% endif %}