Show only required tags in all tags list by default

boards/locale/ru/LC_MESSAGES/django.po

@@ -1,381 +1,386 b''
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-30 18:42+0300\n"
+"POT-Creation-Date: 2015-04-01 18:05+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: admin.py:22
 msgid "{} posters were banned"
 msgstr ""
 
 #: authors.py:9
 msgid "author"
 msgstr "автор"
 
 #: authors.py:10
 msgid "developer"
 msgstr "разработчик"
 
 #: authors.py:11
 msgid "javascript developer"
 msgstr "разработчик javascript"
 
 #: authors.py:12
 msgid "designer"
 msgstr "дизайнер"
 
 #: forms.py:34
 msgid "Type message here. Use formatting panel for more advanced usage."
 msgstr ""
 "Вводите сообщение сюда. Используйте панель для более сложного форматирования."
 
 #: forms.py:35
 msgid "tag1 several_words_tag"
 msgstr "метка1 метка_из_нескольких_слов"
 
 #: forms.py:37
 msgid "Title"
 msgstr "Заголовок"
 
 #: forms.py:38
 msgid "Text"
 msgstr "Текст"
 
 #: forms.py:39
 msgid "Tag"
 msgstr "Метка"
 
 #: forms.py:40 templates/boards/base.html:36 templates/search/search.html:13
 #: templates/search/search.html.py:17
 msgid "Search"
 msgstr "Поиск"
 
 #: forms.py:139
 msgid "Image"
 msgstr "Изображение"
 
 #: forms.py:142
 msgid "Image URL"
 msgstr "URL изображения"
 
 #: forms.py:148
 msgid "e-mail"
 msgstr ""
 
 #: forms.py:159
 #, python-format
 msgid "Title must have less than %s characters"
 msgstr "Заголовок должен иметь меньше %s символов"
 
 #: forms.py:168
 #, python-format
 msgid "Text must have less than %s characters"
 msgstr "Текст должен быть короче %s символов"
 
 #: forms.py:190
 msgid "Invalid URL"
 msgstr "Неверный URL"
 
 #: forms.py:227
 msgid "Either text or image must be entered."
 msgstr "Текст или картинка должны быть введены."
 
 #: forms.py:243
 #, python-format
 msgid "Wait %s seconds after last posting"
 msgstr "Подождите %s секунд после последнего постинга"
 
 #: forms.py:255
 #, python-format
 msgid "Image must be less than %s bytes"
 msgstr "Изображение должно быть менее %s байт"
 
 #: forms.py:302 templates/boards/rss/post.html:10 templates/boards/tags.html:7
 msgid "Tags"
 msgstr "Метки"
 
 #: forms.py:309
 msgid "Inappropriate characters in tags."
 msgstr "Недопустимые символы в метках."
 
 #: forms.py:320
 msgid "Need at least 1 required tag."
 msgstr "Нужна хотя бы 1 обязательная метка."
 
 #: forms.py:332
 msgid "Theme"
 msgstr "Тема"
 
 #: forms.py:333
 msgid "User name"
 msgstr "Имя пользователя"
 
 #: forms.py:334
 msgid "Time zone"
 msgstr "Часовой пояс"
 
 #: forms.py:340
 msgid "Inappropriate characters."
 msgstr "Недопустимые символы."
 
 #: templates/boards/404.html:6
 msgid "Not found"
 msgstr "Не найдено"
 
 #: templates/boards/404.html:12
 msgid "This page does not exist"
 msgstr "Этой страницы не существует"
 
 #: templates/boards/authors.html:6 templates/boards/authors.html.py:12
 msgid "Authors"
 msgstr "Авторы"
 
 #: templates/boards/authors.html:26
 msgid "Distributed under the"
 msgstr "Распространяется под"
 
 #: templates/boards/authors.html:28
 msgid "license"
 msgstr "лицензией"
 
 #: templates/boards/authors.html:30
 msgid "Repository"
 msgstr "Репозиторий"
 
 #: templates/boards/base.html:13
 msgid "Feed"
 msgstr "Лента"
 
 #: templates/boards/base.html:30
 msgid "All threads"
 msgstr "Все темы"
 
 #: templates/boards/base.html:34
 msgid "Tag management"
 msgstr "Управление метками"
 
 #: templates/boards/base.html:39 templates/boards/base.html.py:40
 #: templates/boards/notifications.html:8
 msgid "Notifications"
 msgstr "Уведомления"
 
 #: templates/boards/base.html:47 templates/boards/settings.html:9
 msgid "Settings"
 msgstr "Настройки"
 
 #: templates/boards/base.html:60
 msgid "Admin"
 msgstr "Администрирование"
 
 #: templates/boards/base.html:62
 #, python-format
 msgid "Speed: %(ppd)s posts per day"
 msgstr "Скорость: %(ppd)s сообщений в день"
 
 #: templates/boards/base.html:64
 msgid "Up"
 msgstr "Вверх"
 
 #: templates/boards/notifications.html:17
 #: templates/boards/posting_general.html:81 templates/search/search.html:26
 msgid "Previous page"
 msgstr "Предыдущая страница"
 
 #: templates/boards/notifications.html:27
 #: templates/boards/posting_general.html:121 templates/search/search.html:37
 msgid "Next page"
 msgstr "Следующая страница"
 
 #: templates/boards/post.html:32
 msgid "Open"
 msgstr "Открыть"
 
 #: templates/boards/post.html:34 templates/boards/post.html.py:38
 msgid "Reply"
 msgstr "Ответ"
 
 #: templates/boards/post.html:43
 msgid "Edit"
 msgstr "Изменить"
 
 #: templates/boards/post.html:45
 msgid "Edit thread"
 msgstr "Изменить тему"
 
 #: templates/boards/post.html:75
 msgid "Replies"
 msgstr "Ответы"
 
 #: templates/boards/post.html:86 templates/boards/thread.html:30
 msgid "messages"
 msgstr "сообщений"
 
 #: templates/boards/post.html:87 templates/boards/thread.html:31
 msgid "images"
 msgstr "изображений"
 
 #: templates/boards/posting_general.html:65
 msgid "Edit tag"
 msgstr "Изменить метку"
 
 #: templates/boards/posting_general.html:68
 #, python-format
 msgid "This tag has %(thread_count)s threads and %(post_count)s posts."
 msgstr "С этой меткой есть %(thread_count)s тем и %(post_count)s сообщений."
 
 #: templates/boards/posting_general.html:96
 #, python-format
 msgid "Skipped %(count)s replies. Open thread to see all replies."
 msgstr "Пропущено %(count)s ответов. Откройте тред, чтобы увидеть все ответы."
 
 #: templates/boards/posting_general.html:126
 msgid "No threads exist. Create the first one!"
 msgstr "Нет тем. Создайте первую!"
 
 #: templates/boards/posting_general.html:132
 msgid "Create new thread"
 msgstr "Создать новую тему"
 
 #: templates/boards/posting_general.html:137 templates/boards/preview.html:16
 #: templates/boards/thread_normal.html:46
 msgid "Post"
 msgstr "Отправить"
 
