From: Vladimír Vondruš <mosra@centrum.cz>
Date: Sat, 9 Dec 2017 22:14:31 +0000 (+0100)
Subject: theme: trim output coming from Pelican to avoid ugly empty lines.
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~cjwatson/git?a=commitdiff_plain;h=3c6151af4ccac9a2fd43b205a2f30b5d7860757f;p=blog.git

theme: trim output coming from Pelican to avoid ugly empty lines.
---

diff --git a/pelican-theme/templates/archives.html b/pelican-theme/templates/archives.html
index 17920902..2ad7421b 100644
--- a/pelican-theme/templates/archives.html
+++ b/pelican-theme/templates/archives.html
@@ -32,7 +32,7 @@
                (article.collapse_first is not defined and not M_COLLAPSE_FIRST_ARTICLE)) %}
         <div class="m-clearfix-l"></div>
 <!-- content -->
-{{ article.content }}
+{{ article.content|trim }}
 <!-- /content -->
         {% endif %}
         <footer>
diff --git a/pelican-theme/templates/article.html b/pelican-theme/templates/article.html
index 645f9489..a044ab34 100644
--- a/pelican-theme/templates/article.html
+++ b/pelican-theme/templates/article.html
@@ -52,7 +52,7 @@
       <div class="m-container">
         <div class="m-row">
           <div class="m-col-m-10 m-push-m-1 m-nopady">
-            {{ article.summary|indent(12) }}
+            {{ article.summary|trim|indent(12) }}
           </div>
         </div>
       </div>
@@ -62,7 +62,7 @@
       <div class="m-row">
         <div class="m-col-m-10 m-push-m-1 m-nopady">
 <!-- content -->
-{{ article.content -}}
+{{ article.content|trim }}
 <!-- /content -->
         </div>
       </div>
@@ -82,7 +82,7 @@
       {{ header()|indent(6) }}
       <div class="m-clearfix-l"></div>
 <!-- content -->
-{{ article.content -}}
+{{ article.content|trim }}
 <!-- /content -->
       <footer>
         {% macro footer() %}{% include "article_footer.html" %}{% endmacro %}
diff --git a/pelican-theme/templates/article_header.html b/pelican-theme/templates/article_header.html
index a05b659a..5804e8fe 100644
--- a/pelican-theme/templates/article_header.html
+++ b/pelican-theme/templates/article_header.html
@@ -19,6 +19,6 @@
           (article.collapse_first is not defined and M_COLLAPSE_FIRST_ARTICLE))) or
         (article.hide_summary is defined and article.hide_summary != 'True') or
         (article.hide_summary is not defined and not M_HIDE_ARTICLE_SUMMARY) %}
-  {{ article.summary|indent(2) }}
+  {{ article.summary|trim|indent(2) }}
   {% endif %}
 </header>
diff --git a/pelican-theme/templates/index.html b/pelican-theme/templates/index.html
index 2d19df32..74a702f3 100644
--- a/pelican-theme/templates/index.html
+++ b/pelican-theme/templates/index.html
@@ -27,7 +27,7 @@
                (article.collapse_first is not defined and not M_COLLAPSE_FIRST_ARTICLE)) %}
         <div class="m-clearfix-l"></div>
 <!-- content -->
-{{ article.content }}
+{{ article.content|trim }}
 <!-- /content -->
         {% endif %}
         <footer>
diff --git a/pelican-theme/templates/page.html b/pelican-theme/templates/page.html
index abc26b39..415e7d53 100644
--- a/pelican-theme/templates/page.html
+++ b/pelican-theme/templates/page.html
@@ -46,7 +46,7 @@
   <div class="m-row">
     <div class="m-col-l-10 m-push-l-1 m-nopadb">
 <!-- header -->
-{{ page.header|expand_links(page) -}}
+{{ page.header|trim|expand_links(page) }}
 <!-- /header -->
     </div>
   </div>
@@ -58,7 +58,7 @@
     <div id="m-landing-cover">
       <div class="m-container">
 <!-- landing -->
-{{ page.landing|expand_links(page) -}}
+{{ page.landing|trim|expand_links(page) }}
 <!-- /landing -->
       </div>
     </div>
@@ -82,7 +82,7 @@
         </h1>
         {% endif %}
 <!-- content -->
-{{ page.content -}}
+{{ page.content|trim }}
 <!-- /content -->
       </div>
     </div>
@@ -93,7 +93,7 @@
   <div class="m-row">
     <div class="m-col-l-10 m-push-l-1 m-nopadt">
 <!-- footer -->
-{{ page.footer|expand_links(page) -}}
+{{ page.footer|trim|expand_links(page) }}
 <!-- /footer -->
     </div>
   </div>