From 42ded799e4c55ca7d6ad46ca56ef694f79a539d1 Mon Sep 17 00:00:00 2001 From: Jean-Romain Garnier Date: Fri, 15 Jan 2021 19:40:04 +0100 Subject: [PATCH] fix: Whitelist and ticket list responsiveness --- tickets/templates/tickets/aff_tickets.html | 2 +- users/templates/users/aff_whitelists.html | 79 +++++++++++----------- 2 files changed, 41 insertions(+), 40 deletions(-) diff --git a/tickets/templates/tickets/aff_tickets.html b/tickets/templates/tickets/aff_tickets.html index beaadc4f..caf82cf3 100644 --- a/tickets/templates/tickets/aff_tickets.html +++ b/tickets/templates/tickets/aff_tickets.html @@ -46,7 +46,7 @@ with this program; if not, write to the Free Software Foundation, Inc., -
+
diff --git a/users/templates/users/aff_whitelists.html b/users/templates/users/aff_whitelists.html index fdfd0b76..40d55d28 100644 --- a/users/templates/users/aff_whitelists.html +++ b/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 %} -
- - - {% trans "User" as tr_user %} - - - {% trans "Start date" as tr_start %} - - {% trans "End date" as tr_end %} - - - - - {% for whitelist in white_list %} - {% if whitelist.is_active %} - - {% else %} - +
+
{% include 'buttons/sort.html' with prefix='white' col="user" text=tr_user %}{% trans "Reason" %}{% include 'buttons/sort.html' with prefix='white' col="start" text=tr_start %}{% include 'buttons/sort.html' with prefix='white' col="end" text=tr_end %}
+ + + {% trans "User" as tr_user %} + + + {% trans "Start date" as tr_start %} + + {% trans "End date" as tr_end %} + + + + + {% for whitelist in white_list %} + {% if whitelist.is_active %} + + {% else %} + + {% endif %} + + + + + + + {% endfor %} +
{% include 'buttons/sort.html' with prefix='white' col="user" text=tr_user %}{% trans "Reason" %}{% include 'buttons/sort.html' with prefix='white' col="start" text=tr_start %}{% include 'buttons/sort.html' with prefix='white' col="end" text=tr_end %}
{{ whitelist.user }}{{ whitelist.raison }}{{ whitelist.date_start }}{{ whitelist.date_end }} + {% 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 %} +
+ + {% if white_list.paginator %} + {% include 'pagination.html' with list=white_list %} {% endif %} - {{ whitelist.user }} - {{ whitelist.raison }} - {{ whitelist.date_start }} - {{ whitelist.date_end }} - - {% 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 %} - - - {% endfor %} - - -{% if white_list.paginator %} - {% include 'pagination.html' with list=white_list %} -{% endif %} - +