-#: templates/boards/posting_general.html:143
+#: templates/boards/posting_general.html:142
 msgid "Tags must be delimited by spaces. Text or image is required."
 msgstr ""
 "Метки должны быть разделены пробелами. Текст или изображение обязательны."
 
-#: templates/boards/posting_general.html:146
+#: templates/boards/posting_general.html:145
 #: templates/boards/thread_normal.html:51
 msgid "Text syntax"
 msgstr "Синтаксис текста"
 
-#: templates/boards/posting_general.html:158
+#: templates/boards/posting_general.html:157
 msgid "Pages:"
 msgstr "Страницы: "
 
-#: templates/boards/preview.html:6 templates/boards/staticpages/help.html:20
+#: templates/boards/preview.html:6 templates/boards/staticpages/help.html:21
 msgid "Preview"
 msgstr "Предпросмотр"
 
 #: templates/boards/rss/post.html:5
 msgid "Post image"
 msgstr "Изображение сообщения"
 
 #: templates/boards/settings.html:17
 msgid "You are moderator."
 msgstr "Вы модератор."
 
 #: templates/boards/settings.html:21
 msgid "Hidden tags:"
 msgstr "Скрытые метки:"
 
 #: templates/boards/settings.html:29
 msgid "No hidden tags."
 msgstr "Нет скрытых меток."
 
 #: templates/boards/settings.html:38
 msgid "Save"
 msgstr "Сохранить"
 
 #: templates/boards/staticpages/banned.html:6
 msgid "Banned"
 msgstr "Заблокирован"
 
 #: templates/boards/staticpages/banned.html:11
 msgid "Your IP address has been banned. Contact the administrator"
 msgstr "Ваш IP адрес был заблокирован. Свяжитесь с администратором"
 
 #: templates/boards/staticpages/help.html:6
 #: templates/boards/staticpages/help.html:10
 msgid "Syntax"
 msgstr "Синтаксис"
 
 #: templates/boards/staticpages/help.html:11
 msgid "Italic text"
 msgstr "Курсивный текст"
 
 #: templates/boards/staticpages/help.html:12
 msgid "Bold text"
 msgstr "Полужирный текст"
 
 #: templates/boards/staticpages/help.html:13
 msgid "Spoiler"
 msgstr "Спойлер"
 
 #: templates/boards/staticpages/help.html:14
 msgid "Link to a post"
 msgstr "Ссылка на сообщение"
 
 #: templates/boards/staticpages/help.html:15
 msgid "Add post to this thread"
 msgstr "Добавить сообщение в эту тему"
 
 #: templates/boards/staticpages/help.html:16
 msgid "Strikethrough text"
 msgstr "Зачеркнутый текст"
 
 #: templates/boards/staticpages/help.html:17
 msgid "Comment"
 msgstr "Комментарий"
 
 #: templates/boards/staticpages/help.html:18
