Made normal and gallery view use the same super-template with the same

metadata panel code and cache

boards/templates/boards/thread.html

@@ -10,63 +10,6 b''
         - {{ site_name }}</title>
 {% endblock %}
 
-{% block content %}
-    {% get_current_language as LANGUAGE_CODE %}
-
-    {% cache 600 thread_view thread.id thread.last_edit_time moderator LANGUAGE_CODE %}
-
-    <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 %}
-        <div class="bar-bg">
-            <div class="bar-value" style="width:{{ bumplimit_progress }}%" id="bumplimit_progress">
-            </div>
-            <div class="bar-text">
-                <span id="left_to_limit">{{ posts_left }}</span> {% trans 'posts to bumplimit' %}
-            </div>
-        </div>
-    {% endif %}
-
-    <div class="thread">
-        {% for post in thread.get_replies %}
-            {% post_view post moderator=moderator %}
-        {% endfor %}
-    </div>
-
-    {% if not thread.archived %}
-        <div class="post-form-w">
-            <script src="{% static 'js/panel.js' %}"></script>
-            <div class="form-title">{% trans "Reply to thread" %} #{{ opening_post.id }}</div>
-            <div class="post-form" id="compact-form">
-                <div class="swappable-form-full">
-                    <form enctype="multipart/form-data" method="post" id="form">{% csrf_token %}
-                        <div class="compact-form-text"></div>
-                        {{ form.as_div }}
-                        <div class="form-submit">
-                            <input type="submit" value="{% trans "Post" %}"/>
-                        </div>
-                        (ctrl-enter)
-                    </form>
-                </div>
-                <div><a href="{% url "staticpage" name="help" %}">
-                    {% trans 'Text syntax' %}</a></div>
-            </div>
-        </div>
-
-        <script src="{% static 'js/jquery.form.min.js' %}"></script>
-    {% endif %}
-
-    <script src="{% static 'js/form.js' %}"></script>
-    <script src="{% static 'js/thread.js' %}"></script>
-    <script src="{% static 'js/thread_update.js' %}"></script>
-    <script src="{% static 'js/3party/centrifuge.js' %}"></script>
-
-    {% endcache %}
-{% endblock %}
-
 {% block metapanel %}
 
     {% get_current_language as LANGUAGE_CODE %}
@@ -77,8 +20,11 b''
           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 %}
-            <button id="autoupdate">{% trans 'Update' %}</button>
             <span id="reply-count">{{ thread.get_reply_count }}</span>/{{ max_replies }} {% trans 'messages' %},
             <span id="image-count">{{ thread.get_images_count }}</span> {% trans 'images' %}.
             {% trans 'Last update: ' %}<span id="last-update"><time datetime="{{ thread.last_edit_time|date:'c' }}">{{ thread.last_edit_time|date:'r' }}</time></span>

boards/templates/boards/thread_gallery.html

@@ -1,4 +1,4 b''
-{% extends "boards/base.html" %}
+{% extends "boards/thread.html" %}
 
 {% load i18n %}
 {% load cache %}
@@ -51,19 +51,3 b''
 
     {% endspaceless %}
 {% endblock %}
-
-{% block metapanel %}
-
-    {% get_current_language as LANGUAGE_CODE %}
-
-    <span class="metapanel" data-last-update="{{ last_update }}">
-        {% cache 600 thread_gallery_meta thread.last_edit_time moderator LANGUAGE_CODE %}
-            <span id="reply-count">{{ thread.get_reply_count }}</span>/{{ max_replies }}
-            {% trans 'messages' %},
-            <span id="image-count">{{ thread.get_images_count }}</span> {% trans 'images' %}.
-            {% trans 'Last update: ' %}<time datetime="{{ thread.last_edit_time|date:'c' }}">{{ thread.last_edit_time|date:'r' }}</time>
-            [<a href="rss/">RSS</a>]
-        {% endcache %}
-    </span>
-
-{% endblock %}

boards/views/thread/normal.py

@@ -1,7 +1,7 b''
 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'