One inclusion tag for any posting form rendering

boards/templates/boards/form.html

@@ -0,0 +1,44 b''
+{% load i18n %}
+{% load board %}
+{% load static %}
+
+<div class="post-form-w">
+    <script src="{% static 'js/panel.js' %}"></script>
+
+    <div class="post-form" data-hasher="{% static 'js/3party/sha256.js' %}"
+                           data-pow-script="{% static 'js/proof_of_work.js' %}">
+        {% if new_thread %}
+            <div class="form-title">{% trans "Create new thread" %}</div>
+        {% else %}
+            <div class="form-title">{% trans "Reply to thread" %} #{{ opening_post_id }}<span class="reply-to-message"> {% trans "to message " %} #<span id="reply-to-message-id"></span></span></div>
+        {% endif %}
+
+        <div class="swappable-form-full">
+        <form enctype="multipart/form-data" method="post" id="form">{% csrf_token %}
+            {{ form.as_div }}
+            <div class="form-submit">
+                <input type="submit" value="{% trans "Post" %}"/>
+                <button id="preview-button" type="button" onclick="return false;">{% trans 'Preview' %}</button>
+            </div>
+        </form>
+        </div>
+
+        <div>
+            {% if new_thread %}
+                {% trans 'Tags must be delimited by spaces. Text or image is required.' %}<br />
+            {% endif %}
+            {% with size=max_file_size|filesizeformat %}
+                {% blocktrans %}Max total file size is {{ size }}.{% endblocktrans %}<br />
+            {% endwith %}
+            {% blocktrans %}Max file number is {{ max_files }}.{% endblocktrans %}
+        </div>
+
+        <div id="preview-text"></div>
+        <div><a href="{% url "staticpage" name="help" %}">{% trans 'Help' %}</a></div>
+    </div>
+</div>
+
+<script src="{% static 'js/form.js' %}"></script>
+<script src="{% static 'js/jquery.form.min.js' %}"></script>
+<script src="{% static 'js/3party/jquery.blockUI.js' %}"></script>
+

boards/templates/boards/all_threads.html

