Fix templates for upgrade to bootstrap 4

Commit c9f68d5f upgraded the site to bootstrap 4, amongst other things,
but completely missed that "labels" are now called "badges", and thus
need new CSS classes.

diff --git a/hamnadmin/hamnadmin/register/templates/edit.html b/hamnadmin/hamnadmin/register/templates/edit.html
index 386f56dcce2c0e37b7d2607506b1c92a7d1c6502..5abc17c0141981d838086d4cc55c9a6820c95fd3 100644 (file)
--- a/hamnadmin/hamnadmin/register/templates/edit.html
+++ b/hamnadmin/hamnadmin/register/templates/edit.html
@@ -8,21 +8,21 @@
             <h3>Status</h3>
             <p>
                 {% if blog.approved %}
-                    This blog is currently <span class="label label-success">approved</span>.
+                    This blog is currently <span class="badge badge-success">approved</span>.
                     {% if blog.recent_failures %}
                         {% if blog.recent_failures <= 5 %}
-                            This blog has generated <span class="label label-warning">sporadic errors</span> in the past 24 hours. See
+                            This blog has generated <span class="badge badge-warning">sporadic errors</span> in the past 24 hours. See
                             the <a href="#log">log</a> below for details.
                         {% else %}
-                            This blog has generated <span class="label label-danger">multiple failures</span> in the past 24 hours. See
+                            This blog has generated <span class="badge badge-danger">multiple failures</span> in the past 24 hours. See
                             the <a href="#log">log</a> below for details.
                         {% endif %}
                     {% else %}{#recent_failures#}
-                        The blog last posted an entry at <span class="label label-info">{{ blog.latestentry.dat|date:"Y-m-d H:i:s" }}</span>.
+                        The blog last posted an entry at <span class="badge badge-info">{{ blog.latestentry.dat|date:"Y-m-d H:i:s" }}</span>.
                     {% endif %}
 
                 {% else %}
-                    This blog is currently <span class="label label-warning">not approved</span>.</p>
+                    This blog is currently <span class="badge badge-warning">not approved</span>.</p>
                     {% if blog.has_entries %}
                         The blog is currently waiting for moderator approval.
                     {% else %}
@@ -85,7 +85,7 @@
     <form method="post" action="." class="form-horizontal">{% csrf_token %}
         {% for field in form %}
             <div class="form-group{% if field.errors %} has-error{% endif %}">
-                <label for="{{ field.id }}" class="col-sm-2">{{ field.label }}</label>
+                <label for="{{ field.id }}" class="col-sm-2">{{ field.badge }}</badge>
                 <div class="col-sm-10">
                     <div class="controls">
                         {{ field }}
@@ -124,9 +124,9 @@
                 <tr>
                     <td>{{ l.ts|date:"Y-m-d H:i:s" }}</td>
                     <td>
-                        {% if l.success %}<span class="label label-success">Success</span>
-                        {% elif l.ts < blog.lastsuccess %}<span class="label label-warning" title="A successful fetch has been completed after this failure occurred">Past failure</span>
-                        {% else %}<span class="label label-danger">Failure</span>{% endif %}
+                        {% if l.success %}<span class="badge badge-success">Success</span>
+                        {% elif l.ts < blog.lastsuccess %}<span class="badge badge-warning" title="A successful fetch has been completed after this failure occurred">Past failure</span>
+                        {% else %}<span class="badge badge-danger">Failure</span>{% endif %}
                     </td>
                     <td>{{ l.info }}</td>
                 </tr>

diff --git a/hamnadmin/hamnadmin/register/templates/index.html b/hamnadmin/hamnadmin/register/templates/index.html
index aa32fde5c5a3f4cacfcad7951091ae149abb0e38..066218d54c0ba9eb5c741e1c13563c31a218d7f6 100644 (file)
--- a/hamnadmin/hamnadmin/register/templates/index.html
+++ b/hamnadmin/hamnadmin/register/templates/index.html
@@ -45,9 +45,9 @@
                             <strong>Email:</strong> {{ blog.user.email }}{%endif%}</td>
                         <td>
                             {% if blog.archived %}
-                                <span class="label label-info">Archived</span>
+                                <span class="badge badge-info">Archived</span>
                             {% else %}
-                                <span class="label label-{{ blog.approved|yesno:"success,warning" }}">{{ blog.approved|yesno:"Yes,No" }}</span>
+                                <span class="badge badge-{{ blog.approved|yesno:"success,warning" }}">{{ blog.approved|yesno:"Yes,No" }}</span>
                             {% endif %}
                         </td>
                         <td><strong>Feed:</strong> <a href="{{ blog.feedurl }}">{{ blog.feedurl }}</a><br/><strong>Blog:</strong> <a href="{{ blog.blogurl }}">{{ blog.blogurl }}</a><br/>
@@ -57,26 +57,26 @@
                         <td class="feedstatus">
                             <div>
                                 {% if blog.archived %}
-                                    <span class="label label-info">Archived</span>
+                                    <span class="badge badge-info">Archived</span>
                                 {% elif blog.approved %}
                                     {% if blog.recent_failures %}
                                         {% if blog.recent_failures > 5 %}
-                                            <a href="edit/{{ blog.id }}/#log"><span class="label label-danger">Multiple failures</span></a>
+                                            <a href="edit/{{ blog.id }}/#log"><span class="badge badge-danger">Multiple failures</span></a>
                                         {% else%}
-                                            <a href="edit/{{ blog.id }}/#log"><span class="label label-warning">Sporadic errors</span></a>
+                                            <a href="edit/{{ blog.id }}/#log"><span class="badge badge-warning">Sporadic errors</span></a>
                                         {% endif %}
                                         </div>
                                         <div>
-                                            {% if blog.last_was_success %}<span class="label label-success">Last attempt succeeded</span>
-                                            {% else %}<span class="label label-danger">Last attempt failed</span>{% endif %}
+                                            {% if blog.last_was_success %}<span class="badge badge-success">Last attempt succeeded</span>
+                                            {% else %}<span class="badge badge-danger">Last attempt failed</span>{% endif %}
                                     {% else %}
-                                        <span class="label label-success">Approved and working</span>
+                                        <span class="badge badge-success">Approved and working</span>
                                     {% endif %}{#recent_failures#}
                                 {% else %}{#approved#}
                                     {% if blog.has_entries %}
-                                        <span class="label label-info">Pending approval</span>
+                                        <span class="badge badge-info">Pending approval</span>
                                     {% else %}
-                                        <span class="label label-danger">No entries found</span>
+                                        <span class="badge badge-danger">No entries found</span>
                                     {% endif %}
                                 {% endif %}
                             </div>