From 83123d9dc164b3213bc1ce0526f638d5f3010b86 Mon Sep 17 00:00:00 2001 From: Jean-Roman Garnier Date: Fri, 6 Dec 2019 00:15:06 +0000 Subject: [PATCH] Make search-results pagination more coherent with rest of pagination style --- search/templates/search/index.html | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/search/templates/search/index.html b/search/templates/search/index.html index 2b05dbb4..a93547cc 100644 --- a/search/templates/search/index.html +++ b/search/templates/search/index.html @@ -34,62 +34,90 @@ with this program; if not, write to the Free Software Foundation, Inc.,

{% trans "Results among users:" %}

{% include 'pagination.html' with list=users page_arg='users_page' go_to_id='users_results' %} {% include 'users/aff_users.html' with users_list=users.object_list %} + {% include 'pagination.html' with list=users page_arg='users_page' go_to_id='users_results' %} +
+
{% endif%} {% if clubs %}

{% trans "Results among clubs:" %}

{% include 'pagination.html' with list=clubs page_arg='clubs_page' go_to_id='clubs_results' %} {% include 'users/aff_clubs.html' with clubs_list=clubs.object_list %} + {% include 'pagination.html' with list=clubs page_arg='clubs_page' go_to_id='clubs_results' %}
+
+
{% endif%} {% if machines %}

{% trans "Results among machines:" %}

{% include 'pagination.html' with list=machines page_arg='machines_page' go_to_id='machines_results' %} {% include 'machines/aff_machines.html' with machines_list=machines.object_list %} + {% include 'pagination.html' with list=machines page_arg='machines_page' go_to_id='machines_results' %}
+
+
{% endif %} {% if factures %}

{% trans "Results among invoices:" %}

{% include 'pagination.html' with list=factures page_arg='factures_page' go_to_id='invoices_results' %} {% include 'cotisations/aff_cotisations.html' with facture_list=factures.object_list %} + {% include 'pagination.html' with list=factures page_arg='factures_page' go_to_id='invoices_results' %}
+
+
{% endif %} {% if whitelists %}

{% trans "Results among whitelists:" %}

{% include 'pagination.html' with list=whitelists page_arg='whitelists_page' go_to_id='whitelists_results' %} {% include 'users/aff_whitelists.html' with white_list=whitelists.object_list %} + {% include 'pagination.html' with list=whitelists page_arg='whitelists_page' go_to_id='whitelists_results' %}
+
+
{% endif %} {% if bans %}

{% trans "Results among bans:" %}

{% include 'pagination.html' with list=bans page_arg='bans_page' go_to_id='bans_results' %} {% include 'users/aff_bans.html' with ban_list=bans.object_list %} + {% include 'pagination.html' with list=bans page_arg='bans_page' go_to_id='bans_results' %}
+
+
{% endif %} {% if rooms %}

{% trans "Results among rooms:" %}

{% include 'pagination.html' with list=rooms page_arg='rooms_page' go_to_id='rooms_results' %} {% include 'topologie/aff_chambres.html' with room_list=rooms.object_list %} + {% include 'pagination.html' with list=rooms page_arg='rooms_page' go_to_id='rooms_results' %} +
+
+
{% endif %} {% if ports %}

{% trans "Results among ports:" %}

{% include 'pagination.html' with list=ports page_arg='ports_page' go_to_id='ports_results' %} {% include 'topologie/aff_port.html' with port_list=ports.object_list search=True %} + {% include 'pagination.html' with list=ports page_arg='ports_page' go_to_id='ports_results' %}
+
+
{% endif %} {% if switches %}

{% trans "Results among switches:" %}

{% include 'pagination.html' with list=switches page_arg='switches_page' go_to_id='switches_results' %} {% include 'topologie/aff_switch.html' with switch_list=switches.object_list %} + {% include 'pagination.html' with list=switches page_arg='switches_page' go_to_id='switches_results' %}
+
+
{% endif %} {% if not users and not machines and not factures and not whitelists and not bans and not rooms and not ports and not switches %}

{% trans "No result" %}