Refactored post view, added a hint of how to add new tags to favorites

boards/forms.py

@@ -33,7 +33,7 b" ATTRIBUTE_ROWS = 'rows'"
 LAST_POST_TIME = 'last_post_time'
 LAST_LOGIN_TIME = 'last_login_time'
 TEXT_PLACEHOLDER = _('Type message here. Use formatting panel for more advanced usage.')
-TAGS_PLACEHOLDER = _('tag1 several_words_tag')
+TAGS_PLACEHOLDER = _('music images i_dont_like_tags')
 
 LABEL_TITLE = _('Title')
 LABEL_TEXT = _('Text')

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-04-07 15:26+0300\n"
+"POT-Creation-Date: 2015-04-14 13:07+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"
@@ -44,8 +44,8 b' msgstr ""'
 "Вводите сообщение сюда. Используйте панель для более сложного форматирования."
 
 #: forms.py:36
-msgid "tag1 several_words_tag"
-msgstr "метка1 метка_из_нескольких_слов"
+msgid "music images i_dont_like_tags"
+msgstr "музыка картинки теги_не_нужны"
 
 #: forms.py:38
 msgid "Title"
@@ -59,7 +59,7 b' msgstr "\xd0\xa2\xd0\xb5\xd0\xba\xd1\x81\xd1\x82"'
 msgid "Tag"
 msgstr "Метка"
 
-#: forms.py:41 templates/boards/base.html:36 templates/search/search.html:7
+#: forms.py:41 templates/boards/base.html:40 templates/search/search.html:7
 msgid "Search"
 msgstr "Поиск"
 
@@ -76,7 +76,6 b' msgid "e-mail"'
 msgstr ""
 
 #: forms.py:152
-#| msgid "All threads"
 msgid "Additional threads"
 msgstr "Дополнительные темы"
 
@@ -94,50 +93,50 b' msgstr "\xd0\xa2\xd0\xb5\xd0\xba\xd1\x81\xd1\x82 \xd0\xb4\xd0\xbe\xd0\xbb\xd0\xb6\xd0\xb5\xd0\xbd \xd0\xb1\xd1\x8b\xd1\x82\xd1\x8c \xd0\xba\xd0\xbe\xd1\x80\xd0\xbe\xd1\x87\xd0\xb5 %s \xd1\x81\xd0\xb8\xd0\xbc\xd0\xb2\xd0\xbe\xd0\xbb\xd0\xbe\xd0\xb2"'
 msgid "Invalid URL"
 msgstr "Неверный URL"
 
-#: forms.py:214
+#: forms.py:215
 msgid "Invalid additional thread list"
 msgstr "Неверный список дополнительных тем"
 
-#: forms.py:249
+#: forms.py:250
 msgid "Either text or image must be entered."
 msgstr "Текст или картинка должны быть введены."
 
-#: forms.py:265
+#: forms.py:266
 #, python-format
 msgid "Wait %s seconds after last posting"
 msgstr "Подождите %s секунд после последнего постинга"
 
-#: forms.py:277
+#: forms.py:278
 #, python-format
 msgid "Image must be less than %s bytes"
 msgstr "Изображение должно быть менее %s байт"
 
-#: forms.py:324 templates/boards/posting_general.html:148
+#: forms.py:325 templates/boards/posting_general.html:148
 #: templates/boards/rss/post.html:10 templates/boards/tags.html:7
 msgid "Tags"
 msgstr "Метки"
 
-#: forms.py:331
+#: forms.py:332
 msgid "Inappropriate characters in tags."
 msgstr "Недопустимые символы в метках."
 
-#: forms.py:342
+#: forms.py:343
 msgid "Need at least 1 required tag."
 msgstr "Нужна хотя бы 1 обязательная метка."
 
-#: forms.py:354
+#: forms.py:355
 msgid "Theme"
 msgstr "Тема"
 
-#: forms.py:355
+#: forms.py:356
 msgid "User name"
 msgstr "Имя пользователя"
 
-#: forms.py:356
+#: forms.py:357
 msgid "Time zone"
 msgstr "Часовой пояс"
 
-#: forms.py:362
+#: forms.py:363
 msgid "Inappropriate characters."
 msgstr "Недопустимые символы."
 
@@ -173,29 +172,33 b' msgstr "\xd0\x9b\xd0\xb5\xd0\xbd\xd1\x82\xd0\xb0"'
 msgid "All threads"
 msgstr "Все темы"
 