+#: templates/boards/staticpages/help.html:19
 msgid "Quote"
 msgstr "Цитата"
 
-#: templates/boards/staticpages/help.html:20
+#: templates/boards/staticpages/help.html:21
 msgid "You can try pasting the text and previewing the result here:"
 msgstr "Вы можете попробовать вставить текст и проверить результат здесь:"
 
 #: templates/boards/tags.html:23
 msgid "No tags found."
 msgstr "Метки не найдены."
 
+#: templates/boards/tags.html:26
+msgid "All tags"
+msgstr "Все метки"
+
 #: templates/boards/thread.html:32
 msgid "Last update: "
 msgstr "Последнее обновление: "
 
 #: templates/boards/thread_gallery.html:21
 #: templates/boards/thread_normal.html:16
 msgid "Normal mode"
 msgstr "Нормальный режим"
 
 #: templates/boards/thread_gallery.html:22
 #: templates/boards/thread_normal.html:17
 msgid "Gallery mode"
 msgstr "Режим галереи"
 
 #: templates/boards/thread_gallery.html:52
 msgid "No images."
 msgstr "Нет изображений."
 
 #: templates/boards/thread_normal.html:25
 msgid "posts to bumplimit"
 msgstr "сообщений до бамплимита"
 
 #: templates/boards/thread_normal.html:39
 msgid "Reply to thread"
 msgstr "Ответить в тему"
 
 #: templates/boards/thread_normal.html:52
 msgid "Close form"
 msgstr "Закрыть форму"
 
 #: templates/boards/thread_normal.html:68
 msgid "Update"
 msgstr "Обновить"

boards/templates/boards/base.html

@@ -1,68 +1,68 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 theme_css %}" media="all"/>
 
     <link rel="alternate" type="application/rss+xml" href="rss/" title="{% trans 'Feed' %}"/>
 
     <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>
     <script src="{% static 'js/jquery-2.0.1.min.js' %}"></script>
     <script src="{% static 'js/jquery-ui-1.10.3.custom.min.js' %}"></script>
     <script src="{% static 'js/jquery.mousewheel.js' %}"></script>
     <script src="{% url 'js_info_dict' %}"></script>
 
     <div class="navigation_panel header">
         <a class="link" href="{% url 'index' %}">{% trans "All threads" %}</a>
         {% autoescape off %}
             {{ tags_str }},
         {% endautoescape %}
