# HG changeset patch
# User neko259 <neko259@gmail.com>
# Date 2015-08-03 15:28:29
# Node ID 6b9c7236c1ad3cbc0be2fe42e1da910548868bfc
# Parent  be089b6c757242aef19e4c20d7ab046ed091d3e2

Required tags are now called sections and split up in the all tags list

diff --git a/boards/locale/ru/LC_MESSAGES/django.mo b/boards/locale/ru/LC_MESSAGES/django.mo
index fef6b3383e27e90f945fab09ea4c7f772026d648..2658e13e1165d63ae83f01110169b9fc48dbe85e
GIT binary patch
literal 7654
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

diff --git a/boards/locale/ru/LC_MESSAGES/django.po b/boards/locale/ru/LC_MESSAGES/django.po
--- a/boards/locale/ru/LC_MESSAGES/django.po
+++ b/boards/locale/ru/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-07-24 13:39+0300\n"
+"POT-Creation-Date: 2015-08-03 18:26+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -111,7 +111,7 @@ msgstr "Текст или картинка должны быть введены."
 msgid "Image must be less than %s bytes"
 msgstr "Изображение должно быть менее %s байт"
 
-#: forms.py:338 templates/boards/all_threads.html:128
+#: forms.py:338 templates/boards/all_threads.html:136
 #: templates/boards/rss/post.html:10 templates/boards/tags.html:6
 msgid "Tags"
 msgstr "Метки"
@@ -156,59 +156,59 @@ msgstr "Этой страницы не существует"
 msgid "Related message"
 msgstr "Связанное сообщение"
 
-#: templates/boards/all_threads.html:60
+#: templates/boards/all_threads.html:68
 msgid "Edit tag"
 msgstr "Изменить метку"
 
-#: templates/boards/all_threads.html:63
+#: templates/boards/all_threads.html:71
 #, python-format
 msgid "This tag has %(thread_count)s threads and %(post_count)s posts."
 msgstr "С этой меткой есть %(thread_count)s тем и %(post_count)s сообщений."
 
-#: templates/boards/all_threads.html:70 templates/boards/feed.html:30
+#: templates/boards/all_threads.html:78 templates/boards/feed.html:30
 #: templates/boards/notifications.html:17 templates/search/search.html:26
 msgid "Previous page"
 msgstr "Предыдущая страница"
 
-#: templates/boards/all_threads.html:84
+#: templates/boards/all_threads.html:92
 #, python-format
 msgid "Skipped %(count)s replies. Open thread to see all replies."
 msgstr "Пропущено %(count)s ответов. Откройте тред, чтобы увидеть все ответы."
 
-#: templates/boards/all_threads.html:102 templates/boards/feed.html:40
+#: templates/boards/all_threads.html:110 templates/boards/feed.html:40
 #: templates/boards/notifications.html:27 templates/search/search.html:37
 msgid "Next page"
 msgstr "Следующая страница"
 
-#: templates/boards/all_threads.html:107
+#: templates/boards/all_threads.html:115
 msgid "No threads exist. Create the first one!"
 msgstr "Нет тем. Создайте первую!"
 
-#: templates/boards/all_threads.html:113
+#: templates/boards/all_threads.html:121
 msgid "Create new thread"
 msgstr "Создать новую тему"
 
-#: templates/boards/all_threads.html:118 templates/boards/preview.html:16
+#: templates/boards/all_threads.html:126 templates/boards/preview.html:16
 #: templates/boards/thread_normal.html:38
 msgid "Post"
 msgstr "Отправить"
 
-#: templates/boards/all_threads.html:123
+#: templates/boards/all_threads.html:131
 msgid "Tags must be delimited by spaces. Text or image is required."
 msgstr ""
 "Метки должны быть разделены пробелами. Текст или изображение обязательны."
 
-#: templates/boards/all_threads.html:125 templates/boards/preview.html:6
+#: templates/boards/all_threads.html:133 templates/boards/preview.html:6
 #: templates/boards/staticpages/help.html:21
 #: templates/boards/thread_normal.html:42
 msgid "Preview"
 msgstr "Предпросмотр"
 
-#: templates/boards/all_threads.html:127 templates/boards/thread_normal.html:45
+#: templates/boards/all_threads.html:135 templates/boards/thread_normal.html:45
 msgid "Text syntax"
 msgstr "Синтаксис текста"
 
