From 5b7b5ae37d1e45cf2511112db40065b27a432e69 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 13 Sep 2018 11:55:49 +0200 Subject: [PATCH] theme: display article draft status more prominently. So I can submit clearly marked draft articles for review and I don't accidentally leave the draft status enabled when publishing. --- pelican-theme/templates/article.html | 2 +- pelican-theme/templates/article_header.html | 3 + .../test/blog_draft/article-jumbo.html | 56 +++++++++++++++++++ .../test/blog_draft/article-jumbo.rst | 6 ++ pelican-theme/test/blog_draft/article.html | 1 + pelican-theme/test/test_blog.py | 1 + 6 files changed, 68 insertions(+), 1 deletion(-) create mode 100644 pelican-theme/test/blog_draft/article-jumbo.html create mode 100644 pelican-theme/test/blog_draft/article-jumbo.rst diff --git a/pelican-theme/templates/article.html b/pelican-theme/templates/article.html index b3023b5d..266e132c 100644 --- a/pelican-theme/templates/article.html +++ b/pelican-theme/templates/article.html @@ -56,7 +56,7 @@
-
{{ article.locale_date|e }}
+
{{ article.locale_date|e }}{% if article.status == 'draft' %} draft{% endif %}
{% if article.authors %}
{% for author in article.authors %}{{ author|e }}{% endfor %}
{% endif %} diff --git a/pelican-theme/templates/article_header.html b/pelican-theme/templates/article_header.html index 610762ad..57ec83c6 100644 --- a/pelican-theme/templates/article_header.html +++ b/pelican-theme/templates/article_header.html @@ -5,6 +5,9 @@ {{ month }} {{ day }} {{year}} {{ article.title }} + {% if article.status == 'draft' %} + draft + {% endif %} {# Display summary only if: - we're on article listing page (either the articles_page is defined by diff --git a/pelican-theme/test/blog_draft/article-jumbo.html b/pelican-theme/test/blog_draft/article-jumbo.html new file mode 100644 index 00000000..105019a3 --- /dev/null +++ b/pelican-theme/test/blog_draft/article-jumbo.html @@ -0,0 +1,56 @@ + + + + + An article | A Pelican Blog + + + + + + +
+
+
+
+
+
+
+
+
Dec 09, 2017 draft
+
+
+
+

An article

+
+
+
+
+
+
+
+
+
+

Posted on in misc. draft

+
+
+
+
+ +
+ + diff --git a/pelican-theme/test/blog_draft/article-jumbo.rst b/pelican-theme/test/blog_draft/article-jumbo.rst new file mode 100644 index 00000000..0ecb0c07 --- /dev/null +++ b/pelican-theme/test/blog_draft/article-jumbo.rst @@ -0,0 +1,6 @@ +An article +########## + +:date: 2017-12-09 +:cover: image.jpg +:status: draft diff --git a/pelican-theme/test/blog_draft/article.html b/pelican-theme/test/blog_draft/article.html index 900f0eb9..91a1e000 100644 --- a/pelican-theme/test/blog_draft/article.html +++ b/pelican-theme/test/blog_draft/article.html @@ -26,6 +26,7 @@ Dec 09 2017 An article + draft
diff --git a/pelican-theme/test/test_blog.py b/pelican-theme/test/test_blog.py index cc595a36..a0f74f9e 100644 --- a/pelican-theme/test/test_blog.py +++ b/pelican-theme/test/test_blog.py @@ -549,3 +549,4 @@ class Draft(BlogTestCase): }) self.assertEqual(*self.actual_expected_contents('article.html')) + self.assertEqual(*self.actual_expected_contents('article-jumbo.html')) -- 2.30.2