From 1c25ac9b148d946eda1dde9b8136767c7b5d5881 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniele=20Vigan=C3=B2?= <daniele@vigano.me>
Date: Sun, 25 May 2025 19:13:28 +0200
Subject: [PATCH] Minor UI improvements

---
 ram/portal/templates/bookshelf/book.html     | 8 +++-----
 ram/portal/templates/cards/book.html         | 2 +-
 ram/portal/templates/cards/consist.html      | 6 +++---
 ram/portal/templates/cards/roster.html       | 6 +++---
 ram/portal/templates/consist.html            | 6 +++---
 ram/portal/templates/flatpages/flatpage.html | 8 +++-----
 ram/portal/templates/rollingstock.html       | 6 +++---
 7 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/ram/portal/templates/bookshelf/book.html b/ram/portal/templates/bookshelf/book.html
index 0acecef..778fcd4 100644
--- a/ram/portal/templates/bookshelf/book.html
+++ b/ram/portal/templates/bookshelf/book.html
@@ -9,6 +9,9 @@
           {% endfor %}
         </p>
         {% endif %}
+        {% if not book.published %}
+        <span class="badge text-bg-warning">Unpublished</span> |
+        {% endif %}
         <small class="text-body-secondary">Updated {{ book.updated_time | date:"M d, Y H:i" }}</small>
         {% endblock %}
         {% block carousel %}
@@ -60,11 +63,6 @@
                         <th colspan="2" scope="row">
                           {% if type == "catalog" %}Catalog
                           {% elif type == "book" %}Book{% endif %}
-                          <div class="float-end">
-                            {% if not book.published %}
-                            <span class="badge text-bg-warning">Draft</span>
-                            {% endif %}
-                          </div>
                         </th>
                       </tr>
                     </thead>
diff --git a/ram/portal/templates/cards/book.html b/ram/portal/templates/cards/book.html
index e3eec4a..6205aee 100644
--- a/ram/portal/templates/cards/book.html
+++ b/ram/portal/templates/cards/book.html
@@ -28,7 +28,7 @@
                       {% elif d.type == "book" %}Book{% endif %}
                       <div class="float-end">
                         {% if not d.item.published %}
-                        <span class="badge text-bg-warning">Draft</span>
+                        <span class="badge text-bg-warning">Unpublished</span>
                         {% endif %}
                       </div>
                     </th>
diff --git a/ram/portal/templates/cards/consist.html b/ram/portal/templates/cards/consist.html
index 7b11d6b..5d22611 100644
--- a/ram/portal/templates/cards/consist.html
+++ b/ram/portal/templates/cards/consist.html
@@ -27,12 +27,12 @@
                   <th colspan="2" scope="row">
                     Consist
                     <div class="float-end">
+                      {% if not d.item.published %}
+                      <span class="badge text-bg-warning">Unpublished</span>
+                      {% endif %}
                       {% if d.item.company.freelance %}
                       <span class="badge text-bg-secondary">Freelance</span>
                       {% endif %}
-                      {% if not d.item.published %}
-                      <span class="badge text-bg-warning">Draft</span>
-                      {% endif %}
                     </div>
                   </th>
                 </tr>
diff --git a/ram/portal/templates/cards/roster.html b/ram/portal/templates/cards/roster.html
index bdb57fe..4eecc96 100644
--- a/ram/portal/templates/cards/roster.html
+++ b/ram/portal/templates/cards/roster.html
@@ -25,12 +25,12 @@
                     <th colspan="2" scope="row">
                       Rolling stock
                       <div class="float-end">
+                        {% if not d.item.published %}
+                        <span class="badge text-bg-warning">Unpublished</span>
+                        {% endif %}
                         {% if d.item.company.freelance %}
                         <span class="badge text-bg-secondary">Freelance</span>
                         {% endif %}
-                        {% if not d.item.published %}
-                        <span class="badge text-bg-warning">Draft</span>
-                        {% endif %}
                       </div>
                     </th>
                   </tr>
diff --git a/ram/portal/templates/consist.html b/ram/portal/templates/consist.html
index 25d1e3b..587a5ba 100644
--- a/ram/portal/templates/consist.html
+++ b/ram/portal/templates/consist.html
@@ -7,6 +7,9 @@
         {{ t.name }}</a>{# new line is required #}
         {% endfor %}
       </p>
+      {% if not consist.published %}
+      <span class="badge text-bg-warning">Unpublished</span> |
+      {% endif %}
       <small class="text-body-secondary">Updated {{ consist.updated_time | date:"M d, Y H:i" }}</small>
       {% endif %}
       {% endblock %}
@@ -83,9 +86,6 @@
                           {% if consist.company.freelance %}
                           <span class="badge text-bg-secondary">Freelance</span>
                           {% endif %}
-                          {% if not consist.published %}
-                          <span class="badge text-bg-warning">Draft</span>
-                          {% endif %}
                         </div>
                       </th>
                     </tr>
diff --git a/ram/portal/templates/flatpages/flatpage.html b/ram/portal/templates/flatpages/flatpage.html
index 004a098..1a9289c 100644
--- a/ram/portal/templates/flatpages/flatpage.html
+++ b/ram/portal/templates/flatpages/flatpage.html
@@ -1,6 +1,9 @@
 {% extends 'base.html' %}
 
         {% block header %}
+        {% if not flatpage.published %}
+        <span class="badge text-bg-warning">Unpublished</span> |
+        {% endif %}
         <small class="text-body-secondary">Updated {{ flatpage.updated_time | date:"M d, Y H:i" }}</small>
         {% endblock %}
         {% block carousel %}
@@ -9,11 +12,6 @@
         <section class="py-4 text-start container">
           <div class="row">
             <div class="mx-auto">
-              {% if not flatpage.published %}
-              <div class="alert alert-warning" role="alert">
-                ⚠️ This page is a <strong>draft</strong> and is not published.
-              </div>
-              {% endif %}
               <div>{{ flatpage.content | safe }} </div>
               <div class="d-grid gap-2 d-md-flex justify-content-md-end">
                 {% if request.user.is_staff %}<a class="btn btn-sm btn-outline-danger" href="{% url 'admin:portal_flatpage_change' flatpage.pk %}">Edit</a>{% endif %}
diff --git a/ram/portal/templates/rollingstock.html b/ram/portal/templates/rollingstock.html
index 6e4d6e0..60eca37 100644
--- a/ram/portal/templates/rollingstock.html
+++ b/ram/portal/templates/rollingstock.html
@@ -8,6 +8,9 @@
           {% endfor %}
         </p>
         {% endif %}
+        {% if not rolling_stock.published %}
+        <span class="badge text-bg-warning">Unpublished</span> |
+        {% endif %}
         <small class="text-body-secondary">Updated {{ rolling_stock.updated_time | date:"M d, Y H:i" }}</small>
         {% endblock %}
         {% block carousel %}
@@ -77,9 +80,6 @@
                             {% if company.freelance %}
                             <span class="badge text-bg-secondary">Freelance</span>
                             {% endif %}
-                            {% if not rolling_stock.published %}
-                            <span class="badge text-bg-warning">Draft</span>
-                            {% endif %}
                           </div>
                         </th>
                       </tr>