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 f2f1442a2345c6efd0720c666e43d00ab0cdcabe..6fce2dd24a8b3eca45ec63ce88896cc897bef32f 100644 (file)
--- 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 c91f86b1ff6886c4d0dab7fde1058e0789ba5a88..d5a0126995194d8c0c8913598c7be321ff3b9667 100644 (file)
--- 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 %}