Show only required tags in all tags list by default

boards/locale/ru/LC_MESSAGES/django.po

@@ -7,7 +7,7 b' 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"
@@ -255,21 +255,21 b' msgstr "\xd0\xa1\xd0\xbe\xd0\xb7\xd0\xb4\xd0\xb0\xd1\x82\xd1\x8c \xd0\xbd\xd0\xbe\xd0\xb2\xd1\x83\xd1\x8e \xd1\x82\xd0\xb5\xd0\xbc\xd1\x83"'
 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 "Предпросмотр"
 
@@ -335,10 +335,11 b' 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 "Вы можете попробовать вставить текст и проверить результат здесь:"
 
@@ -346,6 +347,10 b' msgstr "\xd0\x92\xd1\x8b \xd0\xbc\xd0\xbe\xd0\xb6\xd0\xb5\xd1\x82\xd0\xb5 \xd0\xbf\xd0\xbe\xd0\xbf\xd1\x80\xd0\xbe\xd0\xb1\xd0\xbe\xd0\xb2\xd0\xb0\xd1\x82\xd1\x8c \xd0\xb2\xd1\x81\xd1\x82\xd0\xb0\xd0\xb2\xd0\xb8\xd1\x82\xd1\x8c \xd1\x82\xd0\xb5\xd0\xba\xd1\x81\xd1\x82 \xd0\xb8 \xd0\xbf\xd1\x80\xd0\xbe\xd0\xb2\xd0\xb5\xd1\x80\xd0\xb8\xd1\x82\xd1\x8c \xd1\x80\xd0\xb5\xd0\xb7\xd1\x83\xd0\xbb\xd1\x8c\xd1\x82\xd0\xb0\xd1\x82 \xd0\xb7\xd0\xb4\xd0\xb5\xd1\x81\xd1\x8c:"'
 msgid "No tags found."
 msgstr "Метки не найдены."
 
+#: templates/boards/tags.html:26
+msgid "All tags"
+msgstr "Все метки"
+
 #: templates/boards/thread.html:32
 msgid "Last update: "
 msgstr "Последнее обновление: "

boards/templates/boards/base.html

@@ -31,7 +31,7 b''
         {% 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>.
 

boards/templates/boards/tags.html

@@ -9,7 +9,7 b''
 
 {% block content %}
 
-{% cache 600 all_tags_list %}
+{% cache 600 all_tags_list query %}
     <div class="post">
         {% if all_tags %}
             {% for tag in all_tags %}
@@ -22,6 +22,9 b''
         {% else %}
             {% trans 'No tags found.' %}
         {% endif %}
+        {% if query %}
+            <div><a href="{% url 'tags' %}">{% trans 'All tags' %}</a></div>
+        {% endif %}
     </div>
 {% endcache %}
 

boards/urls.py

@@ -36,7 +36,7 b" urlpatterns = patterns('',"
         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'),
 

boards/views/all_tags.py

@@ -4,11 +4,19 b' from boards.views.base import BaseBoardV'
 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)