Simplified pagination templates. Added a list of pages to the search results page

boards/templates/boards/paginated.html

@@ -0,0 +1,26 b''
+{% extends 'boards/base.html' %}
+
+{% load i18n %}
+{% load board %}
+
+{% block metapanel %}
+
+    <span class="metapanel">
+        {% trans "Pages:" %}
+        [
+        {% 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="{% page_url paginator page %}">{{ page }}</a>{% if not forloop.last %},{% endif %}
+            {% endfor %}
+        {% endwith %}
+        ]
+    </span>
+
+{% endblock %}

boards/templates/boards/all_threads.html

@@ -1,4 +1,4 b''
-{% extends "boards/base.html" %}
+{% extends "boards/paginated.html" %}
 
 {% load i18n %}
 {% load board %}

boards/templates/boards/feed.html

@@ -1,4 +1,4 b''
-{% extends "boards/base.html" %}
+{% extends "boards/paginated.html" %}
 
 {% load i18n %}
 {% load board %}
@@ -50,24 +50,3 b''
     {% endif %}
 {% endblock %}
 
-{% block metapanel %}
-
-    <span class="metapanel">
-        {% trans "Pages:" %}
-        [
-        {% 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="{% page_url paginator page %}">{{ page }}</a>{% if not forloop.last %},{% endif %}
-            {% endfor %}
-        {% endwith %}
-        ]
-    </span>
-
-{% endblock %}

boards/templates/search/search.html

@@ -1,4 +1,4 b''
-{% extends 'boards/base.html' %}
+{% extends 'boards/paginated.html' %}
 
 {% load board %}
 {% load i18n %}
@@ -6,6 +6,13 b''
 {% block head %}
     <title>{% trans 'Search' %} - {{ site_name }}</title>
     <meta name="robots" content="noindex">
+
+    {% if prev_page_link %}
+        <link rel="prev" href="{{ prev_page_link }}" />
+    {% endif %}
+    {% if next_page_link %}
+        <link rel="next" href="{{ next_page_link }}" />
+    {% endif %}
 {% endblock %}
 
 {% block content %}
@@ -20,23 +27,22 b''
         </div>
     </div>
 
-    {% if page %}
-        {% if page.has_previous %}
+    {% if current_page %}
+        {% if prev_page_link %}
             <div class="page_link">
-            <a href="?query={{ query }}&amp;page={{ page.previous_page_number }}">{% trans "Previous page" %}
-            </a>
+                <a href="{{ prev_page_link }}">&lt;&lt; {% trans "Previous page" %} &lt;&lt;</a>
             </div>
         {% endif %}
 
-        {% for result in page.object_list %}
+        {% for result in current_page.object_list %}
             {% post_view result truncated=True need_op_data=True %}
         {% endfor %}
 
-        {% if page.has_next %}
+        {% if next_page_link %}
             <div class="page_link">
-                <a href="?query={{ query }}&amp;page={{ page.next_page_number }}">{% trans "Next page" %}
-                </a>
+                <a href="{{ next_page_link }}">&gt;&gt; {% trans "Next page" %} &gt;&gt;</a>
             </div>
         {% endif %}
     {% endif %}
 {% endblock %}
+

boards/views/search.py

@@ -1,10 +1,12 b''
 from django.shortcuts import render
 from django.views.generic import View
 from django.db.models import Q
+from django.core.urlresolvers import reverse
 
 from boards.abstracts.paginator import get_paginator
 from boards.forms import SearchForm, PlainErrorList
 from boards.models import Post
+from boards.views.mixins import PaginatedMixin
 
 
 MIN_QUERY_LENGTH = 3
@@ -23,7 +25,7 b" REQUEST_PAGE = 'page'"
 TEMPLATE = 'search/search.html'
 
 
-class BoardSearchView(View):
+class BoardSearchView(View, PaginatedMixin):
     def get(self, request):
         params = dict()
 
@@ -37,10 +39,11 b' class BoardSearchView(View):'
                         | Q(title__icontains=query) | Q(opening=True,
                             thread__tags__aliases__name__icontains=query)).order_by('-id').distinct()
                 paginator = get_paginator(results, RESULTS_PER_PAGE)
+                paginator.set_url(reverse('search'), request.GET.dict())
 
                 page = int(request.GET.get(REQUEST_PAGE, '1'))
 
-                params[CONTEXT_PAGE] = paginator.page(page)
                 params[CONTEXT_QUERY] = query
+                params.update(self.get_page_context(paginator, page))
 
         return render(request, TEMPLATE, params)