Pretty divided paginator with ellipsis

boards/abstracts/paginator.py

@@ -14,29 +14,29 b' class DividedPaginator(Paginator):'
     lookaround_size = PAGINATOR_LOOKAROUND_SIZE
     current_page = 0
 
-    def left_range(self):
+    def _left_range(self):
         return self.page_range[:self.lookaround_size]
 
-    def right_range(self):
+    def _right_range(self):
         pages = self.num_pages-self.lookaround_size
         if pages <= 0:
             return []
         else:
             return self.page_range[pages:]
 
-    def center_range(self):
+    def _center_range(self):
         index = self.page_range.index(self.current_page)
 
         start = max(self.lookaround_size, index - self.lookaround_size)
         end = min(self.num_pages - self.lookaround_size, index + self.lookaround_size + 1)
         return self.page_range[start:end]
 
-    def divided_range(self):
+    def get_divided_range(self):
         dr = list()
 
-        dr += self.left_range()
-        dr += self.center_range()
-        dr += self.right_range()
+        dr += self._left_range()
+        dr += self._center_range()
+        dr += self._right_range()
 
         # Remove duplicates
         dr = list(set(dr))
@@ -44,9 +44,18 b' class DividedPaginator(Paginator):'
 
         return dr
 
-    def get_left_divider(self):
-        return self.lookaround_size + 1
+    def get_dividers(self):
+        dividers = []
+
+        prev_page = 1
+        for page in self.get_divided_range():
+            if page - prev_page > 1:
+                dividers.append(page)
 
-    def get_right_divider(self):
-        return self.num_pages - self.lookaround_size + 1
+                # There can be no more than 2 dividers, so don't bother going
+                # further
+                if len(dividers) > 2:
+                    break
+            prev_page = page
 
+        return dividers

boards/templates/boards/all_threads.html

@@ -142,20 +142,25 b''
         <b><a href="{% url "authors" %}">{{ site_name }}</a> {{ version }}</b>
         {% trans "Pages:" %}
         [
-        {% for page in paginator.divided_range %}
-            <a
-                {% ifequal page current_page.number %}
-                    class="current_page"
-                {% endifequal %}
-                href="
-            {% if tag %}
-                {% url "tag" tag_name=tag.name page=page %}
-            {% else %}
-                {% url "index" page=page %}
-            {% endif %}
-            ">{{ page }}</a>
-            {% if not forloop.last %},{% endif %}
-        {% endfor %}
+        {% with dividers=paginator.get_dividers %}
+            {% for page in paginator.get_divided_range %}
+                {% if page in dividers %}
+                    …,
+                {% endif %}
+                <a
+                    {% ifequal page current_page.number %}
+                        class="current_page"
+                    {% endifequal %}
+                    href="
+                {% if tag %}
+                    {% url "tag" tag_name=tag.name page=page %}
+                {% else %}
+                    {% url "index" page=page %}
+                {% endif %}
+                ">{{ page }}</a>
+                {% if not forloop.last %},{% endif %}
+            {% endfor %}
+        {% endwith %}
         ]
         [<a href="rss/">RSS</a>]
     </span>

boards/templates/boards/feed.html

@@ -52,16 +52,21 b''
         <b><a href="{% url "authors" %}">{{ site_name }}</a> {{ version }}</b>
         {% trans "Pages:" %}
         [
-        {% for page in paginator.divided_range %}
-            <a
-                {% ifequal page current_page.number %}
-                    class="current_page"
-                {% endifequal %}
-                href="
-            {% url "feed" page=page %}
-            ">{{ page }}</a>
-            {% if not forloop.last %},{% endif %}
-        {% endfor %}
+        {% with dividers=paginator.get_dividers %}
+            {% for page in paginator.get_divided_range %}
+                {% if page in dividers %}
+                    …,
+                {% endif %}
+                <a
+                    {% ifequal page current_page.number %}
+                        class="current_page"
+                    {% endifequal %}
+                    href="
+                {% url "feed" page=page %}
+                ">{{ page }}</a>
+                {% if not forloop.last %},{% endif %}
+            {% endfor %}
+        {% endwith %}
         ]
     </span>