-#: templates/boards/all_threads.html:141 templates/boards/feed.html:53
+#: templates/boards/all_threads.html:149 templates/boards/feed.html:53
 msgid "Pages:"
 msgstr "Страницы: "
 
@@ -257,7 +257,6 @@ msgid "feed"
 msgstr "лента"
 
 #: templates/boards/base.html:42 templates/boards/random.html:6
-#| msgid "No images."
 msgid "Random images"
 msgstr "Случайные изображения"
 
@@ -315,11 +314,11 @@ msgstr "Изменить тему"
 msgid "Replies"
 msgstr "Ответы"
 
-#: templates/boards/post.html:97 templates/boards/thread.html:37
+#: templates/boards/post.html:97 templates/boards/thread.html:34
 msgid "messages"
 msgstr "сообщений"
 
-#: templates/boards/post.html:98 templates/boards/thread.html:38
+#: templates/boards/post.html:98 templates/boards/thread.html:35
 msgid "images"
 msgstr "изображений"
 
@@ -389,13 +388,19 @@ msgstr "Цитата"
 msgid "You can try pasting the text and previewing the result here:"
 msgstr "Вы можете попробовать вставить текст и проверить результат здесь:"
 
-#: templates/boards/tags.html:21
-msgid "No tags found."
-msgstr "Метки не найдены."
+#: templates/boards/tags.html:14
+msgid "Sections:"
+msgstr "Разделы:"
 
-#: templates/boards/tags.html:24
-msgid "All tags"
-msgstr "Все метки"
+#: templates/boards/tags.html:26
+#| msgid "Hidden tags:"
+msgid "Other tags:"
+msgstr "Другие метки:"
+
+#: templates/boards/tags.html:38
+#| msgid "All tags"
+msgid "All tags..."
+msgstr "Все метки..."
 
 #: templates/boards/thread.html:15
 msgid "Normal"
@@ -409,7 +414,7 @@ msgstr "Галерея"
 msgid "Tree"
 msgstr "Дерево"
 
-#: templates/boards/thread.html:39
+#: templates/boards/thread.html:36
 msgid "Last update: "
 msgstr "Последнее обновление: "
 
@@ -429,10 +434,7 @@ msgstr "Ответить в тему"
 msgid "Close form"
 msgstr "Закрыть форму"
 
-#: templates/boards/thread_normal.html:60
-msgid "Update"
-msgstr "Обновить"
-
 #: templates/search/search.html:17
 msgid "Ok"
 msgstr "Ок"
+
diff --git a/boards/templates/boards/tags.html b/boards/templates/boards/tags.html
--- a/boards/templates/boards/tags.html
+++ b/boards/templates/boards/tags.html
@@ -9,7 +9,21 @@
 {% block content %}
 
 <div class="post">
+    {% if section_tags %}
+        <div>
+        {% trans 'Sections:' %}
+        {% for tag in section_tags %}
+            <div class="tag_item">
+                {% autoescape off %}
+                    {{ tag.get_view }}
+                {% endautoescape %}
+            </div>
+        {% endfor %}
+        </div>
+    {% endif %}
     {% if all_tags %}
+        <div>
+        {% trans 'Other tags:' %}
         {% for tag in all_tags %}
             <div class="tag_item">
                 {% autoescape off %}
@@ -17,11 +31,11 @@
                 {% endautoescape %}
             </div>
         {% endfor %}
-    {% else %}
-        {% trans 'No tags found.' %}
+        </div>
     {% endif %}
+
     {% if query %}
-        <div><a href="{% url 'tags' %}">{% trans 'All tags' %}</a></div>
+        <div><a href="{% url 'tags' %}">{% trans 'All tags...' %}</a></div>
     {% endif %}
 </div>
 
diff --git a/boards/views/all_tags.py b/boards/views/all_tags.py
--- a/boards/views/all_tags.py
+++ b/boards/views/all_tags.py
@@ -4,6 +4,7 @@ from boards.views.base import BaseBoardV
 from boards.models.tag import Tag
 
 
+PARAM_SECTION_TAGS = 'section_tags'
 PARAM_TAGS = 'all_tags'
 PARAM_QUERY = 'query'
 
@@ -13,10 +14,10 @@ class AllTagsView(BaseBoardView):
     def get(self, request, query=None):
         params = dict()
 
-        if query == 'required':
-            params[PARAM_TAGS] = Tag.objects.filter(required=True)
-        else:
-            params[PARAM_TAGS] = Tag.objects.get_not_empty_tags()
+        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
 
         return render(request, 'boards/tags.html', params)