From 8ff34eb0735bb97342179441093d6ea5bce718f6 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Tue, 7 Nov 2017 18:09:03 +0100
Subject: [PATCH] template: deduplicate article footer markup.

---
 pelican-theme/templates/archives.html          | 6 ++++--
 pelican-theme/templates/article.html           | 9 ++++++---
 pelican-theme/templates/article_footer.html    | 4 +---
 pelican-theme/templates/base_blog_section.html | 6 ++++--
 pelican-theme/templates/index.html             | 6 ++++--
 5 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/pelican-theme/templates/archives.html b/pelican-theme/templates/archives.html
index ded6964b..bc7f0fd7 100644
--- a/pelican-theme/templates/archives.html
+++ b/pelican-theme/templates/archives.html
@@ -24,8 +24,10 @@
 {{ article.content }}
 <!-- /content -->
         {% endif %}
-        {% macro footer() %}{% include "article_footer.html" %}{% endmacro %}
-        {{ footer()|indent(8) }}
+        <footer>
+          {% macro footer() %}{% include "article_footer.html" %}{% endmacro %}
+          {{ footer()|indent(10) }}
+        </footer>
         {% if not loop.first or articles_page.number != 1 %}
         <div class="m-clearfix-l"></div>
         {% endif %}
diff --git a/pelican-theme/templates/article.html b/pelican-theme/templates/article.html
index febc2d2e..c948f4e7 100644
--- a/pelican-theme/templates/article.html
+++ b/pelican-theme/templates/article.html
@@ -69,7 +69,8 @@
     <footer class="m-container">
       <div class="m-row">
         <div class="m-col-m-10 m-push-m-1 m-nopadb">
-          <p>Posted {% if article.authors %}by {% for author in article.authors %}<a href="{{ author.url|format_siteurl }}">{{ author }}</a>{% endfor %}{% endif %} on <time datetime="{{ article.date.isoformat() }}">{{ article.locale_date }}</time> in <a href="{{ article.category.url|format_siteurl }} ">{{ article.category }}</a>{% if article.modified %}; <span class="m-text m-success">updated <time datetime="{{ article.modified.isoformat() }}">{{ article.locale_modified }}</time></span>{% endif %}.{% if article.tags %} Tags: {% for tag in article.tags %}<a href="{{ tag.url|format_siteurl }}">{{ tag }}</a>{% if not loop.last %}, {% endif %}{% endfor %}.{% endif %}</p>
+          {% macro footer() %}{% include "article_footer.html" %}{% endmacro %}
+          {{ footer()|indent(10) }}
         </div>
       </div>
     </footer>
@@ -82,8 +83,10 @@
 <!-- content -->
 {{ article.content -}}
 <!-- /content -->
-      {% macro footer() %}{% include "article_footer.html" %}{% endmacro %}
-      {{ footer()|indent(6) }}
+      <footer>
+        {% macro footer() %}{% include "article_footer.html" %}{% endmacro %}
+        {{ footer()|indent(8) }}
+      </footer>
     </article>
     {% endif %}
 {% endblock %}
diff --git a/pelican-theme/templates/article_footer.html b/pelican-theme/templates/article_footer.html
index 3b109206..077e2eba 100644
--- a/pelican-theme/templates/article_footer.html
+++ b/pelican-theme/templates/article_footer.html
@@ -1,3 +1 @@
-<footer>
-  <p>Posted {% if article.authors %}by {% for author in article.authors %}<a href="{{ author.url|format_siteurl }}">{{ author }}</a>{% endfor %}{% endif %} on <time datetime="{{ article.date.isoformat() }}">{{ article.locale_date }}</time> in <a href="{{ article.category.url|format_siteurl }} ">{{ article.category }}</a>{% if article.modified %}; <span class="m-text m-success">updated <time datetime="{{ article.modified.isoformat() }}">{{ article.locale_modified }}</time></span>{% endif %}.{% if article.tags %} Tags: {% for tag in article.tags %}<a href="{{ tag.url|format_siteurl }}">{{ tag }}</a>{% if not loop.last %}, {% endif %}{% endfor %}.{% endif %}</p>
-</footer>
+<p>Posted {% if article.authors %}by {% for author in article.authors %}<a href="{{ author.url|format_siteurl }}">{{ author }}</a>{% endfor %}{% endif %} on <time datetime="{{ article.date.isoformat() }}">{{ article.locale_date }}</time> in <a href="{{ article.category.url|format_siteurl }} ">{{ article.category }}</a>{% if article.modified %}; <span class="m-text m-success">updated <time datetime="{{ article.modified.isoformat() }}">{{ article.locale_modified }}</time></span>{% endif %}.{% if article.tags %} Tags: {% for tag in article.tags %}<a href="{{ tag.url|format_siteurl }}">{{ tag }}</a>{% if not loop.last %}, {% endif %}{% endfor %}.{% endif %}</p>
diff --git a/pelican-theme/templates/base_blog_section.html b/pelican-theme/templates/base_blog_section.html
index 8072d378..142b5dd8 100644
--- a/pelican-theme/templates/base_blog_section.html
+++ b/pelican-theme/templates/base_blog_section.html
@@ -18,8 +18,10 @@
       <article>
         {% macro header() %}{% include "article_header.html" %}{% endmacro %}
         {{ header()|indent(8) }}
-        {% macro footer() %}{% include "article_footer.html" %}{% endmacro %}
-        {{ footer()|indent(8) }}
+        <footer>
+          {% macro footer() %}{% include "article_footer.html" %}{% endmacro %}
+          {{ footer()|indent(10) }}
+        </footer>
       </article>
       {% endfor %}
       {% if articles_page.has_other_pages() %}
diff --git a/pelican-theme/templates/index.html b/pelican-theme/templates/index.html
index ded6964b..bc7f0fd7 100644
--- a/pelican-theme/templates/index.html
+++ b/pelican-theme/templates/index.html
@@ -24,8 +24,10 @@
 {{ article.content }}
 <!-- /content -->
         {% endif %}
-        {% macro footer() %}{% include "article_footer.html" %}{% endmacro %}
-        {{ footer()|indent(8) }}
+        <footer>
+          {% macro footer() %}{% include "article_footer.html" %}{% endmacro %}
+          {{ footer()|indent(10) }}
+        </footer>
         {% if not loop.first or articles_page.number != 1 %}
         <div class="m-clearfix-l"></div>
         {% endif %}
-- 
2.30.2