Added tree mode for the thread

boards/migrations/0019_auto_20150519_1323.py

@@ -0,0 +1,19 b''
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('boards', '0018_banner'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='post',
+            name='referenced_posts',
+            field=models.ManyToManyField(db_index=True, to='boards.Post', null=True, related_name='refposts', blank=True),
+        ),
+    ]

boards/templates/boards/thread_tree.html

@@ -0,0 +1,19 b''
+{% extends "boards/thread.html" %}
+
+{% load i18n %}
+{% load static from staticfiles %}
+{% load board %}
+{% load tz %}
+
+{% block thread_content %}
+    {% get_current_language as LANGUAGE_CODE %}
+    {% get_current_timezone as TIME_ZONE %}
+
+    <div class="thread">
+        {% for post in thread.get_top_level_replies %}
+            {% post_view post moderator=moderator reply_link=True mode_tree=True %}
+        {% endfor %}
+    </div>
+
+    <script src="{% static 'js/thread.js' %}"></script>
+{% endblock %}

boards/views/thread/tree.py

@@ -0,0 +1,27 b''
+from boards import settings
+from boards.views.thread import ThreadView
+
+TEMPLATE_TREE = 'boards/thread_tree.html'
+
+CONTEXT_OP = 'opening_post'
+CONTEXT_BUMPABLE = 'bumpable'
+
+
+class TreeThreadView(ThreadView):
+
+    def get_template(self):
+        return TEMPLATE_TREE
+
+    def get_data(self, thread):
+        params = dict()
+
+        bumpable = thread.can_bump()
+        params[CONTEXT_BUMPABLE] = bumpable
+        max_posts = thread.max_posts
+
+        params[CONTEXT_OP] = thread.get_opening_post()
+
+        return params
+
+    def get_mode(self):
+        return 'tree'

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-05-14 23:38+0300\n"
+"POT-Creation-Date: 2015-05-19 15:44+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"
@@ -189,7 +189,7 b' msgid "Create new thread"'
 msgstr "Создать новую тему"
 
 #: templates/boards/all_threads.html:118 templates/boards/preview.html:16
-#: templates/boards/thread_normal.html:43
+#: templates/boards/thread_normal.html:38
 msgid "Post"
 msgstr "Отправить"
 
@@ -199,7 +199,7 b' msgstr ""'
 "Метки должны быть разделены пробелами. Текст или изображение обязательны."
 
 #: templates/boards/all_threads.html:126
-#: templates/boards/thread_normal.html:48
+#: templates/boards/thread_normal.html:43
 msgid "Text syntax"
 msgstr "Синтаксис текста"
 
@@ -244,7 +244,6 b' msgid "tags"'
 msgstr "метки"
 
 #: templates/boards/base.html:40
-#| msgid "Search"
 msgid "search"
 msgstr "поиск"
 
@@ -298,15 +297,15 b' msgstr "\xd0\x98\xd0\xb7\xd0\xbc\xd0\xb5\xd0\xbd\xd0\xb8\xd1\x82\xd1\x8c"'
 msgid "Edit thread"
 msgstr "Изменить тему"
 
-#: templates/boards/post.html:77
+#: templates/boards/post.html:84
 msgid "Replies"
 msgstr "Ответы"
 
-#: templates/boards/post.html:89 templates/boards/thread.html:26
+#: templates/boards/post.html:97 templates/boards/thread.html:37
 msgid "messages"
 msgstr "сообщений"
 
-#: templates/boards/post.html:90 templates/boards/thread.html:27
+#: templates/boards/post.html:98 templates/boards/thread.html:38
 msgid "images"
 msgstr "изображений"
 
@@ -388,37 +387,40 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:28
-msgid "Last update: "
-msgstr "Последнее обновление: "
-
-#: templates/boards/thread_gallery.html:19
-#: templates/boards/thread_normal.html:13
+#: templates/boards/thread.html:15
 msgid "Normal mode"
 msgstr "Нормальный режим"
 
-#: templates/boards/thread_gallery.html:20
-#: templates/boards/thread_normal.html:14
+#: templates/boards/thread.html:16
 msgid "Gallery mode"
 msgstr "Режим галереи"
 
-#: templates/boards/thread_gallery.html:41
+#: templates/boards/thread.html:17
+#| msgid "Normal mode"
+msgid "Tree mode"
+msgstr "Древовидный режим"
+
+#: templates/boards/thread.html:39
+msgid "Last update: "
+msgstr "Последнее обновление: "
+
+#: templates/boards/thread_gallery.html:36
 msgid "No images."
 msgstr "Нет изображений."
 
-#: templates/boards/thread_normal.html:22
+#: templates/boards/thread_normal.html:17
 msgid "posts to bumplimit"
 msgstr "сообщений до бамплимита"
 
-#: templates/boards/thread_normal.html:36
+#: templates/boards/thread_normal.html:31
 msgid "Reply to thread"
 msgstr "Ответить в тему"
 
-#: templates/boards/thread_normal.html:49
+#: templates/boards/thread_normal.html:44
 msgid "Close form"
 msgstr "Закрыть форму"
 