-#: templates/boards/base.html:34
+#: templates/boards/base.html:36
+msgid "Add tags"
+msgstr "Добавить метки"
+
+#: templates/boards/base.html:38
 msgid "Tag management"
 msgstr "Управление метками"
 
-#: templates/boards/base.html:39 templates/boards/base.html.py:40
+#: templates/boards/base.html:43 templates/boards/base.html.py:44
 #: templates/boards/notifications.html:8
 msgid "Notifications"
 msgstr "Уведомления"
 
-#: templates/boards/base.html:47 templates/boards/settings.html:9
+#: templates/boards/base.html:51 templates/boards/settings.html:9
 msgid "Settings"
 msgstr "Настройки"
 
-#: templates/boards/base.html:60
+#: templates/boards/base.html:64
 msgid "Admin"
 msgstr "Администрирование"
 
-#: templates/boards/base.html:62
+#: templates/boards/base.html:66
 #, python-format
 msgid "Speed: %(ppd)s posts per day"
 msgstr "Скорость: %(ppd)s сообщений в день"
 
-#: templates/boards/base.html:64
+#: templates/boards/base.html:68
 msgid "Up"
 msgstr "Вверх"
 
@@ -229,11 +232,11 b' msgstr "\xd0\x98\xd0\xb7\xd0\xbc\xd0\xb5\xd0\xbd\xd0\xb8\xd1\x82\xd1\x8c \xd1\x82\xd0\xb5\xd0\xbc\xd1\x83"'
 msgid "Replies"
 msgstr "Ответы"
 
-#: templates/boards/post.html:86 templates/boards/thread.html:30
+#: templates/boards/post.html:86 templates/boards/thread.html:31
 msgid "messages"
 msgstr "сообщений"
 
-#: templates/boards/post.html:87 templates/boards/thread.html:31
+#: templates/boards/post.html:87 templates/boards/thread.html:32
 msgid "images"
 msgstr "изображений"
 
@@ -356,7 +359,7 b' msgstr "\xd0\x9c\xd0\xb5\xd1\x82\xd0\xba\xd0\xb8 \xd0\xbd\xd0\xb5 \xd0\xbd\xd0\xb0\xd0\xb9\xd0\xb4\xd0\xb5\xd0\xbd\xd1\x8b."'
 msgid "All tags"
 msgstr "Все метки"
 
-#: templates/boards/thread.html:32
+#: templates/boards/thread.html:33
 msgid "Last update: "
 msgstr "Последнее обновление: "
 
@@ -392,5 +395,7 b' msgstr "\xd0\x9e\xd0\xb1\xd0\xbd\xd0\xbe\xd0\xb2\xd0\xb8\xd1\x82\xd1\x8c"'
 
 #: templates/search/search.html:17
 msgid "Ok"
-msgstr ""
+msgstr "Ок"
 
+#~ msgid "tag1 several_words_tag"
+#~ msgstr "метка1 метка_из_нескольких_слов"

boards/templates/boards/base.html

@@ -28,9 +28,13 b''
 
     <div class="navigation_panel header">
         <a class="link" href="{% url 'index' %}">{% trans "All threads" %}</a>
-        {% autoescape off %}
-            {{ tags_str }},
-        {% endautoescape %}
+        {% if tags_str %}
+            {% autoescape off %}
+                {{ tags_str }},
+            {% endautoescape %}
+        {% else %}
+            {% trans 'Add tags' %} → 
+        {% endif %}
         <a href="{% url 'tags' 'required'%}" title="{% trans 'Tag management' %}"
                 >[...]</a>,
         <a href="{% url 'search' %}" title="{% trans 'Search' %}">[S]</a>.

boards/templates/boards/post.html

@@ -4,92 +4,85 b''
 
 {% get_current_language as LANGUAGE_CODE %}
 
