Merge pull request #5235 from nyaruka/alerts_vs_errors

Don't use error level alerts for form errors
nyaruka · May 15, 2024 · 5a0384b · 5a0384b
2 parents 1eabf26 + 734469c
commit 5a0384b
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 38 deletions.
diff --git a/templates/contacts/contact_list.html b/templates/contacts/contact_list.html
@@ -78,9 +78,9 @@
     </form>
   </div>
   {% if search_error %}
-    <temba-alert level="error" class="mt-4">
+    <div class="alert alert-error mt-4">
       {{ search_error }}
-    </temba-alert>
+    </div>
   {% endif %}
   {% if org_perms.contacts.contact_delete %}
     <temba-dialog header="{{ _("Delete Selected Contacts") |escapejs }}"

diff --git a/templates/contacts/contactimport_preview.html b/templates/contacts/contactimport_preview.html
@@ -13,11 +13,7 @@
   </div>
   <form method="post" enctype="multipart/form-data" class="smartmin-form horizontal-form">
     {% csrf_token %}
-    {% if form.non_field_errors %}
-      <temba-alert level="error" class="form-errors">
-        {{ form.non_field_errors }}
-      </temba-alert>
-    {% endif %}
+    {% if form.non_field_errors %}<div class="alert alert-error form-errors">{{ form.non_field_errors }}</div>{% endif %}
     <div class="card w-full">
       {% block fields %}
         <fieldset>

diff --git a/templates/orgs/login/confirm_access.html b/templates/orgs/login/confirm_access.html
@@ -14,11 +14,7 @@
       <temba-textinput name="password" placeholder="{{ _("Password") |escape }}" password="true">
       </temba-textinput>
     </div>
-    {% if form.password.errors %}
-      <temba-alert level="error" class="mt-4">
-        {{ form.password.errors }}
-      </temba-alert>
-    {% endif %}
+    {% if form.password.errors %}<div class="alert alert-error mt-4">{{ form.password.errors }}</div>{% endif %}
     <div class="mt-6">
       <input type="submit" value="{{ _("Confirm") |escape }}" class="button-primary">
     </div>

diff --git a/templates/orgs/login/login.html b/templates/orgs/login/login.html
@@ -9,14 +9,10 @@
   {% blocktrans trimmed %}
     Please sign in with your email address and password.
   {% endblocktrans %}
-  <form method="POST" id="login-form">
+  <form method="post" id="login-form">
     {% csrf_token %}
     {% for field, errors in form.errors.items %}
-      {% if field == '__all__' %}
-        <temba-alert level="error" class="my-4">
-          {{ errors }}
-        </temba-alert>
-      {% endif %}
+      {% if field == '__all__' %}<div class="alert alert-error my-4">{{ errors }}</div>{% endif %}
     {% endfor %}
     <div class="mt-4">
       <input type="text"
@@ -26,19 +22,11 @@
              value="{% if form.username.value %}{{ form.username.value|escape }}{% endif %}"
              class="input">
     </div>
-    {% if form.username.errors %}
-      <temba-alert level="error" class="mt-4">
-        {{ form.username.errors }}
-      </temba-alert>
-    {% endif %}
+    {% if form.username.errors %}<div class="alert alert-error mt-4">{{ form.username.errors }}</div>{% endif %}
     <div class="mt-4">
       <input type="password" name="password" placeholder="{{ _("Password") |escapejs }}" class="input">
     </div>
-    {% if form.password.errors %}
-      <temba-alert level="error" class="mt-4">
-        {{ form.password.errors }}
-      </temba-alert>
-    {% endif %}
+    {% if form.password.errors %}<div class="alert alert-error mt-4">{{ form.password.errors }}</div>{% endif %}
     <div class="mt-2 text-right">
       <a href="/user/forget/">Forgot your password?</a>
     </div>

diff --git a/templates/orgs/login/two_factor_backup.html b/templates/orgs/login/two_factor_backup.html
@@ -17,11 +17,7 @@
       <temba-textinput name="token" maxlength="8" placeholder="{{ _("8-character token") |escape }}">
       </temba-textinput>
     </div>
-    {% if form.token.errors %}
-      <temba-alert level="error" class="mt-4">
-        {{ form.token.errors }}
-      </temba-alert>
-    {% endif %}
+    {% if form.token.errors %}<div class="alert alert-error mt-4">{{ form.token.errors }}</div>{% endif %}
     <div class="mt-2 text-right">
       <a href="{% url 'users.two_factor_verify' %}">{% trans "Use Device" %}</a>
     </div>

diff --git a/templates/orgs/login/two_factor_verify.html b/templates/orgs/login/two_factor_verify.html
@@ -16,11 +16,7 @@
     <div class="mt-4">
       <input name="otp" maxlength="6" placeholder="{{ _("6-digit code") |escape }}" class="input">
     </div>
-    {% if form.otp.errors %}
-      <temba-alert level="error" class="mt-4">
-        {{ form.otp.errors }}
-      </temba-alert>
-    {% endif %}
+    {% if form.otp.errors %}<div class="alert alert-error mt-4">{{ form.otp.errors }}</div>{% endif %}
     <div class="mt-2 text-right">
       <a href="{% url 'users.two_factor_backup' %}">{% trans "Use Backup Token" %}</a>
     </div>