-        <a href="{% url 'tags' %}" title="{% trans 'Tag management' %}"
+        <a href="{% url 'tags' 'required'%}" title="{% trans 'Tag management' %}"
                 >[...]</a>,
         <a href="{% url 'search' %}" title="{% trans 'Search' %}">[S]</a>.
 
         {% if username %}
             <a class="right-link link" href="{% url 'notifications' username %}" 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>
     </div>
 
     {% block content %}{% endblock %}
 
     <script src="{% static 'js/3party/highlight.min.js' %}"></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>
 
     <div class="navigation_panel footer">
         {% block metapanel %}{% endblock %}
         [<a href="{% url 'admin:index' %}">{% trans 'Admin' %}</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>
     </div>
 
 </body>
 </html>

boards/templates/boards/tags.html

@@ -1,28 +1,31 b''
 {% extends "boards/base.html" %}
 
 {% load i18n %}
 {% load cache %}
 
 {% block head %}
     <title>Neboard - {% trans "Tags" %}</title>
 {% endblock %}
 
 {% block content %}
 
-{% cache 600 all_tags_list %}
+{% cache 600 all_tags_list query %}
     <div class="post">
         {% if all_tags %}
             {% for tag in all_tags %}
                 <div class="tag_item">
                     {% autoescape off %}
                         {{ tag.get_view }}
                     {% endautoescape %}
                 </div>
             {% endfor %}
         {% else %}
             {% trans 'No tags found.' %}
         {% endif %}
+        {% if query %}
+            <div><a href="{% url 'tags' %}">{% trans 'All tags' %}</a></div>
+        {% endif %}
     </div>
 {% endcache %}
 
 {% endblock %}

boards/urls.py

@@ -1,81 +1,81 b''
 from django.conf.urls import patterns, url, include
 from django.contrib import admin
 from boards import views
 from boards.rss import AllThreadsFeed, TagThreadsFeed, ThreadPostsFeed
 from boards.views import api, tag_threads, all_threads, \
     settings, all_tags
 from boards.views.authors import AuthorsView
 from boards.views.ban import BanUserView
 from boards.views.notifications import NotificationView
 from boards.views.search import BoardSearchView
 from boards.views.static import StaticPageView
 from boards.views.preview import PostPreviewView
 
 js_info_dict = {
     'packages': ('boards',),
 }
 
 urlpatterns = patterns('',
     # /boards/
     url(r'^$', all_threads.AllThreadsView.as_view(), name='index'),
     # /boards/page/
     url(r'^page/(?P<page>\w+)/$', 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/tag/tag_id/page/
     url(r'^tag/(?P<tag_name>\w+)/page/(?P<page>\w+)/$',
         tag_threads.TagView.as_view(), name='tag'),
 
     # /boards/thread/
     url(r'^thread/(?P<post_id>\w+)/$', views.thread.normal.NormalThreadView.as_view(),
         name='thread'),
     url(r'^thread/(?P<post_id>\w+)/mode/gallery/$', views.thread.gallery.GalleryThreadView.as_view(),
         name='thread_gallery'),
 
     url(r'^settings/$', settings.SettingsView.as_view(), name='settings'),
-    url(r'^tags/$', all_tags.AllTagsView.as_view(), name='tags'),
+    url(r'^tags/(?P<query>\w+)?/?$', all_tags.AllTagsView.as_view(), name='tags'),
     url(r'^authors/$', AuthorsView.as_view(), name='authors'),
     url(r'^ban/(?P<post_id>\w+)/$', BanUserView.as_view(), name='ban'),
 
     url(r'^banned/$', views.banned.BannedView.as_view(), name='banned'),
     url(r'^staticpage/(?P<name>\w+)/$', StaticPageView.as_view(),
         name='staticpage'),
 
     # RSS feeds
     url(r'^rss/$', AllThreadsFeed()),
     url(r'^page/(?P<page>\w+)/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>\w+)/rss/$', ThreadPostsFeed()),
 
     # i18n
     url(r'^jsi18n/$', 'boards.views.cached_js_catalog', js_info_dict,
         name='js_info_dict'),
 
     # API
     url(r'^api/post/(?P<post_id>\w+)/$', api.get_post, name="get_post"),
     url(r'^api/diff_thread/(?P<thread_id>\w+)/(?P<last_update_time>\w+)/$',
         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'),
 
     # Search
     url(r'^search/$', BoardSearchView.as_view(), name='search'),
 
     # Notifications
     url(r'^notifications/(?P<username>\w+)$', NotificationView.as_view(), name='notifications'),
 
     # Post preview
     url(r'^preview/$', PostPreviewView.as_view(), name='preview')
 
 )

boards/views/all_tags.py

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