{% if posts %} {% for post in posts %} diff --git a/boards/templates/boards/thread_normal.html b/boards/templates/boards/thread_normal.html --- a/boards/templates/boards/thread_normal.html +++ b/boards/templates/boards/thread_normal.html @@ -5,15 +5,10 @@ {% load board %} {% load tz %} -{% block content %} +{% block thread_content %} {% get_current_language as LANGUAGE_CODE %} {% get_current_timezone as TIME_ZONE %} -

- {% trans 'Normal mode' %}, - {% trans 'Gallery mode' %} -

- {% if bumpable and thread.has_post_limit %}

diff --git a/boards/templates/boards/thread_tree.html b/boards/templates/boards/thread_tree.html new file mode 100644 --- /dev/null +++ b/boards/templates/boards/thread_tree.html @@ -0,0 +1,19 @@ +{% 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 %} + +

+ {% for post in thread.get_top_level_replies %} + {% post_view post moderator=moderator reply_link=True mode_tree=True %} + {% endfor %} +

+ + +{% endblock %} diff --git a/boards/urls.py b/boards/urls.py --- a/boards/urls.py +++ b/boards/urls.py @@ -31,10 +31,12 @@ urlpatterns = patterns('', tag_threads.TagView.as_view(), name='tag'), # /boards/thread/ - url(r'^thread/(?P\d+)/$', views.thread.normal.NormalThreadView.as_view(), + url(r'^thread/(?P\d+)/$', views.thread.NormalThreadView.as_view(), name='thread'), - url(r'^thread/(?P\d+)/mode/gallery/$', views.thread.gallery.GalleryThreadView.as_view(), + url(r'^thread/(?P\d+)/mode/gallery/$', views.thread.GalleryThreadView.as_view(), name='thread_gallery'), + url(r'^thread/(?P\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\w+)/$', views.feed.FeedView.as_view(), diff --git a/boards/views/thread/__init__.py b/boards/views/thread/__init__.py --- a/boards/views/thread/__init__.py +++ b/boards/views/thread/__init__.py @@ -1,3 +1,4 @@ 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 diff --git a/boards/views/thread/gallery.py b/boards/views/thread/gallery.py --- a/boards/views/thread/gallery.py +++ b/boards/views/thread/gallery.py @@ -3,6 +3,7 @@ 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 @@ 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' diff --git a/boards/views/thread/normal.py b/boards/views/thread/normal.py --- a/boards/views/thread/normal.py +++ b/boards/views/thread/normal.py @@ -14,6 +14,9 @@ class NormalThreadView(ThreadView): def get_template(self): return TEMPLATE_NORMAL + def get_mode(self): + return 'normal' + def get_data(self, thread): params = dict() diff --git a/boards/views/thread/thread.py b/boards/views/thread/thread.py --- a/boards/views/thread/thread.py +++ b/boards/views/thread/thread.py @@ -21,6 +21,7 @@ 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 @@ 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 @@ class ThreadView(BaseBoardView, PostMixi """ pass + + def get_mode(self): + pass diff --git a/boards/views/thread/tree.py b/boards/views/thread/tree.py new file mode 100644 --- /dev/null +++ b/boards/views/thread/tree.py @@ -0,0 +1,27 @@ +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'