-{% if thread.archived %}
-    <div class="post archive_post" id="{{ post.id }}">
-{% elif bumpable %}
-    <div class="post" id="{{ post.id }}">
-{% else %}
-    <div class="post dead_post" id="{{ post.id }}">
-{% endif %}
-
-<div class="post-info">
-    <a class="post_id" href="{{ post.get_url }}">({{ post.get_absolute_id }})</a>
-    <span class="title">{{ post.title }}</span>
-    <span class="pub_time"><time datetime="{{ post.pub_time|date:'c' }}">{{ post.pub_time|date:'r' }}</time></span>
-    {% comment %}
-        Thread death time needs to be shown only if the thread is alredy archived
-        and this is an opening post (thread death time) or a post for popup
-        (we don't see OP here so we show the death time in the post itself).
-    {% endcomment %}
-    {% if thread.archived %}
-        {% if is_opening %}
-        — <time datetime="{{ thread.bump_time|date:'c' }}">{{ thread.bump_time|date:'r' }}</time>
+<div class="{{ css_class }}" id="{{ post.id }}">
+    <div class="post-info">
+        <a class="post_id" href="{{ post.get_url }}">({{ post.get_absolute_id }})</a>
+        <span class="title">{{ post.title }}</span>
+        <span class="pub_time"><time datetime="{{ post.pub_time|date:'c' }}">{{ post.pub_time|date:'r' }}</time></span>
+        {% comment %}
+            Thread death time needs to be shown only if the thread is alredy archived
+            and this is an opening post (thread death time) or a post for popup
+            (we don't see OP here so we show the death time in the post itself).
+        {% endcomment %}
+        {% if thread.archived %}
+            {% if is_opening %}
+            — <time datetime="{{ thread.bump_time|date:'c' }}">{{ thread.bump_time|date:'r' }}</time>
+            {% endif %}
         {% endif %}
-    {% endif %}
-    {% if is_opening and need_open_link %}
-        {% if thread.archived %}
-            <a class="link" href="{% url 'thread' post.id %}">{% trans "Open" %}</a>
-        {% else %}
-            <a class="link" href="{% url 'thread' post.id %}#form">{% trans "Reply" %}</a>
+        {% if is_opening and need_open_link %}
+            {% if thread.archived %}
+                <a class="link" href="{% url 'thread' post.id %}">{% trans "Open" %}</a>
+            {% else %}
+                <a class="link" href="{% url 'thread' post.id %}#form">{% trans "Reply" %}</a>
+            {% endif %}
         {% endif %}
-    {% endif %}
-    {% if reply_link and not thread.archived %}
-        <a href="#form" onclick="addQuickReply('{{ post.id }}'); return false;">{% trans 'Reply' %}</a>
-    {% endif %}
+        {% if reply_link and not thread.archived %}
+            <a href="#form" onclick="addQuickReply('{{ post.id }}'); return false;">{% trans 'Reply' %}</a>
+        {% endif %}
 
-    {% if moderator %}
-        <span class="moderator_info">
-            <a href="{% url 'admin:boards_post_change' post.id %}">{% trans 'Edit' %}</a>
-            {% if is_opening %}
-                | <a href="{% url 'admin:boards_thread_change' thread.id %}">{% trans 'Edit thread' %}</a>
-            {% endif %}
-        </span>
+        {% if moderator %}
+            <span class="moderator_info">
+                <a href="{% url 'admin:boards_post_change' post.id %}">{% trans 'Edit' %}</a>
+                {% if is_opening %}
+                    | <a href="{% url 'admin:boards_thread_change' thread.id %}">{% trans 'Edit thread' %}</a>
+                {% endif %}
+            </span>
+        {% endif %}
+    </div>
+    {% comment %}
+        Post images. Currently only 1 image can be posted and shown, but post model
+        supports multiple.
+    {%  endcomment %}
+    {% if post.images.exists %}
+        {% with post.images.all.0 as image %}
+            {% autoescape off %}
+                {{ image.get_view }}
+            {% endautoescape %}
+        {% endwith %}
     {% endif %}
-</div>
-{% comment %}
-    Post images. Currently only 1 image can be posted and shown, but post model
-    supports multiple.
-{%  endcomment %}
-{% if post.images.exists %}
-    {% with post.images.all.0 as image %}
+    {% comment %}
+        Post message (text)
+    {% endcomment %}
+    <div class="message">
         {% autoescape off %}
-            {{ image.get_view }}
+            {% if truncated %}
+                {{ post.get_text|truncatewords_html:50 }}
+            {% else %}
+                {{ post.get_text }}
+            {% endif %}
         {% endautoescape %}
-    {% endwith %}
-{% endif %}
-{% comment %}
-    Post message (text)
-{% endcomment %}
-<div class="message">
-    {% autoescape off %}
-        {% if truncated %}
-            {{ post.get_text|truncatewords_html:50 }}
-        {% else %}
-            {{ post.get_text }}
+        {% if post.is_referenced %}
+            <div class="refmap">
+                {% autoescape off %}
+                    {% trans "Replies" %}: {{ post.refmap }}
+                {% endautoescape %}
+            </div>
         {% endif %}
-    {% endautoescape %}
-    {% if post.is_referenced %}
-        <div class="refmap">
-            {% autoescape off %}
-                {% trans "Replies" %}: {{ post.refmap }}
-            {% endautoescape %}
+    </div>
+    {% comment %}
+        Thread metadata: counters, tags etc
+    {% endcomment %}
+    {% if is_opening %}
+        <div class="metadata">
+            {% if is_opening and need_open_link %}
+                {{ thread.get_reply_count }} {% trans 'messages' %},
+                {{ thread.get_images_count }} {% trans 'images' %}.
+            {% endif %}
+            <span class="tags">
+                {% autoescape off %}
+                    {{ thread.get_tag_url_list }}
+                {% endautoescape %}
+            </span>
         </div>
     {% endif %}
 </div>
-{% comment %}
-    Thread metadata: counters, tags etc
-{% endcomment %}
-{% if is_opening %}
-    <div class="metadata">
-        {% if is_opening and need_open_link %}
-            {{ thread.get_reply_count }} {% trans 'messages' %},
-            {{ thread.get_images_count }} {% trans 'images' %}.
-        {% endif %}
-        <span class="tags">
-            {% autoescape off %}
-                {{ thread.get_tag_url_list }}
-            {% endautoescape %}
-        </span>
-    </div>
-{% endif %}
-</div>

boards/templatetags/board.py

@@ -43,7 +43,6 b' def image_actions(*args, **kwargs):'
         action['link'] % image_link, action['name'])for action in actions])
 
 
