alerts: replace old alerts in form templates

liqd · Jan 28, 2025 · 193cce3 · 193cce3
1 parent 5a5fe85
commit 193cce3
Show file tree

Hide file tree

Showing 14 changed files with 43 additions and 41 deletions.
diff --git a/meinberlin/apps/budgeting/templates/meinberlin_budgeting/includes/proposal_form.html b/meinberlin/apps/budgeting/templates/meinberlin_budgeting/includes/proposal_form.html
@@ -40,12 +40,16 @@ <h2>{% blocktranslate %}Contact Information{% endblocktranslate %}</h2>
             {% blocktranslate with privacy_policy="/datenschutz" %}I hereby expressly consent to the storage of the contact information I have entered. The contact information may be used by the responsible administration exclusively for contacting me in the present project. I can revoke this consent at any time. I have read and accept the <a href="{{privacy_policy}}" target="_blank">privacy policy</a>.{% endblocktranslate %}
         </label>
         {% if form.contact_storage_consent.errors %}
+        {% if form.contact_storage_consent.errors|length > 1 %}
             <ul class="errorlist" aria-live="assertive" aria-atomic="true">
-            {% for error in form.contact_storage_consent.errors %}
-                <li>{{ error|escape }}</li>
-            {% endfor %}
+                {% for error in form.contact_storage_consent.errors %}
+                    <li>{{ error|escape }}</li>
+                {% endfor %}
             </ul>
+        {% else %}
+            {% include 'meinberlin_contrib/components/alert.html' with alert_message=form.contact_storage_consent.errors.0|escape alert_type='danger' %}
         {% endif %}
+    {% endif %}
     </div>
 
     {% include 'meinberlin_contrib/includes/form_submit_actions.html' with button_text='Send' %}

diff --git a/meinberlin/apps/budgeting/templates/meinberlin_budgeting/proposal_update_form.html b/meinberlin/apps/budgeting/templates/meinberlin_budgeting/proposal_update_form.html
@@ -25,9 +25,7 @@
     <h1>{% translate 'Edit proposal' %}</h1>
 
     {% if form.errors %}
-    <div class="alert alert--danger" aria-live="assertive" aria-atomic="true" id="alert">
-        {% translate 'An error occurred while evaluating your data. Please check the data you entered again.' %}
-    </div>
+        {% include 'meinberlin_contrib/components/alert.html' with alert_message='Error during validation. Please check your entries.' alert_type='danger' %}
     {% endif %}
 
     {% include "meinberlin_budgeting/includes/proposal_form.html" with proposal=proposal cancel=object.get_absolute_url %}

diff --git a/meinberlin/apps/contrib/templates/meinberlin_contrib/components/moderator_form.html b/meinberlin/apps/contrib/templates/meinberlin_contrib/components/moderator_form.html
@@ -1,14 +1,16 @@
 {% load i18n item_tags contrib_tags moderatorremark_tags %}
 
-<form enctype="multipart/form-data" action="{{ request.path }}" method="post">
+<form class="form--base panel--heavy" enctype="multipart/form-data" action="{{ request.path }}" method="post">
     {% csrf_token %}
     {% for form in forms.values %}
         {{ form.media }}
     {% endfor %}
 
     {% include 'meinberlin_contrib/includes/form_field_select.html' with field=forms.moderateable.moderator_status %}
     {% include 'meinberlin_contrib/includes/form_field.html' with field=forms.feedback_text.feedback_text %}
-    {% include 'meinberlin_contrib/includes/form_checkbox_field.html' with field=forms.moderateable.is_archived %}
+    {% if forms.moderateable.is_archived %}
+        {% include 'meinberlin_contrib/includes/form_checkbox_field.html' with field=forms.moderateable.is_archived %}
+    {% endif %}
     {% if forms.moderateable.show_tasks %}
         {% include 'meinberlin_contrib/includes/form_field.html' with field=forms.moderateable.completed_tasks add_class='u-top-divider' %}
         {% include 'meinberlin_contrib/includes/form_field.html' with field=forms.remark.remark %}

diff --git a/meinberlin/apps/contrib/templates/meinberlin_contrib/includes/form_checkbox_field.html b/meinberlin/apps/contrib/templates/meinberlin_contrib/includes/form_checkbox_field.html
@@ -12,11 +12,15 @@
             {% endif %}
         </label>
         {% if field.errors %}
