From a3124c9c752120ad200ae015c2521a690b5f605a Mon Sep 17 00:00:00 2001
From: Paul Marillonnet <pmarillonnet@entrouvert.com>
Date: Thu, 16 Dec 2021 12:04:38 +0100
Subject: [PATCH] templates: provide more consistent use of ellipses in
 pagination (#59773)

---
 gadjo/templates/gadjo/pagination.html | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/gadjo/templates/gadjo/pagination.html b/gadjo/templates/gadjo/pagination.html
index aec4916..d7e576d 100644
--- a/gadjo/templates/gadjo/pagination.html
+++ b/gadjo/templates/gadjo/pagination.html
@@ -14,10 +14,15 @@ Expected context variables:
 {% with page_key=page_key|default:"page" %}
 {% spaceless %}
 <p class="paginator">
-  {% if page_obj.number > 1 %}
-    {% if page_obj.previous_page_number != 1 %}
+  {% if page_obj.number > 4 %}
       <a href="{% querystring page_key=1 without without_key %}{{ anchor }}">1</a>
       …
+  {% else %}
+    {% if page_obj.number >= 3 %}
+      <a href="{% querystring page_key=1 without without_key %}{{ anchor }}">1</a>
+      {% if page_obj.number == 4 %}
+        <a href="{% querystring page_key=2 without without_key %}{{ anchor }}">2</a>
+      {% endif %}
     {% endif %}
   {% endif %}
 
@@ -30,11 +35,21 @@ Expected context variables:
   {% if page_obj.has_next %}
     <a href="{% querystring page_key=page_obj.next_page_number without without_key %}{{ anchor }}">{{ page_obj.next_page_number }}</a>
   {% endif %}
-  {% if page_obj.number != page_obj.paginator.num_pages %}
+
+  {% if page_obj.number < page_obj.paginator.num_pages|add:"-3" %}
     {% if page_obj.next_page_number != page_obj.paginator.num_pages %}
       …
       <a href="{% querystring page_key=page_obj.paginator.num_pages without without_key %}{{ anchor }}">{{ page_obj.paginator.num_pages }}</a>
     {% endif %}
+  {% else %}
+    {% if page_obj.number <= page_obj.paginator.num_pages|add:"-2" %}
+      {% if page_obj.number == page_obj.paginator.num_pages|add:"-3" %}
+        {% with a_page_key=page_obj.paginator.num_pages|add:"-1" %}
+          <a href="{% querystring page_key=a_page_key without without_key %}{{ anchor }}">{{ a_page_key }}</a>
+        {% endwith %}
+      {% endif %}
+      <a href="{% querystring page_key=page_obj.paginator.num_pages without without_key %}{{ anchor }}">{{ page_obj.paginator.num_pages }}</a>
+    {% endif %}
   {% endif %}
 </p>
 {% endspaceless %}