From e71c18c46fac4499cf081c3c9036983021294c05 Mon Sep 17 00:00:00 2001
From: Tobias Kunze <r@rixx.de>
Date: Tue, 18 Mar 2025 23:01:21 +0100
Subject: [PATCH] Fix rendering of form errors

---
 .../frontend/templates/account/login.html      |  2 +-
 .../frontend/forms/vertical_field.html         |  4 ++--
 .../frontend/templates/frontend/profile.html   |  2 +-
 .../frontend/templates/includes/form.html      |  1 +
 .../templates/includes/form_errors.html        | 18 ++++++++++++++++++
 5 files changed, 23 insertions(+), 4 deletions(-)
 create mode 100644 src/servala/frontend/templates/includes/form_errors.html

diff --git a/src/servala/frontend/templates/account/login.html b/src/servala/frontend/templates/account/login.html
index 6494b6a..5a31aea 100644
--- a/src/servala/frontend/templates/account/login.html
+++ b/src/servala/frontend/templates/account/login.html
@@ -42,4 +42,4 @@
             {% include "includes/form.html" %}
         </div>
     </div>
-{% endblock content %}
+{% endblock card_content %}
diff --git a/src/servala/frontend/templates/frontend/forms/vertical_field.html b/src/servala/frontend/templates/frontend/forms/vertical_field.html
index bcbf8d6..22562d0 100644
--- a/src/servala/frontend/templates/frontend/forms/vertical_field.html
+++ b/src/servala/frontend/templates/frontend/forms/vertical_field.html
@@ -1,6 +1,6 @@
 {% load i18n %}
 <div class="col-12">
-    <div class="form-group{% with classes=field.css_classes %}{% if classes %} {{ classes }}{% endif %}{% endwith %}">
+    <div class="form-group{% with classes=field.css_classes %}{% if classes %} {{ classes }}{% endif %}{% endwith %}{% if errors %} is-invalid{% endif %}">
         {% if field.field.widget.input_type != "checkbox" or field.field.widget.allow_multiple_selected %}
             <label for="{{ field.auto_id }}" class="{{ label_class }}">
                 {{ field.label }}
@@ -17,7 +17,7 @@
                 <label for="{{ field.auto_id }}">{{ field.label }}</label>
             {% endif %}
             {% if field.use_fieldset %}</fieldset>{% endif %}
-        {% for text in field.errors %}<div class="invalid-feedback">{{ text }}</div>{% endfor %}
+        {% for text in field.errors %}<div class="text-danger">{{ text }}</div>{% endfor %}
         {% if field.help_text %}
             <small class="form-text text-muted"
                    {% if field.auto_id %}id="{{ field.auto_id }}_helptext"{% endif %}>{{ field.help_text|safe }}</small>
diff --git a/src/servala/frontend/templates/frontend/profile.html b/src/servala/frontend/templates/frontend/profile.html
index 3188a91..a14d730 100644
--- a/src/servala/frontend/templates/frontend/profile.html
+++ b/src/servala/frontend/templates/frontend/profile.html
@@ -34,4 +34,4 @@
             </tbody>
         </table>
     </div>
-{% endblock content %}
+{% endblock card_content %}
diff --git a/src/servala/frontend/templates/includes/form.html b/src/servala/frontend/templates/includes/form.html
index d8a01e5..fec4356 100644
--- a/src/servala/frontend/templates/includes/form.html
+++ b/src/servala/frontend/templates/includes/form.html
@@ -2,6 +2,7 @@
 <form class="form form-vertical"
       method="post"
       {% if form_action %}action="{{ form_action }}"{% endif %}>
+    {% include "includes/form_errors.html" %}
     {% csrf_token %}
     {{ form }}
     <button class="btn btn-primary" type="submit">
diff --git a/src/servala/frontend/templates/includes/form_errors.html b/src/servala/frontend/templates/includes/form_errors.html
new file mode 100644
index 0000000..2be9051
--- /dev/null
+++ b/src/servala/frontend/templates/includes/form_errors.html
@@ -0,0 +1,18 @@
+{% load i18n %}
+{% if form.non_field_errors or form.errors %}
+    <div class="alert alert-danger" role="alert">
+        <div>
+            {% if form.non_field_errors %}
+                {% if form.non_field_errors|length > 1 %}
+                    <ul>
+                        {% for error in form.non_field_errors %}<li>{{ error }}</li>{% endfor %}
+                    </ul>
+                {% else %}
+                    {{ form.non_field_errors.0 }}
+                {% endif %}
+            {% else %}
+                {% translate "We could not save your changes." %}
+            {% endif %}
+        </div>
+    </div>
+{% endif %}