Merge branch 'minor_ui_fixes' into 'dev'

Fix: Minor UI issues

See merge request re2o/re2o!594

cotisations/templates/cotisations/aff_cost_estimate.html

@@ -73,9 +73,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
             <td>{{ estimate.id }}</td>
             <td>
                 {% if estimate.final_invoice %}
-                <a href="{% url 'cotisations:edit-custom-invoice' estimate.final_invoice.pk %}"><i style="color: #1ECA18;" class="fa fa-check"></i></a>
+                <a href="{% url 'cotisations:edit-custom-invoice' estimate.final_invoice.pk %}"><i class="fa fa-check text-success"></i></a>
                 {% else %}
-                <i style="color: #D10115;" class="fa fa-times"></i>
+                <i class="fa fa-times text-danger"></i>
                 {% endif %}
             </td>
             <td>

cotisations/templates/cotisations/aff_cotisations.html

@@ -60,7 +60,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
         <tr>
             <td><a href="{% url 'users:profil' userid=facture.user.id %}">{{ facture.user }}</a></td>
             <td>
-                <table class="table-striped">
+                <table class="table-borderless">
                     {% for article in facture.name_detailed %}
                     <tr>
                         <td>

re2o/templatetags/design.py

@@ -31,9 +31,9 @@ def tick(valeur, autoescape=False):
 
     if isinstance(valeur, bool):
         if valeur == True:
-            result = '<i style="color: #1ECA18;" class="fa fa-check"></i>'
+            result = '<i class="fa fa-check text-success"></i>'
         else:
-            result = '<i style="color: #D10115;" class="fa fa-times"></i>'
+            result = '<i class="fa fa-times text-danger"></i>'
         return mark_safe(result)
 
     else:  #  if the value is not a boolean, display it as if tick was not called

tickets/templates/tickets/aff_tickets.html

@@ -46,7 +46,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 
 
-<div class="table-responsiv">
+<div class="table-responsive">
 
 	<table class="table">
     <thead>

users/templates/users/aff_whitelists.html

@@ -30,43 +30,44 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 {% load acl %}
 {% load logs_extra %}
 
-<table class="table table-striped">
-    <thead>
-        <tr>
-            {% trans "User" as tr_user %}
-            <th>{% include 'buttons/sort.html' with prefix='white' col="user" text=tr_user %}</th>
-            <th>{% trans "Reason" %}</th>
-            {% trans "Start date" as tr_start %}
-            <th>{% include 'buttons/sort.html' with prefix='white' col="start" text=tr_start %}</th>
-            {% trans "End date" as tr_end %}
-            <th>{% include 'buttons/sort.html' with prefix='white' col="end" text=tr_end %}</th>
-            <th></th>
-        </tr>
-    </thead>
-    {% for whitelist in white_list %}
-    {% if whitelist.is_active %}
-        <tr class="success">
-    {% else %}
-        <tr>
-    {% endif %}
-            <td><a href="{% url 'users:profil' whitelist.user.id%}" class="btn btn-primary btn-sm" role="button"><i class="fa fa-user"></i> {{ whitelist.user }}</a></td>
-            <td>{{ whitelist.raison }}</td>
-            <td>{{ whitelist.date_start }}</td>
-            <td>{{ whitelist.date_end }}</td>
-            <td class="text-right">
-                {% can_delete whitelist %}
-                {% include 'buttons/suppr.html' with href='users:del-whitelist' id=whitelist.id %}
-                {% acl_end %}
-                {% history_button whitelist %}
-                {% can_edit whitelist %}
-                {% include 'buttons/edit.html' with href='users:edit-whitelist' id=whitelist.id %}
-                {% acl_end %}
-            </td>
-        </tr>
-        {% endfor %}
-</table>
-
-{% if white_list.paginator %}
-    {% include 'pagination.html' with list=white_list %}
-{% endif %}
+<div class="table-responsive">
+    <table class="table table-striped">
+        <thead>
+            <tr>
+                {% trans "User" as tr_user %}
+                <th>{% include 'buttons/sort.html' with prefix='white' col="user" text=tr_user %}</th>
+                <th>{% trans "Reason" %}</th>
+                {% trans "Start date" as tr_start %}
+                <th>{% include 'buttons/sort.html' with prefix='white' col="start" text=tr_start %}</th>
+                {% trans "End date" as tr_end %}
+                <th>{% include 'buttons/sort.html' with prefix='white' col="end" text=tr_end %}</th>
+                <th></th>
+            </tr>
+        </thead>
+        {% for whitelist in white_list %}
+        {% if whitelist.is_active %}
+            <tr class="success">
+        {% else %}
+            <tr>
+        {% endif %}
+                <td><a href="{% url 'users:profil' whitelist.user.id%}" class="btn btn-primary btn-sm" role="button"><i class="fa fa-user"></i> {{ whitelist.user }}</a></td>
+                <td>{{ whitelist.raison }}</td>
+                <td>{{ whitelist.date_start }}</td>
+                <td>{{ whitelist.date_end }}</td>
+                <td class="text-right">
+                    {% can_delete whitelist %}
+                    {% include 'buttons/suppr.html' with href='users:del-whitelist' id=whitelist.id %}
+                    {% acl_end %}
+                    {% history_button whitelist %}
+                    {% can_edit whitelist %}
+                    {% include 'buttons/edit.html' with href='users:edit-whitelist' id=whitelist.id %}
+                    {% acl_end %}
+                </td>
+            </tr>
+            {% endfor %}
+    </table>
 
+    {% if white_list.paginator %}
+        {% include 'pagination.html' with list=white_list %}
+    {% endif %}
+</div>