Merge branch 'feature' into feature-2434

This commit is contained in:
checktheroads 2021-05-10 13:57:32 -07:00
commit 892d1214b0

View File

@ -1,49 +1,39 @@
<div <div id="django-messages" class="toast-container position-fixed bottom-0 end-0 m-3">
id="django-messages" {% if messages %}
class="toast-container position-fixed bottom-0 end-0 m-3" {% for message in messages %}
> <div class="django-message toast align-items-center border-0 bg-{% if message.tags %}{{ message.tags }}{% else %}info{% endif %}" role="alert" aria-live="assertive" aria-atomic="true" data-bs-delay="10000">
{% if messages %} {% for message in messages %}
<div
class="django-message toast align-items-center border-0 bg-{% if message.tags %}{{ message.tags }}{% else %}info{% endif %}"
role="alert"
aria-live="assertive"
aria-atomic="true"
data-bs-delay="10000"
>
<div class="d-flex"> <div class="d-flex">
<div class="toast-body"> <div class="toast-body">
{{ message }} {{ message }}
</div> </div>
<button <button type="button" class="btn-close me-2 m-auto" data-bs-dismiss="toast" aria-label="Close"></button>
type="button"
class="btn-close me-2 m-auto"
data-bs-dismiss="toast"
aria-label="Close"
></button>
</div> </div>
</div> </div>
{% endfor %} {% endfor %}
{% elif form and form.non_field_errors %} {% elif form and form.non_field_errors %}
{% for error in form.non_field_errors.get_json_data %} {% for error in form.non_field_errors.get_json_data %}
<div <div class="django-message toast align-items-center border-0 bg-danger" role="alert" aria-live="assertive" aria-atomic="true" data-bs-delay="10000">
class="django-message toast align-items-center border-0 bg-danger"
role="alert"
aria-live="assertive"
aria-atomic="true"
data-bs-delay="10000"
>
<div class="d-flex"> <div class="d-flex">
<div class="toast-body"> <div class="toast-body">
{{ error.message }} {{ error.message }}
</div> </div>
<button <button type="button" class="btn-close me-2 m-auto" data-bs-dismiss="toast" aria-label="Close"></button>
type="button"
class="btn-close me-2 m-auto"
data-bs-dismiss="toast"
aria-label="Close"
></button>
</div> </div>
</div> </div>
{% endfor %} {% endfor %}
{% elif form and form.errors %}
{% for field in form %}
{% for error in field.errors %}
<div class="django-message toast align-items-center border-0 bg-danger" role="alert" aria-live="assertive" aria-atomic="true" data-bs-delay="60000">
<div class="toast-header bg-danger">
<strong class="me-auto">{{ field.label }}</strong>
<button type="button" class="btn-close me-2 m-auto" data-bs-dismiss="toast" aria-label="Close"></button>
</div>
<div class="toast-body">
{{ error|escape }}
</div>
</div>
{% endfor %}
{% endfor %}
{% endif %} {% endif %}
</div> </div>