-#: templates/boards/thread_normal.html:63
+#: templates/boards/thread_normal.html:58 templates/boards/thread_tree.html:22
 msgid "Update"
 msgstr "Обновить"
 

boards/models/post/__init__.py

@@ -51,6 +51,15 b" PARAMETER_NEED_OPEN_LINK = 'need_open_li"
 PARAMETER_REPLY_LINK = 'reply_link'
 PARAMETER_NEED_OP_DATA = 'need_op_data'
 
+POST_VIEW_PARAMS = (
+    'need_op_data',
+    'reply_link',
+    'moderator',
+    'need_open_link',
+    'truncated',
+    'mode_tree',
+)
+
 REFMAP_STR = '<a href="{}">&gt;&gt;{}</a>'
 
 
@@ -171,7 +180,7 b' class Post(models.Model, Viewable):'
 
     referenced_posts = models.ManyToManyField('Post', symmetrical=False,
                                               null=True,
-                                              blank=True, related_name='rfp+',
+                                              blank=True, related_name='refposts',
                                               db_index=True)
     refmap = models.TextField(null=True, blank=True)
     threads = models.ManyToManyField('Thread', db_index=True)
@@ -183,6 +192,9 b' class Post(models.Model, Viewable):'
     def __str__(self):
         return 'P#{}/{}'.format(self.id, self.title)
 
