Since we show sections on the landing page now, always show all tags in the tags view

boards/models/tag.py

@@ -1,145 +1,145 b''
 import hashlib
 from boards.models.attachment import FILE_TYPES_IMAGE
 from django.template.loader import render_to_string
 from django.db import models
 from django.db.models import Count
 from django.core.urlresolvers import reverse
 
 from boards.models import Attachment
 from boards.models.base import Viewable
 from boards.models.thread import STATUS_ACTIVE, STATUS_BUMPLIMIT, STATUS_ARCHIVE
 from boards.utils import cached_result
 import boards
 
 __author__ = 'neko259'
 
 
 RELATED_TAGS_COUNT = 5
 
 
 class TagManager(models.Manager):
 
     def get_not_empty_tags(self):
         """
         Gets tags that have non-archived threads.
         """
 
         return self.annotate(num_threads=Count('thread_tags')).filter(num_threads__gt=0)\
-            .order_by('-required', 'name')
+            .order_by('name')
 
     def get_tag_url_list(self, tags: list) -> str:
         """
         Gets a comma-separated list of tag links.
         """
 
         return ', '.join([tag.get_view() for tag in tags])
 
 
 class Tag(models.Model, Viewable):
     """
     A tag is a text node assigned to the thread. The tag serves as a board
     section. There can be multiple tags for each thread
     """
 
     objects = TagManager()
 
     class Meta:
         app_label = 'boards'
         ordering = ('name',)
 
     name = models.CharField(max_length=100, db_index=True, unique=True)
     required = models.BooleanField(default=False, db_index=True)
     description = models.TextField(blank=True)
 
     parent = models.ForeignKey('Tag', null=True, blank=True,
             related_name='children')
 
     def __str__(self):
         return self.name
 
     def is_empty(self) -> bool:
         """
         Checks if the tag has some threads.
         """
 
         return self.get_thread_count() == 0
 
     def get_thread_count(self, status=None) -> int:
         threads = self.get_threads()
         if status is not None:
             threads = threads.filter(status=status)
         return threads.count()
 
     def get_active_thread_count(self) -> int:
         return self.get_thread_count(status=STATUS_ACTIVE)
 
     def get_bumplimit_thread_count(self) -> int:
         return self.get_thread_count(status=STATUS_BUMPLIMIT)
 
     def get_archived_thread_count(self) -> int:
         return self.get_thread_count(status=STATUS_ARCHIVE)
 
     def get_absolute_url(self):
         return reverse('tag', kwargs={'tag_name': self.name})
 
     def get_threads(self):
         return self.thread_tags.order_by('-bump_time')
 
     def is_required(self):
         return self.required
 
     def get_view(self):
         link = '<a class="tag" href="{}">{}</a>'.format(
             self.get_absolute_url(), self.name)
         if self.is_required():
             link = '<b>{}</b>'.format(link)
         return link
 
     @cached_result()
     def get_post_count(self):
         return self.get_threads().aggregate(num_posts=Count('replies'))['num_posts']
 
     def get_description(self):
         return self.description
 
     def get_random_image_post(self, status=[STATUS_ACTIVE, STATUS_BUMPLIMIT]):
         posts = boards.models.Post.objects.filter(attachments__mimetype__in=FILE_TYPES_IMAGE)\
             .annotate(images_count=Count(
             'attachments')).filter(images_count__gt=0, thread__tags__in=[self])
         if status is not None:
             posts = posts.filter(thread__status__in=status)
         return posts.order_by('?').first()
 
     def get_first_letter(self):
         return self.name and self.name[0] or ''
 
     def get_related_tags(self):
         return set(Tag.objects.filter(thread_tags__in=self.get_threads()).exclude(
             id=self.id).order_by('?')[:RELATED_TAGS_COUNT])
 
     @cached_result()
     def get_color(self):
         """
         Gets color hashed from the tag name.
         """
         return hashlib.md5(self.name.encode()).hexdigest()[:6]
 
     def get_parent(self):
         return self.parent
 
     def get_all_parents(self):
         parents = list()
         parent = self.get_parent()
         if parent and parent not in parents:
             parents.insert(0, parent)
             parents = parent.get_all_parents() + parents
 
         return parents
 
     def get_children(self):
         return self.children
 
     def get_images(self):
         return Attachment.objects.filter(
             attachment_posts__thread__tags__in=[self]).filter(
             mimetype__in=FILE_TYPES_IMAGE).order_by('-attachment_posts__pub_time')

