diff --git a/boards/templates/boards/base.html b/boards/templates/boards/base.html --- a/boards/templates/boards/base.html +++ b/boards/templates/boards/base.html @@ -21,43 +21,43 @@ {% block head %}{% endblock %} - - - - + + + + -
- {% trans "All threads" %} - {% autoescape off %} - {{ tags_str }}, - {% endautoescape %} - [...], - [S]. +
+ {% trans "All threads" %} + {% autoescape off %} + {{ tags_str }}, + {% endautoescape %} + [...], + [S]. - {% if username %} - {{ new_notifications_count }} {% trans 'notifications' %}. - {% endif %} + {% if username %} + {{ new_notifications_count }} {% trans 'notifications' %}. + {% endif %} - {% trans 'Settings' %} -
+ {% trans 'Settings' %} +
-{% block content %}{% endblock %} + {% block content %}{% endblock %} - - - - - + + + + + -
- {% block metapanel %}{% endblock %} - [{% trans 'Admin' %}] - {% with ppd=posts_per_day|floatformat:2 %} - {% blocktrans %}Speed: {{ ppd }} posts per day{% endblocktrans %} - {% endwith %} - {% trans 'Up' %} -
+
+ {% block metapanel %}{% endblock %} + [{% trans 'Admin' %}] + {% with ppd=posts_per_day|floatformat:2 %} + {% blocktrans %}Speed: {{ ppd }} posts per day{% endblocktrans %} + {% endwith %} + {% trans 'Up' %} +
diff --git a/boards/templates/boards/thread.html b/boards/templates/boards/thread.html --- a/boards/templates/boards/thread.html +++ b/boards/templates/boards/thread.html @@ -10,63 +10,6 @@ - {{ site_name }} {% endblock %} -{% block content %} - {% get_current_language as LANGUAGE_CODE %} - - {% cache 600 thread_view thread.id thread.last_edit_time moderator LANGUAGE_CODE %} - -
- {% trans 'Normal mode' %}, - {% trans 'Gallery mode' %} -
- - {% if bumpable %} -
-
-
-
- {{ posts_left }} {% trans 'posts to bumplimit' %} -
-
- {% endif %} - -
- {% for post in thread.get_replies %} - {% post_view post moderator=moderator %} - {% endfor %} -
- - {% if not thread.archived %} -
- -
{% trans "Reply to thread" %} #{{ opening_post.id }}
-
-
-
{% csrf_token %} -
- {{ form.as_div }} -
- -
- (ctrl-enter) -
-
-
- {% trans 'Text syntax' %}
-
-
- - - {% endif %} - - - - - - - {% endcache %} -{% endblock %} - {% block metapanel %} {% get_current_language as LANGUAGE_CODE %} @@ -77,8 +20,11 @@ data-ws-project="{{ ws_project }}" data-ws-host="{{ ws_host }}" data-ws-port="{{ ws_port }}"> + + {% block thread_meta_panel %} + {% endblock %} + {% cache 600 thread_meta thread.last_edit_time moderator LANGUAGE_CODE %} - {{ thread.get_reply_count }}/{{ max_replies }} {% trans 'messages' %}, {{ thread.get_images_count }} {% trans 'images' %}. {% trans 'Last update: ' %} diff --git a/boards/templates/boards/thread_gallery.html b/boards/templates/boards/thread_gallery.html --- a/boards/templates/boards/thread_gallery.html +++ b/boards/templates/boards/thread_gallery.html @@ -1,4 +1,4 @@ -{% extends "boards/base.html" %} +{% extends "boards/thread.html" %} {% load i18n %} {% load cache %} @@ -51,19 +51,3 @@ {% endspaceless %} {% endblock %} - -{% block metapanel %} - - {% get_current_language as LANGUAGE_CODE %} - - - {% cache 600 thread_gallery_meta thread.last_edit_time moderator LANGUAGE_CODE %} - {{ thread.get_reply_count }}/{{ max_replies }} - {% trans 'messages' %}, - {{ thread.get_images_count }} {% trans 'images' %}. - {% trans 'Last update: ' %} - [RSS] - {% endcache %} - - -{% endblock %} 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 @@ -1,7 +1,7 @@ from boards import settings from boards.views.thread import ThreadView -TEMPLATE_NORMAL = 'boards/thread.html' +TEMPLATE_NORMAL = 'boards/thread_normal.html' CONTEXT_OP = 'opening_post' CONTEXT_BUMPLIMIT_PRG = 'bumplimit_progress'