@@ -155,35 +155,8 b''
             {% 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" data-hasher="{% static 'js/3party/sha256.js' %}"
-                               data-pow-script="{% static 'js/proof_of_work.js' %}">
-            <div class="form-title">{% trans "Create new thread" %}</div>
-            <div class="swappable-form-full">
-            <form enctype="multipart/form-data" method="post" id="form">{% csrf_token %}
-                {{ form.as_div }}
-                <div class="form-submit">
-                    <input type="submit" value="{% trans "Post" %}"/>
-                    <button id="preview-button" type="button" onclick="return false;">{% trans 'Preview' %}</button>
-                </div>
-            </form>
-            </div>
-            <div>
-                {% trans 'Tags must be delimited by spaces. Text or image is required.' %}
-                {% with size=max_file_size|filesizeformat %}
-                    {% blocktrans %}Max total file size is {{ size }}.{% endblocktrans %}
-                {% endwith %}
-                {% blocktrans %}Max file number is {{ max_files }}.{% endblocktrans %}
-            </div>
-            <div id="preview-text"></div>
-            <div><a href="{% url "staticpage" name="help" %}">{% trans 'Help' %}</a></div>
-        </div>
-    </div>
+    {% form_view form=form new_thread=True %}
 
-    <script src="{% static 'js/form.js' %}"></script>
-    <script src="{% static 'js/jquery.form.min.js' %}"></script>
-    <script src="{% static 'js/3party/jquery.blockUI.js' %}"></script>
     <script src="{% static 'js/thread_create.js' %}"></script>
 
 {% endblock %}

boards/templates/boards/thread_normal.html

@@ -42,37 +42,8 b''
     </div>
 
     {% if not thread.is_archived %}
-        <div class="post-form-w">
-            <script src="{% static 'js/panel.js' %}"></script>
-            <div class="form-title">{% trans "Reply to thread" %} #{{ opening_post.id }}<span class="reply-to-message"> {% trans "to message " %} #<span id="reply-to-message-id"></span></span></div>
-            <div class="post-form" id="compact-form" data-hasher="{% static 'js/3party/sha256.js' %}"
-                       data-pow-script="{% static 'js/proof_of_work.js' %}">
-                <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" %}"/>
-                            <button id="preview-button" type="button" onclick="return false;">{% trans 'Preview' %}</button>
-                        </div>
-                    </form>
-                </div>
-                <div id="preview-text"></div>
-                <div>
-                    {% with size=max_file_size|filesizeformat %}
-                        {% blocktrans %}Max total file size is {{ size }}.{% endblocktrans %}
-                    {% endwith %}
-                    {% blocktrans %}Max file number is {{ max_files }}.{% endblocktrans %}
-                </div>
-                <div><a href="{% url "staticpage" name="help" %}">
-                    {% trans 'Help' %}</a></div>
-                <div><a href="#" onClick="resetForm(); return false;">{% trans 'Reset form' %}</a></div>
-            </div>
-        </div>
+        {% form_view form=form new_thread=False opening_post_id=opening_post.id %}
 
-        <script src="{% static 'js/form.js' %}"></script>
-        <script src="{% static 'js/jquery.form.min.js' %}"></script>
-        <script src="{% static 'js/3party/jquery.blockUI.js' %}"></script>
         <script src="{% static 'js/thread.js' %}"></script>
         <script src="{% static 'js/thread_update.js' %}"></script>
     {% endif %}

boards/templatetags/board.py

@@ -4,6 +4,8 b' from django.shortcuts import get_object_'
 from django.utils.text import re_tag
 
 from boards.mdx_neboard import LINE_BREAK_HTML
+from boards import settings
+from boards.settings import SECTION_FORMS
 
 IMG_ACTION_URL = '[<a href="{}">{}</a>]'
 REGEX_NEWLINE = re.compile(LINE_BREAK_HTML)
@@ -11,6 +13,8 b" TRUNCATOR = '...'"
 HTML4_SINGLETS =(
     'br', 'col', 'link', 'base', 'img', 'param', 'area', 'hr', 'input'
 )
+PARAM_MAX_FILE_SIZE = 'max_file_size'
+PARAM_MAX_FILES = 'max_files'
 
 
 register = template.Library()
@@ -94,3 +98,11 b' def truncatenewlines_html(value, arg):'
 
     return text
 
+
[e-mail]_tag('boards/form.html', name='form_view', takes_context=True)
+def form_view(context, *args, **kwargs):
+    kwargs['perms'] = context['perms']
+    kwargs[PARAM_MAX_FILE_SIZE] = settings.get_int(SECTION_FORMS, 'MaxFileSize')
+    kwargs[PARAM_MAX_FILES] = settings.get_int(SECTION_FORMS, 'MaxFileCount')
+    return kwargs
+

boards/views/all_threads.py

@@ -33,16 +33,13 b" PARAMETER_CURRENT_PAGE = 'current_page'"
 PARAMETER_PAGINATOR = 'paginator'
 PARAMETER_THREADS = 'threads'
 PARAMETER_ADDITIONAL = 'additional_params'
-PARAMETER_MAX_FILE_SIZE = 'max_file_size'
 PARAMETER_RSS_URL = 'rss_url'
-PARAMETER_MAX_FILES = 'max_files'
 
 TEMPLATE = 'boards/all_threads.html'
 DEFAULT_PAGE = 1
 
 
-class AllThreadsView(FileUploadMixin, BaseBoardView, PaginatedMixin,
-                     DispatcherMixin):
+class AllThreadsView(BaseBoardView, PaginatedMixin, DispatcherMixin):
 
     tag_name = ''
 
@@ -83,9 +80,7 b' class AllThreadsView(FileUploadMixin, Ba'
 
         params[PARAMETER_THREADS] = threads
         params[CONTEXT_FORM] = form
-        params[PARAMETER_MAX_FILE_SIZE] = self.get_max_upload_size()
         params[PARAMETER_RSS_URL] = self.get_rss_url()
-        params[PARAMETER_MAX_FILES] = settings.get_int(SECTION_FORMS, 'MaxFileCount')
 
         paginator.set_url(self.get_reverse_url(), request.GET.dict())
         params.update(self.get_page_context(paginator, page))

boards/views/mixins.py

@@ -35,6 +35,7 b' class DispatcherMixin:'
             return getattr(self, method_name)(*args, **kwargs)
 
 
+# TODO Check if it is still used anywhere and safely remove
 class FileUploadMixin:
     def get_max_upload_size(self):
         return boards.settings.get_int(SECTION_FORMS, 'MaxFileSize')

boards/views/thread/normal.py

@@ -8,11 +8,9 b" TEMPLATE_NORMAL = 'boards/thread_normal."
 CONTEXT_BUMPLIMIT_PRG = 'bumplimit_progress'
 CONTEXT_POSTS_LEFT = 'posts_left'
 CONTEXT_BUMPABLE = 'bumpable'
-PARAM_MAX_FILE_SIZE = 'max_file_size'
-PARAM_MAX_FILES = 'max_files'
 
 
-class NormalThreadView(ThreadView, FileUploadMixin):
+class NormalThreadView(ThreadView):
 
     def get_template(self):
         return TEMPLATE_NORMAL
@@ -31,7 +29,5 b' class NormalThreadView(ThreadView, FileU'
             params[CONTEXT_POSTS_LEFT] = left_posts
             params[CONTEXT_BUMPLIMIT_PRG] = str(
                 float(left_posts) / max_posts * 100)
-        params[PARAM_MAX_FILE_SIZE] = self.get_max_upload_size()
-        params[PARAM_MAX_FILES] = settings.get_int(SECTION_FORMS, 'MaxFileCount')
 
         return params