Removed truncated post view, using an argument for this mode. Fixed bumpable argument in thread

boards/templates/boards/api_post.html

@@ -1,7 +1,3 b''
 {% load board %}
 
-{% if truncated %}
-    {% post_view_truncated post %}
-{% else %}
-    {% post_view post %}
-{% endif %}
+{% post_view post truncated=truncated %}
  No newline at end of file

boards/templates/boards/posting_general.html

@@ -1,163 +1,163 b''
 {% extends "boards/base.html" %}
 
 {% load i18n %}
 {% load cache %}
 {% load board %}
 {% load static %}
 
 {% block head %}
     {% if tag %}
         <title>{{ tag.name }} - {{ site_name }}</title>
     {% else %}
         <title>{{ site_name }}</title>
     {% endif %}
 
     {% if current_page.has_previous %}
         <link rel="prev" href="
             {% if tag %}
                 {% url "tag" tag_name=tag page=current_page.previous_page_number %}
             {% elif archived %}
                 {% url "archive" page=current_page.previous_page_number %}
             {% else %}
                 {% url "index" page=current_page.previous_page_number %}
             {% endif %}
         " />
     {% endif %}
     {% if current_page.has_next %}
         <link rel="next" href="
             {% if tag %}
                 {% url "tag" tag_name=tag page=current_page.next_page_number %}
             {% elif archived %}
                 {% url "archive" page=current_page.next_page_number %}
             {% else %}
                 {% url "index" page=current_page.next_page_number %}
             {% endif %}
         " />
     {% endif %}
 
 {% endblock %}
 
 {% block content %}
 
     {% get_current_language as LANGUAGE_CODE %}
 
 {% if tag %}
     <div class="tag_info">
         <h2>
             {% if tag in user.fav_tags.all %}
                 <a href="{% url 'tag' tag.name %}?method=unsubscribe&next={{ request.path }}"
                    class="fav">★</a>
             {% else %}
                 <a href="{% url 'tag' tag.name %}?method=subscribe&next={{ request.path }}"
                    class="not_fav">★</a>
             {% endif %}
             #{{ tag.name }}
         </h2>
     </div>
 {% endif %}
 
     {% if threads %}
         {% if current_page.has_previous %}
             <div class="page_link">
                 <a href="
             {% if tag %}
                 {% url "tag" tag_name=tag page=current_page.previous_page_number %}
             {% elif archived %}
                 {% url "archive" page=current_page.previous_page_number %}
             {% else %}
                 {% url "index" page=current_page.previous_page_number %}
             {% endif %}
                 ">{% trans "Previous page" %}</a>
             </div>
         {% endif %}
 
         {% for thread in threads %}
             {% cache 600 thread_short thread.id thread.last_edit_time moderator LANGUAGE_CODE %}
             <div class="thread">
                 {% with can_bump=thread.can_bump %}
-                {% post_view_truncated thread.get_opening_post True moderator is_opening=True thread=thread can_bump=can_bump %}
+                {% post_view thread.get_opening_post moderator is_opening=True thread=thread can_bump=can_bump truncated=True need_open_link=True %}
                 {% if not thread.archived %}
                 {% if thread.get_last_replies.exists %}
                     {% if thread.get_skipped_replies_count %}
                         <div class="skipped_replies">
                             <a href="{% url 'thread' thread.get_opening_post.id %}">
                                 {% blocktrans with count=thread.get_skipped_replies_count %}Skipped {{ count }} replies. Open thread to see all replies.{% endblocktrans %}
                             </a>
                         </div>
                     {% endif %}
                     <div class="last-replies">
                         {% for post in thread.get_last_replies %}
