Added tag gallery

boards/views/tag_gallery.py

@@ -0,0 +1,31 b''
+from django.core.urlresolvers import reverse
+from django.shortcuts import get_object_or_404, render
+
+from boards import settings
+from boards.abstracts.paginator import get_paginator
+from boards.models import Tag
+from boards.views.base import BaseBoardView
+from boards.views.mixins import PaginatedMixin
+
+IMAGES_PER_PAGE = settings.get_int('View', 'ImagesPerPageGallery')
+
+TEMPLATE = 'boards/tag_gallery.html'
+
+
+class TagGalleryView(BaseBoardView, PaginatedMixin):
+
+    def get(self, request, tag_name):
+        page = int(request.GET.get('page', 1))
+
+        params = dict()
+        tag = get_object_or_404(Tag, name=tag_name)
+        params['tag'] = tag
+        paginator = get_paginator(tag.get_images(), IMAGES_PER_PAGE,
+                                  current_page=page)
+        params['paginator'] = paginator
+        params['images'] = paginator.page(page).object_list
+        paginator.set_url(reverse('tag_gallery', kwargs={'tag_name': tag_name}),
+                          request.GET.dict())
+        self.set_page_urls(paginator, params)
+
+        return render(request, TEMPLATE, params)
  No newline at end of file

boards/abstracts/paginator.py

@@ -12,7 +12,14 b' def get_paginator(*args, **kwargs):'
 class DividedPaginator(Paginator):
 
     lookaround_size = PAGINATOR_LOOKAROUND_SIZE
-    current_page = 0
+
+    def __init__(self, object_list, per_page, orphans=0,
+                 allow_empty_first_page=True, current_page=1):
+        super().__init__(object_list, per_page, orphans, allow_empty_first_page)
+
+        self.link = None
+        self.params = None
+        self.current_page = current_page
 
     def _left_range(self):
         return self.page_range[:self.lookaround_size]
@@ -67,8 +74,18 b' class DividedPaginator(Paginator):'
     def get_page_url(self, page):
         self.params['page'] = page
         url_params = '?' + '&'.join(['{}={}'.format(key, self.params[key])
-            for key in self.params.keys()])
+                                     for key in self.params.keys()])
         return self.link + url_params
 
     def supports_urls(self):
         return self.link is not None and self.params is not None
+
+    def get_next_page_url(self):
+        current = self.page(self.current_page)
+        if current.has_next():
+            return self.get_page_url(current.next_page_number())
+
+    def get_prev_page_url(self):
+        current = self.page(self.current_page)
+        if current.has_previous():
+            return self.get_page_url(current.previous_page_number())
  No newline at end of file

boards/config/default_settings.ini

@@ -24,6 +24,7 b' DefaultTheme = md'
 DefaultImageViewer = simple
 LastRepliesCount = 3
 ThreadsPerPage = 3
+ImagesPerPageGallery = 20
 
 [Storage]
 # Enable archiving threads instead of deletion when the thread limit is reached

boards/models/tag.py

@@ -4,6 +4,7 b' from django.db import models'
 from django.db.models import Count
 from django.core.urlresolvers import reverse
 
+from boards.models import PostImage
 from boards.models.base import Viewable
 from boards.models.thread import STATUS_ACTIVE, STATUS_BUMPLIMIT, STATUS_ARCHIVE
 from boards.utils import cached_result
@@ -140,3 +141,7 b' class Tag(models.Model, Viewable):'
 
     def get_children(self):
         return self.children
+
+    def get_images(self):
+        return PostImage.objects.filter(post_images__thread__tags__in=[self])\
+            .order_by('-post_images__pub_time')
  No newline at end of file

boards/templates/boards/all_threads.html

@@ -71,6 +71,7 b''
                         <button name="method" value="hide" class="not_fav">H</button>
                     {% endif %}
                 </form>
+                <a href="{% url 'tag_gallery' tag.name %}">{% trans 'Gallery' %}</a>
             </p>
             {% if tag.get_description %}
                 <p>{{ tag.get_description|safe }}</p>

boards/templates/boards/tag_gallery.html

@@ -8,11 +8,7 b''
 {% block head %}
     <meta name="robots" content="noindex">
 
-    {% if tag %}
-        <title>{{ tag.name }} - {{ site_name }}</title>
-    {% else %}
-        <title>{{ site_name }}</title>
-    {% endif %}
+    <title>{{ tag.name }} - {% trans 'Gallery' %} - {{ site_name }}</title>
 
     {% if prev_page_link %}
         <link rel="prev" href="{{ prev_page_link }}" />
@@ -36,7 +32,6 b''
         </div>
     {% endfor %}
 
-{% if tag %}
     <div class="tag_info" style="border-bottom: solid .5ex #{{ tag.get_color }}">
         {% if random_image_post %}
             <div class="tag-image">
@@ -56,22 +51,6 b''
                 <span class="moderator_info">| <a href="{% url 'admin:boards_tag_change' tag.id %}">{% trans 'Edit tag' %}</a></span>
                 {% endif %}
             </h2>
-            <p>
-                <form action="{% url 'tag' tag.name %}" method="post" class="post-button-form">
-                    {% if is_favorite %}
-                        <button name="method" value="unsubscribe" class="fav">★</button>
-                    {% else %}
-                        <button name="method" value="subscribe" class="not_fav">★</button>
-                    {% endif %}
-                </form>
-                <form action="{% url 'tag' tag.name %}" method="post" class="post-button-form">
-                    {% if is_hidden %}
-                        <button name="method" value="unhide" class="fav">H</button>
-                    {% else %}
-                        <button name="method" value="hide" class="not_fav">H</button>
-                    {% endif %}
-                </form>
-            </p>
             {% if tag.get_description %}
                 <p>{{ tag.get_description|safe }}</p>
             {% endif %}
