Merge branch 'notification_with_icons' into 'master'

Improve messages

See merge request allianceauth/allianceauth!1320
This commit is contained in:
Ariel Rin 2021-06-21 10:39:56 +00:00
commit 5fcb56a087
2 changed files with 21 additions and 9 deletions

View File

@ -30,15 +30,7 @@
<div class="row" id="site-body-wrapper"> <div class="row" id="site-body-wrapper">
{% include 'allianceauth/side-menu.html' %} {% include 'allianceauth/side-menu.html' %}
<div class="col-sm-10"> <div class="col-sm-10">
{% if messages %} {% include 'allianceauth/messages.html' %}
<br>
{% for message in messages %}
<div class="alert alert-{{ message.level_tag }}">{{ message }}</div>
{% if not forloop.last %}
<br>
{% endif %}
{% endfor %}
{% endif %}
{% block content %} {% block content %}
{% endblock content %} {% endblock content %}
</div> </div>

View File

@ -0,0 +1,20 @@
{% if messages %}
<br>
{% for message in messages %}
<div class="alert alert-{{ message.level_tag }} alert-dismissible" role="alert">
<button type="button" class="close" data-dismiss="alert" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
{% if message.level_tag == "info" %}
<i class="fas fa-info-circle"></i>
{% elif message.level_tag == "success" %}
<i class="fas fa-check-circle"></i>
{% elif message.level_tag == "warning" %}
<i class="fas fa-exclamation-circle"></i>
{% elif message.level_tag == "danger" %}
<i class="fas fa-exclamation-triangle"></i>
{% endif %}
&nbsp;{{ message }}
</div>
{% endfor %}
{% endif %}