+    def get_referenced_posts(self):
+        return self.referenced_posts.order_by('pub_time')
+
     def get_title(self) -> str:
         """
         Gets original post title or part of its text.
@@ -228,8 +240,7 b' class Post(models.Model, Viewable):'
 
         return self.threads
 
-    def get_view(self, moderator=False, need_open_link=False,
-                 truncated=False, reply_link=False, *args, **kwargs) -> str:
+    def get_view(self, *args, **kwargs) -> str:
         """
         Renders post's HTML view. Some of the post params can be passed over
         kwargs for the means of caching (if we view the thread, some params
@@ -250,19 +261,21 b' class Post(models.Model, Viewable):'
         elif not thread.can_bump():
             css_class += ' dead_post'
 
-        return render_to_string('boards/post.html', {
+        params = dict()
+        for param in POST_VIEW_PARAMS:
+            if param in kwargs:
+                params[param] = kwargs[param]
+
+        params.update({
             PARAMETER_POST: self,
-            PARAMETER_MODERATOR: moderator,
             PARAMETER_IS_OPENING: is_opening,
             PARAMETER_THREAD: thread,
             PARAMETER_CSS_CLASS: css_class,
-            PARAMETER_NEED_OPEN_LINK: need_open_link,
-            PARAMETER_TRUNCATED: truncated,
             PARAMETER_OP_ID: opening_post_id,
-            PARAMETER_REPLY_LINK: reply_link,
-            PARAMETER_NEED_OP_DATA: kwargs.get(PARAMETER_NEED_OP_DATA)
         })
 
+        return render_to_string('boards/post.html', params)
+
     def get_search_view(self, *args, **kwargs):
         return self.get_view(need_op_data=True, *args, **kwargs)
 

boards/models/thread.py

@@ -156,6 +156,9 b' class Thread(models.Model):'
             query = query.defer('poster_ip')
         return query.all()
 
+    def get_top_level_replies(self):
+        return self.get_replies().exclude(refposts__threads__in=[self])
+
     def get_replies_with_images(self, view_fields_only=False) -> list:
         """
         Gets replies that have at least one image attached

boards/static/css/md/base_page.css

@@ -524,3 +524,10 b' ul {'
 .post-button-form > button:hover {
     text-decoration: underline;
 }
+
+.tree_reply > .post {
+    margin-left: 1ex;
+    margin-top: 1ex;
+    border-left: solid 1px #777;
+    border-right: solid 1px #777;
+}

boards/templates/boards/post.html

@@ -69,12 +69,20 b''
             {% endif %}
         {% endautoescape %}
         {% if post.is_referenced %}
+            {% if mode_tree %}
+                <div class="tree_reply">
+                    {% for refpost in post.get_referenced_posts %}
+                        {% post_view refpost mode_tree=True %}
+                    {% endfor %}
+                </div>
+            {% else %}
             <div class="refmap">
                 {% autoescape off %}
                     {% trans "Replies" %}: {{ post.refmap }}
                 {% endautoescape %}
             </div>
         {% endif %}
+        {% endif %}
     </div>
     {% comment %}
         Thread metadata: counters, tags etc

boards/templates/boards/thread.html

@@ -10,6 +10,17 b''
         - {{ site_name }}</title>
 {% endblock %}
 
+{% block content %}
+    <div class="image-mode-tab">
+        <a {% ifequal mode 'normal' %}class="current_mode"{% endifequal %} href="{% url 'thread' opening_post.id %}">{% trans 'Normal mode' %}</a>,
+        <a {% ifequal mode 'gallery' %}class="current_mode"{% endifequal %} href="{% url 'thread_gallery' opening_post.id %}">{% trans 'Gallery mode' %}</a>,
+        <a {% ifequal mode 'tree' %}class="current_mode"{% endifequal %} href="{% url 'thread_tree' opening_post.id %}">{% trans 'Tree mode' %}</a>
+    </div>
+
+    {% block thread_content %}
+    {% endblock %}
+{% endblock %}
+
 {% block metapanel %}
 
     <span class="metapanel"

boards/templates/boards/thread_gallery.html

@@ -11,15 +11,10 b''
         - {{ site_name }}</title>
 {% endblock %}
 
-{% block content %}
+{% block thread_content %}
     {% get_current_language as LANGUAGE_CODE %}
     {% get_current_timezone as TIME_ZONE %}
 
-    <div class="image-mode-tab">
-        <a href="{% url 'thread' thread.get_opening_post.id %}">{% trans 'Normal mode' %}</a>,
-        <a class="current_mode" href="{% url 'thread_gallery' thread.get_opening_post.id %}">{% trans 'Gallery mode' %}</a>
-    </div>
-
     <div id="posts-table">
         {% if posts %}
             {% for post in posts %}

boards/templates/boards/thread_normal.html

@@ -5,15 +5,10 b''
 {% load board %}
 {% load tz %}
 
-{% block content %}
+{% block thread_content %}
     {% get_current_language as LANGUAGE_CODE %}
     {% get_current_timezone as TIME_ZONE %}
 
-    <div class="image-mode-tab">
-        <a class="current_mode" href="{% url 'thread' opening_post.id %}">{% trans 'Normal mode' %}</a>,
-        <a href="{% url 'thread_gallery' opening_post.id %}">{% trans 'Gallery mode' %}</a>
-    </div>
-
     {% if bumpable and thread.has_post_limit %}
         <div class="bar-bg">
             <div class="bar-value" style="width:{{ bumplimit_progress }}%" id="bumplimit_progress">

boards/urls.py

@@ -31,10 +31,12 b" urlpatterns = patterns('',"
         tag_threads.TagView.as_view(), name='tag'),
 
     # /boards/thread/
-    url(r'^thread/(?P<post_id>\d+)/$', views.thread.normal.NormalThreadView.as_view(),
+    url(r'^thread/(?P<post_id>\d+)/$', views.thread.NormalThreadView.as_view(),
         name='thread'),
-    url(r'^thread/(?P<post_id>\d+)/mode/gallery/$', views.thread.gallery.GalleryThreadView.as_view(),
+    url(r'^thread/(?P<post_id>\d+)/mode/gallery/$', views.thread.GalleryThreadView.as_view(),
         name='thread_gallery'),
+    url(r'^thread/(?P<post_id>\d+)/mode/tree/$', views.thread.TreeThreadView.as_view(),
+        name='thread_tree'),
     # /feed/
     url(r'^feed/$', views.feed.FeedView.as_view(), name='feed'),
     url(r'^feed/page/(?P<page>\w+)/$', views.feed.FeedView.as_view(),

boards/views/thread/__init__.py

@@ -1,3 +1,4 b''
 from boards.views.thread.thread import ThreadView
 from boards.views.thread.normal import NormalThreadView
 from boards.views.thread.gallery import GalleryThreadView
+from boards.views.thread.tree import TreeThreadView

boards/views/thread/gallery.py

@@ -3,6 +3,7 b' from boards.views.thread import ThreadVi'
 TEMPLATE_GALLERY = 'boards/thread_gallery.html'
 
 CONTEXT_POSTS = 'posts'
+CONTEXT_OP = 'opening_post'
 
 
 class GalleryThreadView(ThreadView):
@@ -15,5 +16,9 b' class GalleryThreadView(ThreadView):'
 
         params[CONTEXT_POSTS] = thread.get_replies_with_images(
             view_fields_only=True)
+        params[CONTEXT_OP] = thread.get_opening_post()
 
         return params
+
+    def get_mode(self):
+        return 'gallery'

boards/views/thread/normal.py

@@ -14,6 +14,9 b' class NormalThreadView(ThreadView):'
     def get_template(self):
         return TEMPLATE_NORMAL
 
+    def get_mode(self):
+        return 'normal'
+
     def get_data(self, thread):
         params = dict()
 

boards/views/thread/thread.py

@@ -21,6 +21,7 b" CONTEXT_WS_PROJECT = 'ws_project'"
 CONTEXT_WS_HOST = 'ws_host'
 CONTEXT_WS_PORT = 'ws_port'
 CONTEXT_WS_TIME = 'ws_token_time'
+CONTEXT_MODE = 'mode'
 
 FORM_TITLE = 'title'
 FORM_TEXT = 'text'
@@ -51,6 +52,7 b' class ThreadView(BaseBoardView, PostMixi'
         params[CONTEXT_FORM] = form
         params[CONTEXT_LASTUPDATE] = str(thread_to_show.last_edit_time)
         params[CONTEXT_THREAD] = thread_to_show
+        params[CONTEXT_MODE] = self.get_mode()
 
         if settings.get_bool('External', 'WebsocketsEnabled'):
             token_time = format(timezone.now(), u'U')
@@ -129,3 +131,6 b' class ThreadView(BaseBoardView, PostMixi'
         """
 
         pass
+
+    def get_mode(self):
+        pass