Divided paginator with page range

boards/abstracts/paginator.py

@@ -2,7 +2,7 b''
 
 from django.core.paginator import Paginator
 
-PAGINATOR_LOOKAROUND_SIZE = 3
+PAGINATOR_LOOKAROUND_SIZE = 2
 
 
 def get_paginator(*args, **kwargs):
@@ -14,9 +14,39 b' class DividedPaginator(Paginator):'
     lookaround_size = PAGINATOR_LOOKAROUND_SIZE
     current_page = 0
 
+    def left_range(self):
+        return self.page_range[:self.lookaround_size]
+
+    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):
         index = self.page_range.index(self.current_page)
 
-        start = max(0, index - self.lookaround_size)
-        end = min(len(self.page_range), index + self.lookaround_size + 1)
-        return self.page_range[start:end]
  No newline at end of file
+        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):
+        dr = list()
+
+        dr += self.left_range()
+        dr += self.center_range()
+        dr += self.right_range()
+
+        # Remove duplicates
+        dr = list(set(dr))
+        dr.sort()
+
+        return dr
+
+    def get_left_divider(self):
+        return self.lookaround_size + 1
+
+    def get_right_divider(self):
+        return self.num_pages - self.lookaround_size + 1
+

boards/templates/boards/all_threads.html

@@ -141,15 +141,8 b''
     <span class="metapanel">
         <b><a href="{% url "authors" %}">{{ site_name }}</a> {{ version }}</b>
         {% trans "Pages:" %}
-        <a href="
-            {% if tag %}
-                {% url "tag" tag_name=tag.name page=paginator.page_range|first %}
-            {% else %}
-                {% url "index" page=paginator.page_range|first %}
-            {% endif %}
-        ">&lt;&lt;</a>
         [
-        {% for page in paginator.center_range %}
+        {% for page in paginator.divided_range %}
             <a
                 {% ifequal page current_page.number %}
                     class="current_page"
@@ -164,13 +157,6 b''
             {% if not forloop.last %},{% endif %}
         {% endfor %}
         ]
-        <a href="
-            {% if tag %}
-                {% url "tag" tag_name=tag.name page=paginator.page_range|last %}
-            {% else %}
-                {% url "index" page=paginator.page_range|last %}
-            {% endif %}
-        ">&gt;&gt;</a>
         [<a href="rss/">RSS</a>]
     </span>
 

boards/templates/boards/feed.html

@@ -51,11 +51,8 b''
     <span class="metapanel">
         <b><a href="{% url "authors" %}">{{ site_name }}</a> {{ version }}</b>
         {% trans "Pages:" %}
-        <a href="
-            {% url "feed" page=paginator.page_range|first %}
-        ">&lt;&lt;</a>
         [
-        {% for page in paginator.center_range %}
+        {% for page in paginator.divided_range %}
             <a
                 {% ifequal page current_page.number %}
                     class="current_page"
@@ -66,9 +63,6 b''
             {% if not forloop.last %},{% endif %}
         {% endfor %}
         ]
-        <a href="
-            {% url "feed" page=paginator.page_range|last %}
-        ">&gt;&gt;</a>
     </span>
 
 {% endblock %}