From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 1 Sep 2018 15:19:21 +0000 (+0100)
Subject: blog: Show better release time for drafts
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=52de8ae07b065794b98e048c551e942bedaa2998;p=ipfire.org.git

blog: Show better release time for drafts

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/templates/blog/drafts.html b/src/templates/blog/drafts.html
index f2f1442a..6fce2dd2 100644
--- a/src/templates/blog/drafts.html
+++ b/src/templates/blog/drafts.html
@@ -14,17 +14,15 @@
 					</strong>
 
 					<p class="text-muted small">
+						{% if post.published_at %}
+							<span class="text-danger">{{ _("Scheduled to be published %s") % locale.format_date(post.published_at, relative=False) }}</span>,
+						{% end %}
+
 						{% if post.updated_at %}
 							{{ _("Updated %s") % locale.format_date(post.updated_at) }}
 						{% else %}
 							{{ _("Created %s") % locale.format_date(post.created_at) }}
 						{% end %}
-
-						{% if post.published_at %}
-							<span class="badge badge-primary">
-								{{ _("Scheduled to be pushed at %s") % locale.format_date(post.published_at, shorter=True, relative=False) }}
-							</span>
-						{% end %}
 					</p>
 				{% end %}
 			{% else %}
diff --git a/src/templates/blog/modules/post.html b/src/templates/blog/modules/post.html
index c91f86b1..d5a01269 100644
--- a/src/templates/blog/modules/post.html
+++ b/src/templates/blog/modules/post.html
@@ -17,13 +17,15 @@
 				<strong>{{ post.author }}</strong>,
 			{% end %}
 
-			{% if post.published_at %}
+			{% if post.is_published() %}
 				{% if post.updated_at and post.updated_at > post.published_at %}
 					{{ locale.format_date(post.published_at, shorter=True, relative=False) }},
 					{{ _("Updated %s") % locale.format_date(post.updated_at, shorter=True) }}
 				{% else %}
 					{{ locale.format_date(post.published_at, shorter=True, relative=False) }}
 				{% end %}
+			{% elif post.published_at %}
+				<span class="text-danger">{{ _("Scheduled to be published %s") % locale.format_date(post.published_at, relative=False) }}</span>
 			{% else %}
 				{{ _("Not published") }}
 			{% end %}