@@ -99,79 +78,29 b''
             {% endif %}
         </div>
     </div>
-{% endif %}
 
-    {% if threads %}
-        {% if prev_page_link %}
-            <div class="page_link">
-                <a href="{{ prev_page_link }}">{% trans "Previous page" %}</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 }}">{% trans "Next page" %}</a>
-            </div>
-        {% endif %}
-    {% else %}
-        <div class="post">
-            {% trans 'No threads exist. Create the first one!' %}</div>
+    {% if prev_page_link %}
+        <div class="page_link">
+            <a href="{{ prev_page_link }}">{% trans "Previous page" %}</a>
+        </div>
     {% endif %}
 
-    <div class="post-form-w">
-        <script src="{% static 'js/panel.js' %}"></script>
-        <div class="post-form">
-            <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" onclick="return false;">{% trans 'Preview' %}</button>
-                </div>
-            </form>
+    {% for image in images %}
+        <div class="gallery_image">
+            {% autoescape off %}
+                {{ image.get_view }}
+            {% endautoescape %}
+            <div class="gallery_image_metadata">
+                {{ image.width }}x{{ image.height }}
             </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 %}
-            </div>
-            <div id="preview-text"></div>
-            <div><a href="{% url "staticpage" name="help" %}">{% trans 'Text syntax' %}</a></div>
-            <div><a href="{% url "tags" "required" %}">{% trans 'Tags' %}</a></div>
         </div>
-    </div>
+    {% endfor %}
 
-    <script src="{% static 'js/form.js' %}"></script>
-    <script src="{% static 'js/thread_create.js' %}"></script>
-
+    {% if next_page_link %}
+        <div class="page_link">
+            <a href="{{ next_page_link }}">{% trans "Next page" %}</a>
+        </div>
+    {% endif %}
 {% endblock %}
 
 {% block metapanel %}
@@ -186,7 +115,7 b''
                     …,
                 {% endif %}
                 <a
-                    {% ifequal page current_page.number %}
+                    {% ifequal page paginator.current_page %}
                         class="current_page"
                     {% endifequal %}
                     href="{% page_url paginator page %}">{{ page }}</a>

boards/urls.py

@@ -11,6 +11,7 b' from boards.views.search import BoardSea'
 from boards.views.static import StaticPageView
 from boards.views.preview import PostPreviewView
 from boards.views.random import RandomImageView
+from boards.views.tag_gallery import TagGalleryView
 from boards.views.translation import cached_javascript_catalog
 
 
@@ -45,6 +46,7 b" urlpatterns = patterns('',"
         name='staticpage'),
 
     url(r'^random/$', RandomImageView.as_view(), name='random'),
+    url(r'^tag/(?P<tag_name>\w+)/gallery/$', TagGalleryView.as_view(), name='tag_gallery'),
 
     # RSS feeds
     url(r'^rss/$', AllThreadsFeed()),

boards/views/all_threads.py

@@ -15,8 +15,7 b' from boards.models import Post, Thread, '
 from boards.views.banned import BannedView
 from boards.views.base import BaseBoardView, CONTEXT_FORM
 from boards.views.posting_mixin import PostMixin
-from boards.views.mixins import FileUploadMixin
-
+from boards.views.mixins import FileUploadMixin, PaginatedMixin
 
 FORM_TAGS = 'tags'
 FORM_TEXT = 'text'
@@ -34,14 +33,11 b" PARAMETER_ADDITIONAL = 'additional_param"
 PARAMETER_MAX_FILE_SIZE = 'max_file_size'
 PARAMETER_RSS_URL = 'rss_url'
 
-PARAMETER_PREV_LINK = 'prev_page_link'
-PARAMETER_NEXT_LINK = 'next_page_link'
-
 TEMPLATE = 'boards/all_threads.html'
 DEFAULT_PAGE = 1
 
 
-class AllThreadsView(PostMixin, FileUploadMixin, BaseBoardView):
+class AllThreadsView(PostMixin, FileUploadMixin, BaseBoardView, PaginatedMixin):
 
     def __init__(self):
         self.settings_manager = None
@@ -106,12 +102,7 b' class AllThreadsView(PostMixin, FileUplo'
         params[PARAMETER_PAGINATOR] = paginator
         current_page = paginator.page(int(page))
         params[PARAMETER_CURRENT_PAGE] = current_page
-        if current_page.has_previous():
-            params[PARAMETER_PREV_LINK] = paginator.get_page_url(
-                    current_page.previous_page_number())
-        if current_page.has_next():
-            params[PARAMETER_NEXT_LINK] = paginator.get_page_url(
-                    current_page.next_page_number())
+        self.set_page_urls(paginator, params)
 
     def get_reverse_url(self):
         return reverse('index')

boards/views/mixins.py

@@ -32,3 +32,9 b' class DispatcherMixin:'
 class FileUploadMixin:
     def get_max_upload_size(self):
         return boards.settings.get_int('Forms', 'MaxFileSize')
+
+
+class PaginatedMixin:
+    def set_page_urls(self, paginator, params):
+        params['prev_page_link'] = paginator.get_prev_page_url()
+        params['next_page_link'] = paginator.get_next_page_url()