-            <ul class="errorlist" aria-live="assertive" aria-atomic="true">
-                {% for error in field.errors %}
-                    <li>{{ error|escape }}</li>
-                {% endfor %}
-            </ul>
-        {% endif %}
+            {% if field.errors|length > 1 %}
+                <ul class="errorlist" aria-live="assertive" aria-atomic="true">
+                    {% for error in field.errors %}
+                        <li>{{ error|escape }}</li>
+                    {% endfor %}
+                </ul>
+            {% else %}
+                {% include 'meinberlin_contrib/components/alert.html' with alert_message=field.errors.0|escape alert_type='danger' %}
+            {% endif %}
+         {% endif %}
     </div>
 </div>
diff --git a/meinberlin/apps/maptopicprio/templates/meinberlin_maptopicprio/maptopic_create_form.html b/meinberlin/apps/maptopicprio/templates/meinberlin_maptopicprio/maptopic_create_form.html
@@ -8,9 +8,7 @@
     <h1 class="u-first-heading">{% translate 'Add a new place' %}</h1>
 
     {% if form.errors %}
-    <div class="alert alert--danger" aria-live="assertive" aria-atomic="true" id="alert">
-      {% translate 'An error occurred while evaluating your data. Please check the data you entered again.' %}
-    </div>
+      {% include 'meinberlin_contrib/components/alert.html' with alert_message='An error occurred while evaluating your data. Please check the data you entered again.' alert_type='danger' %}
     {% endif %}
 
     {% url 'a4dashboard:maptopic-list' module_slug=module.slug as cancel %}

diff --git a/meinberlin/apps/maptopicprio/templates/meinberlin_maptopicprio/maptopic_update_form.html b/meinberlin/apps/maptopicprio/templates/meinberlin_maptopicprio/maptopic_update_form.html
@@ -8,9 +8,7 @@
     <h1 class="u-first-heading">{% translate 'Edit place' %}</h1>
 
     {% if form.errors %}
-    <div class="alert alert--danger" aria-live="assertive" aria-atomic="true" id="alert">
-      {% translate 'An error occurred while evaluating your data. Please check the data you entered again.' %}
-    </div>
+      {% include 'meinberlin_contrib/components/alert.html' with alert_message='An error occurred while evaluating your data. Please check the data you entered again.' alert_type='danger' %}
     {% endif %}
 
     {% url 'a4dashboard:maptopic-list' module_slug=module.slug as cancel %}

diff --git a/...erlin/apps/offlineevents/templates/meinberlin_offlineevents/offlineevent_create_form.html b/...erlin/apps/offlineevents/templates/meinberlin_offlineevents/offlineevent_create_form.html
@@ -7,9 +7,7 @@
     <h1 class="u-first-heading">{% translate 'Add a new offline event'%}</h1>
 
     {% if form.errors %}
-    <div class="alert alert--danger" aria-live="assertive" aria-atomic="true" id="alert">
-      {% translate 'An error occurred while evaluating your data. Please check the data you entered again.' %}
-    </div>
+      {% include 'meinberlin_contrib/components/alert.html' with alert_message='An error occurred while evaluating your data. Please check the data you entered again.' alert_type='danger' %}
     {% endif %}
 
     {% url 'a4dashboard:offlineevent-list' project_slug=project.slug as cancel %}

diff --git a/...erlin/apps/offlineevents/templates/meinberlin_offlineevents/offlineevent_update_form.html b/...erlin/apps/offlineevents/templates/meinberlin_offlineevents/offlineevent_update_form.html
@@ -8,9 +8,7 @@
     <h1 class="u-first-heading">{% translate 'Edit offline event' %}</h1>
 
     {% if form.errors %}
-    <div class="alert alert--danger" aria-live="assertive" aria-atomic="true" id="alert">
-      {% translate 'An error occurred while evaluating your data. Please check the data you entered again.' %}
-    </div>
+      {% include 'meinberlin_contrib/components/alert.html' with alert_message='An error occurred while evaluating your data. Please check the data you entered again.' alert_type='danger' %}
     {% endif %}
 
     {% url 'a4dashboard:offlineevent-list' project_slug=project.slug as cancel %}