-                            {% post_view_truncated post moderator=moderator is_opening=False thread=thread can_bump=can_bump %}
+                            {% post_view post moderator=moderator is_opening=False thread=thread can_bump=can_bump truncated=True %}
                         {% endfor %}
                     </div>
                 {% endif %}
                 {% endif %}
                 {% endwith %}
         </div>
         {% endcache %}
         {% endfor %}
 
         {% if current_page.has_next %}
             <div class="page_link">
                 <a href="
             {% if tag %}
                 {% url "tag" tag_name=tag page=current_page.next_page_number %}
             {% elif archived %}
                 {% url "archive" page=current_page.next_page_number %}
             {% else %}
                 {% url "index" page=current_page.next_page_number %}
             {% endif %}
                 ">{% trans "Next page" %}</a>
             </div>
         {% endif %}
     {% else %}
         <div class="post">
             {% trans 'No threads exist. Create the first one!' %}</div>
     {% endif %}
 
     <div class="post-form-w">
         <script src="{% static 'js/panel.js' %}"></script>
         <div class="post-form">
             <div class="form-title">{% trans "Create new thread" %}</div>
             <form enctype="multipart/form-data" method="post">{% csrf_token %}
                 {{ form.as_div }}
                 <div class="form-submit">
                     <input type="submit" value="{% trans "Post" %}"/>
                 </div>
             </form>
             <div>
                 {% trans 'Tags must be delimited by spaces. Text or image is required.' %}
             </div>
             <div><a href="{% url "staticpage" name="help" %}">
                 {% trans 'Text syntax' %}</a></div>
         </div>
     </div>
 
 {% endblock %}
 
 {% block metapanel %}
 
     <span class="metapanel">
         <b><a href="{% url "authors" %}">{{ site_name }}</a> {{ version }}</b>
         {% trans "Pages:" %}[
         {% for page in paginator.page_range %}
             <a
                 {% ifequal page current_page.number %}
                     class="current_page"
                 {% endifequal %}
                 href="
             {% if tag %}
                 {% url "tag" tag_name=tag page=page %}
             {% elif archived %}
                 {% url "archive" page=page %}
             {% else %}
                 {% url "index" page=page %}
             {% endif %}
             ">{{ page }}</a>
             {% if not forloop.last %},{% endif %}
         {% endfor %}
         ]
         [<a href="rss/">RSS</a>]
     </span>
 
 {% endblock %}

boards/templatetags/board.py

@@ -1,104 +1,74 b''
 from django.shortcuts import get_object_or_404
 from boards.models import Post
 from boards.views import thread, api
 from django import template
 
 register = template.Library()
 
 actions = [
     {
         'name': 'google',
         'link': 'http://google.com/searchbyimage?image_url=%s',
     },
     {
         'name': 'iqdb',
         'link': 'http://iqdb.org/?url=%s',
     },
 ]
 
 
 @register.simple_tag(name='post_url')
 def post_url(*args, **kwargs):
     post_id = args[0]
 
     post = get_object_or_404(Post, id=post_id)
 
     return post.get_url()
 
 
 @register.simple_tag(name='image_actions')
 def image_actions(*args, **kwargs):
     image_link = args[0]
     if len(args) > 1:
         image_link = 'http://' + args[1] + image_link # TODO https?
 
     result = ''
 
     for action in actions:
         result += '[<a href="' + action['link'] % image_link + '">' + \
                   action['name'] + '</a>]'
 
     return result
 
 
 @register.inclusion_tag('boards/post.html', name='post_view')
-def post_view(post, moderator=False, **kwargs):
+def post_view(post, moderator=False, need_open_link=False, truncated=False,
+              **kwargs):
     """
     Get post
     """
 
     if 'is_opening' in kwargs:
         is_opening = kwargs['is_opening']
     else:
         is_opening = post.is_opening()
 
     if 'thread' in kwargs:
         thread = kwargs['thread']
     else:
         thread = post.thread_new
 
-#    if 'can_bump' in kwargs:
-#        can_bump = kwargs['can_bump']
-#    else:
-    can_bump = thread.can_bump()
-
-    return {
-        'post': post,
-        'moderator': moderator,
-        'is_opening': is_opening,
-        'thread': thread,
-        'bumpable': can_bump,
-    }
-
-
[e-mail]_tag('boards/post.html', name='post_view_truncated')
-def post_view_truncated(post, need_open_link=False, moderator=False, **kwargs):
-    """
-    Get post with truncated text. If the 'open' or 'reply' link is needed, pass
-    the second parameter as True.
-    """
-
-    if 'is_opening' in kwargs:
-        is_opening = kwargs['is_opening']
-    else:
-        is_opening = post.is_opening()
-
-    if 'thread' in kwargs:
-        thread = kwargs['thread']
-    else:
-        thread = post.thread_new
-
     if 'can_bump' in kwargs:
         can_bump = kwargs['can_bump']
     else:
         can_bump = thread.can_bump()
 
     return {
         'post': post,
-        'truncated': True,
-        'need_open_link': need_open_link,
         'moderator': moderator,
         'is_opening': is_opening,
         'thread': thread,
         'bumpable': can_bump,
-    }
+        'need_open_link': need_open_link,
+        'truncated': truncated,
+    }
  No newline at end of file