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,208 +1,208 b''
-{% extends "boards/base.html" %}
+{% extends "boards/paginated.html" %}
 
 {% load i18n %}
 {% load board %}
 {% load static %}
 {% load tz %}
 
 {% block head %}
     <meta name="robots" content="noindex">
 
     {% if tag %}
         <title>{{ tag.get_name }} - {{ site_name }}</title>
     {% else %}
         <title>{{ site_name }}</title>
     {% endif %}
 
     {% 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 %}
 
     {% get_current_language as LANGUAGE_CODE %}
     {% get_current_timezone as TIME_ZONE %}
 
     {% for banner in banners %}
         <div class="post">
             <div class="title">{{ banner.title }}</div>
             <div>{{ banner.get_text|safe }}</div>
             <div>{% trans 'Details' %}: <a href="{{ banner.post.get_absolute_url }}">>>{{ banner.post.id }}</a></div>
         </div>
     {% endfor %}
 
 {% if tag %}
     <div class="tag_info" style="border-bottom: solid .5ex #{{ tag.get_color }}">
         {% if random_image_post %}
             <div class="tag-image">
                 {% with image=random_image_post.get_first_image %}
                     <a href="{{ random_image_post.get_absolute_url }}"><img 
                         src="{{ image.get_thumb_url }}"
                         width="{{ image.get_preview_size.0 }}"
                         height="{{ image.get_preview_size.1 }}"
                         alt="{{ random_image_post.id }}"/></a>
                 {% endwith %}
             </div>
         {% endif %}
         <div class="tag-text-data">
             <h2>
                 /{{ tag.get_view|safe }}/
             </h2>
             {% if perms.change_tag %}
                 <div class="moderator_info"><a href="{% url 'admin:boards_tag_change' tag.id %}">{% trans 'Edit tag' %}</a></div>
             {% endif %}
             <p>
                 <form action="{% url 'tag' tag.get_name %}" method="post" class="post-button-form">
                     {% if is_favorite %}
                         <button name="method" value="unsubscribe" class="fav">★ {% trans "Remove from favorites" %}</button>
                     {% else %}
                         <button name="method" value="subscribe" class="not_fav">★ {% trans "Add to favorites" %}</button>
                     {% endif %}
                 </form>
                 <form action="{% url 'tag' tag.get_name %}" method="post" class="post-button-form">
                     {% if is_hidden %}
                         <button name="method" value="unhide" class="fav">{% trans "Show" %}</button>
                     {% else %}
                         <button name="method" value="hide" class="not_fav">{% trans "Hide" %}</button>
                     {% endif %}
                 </form>
                 <a href="{% url 'tag_gallery' tag.get_name %}">{% trans 'Gallery' %}</a>
             </p>
             {% if tag.get_description %}
                 <p>{{ tag.get_description|safe }}</p>
             {% endif %}
             <p>
                 {% with active_count=tag.get_active_thread_count bumplimit_count=tag.get_bumplimit_thread_count archived_count=tag.get_archived_thread_count %}
                     {% if active_count %}
                         ● {{ active_count }}&ensp;
                     {% endif %}
                     {% if bumplimit_count %}
                         ◍ {{ bumplimit_count }}&ensp;
                     {% endif %}
                     {% if archived_count %}
                         ○ {{ archived_count }}&ensp;
                     {% endif %}
                 {% endwith %}
                 ♥ {{ tag.get_post_count }}
             </p>
             {% if tag.get_all_parents %}
                 <p>
                     {% for parent in tag.get_all_parents %}
                         {{ parent.get_view|safe }} &gt;
                     {% endfor %}
                     {{ tag.get_view|safe }}
                 </p>
             {% endif %}
             {% if tag.get_children.all %}
                 <p>
                 {% trans "Subsections: " %}
                 {% for child in tag.get_children.all %}
                     {{ child.get_view|safe }}{% if not forloop.last%}, {% endif %}
                 {% endfor %}
                 </p>
             {% endif %}
         </div>
     </div>
 {% endif %}
 
     {% if threads %}
         {% if prev_page_link %}
             <div class="page_link">
                 <a href="{{ prev_page_link }}">&lt;&lt; {% trans "Previous page" %} &lt;&lt;</a>
             </div>
         {% endif %}
 
         {% for thread in threads %}
             <div class="thread">
                 {% post_view thread.get_opening_post thread=thread truncated=True need_open_link=True %}
                 {% if not thread.archived %}
                     {% with last_replies=thread.get_last_replies %}
                         {% if last_replies %}
                             {% with skipped_replies_count=thread.get_skipped_replies_count %}
                                 {% if skipped_replies_count %}
                                     <div class="skipped_replies">
                                         <a href="{% url 'thread' thread.get_opening_post_id %}">
                                             {% blocktrans count count=skipped_replies_count %}Skipped {{ count }} reply. Open thread to see all replies.{% plural %}Skipped {{ count }} replies. Open thread to see all replies.{% endblocktrans %}
                                         </a>
                                     </div>
                                 {% endif %}
                             {% endwith %}
                             <div class="last-replies">
                                 {% for post in last_replies %}
                                     {% post_view post truncated=True %}
                                 {% endfor %}
                             </div>
                         {% endif %}
                     {% endwith %}
                 {% endif %}
             </div>
         {% endfor %}
 
         {% if next_page_link %}
             <div class="page_link">
                 <a href="{{ next_page_link }}">&gt;&gt; {% trans "Next page" %} &gt;&gt;</a>
             </div>
         {% endif %}
     {% else %}
         <div class="post">
             {% trans 'No threads exist. Create the first one!' %}</div>
     {% endif %}
 
     <div class="post-form-w">
         <script src="{% static 'js/panel.js' %}"></script>
         <div class="post-form" data-hasher="{% static 'js/3party/sha256.js' %}"
                                data-pow-script="{% static 'js/proof_of_work.js' %}">
             <div class="form-title">{% trans "Create new thread" %}</div>
             <div class="swappable-form-full">
             <form enctype="multipart/form-data" method="post" id="form">{% csrf_token %}
                 {{ form.as_div }}
                 <div class="form-submit">
                     <input type="submit" value="{% trans "Post" %}"/>
                     <button id="preview-button" type="button" onclick="return false;">{% trans 'Preview' %}</button>
                 </div>
             </form>
             </div>
             <div>
                 {% trans 'Tags must be delimited by spaces. Text or image is required.' %}
                 {% with size=max_file_size|filesizeformat %}
                     {% blocktrans %}Max file size is {{ size }}.{% endblocktrans %}
                 {% endwith %}
                 {% blocktrans %}Max file number is {{ max_files }}.{% endblocktrans %}
             </div>
             <div id="preview-text"></div>
             <div><a href="{% url "staticpage" name="help" %}">{% trans 'Text syntax' %}</a></div>
         </div>
     </div>
 
     <script src="{% static 'js/form.js' %}"></script>
         <script src="{% static 'js/3party/jquery.blockUI.js' %}"></script>
     <script src="{% static 'js/thread_create.js' %}"></script>
 
 {% 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/boards/feed.html

@@ -1,73 +1,52 b''
-{% extends "boards/base.html" %}
+{% extends "boards/paginated.html" %}
 
 {% load i18n %}
 {% load board %}
 {% load static %}
 {% load tz %}
 
 {% block head %}
     <meta name="robots" content="noindex">
 
     <title>{{ site_name }} - {% trans "feed" %}</title>
 
     {% 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 %}
 
     {% get_current_language as LANGUAGE_CODE %}
     {% get_current_timezone as TIME_ZONE %}
 
     {% for query in queries %}
         <div class="image-mode-tab">{{ query }}</div>
     {% endfor %}
 
     {% if posts %}
         {% if prev_page_link %}
             <div class="page_link">
                 <a href="{{ prev_page_link }}">&lt;&lt; {% trans "Previous page" %} &lt;&lt;</a>
             </div>
         {% endif %}
 
         {% for post in posts %}
             {% post_view post moderator=moderator truncated=True need_op_data=True %}
         {% endfor %}
 
         {% if next_page_link %}
             <div class="page_link">
                 <a href="{{ next_page_link }}">&gt;&gt; {% trans "Next page" %} &gt;&gt;</a>
             </div>
         {% endif %}
     {% else %}
         <div class="post">
             {% trans 'No posts exist. Create the first one!' %}</div>
     {% 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,42 +1,48 b''
-{% extends 'boards/base.html' %}
+{% extends 'boards/paginated.html' %}
 
 {% load board %}
 {% load i18n %}
 
 {% 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 %}
     <div class="post-form-w">
         <div class="post-form">
             <form method="get" action="">
                 {{ form.as_div }}
                 <div class="form-submit">
                     <input type="submit" value="{% trans 'Ok' %}">
                 </div>
             </form>
         </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,46 +1,49 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
 RESULTS_PER_PAGE = 10
 
 FORM_QUERY = 'query'
 
 CONTEXT_QUERY = 'query'
 CONTEXT_FORM = 'form'
 CONTEXT_PAGE = 'page'
 
 REQUEST_PAGE = 'page'
 
 __author__ = 'neko259'
 
 TEMPLATE = 'search/search.html'
 
 
-class BoardSearchView(View):
+class BoardSearchView(View, PaginatedMixin):
     def get(self, request):
         params = dict()
 
         form = SearchForm(request.GET, error_class=PlainErrorList)
         params[CONTEXT_FORM] = form
 
         if form.is_valid():
             query = form.cleaned_data[FORM_QUERY]
             if len(query) >= MIN_QUERY_LENGTH:
                 results = Post.objects.filter(Q(text__icontains=query)
                         | 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)