-{% elif bumpable %} -

-{% else %} -

-{% endif %} - -

- ({{ post.get_absolute_id }}) - {{ post.title }} - {{ post.pub_time|date:'r' }} - {% 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 %} - — {{ thread.bump_time|date:'r' }} +

+ ({{ post.get_absolute_id }}) + {{ post.title }} + {{ post.pub_time|date:'r' }} + {% 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 %} + — {{ thread.bump_time|date:'r' }} + {% endif %} {% endif %} - {% endif %} - {% if is_opening and need_open_link %} - {% if thread.archived %} - {% trans "Open" %} - {% else %} - {% trans "Reply" %} + {% if is_opening and need_open_link %} + {% if thread.archived %} + {% trans "Open" %} + {% else %} + {% trans "Reply" %} + {% endif %} {% endif %} - {% endif %} - {% if reply_link and not thread.archived %} - {% trans 'Reply' %} - {% endif %} + {% if reply_link and not thread.archived %} + {% trans 'Reply' %} + {% endif %} - {% if moderator %} - - {% trans 'Edit' %} - {% if is_opening %} - | {% trans 'Edit thread' %} - {% endif %} - + {% if moderator %} + + {% trans 'Edit' %} + {% if is_opening %} + | {% trans 'Edit thread' %} + {% endif %} + + {% endif %} +

+ {% 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 %} -

-{% 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 %} +

{% 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 %} -

- {% autoescape off %} - {% if truncated %} - {{ post.get_text|truncatewords_html:50 }} - {% else %} - {{ post.get_text }} + {% if post.is_referenced %} +

+ {% autoescape off %} + {% trans "Replies" %}: {{ post.refmap }} + {% endautoescape %} +

{% endif %} - {% endautoescape %} - {% if post.is_referenced %} -

- {% autoescape off %} - {% trans "Replies" %}: {{ post.refmap }} - {% endautoescape %} +

+ {% comment %} + Thread metadata: counters, tags etc + {% endcomment %} + {% if is_opening %} +

+ {% if is_opening and need_open_link %} + {{ thread.get_reply_count }} {% trans 'messages' %}, + {{ thread.get_images_count }} {% trans 'images' %}. + {% endif %} + + {% autoescape off %} + {{ thread.get_tag_url_list }} + {% endautoescape %} +

{% endif %}

-{% comment %} - Thread metadata: counters, tags etc -{% endcomment %} -{% if is_opening %} -

- {% if is_opening and need_open_link %} - {{ thread.get_reply_count }} {% trans 'messages' %}, - {{ thread.get_images_count }} {% trans 'images' %}. - {% endif %} - - {% autoescape off %} - {{ thread.get_tag_url_list }} - {% endautoescape %} - -

-{% endif %} -

diff --git a/boards/templatetags/board.py b/boards/templatetags/board.py --- a/boards/templatetags/board.py +++ b/boards/templatetags/board.py @@ -43,7 +43,6 @@ 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 @@ 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 -@register.filter(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 += '' % tag - # Return string - return out