boards/templates/boards/all_threads.html

@@ -1,209 +1,208 b''
 {% extends "boards/base.html" %}
 
 {% load i18n %}
 {% load board %}
 {% load static %}
 {% load tz %}
 
 {% block head %}
     <meta name="robots" content="noindex">
 
     {% if tag %}
         <title>{{ tag.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.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.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.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>
                     <button id="file-source-button" type="button" onclick="return false;">{% trans 'Change file source' %}</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 %}
             </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>
 
     <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/base.html

@@ -1,94 +1,94 b''
 {% load staticfiles %}
 {% load i18n %}
 {% load l10n %}
 {% load static from staticfiles %}
 
 <!DOCTYPE html>
 <html>
 <head>
     <link rel="stylesheet" type="text/css" href="{% static 'css/base.css' %}" media="all"/>
     <link rel="stylesheet" type="text/css" href="{% static 'css/3party/highlight.css' %}" media="all"/>
     <link rel="stylesheet" type="text/css" href="{% static 'css/3party/jquery-ui.min.css' %}" media="all"/>
     <link rel="stylesheet" type="text/css" href="{% static theme_css %}" media="all"/>
 
     {% if rss_url %}
         <link rel="alternate" type="application/rss+xml" href="{{ rss_url }}" title="{% trans 'Feed' %}"/>
     {% endif %}
 
     <link rel="icon" type="image/png"
         href="{% static 'favicon.png' %}">
 
     <meta name="viewport" content="width=device-width, initial-scale=1"/>
     <meta charset="utf-8"/>
 
     {% block head %}{% endblock %}
 </head>
 <body data-image-viewer="{{ image_viewer }}"
       data-pow-difficulty="{{ pow_difficulty }}"
       data-update-script="{% static 'js/updates.js' %}">
     <script src="{% static 'js/jquery-2.2.0.min.js' %}"></script>
 
     <header class="navigation_panel">
         <a class="link" href="{% url 'landing' %}">{{ site_name }}</a>
         <a href="{% url 'index' %}" title="{% trans "All threads" %}">~~~</a>,
         {% if tags_str %}
             <form action="{% url 'index' %}" method="post" class="post-button-form">{% csrf_token %}
             {% if only_favorites %}
                 <button name="method" value="toggle_fav" class="fav">★</button>,
             {% else %}
                 <button name="method" value="toggle_fav" class="not_fav">★</button>,
             {% endif %}
             </form>
             {{ tags_str|safe }},
         {% endif %}
-        <a href="{% url 'tags' 'required'%}" title="{% trans 'Tag management' %}">{% trans "tags" %}</a>,
+        <a href="{% url 'tags' %}" title="{% trans 'Tag management' %}">{% trans "tags" %}</a>,
         <a href="{% url 'search' %}" title="{% trans 'Search' %}">{% trans 'search' %}</a>,
         <a href="{% url 'feed' %}" title="{% trans 'Feed' %}">{% trans 'feed' %}</a>,
         <a href="{% url 'random' %}" title="{% trans 'Random images' %}">{% trans 'images' %}</a>{% if has_fav_threads %},
 
         <a href="{% url 'feed' %}?favorites" id="fav-panel-btn">{% trans 'favorites' %} <span id="new-fav-post-count" {% if not new_post_count %}style="display: none" {% endif %}>{{ new_post_count }}</span></a>
         {% endif %}
 
         {% if usernames %}
             <a class="right-link link" href="{% url 'notifications' %}" title="{% trans 'Notifications' %}">
                 {% trans 'Notifications' %}
                 {% ifnotequal new_notifications_count 0 %}
                     (<b>{{ new_notifications_count }}</b>)
                 {% endifnotequal %}
             </a>
         {% endif %}
 
         <a class="right-link link" href="{% url 'settings' %}">{% trans 'Settings' %}</a>
     </header>
 
     <div id="fav-panel"><div class="post">{% trans "Loading..." %}</div></div>
 
     {% block content %}{% endblock %}
 
     <script src="{% static 'js/3party/jquery-ui.min.js' %}"></script>
     <script src="{% static 'js/jquery.mousewheel.js' %}"></script>
     <script src="{% static 'js/3party/highlight.min.js' %}"></script>
 
     <script src="{% url 'js_info_dict' %}"></script>
 
     <script src="{% static 'js/popup.js' %}"></script>
     <script src="{% static 'js/image.js' %}"></script>
     <script src="{% static 'js/refpopup.js' %}"></script>
     <script src="{% static 'js/main.js' %}"></script>
 
     <footer class="navigation_panel">
         <b><a href="{% url "authors" %}">{{ site_name }}</a> {{ version }}</b>
         {% block metapanel %}{% endblock %}
         {% if rss_url %}
             [<a href="{{ rss_url }}">RSS</a>]
         {% endif %}
         [<a href="{% url 'admin:index' %}">{% trans 'Admin' %}</a>]
         [<a href="{% url 'index' %}?order=pub">{% trans 'New threads' %}</a>]
         {% with ppd=posts_per_day|floatformat:2 %}
             {% blocktrans %}Speed: {{ ppd }} posts per day{% endblocktrans %}
         {% endwith %}
         <a class="link" href="#top" id="up">{% trans 'Up' %}</a>
     </footer>
 
 </body>
 </html>

boards/templates/boards/tags.html

@@ -1,47 +1,28 b''
 {% extends "boards/base.html" %}
 
 {% load i18n %}
 
 {% block head %}
-    <title>Neboard - {% trans "Tags" %}</title>
+    <title>{{ site_name }} - {% trans "Tags" %}</title>
 {% endblock %}
 
 {% block content %}
 
-{% regroup section_tags by get_first_letter as section_tag_list %}
 {% regroup all_tags by get_first_letter as other_tag_list %}
 
 <div class="post">
-    {% if section_tags %}
-        <div>
-        {% trans 'Sections:' %}
-        {% for letter in section_tag_list %}
-            <br />({{ letter.grouper|upper }})
-            {% for tag in letter.list %}
-                {% autoescape off %}
-                    {{ tag.get_view }}{% if not forloop.last %},{% endif %}
-                {% endautoescape %}
-            {% endfor %}
-        {% endfor %}
-        </div>
-    {% endif %}
     {% if all_tags %}
         <div>
-        {% trans 'Other tags:' %}
         {% for letter in other_tag_list %}
             <br />({{ letter.grouper|upper }})
             {% for tag in letter.list %}
                 {% autoescape off %}
                     {{ tag.get_view }}{% if not forloop.last %},{% endif %}
                 {% endautoescape %}
             {% endfor %}
         {% endfor %}
         </div>
     {% endif %}
-
-    {% if query %}
-        <div><a href="{% url 'tags' %}">{% trans 'All tags...' %}</a></div>
-    {% endif %}
 </div>
 
 {% endblock %}

boards/urls.py

@@ -1,97 +1,97 b''
 from django.conf.urls import url
 
 import neboard
 
 from boards import views
 from boards.rss import AllThreadsFeed, TagThreadsFeed, ThreadPostsFeed
 from boards.views import api, tag_threads, all_threads, \
     settings, all_tags, feed, alias
 from boards.views.authors import AuthorsView
 from boards.views.notifications import NotificationView
 from boards.views.static import StaticPageView
 from boards.views.preview import PostPreviewView
 from boards.views.sync import get_post_sync_data, response_get, response_list
 from boards.views.random import RandomImageView
 from boards.views.tag_gallery import TagGalleryView
 from boards.views.translation import cached_javascript_catalog
 from boards.views.search import BoardSearchView
 from boards.views.landing import LandingView
 
 
 js_info_dict = {
     'packages': ('boards',),
 }
 
 urlpatterns = [
     # /boards/
     url(r'^all/$', all_threads.AllThreadsView.as_view(), name='index'),
 
     # /boards/tag/tag_name/
     url(r'^tag/(?P<tag_name>\w+)/$', tag_threads.TagView.as_view(),
         name='tag'),
 
     # /boards/thread/
     url(r'^thread/(?P<post_id>\d+)/$', views.thread.NormalThreadView.as_view(),
         name='thread'),
     url(r'^thread/(?P<post_id>\d+)/mode/gallery/$', views.thread.GalleryThreadView.as_view(),
         name='thread_gallery'),
     url(r'^thread/(?P<post_id>\d+)/mode/tree/$', views.thread.TreeThreadView.as_view(),
         name='thread_tree'),
     # /feed/
     url(r'^feed/$', views.feed.FeedView.as_view(), name='feed'),
 
     url(r'^settings/$', settings.SettingsView.as_view(), name='settings'),
     url(r'^aliases/(?P<category>\w+)/$', alias.AliasesView.as_view(), name='aliases'),
-    url(r'^tags/(?P<query>\w+)?/?$', all_tags.AllTagsView.as_view(), name='tags'),
+    url(r'^tags/$', all_tags.AllTagsView.as_view(), name='tags'),
     url(r'^authors/$', AuthorsView.as_view(), name='authors'),
 
     url(r'^banned/$', views.banned.BannedView.as_view(), name='banned'),
     url(r'^staticpage/(?P<name>\w+)/$', StaticPageView.as_view(),
         name='staticpage'),
 
     url(r'^random/$', RandomImageView.as_view(), name='random'),
     url(r'^tag/(?P<tag_name>\w+)/gallery/$', TagGalleryView.as_view(), name='tag_gallery'),
     url(r'^search/$', BoardSearchView.as_view(), name='search'),
     url(r'^$', LandingView.as_view(), name='landing'),
 
     # RSS feeds
     url(r'^rss/$', AllThreadsFeed()),
     url(r'^page/(?P<page>\d+)/rss/$', AllThreadsFeed()),
     url(r'^tag/(?P<tag_name>\w+)/rss/$', TagThreadsFeed()),
     url(r'^tag/(?P<tag_name>\w+)/page/(?P<page>\w+)/rss/$', TagThreadsFeed()),
     url(r'^thread/(?P<post_id>\d+)/rss/$', ThreadPostsFeed()),
 
     # i18n
     url(r'^jsi18n/$', cached_javascript_catalog, js_info_dict,
         name='js_info_dict'),
 
     # API
     url(r'^api/post/(?P<post_id>\d+)/$', api.get_post, name="get_post"),
     url(r'^api/diff_thread/$', api.api_get_threaddiff, name="get_thread_diff"),
     url(r'^api/threads/(?P<count>\w+)/$', api.api_get_threads,
             name='get_threads'),
     url(r'^api/tags/$', api.api_get_tags, name='get_tags'),
     url(r'^api/thread/(?P<opening_post_id>\w+)/$', api.api_get_thread_posts,
             name='get_thread'),
     url(r'^api/add_post/(?P<opening_post_id>\w+)/$', api.api_add_post,
             name='add_post'),
     url(r'^api/notifications/(?P<username>\w+)/$', api.api_get_notifications,
             name='api_notifications'),
     url(r'^api/preview/$', api.api_get_preview, name='preview'),
     url(r'^api/new_posts/$', api.api_get_new_posts, name='new_posts'),
     url(r'^api/stickers/$', api.api_get_stickers, name='get_stickers'),
 
     # Sync protocol API
     url(r'^api/sync/list/$', response_list, name='api_sync_list'),
     url(r'^api/sync/get/$', response_get, name='api_sync_get'),
 
     # Notifications
     url(r'^notifications/(?P<username>\w+)/$', NotificationView.as_view(), name='notifications'),
     url(r'^notifications/$', NotificationView.as_view(), name='notifications'),
 
     # Post preview
     url(r'^preview/$', PostPreviewView.as_view(), name='preview'),
     url(r'^post_xml/(?P<post_id>\d+)$', get_post_sync_data,
         name='post_sync_data'),
 ]
 

boards/views/all_tags.py

@@ -1,23 +1,17 b''
 from django.shortcuts import render
 
 from boards.views.base import BaseBoardView
 from boards.models.tag import Tag
 
 
-PARAM_SECTION_TAGS = 'section_tags'
 PARAM_TAGS = 'all_tags'
-PARAM_QUERY = 'query'
 
 
 class AllTagsView(BaseBoardView):
 
-    def get(self, request, query=None):
+    def get(self, request):
         params = dict()
 
-        params[PARAM_SECTION_TAGS] = Tag.objects.filter(required=True)
-        if query != 'required':
-            params[PARAM_TAGS] = Tag.objects.get_not_empty_tags().filter(
-                    required=False)
-        params[PARAM_QUERY] = query
+        params[PARAM_TAGS] = Tag.objects.get_not_empty_tags()
 
         return render(request, 'boards/tags.html', params)