diff --git a/meinberlin/apps/plans/templates/meinberlin_plans/includes/plan_form.html b/meinberlin/apps/plans/templates/meinberlin_plans/includes/plan_form.html
@@ -4,9 +4,7 @@
     {{ form.media }}
 
     {% if form.errors %}
-    <div class="alert alert--danger" aria-live="assertive" aria-atomic="true" id="alert">
-      {% translate 'An error occurred while evaluating your data. Please check the data you entered again.' %}
-    </div>
+      {% include 'meinberlin_contrib/components/alert.html' with alert_message='An error occurred while evaluating your data. Please check the data you entered again.' alert_type='danger' %}
     {% endif %}
 
     <h2 class="form__subheading"> {% translate 'Description of the plan' %}</h2>

diff --git a/meinberlin/apps/projects/templates/meinberlin_projects/includes/users_from_email_form.html b/meinberlin/apps/projects/templates/meinberlin_projects/includes/users_from_email_form.html
@@ -3,9 +3,7 @@
 <form method="POST">
     {% csrf_token %}
     {% if form.errors %}
-    <div class="alert alert--danger" aria-live="assertive" aria-atomic="true" id="alert">
-        {% translate 'An error occurred while evaluating your data. Please check the data you entered again.' %}
-    </div>
+      {% include 'meinberlin_contrib/components/alert.html' with alert_message='An error occurred while evaluating your data. Please check the data you entered again.' alert_type='danger' %}
     {% endif %}
 
     <div class="form-group">

diff --git a/meinberlin/apps/votes/templates/meinberlin_votes/token_generation_dashboard.html b/meinberlin/apps/votes/templates/meinberlin_votes/token_generation_dashboard.html
@@ -10,9 +10,7 @@ <h1 class="u-first-heading">{% translate 'Generate voting codes' %}</h1>
 <form method="POST">
     {% csrf_token %}
     {% if form.errors %}
-    <div class="alert alert--danger" aria-live="assertive" aria-atomic="true" id="alert">
-        {% translate 'An error occurred while evaluating your data. Please check the data you entered again.' %}
-    </div>
+      {% include 'meinberlin_contrib/components/alert.html' with alert_message='An error occurred while evaluating your data. Please check the data you entered again.' alert_type='danger' %}
     {% endif %}
 
     {% if form.non_field_errors %}

diff --git a/meinberlin/templates/a4dashboard/base_form_module.html b/meinberlin/templates/a4dashboard/base_form_module.html
@@ -7,9 +7,7 @@
     <h1 class="u-first-heading">{{ view.title }}</h1>
 
     {% if form.errors %}
-    <div class="alert alert--danger" aria-live="assertive" aria-atomic="true" id="alert">
-        {% translate 'An error occurred while evaluating your data. Please check the data you entered again.' %}
-    </div>
+      {% include 'meinberlin_contrib/components/alert.html' with alert_message='An error occurred while evaluating your data. Please check the data you entered again.' alert_type='danger' %}
     {% endif %}
 
     {% if form.non_field_errors %}

diff --git a/meinberlin/templates/a4dashboard/base_form_project.html b/meinberlin/templates/a4dashboard/base_form_project.html
@@ -7,9 +7,7 @@
     <h1 class="u-first-heading">{{ view.title }}</h1>
 
     {% if form.errors %}
-    <div class="alert alert--danger" aria-live="assertive" aria-atomic="true" id="alert">
-        {% translate 'An error occurred while evaluating your data. Please check the data you entered again.' %}
-    </div>
+      {% include 'meinberlin_contrib/components/alert.html' with alert_message='An error occurred while evaluating your data. Please check the data you entered again.' alert_type='danger' %}
     {% endif %}
 
     {% if form.non_field_errors %}

diff --git a/meinberlin/templates/a4forms/includes/form_checkbox_field.html b/meinberlin/templates/a4forms/includes/form_checkbox_field.html
@@ -19,4 +19,16 @@
         {% endfor %}
         </ul>
     {% endif %}
+
+    {% if field.errors %}
+        {% if field.errors|length > 1 %}
+            <ul class="errorlist" aria-live="assertive" aria-atomic="true">
+                {% for error in field.errors %}
+                    <li>{{ error|escape }}</li>
+                {% endfor %}
+            </ul>
+        {% else %}
+            {% include 'meinberlin_contrib/components/alert.html' with alert_message=field.errors.0|escape alert_type='danger' %}
+        {% endif %}
+    {% endif %}
 </div>