-# TODO Use get_view of a post instead of this
 @register.inclusion_tag('boards/post.html', name='post_view')
 def post_view(post, moderator=False, need_open_link=False, truncated=False,
               reply_link=False, **kwargs):
@@ -53,87 +52,27 b' def post_view(post, moderator=False, nee'
 
     thread = post.get_thread()
     is_opening = post.is_opening()
-    can_bump = thread.can_bump()
 
     if is_opening:
         opening_post_id = post.id
     else:
         opening_post_id = thread.get_opening_post_id()
 
+    css_class = 'post'
+    if thread.archived:
+        css_class += ' archive_post'
+    elif not thread.can_bump():
+        css_class += ' dead_post'
+
     return {
         'post': post,
         'moderator': moderator,
         'is_opening': is_opening,
         'thread': thread,
-        'bumpable': can_bump,
+        'css_class': css_class,
         'need_open_link': need_open_link,
         'truncated': truncated,
         'opening_post_id': opening_post_id,
         'reply_link': reply_link,
     }
 
-
-# TODO Fix or remove this method
[e-mail](is_safe=True)
-def truncate_lines(text, length):
-    if length <= 0:
-        return ''
-
-    html4_singlets = (
-        'br', 'col', 'link', 'base', 'img',
-        'param', 'area', 'hr', 'input'
-    )
-
-    # Count non-HTML chars/words and keep note of open tags
-    pos = 0
-    end_text_pos = 0
-    current_len = 0
-    open_tags = []
-
-    while current_len <= length:
-        m = REGEX_LINES.search(text, pos)
-        if not m:
-            # Checked through whole string
-            break
-        pos = m.end(0)
-        if m.group(1):
-            # It's an actual non-HTML word or char
-            current_len += 1
-            if current_len == length:
-                end_text_pos = m.start(0)
-            continue
-        # Check for tag
-        tag = REGEX_TAG.match(m.group(0))
-        if not tag or current_len >= length:
-            # Don't worry about non tags or tags after our truncate point
-            continue
-        closing_tag, tagname, self_closing = tag.groups()
-        # Element names are always case-insensitive
-        tagname = tagname.lower()
-        if self_closing or tagname in html4_singlets:
-            pass
-        elif closing_tag:
-            # Check for match in open tags list
-            try:
-                i = open_tags.index(tagname)
-            except ValueError:
-                pass
-            else:
-                # SGML: An end tag closes, back to the matching start tag,
-                # all unclosed intervening start tags with omitted end tags
-                open_tags = open_tags[i + 1:]
-        else:
-            # Add it to the start of the open tags list
-            open_tags.insert(0, tagname)
-
-    if current_len <= length:
-        return text
-    out = text[:end_text_pos]
-
-    if not out.endswith(ELLIPSIZER):
-        out += ELLIPSIZER
-    # Close any tags still open
-    for tag in open_tags:
-        out += '</%s>' % tag
-    # Return string
-    return out