From: Vladimír Vondruš Date: Wed, 13 May 2020 10:56:43 +0000 (+0200) Subject: Revert "wrap page/article content in blocks" X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~cjwatson/git?a=commitdiff_plain;h=3cd5a21840066184c87c65901aad9b56322a0e39;p=blog.git Revert "wrap page/article content in blocks" It's actually completely broken, GitHub led me to a false sense of security by showing a green tick. This reverts commit 4d1a78e9707fe52676074e600289e770a17720d8. --- diff --git a/pelican-theme/templates/article.html b/pelican-theme/templates/article.html index 9c692161..7b09f18b 100644 --- a/pelican-theme/templates/article.html +++ b/pelican-theme/templates/article.html @@ -93,9 +93,7 @@ {{ M_ARCHIVED_ARTICLE_BADGE|render_rst|replace('{year}', article.date.year)|indent(8) }} {% endif %} -{% block article_content %} {{ article.content|trim }} -{% endblock %} {% if article.category.badge or (article.author and article.author.badge) %} {{ badges()|rtrim|indent(10) }} @@ -123,9 +121,7 @@ {% endif %} {% if article.content %} -{% block article_content %} {{ article.content|trim }} -{% endblock %} {% endif %} {% if article.category.badge or (article.author and article.author.badge) %} diff --git a/pelican-theme/templates/page.html b/pelican-theme/templates/page.html index ae60833f..2328e101 100644 --- a/pelican-theme/templates/page.html +++ b/pelican-theme/templates/page.html @@ -117,9 +117,7 @@ {% endif %} {% if page.content %} -{% block page_content %} {{ page.content|trim }} -{% endblock %} {% endif %} diff --git a/pelican-theme/templates/passthrough.html b/pelican-theme/templates/passthrough.html index cacdfd26..bdf92b77 100644 --- a/pelican-theme/templates/passthrough.html +++ b/pelican-theme/templates/passthrough.html @@ -21,8 +21,6 @@ {% endif %} -{% block page_content %} {{- page.content -}} -{% endblock %}