Reset form to the end of thread instead of closing it

boards/static/js/thread.js

@@ -1,85 +1,85 b''
 /*
  @licstart  The following is the entire license notice for the
  JavaScript code in this page.
 
 
  Copyright (C) 2013  neko259
 
  The JavaScript code in this page is free software: you can
  redistribute it and/or modify it under the terms of the GNU
  General Public License (GNU GPL) as published by the Free Software
  Foundation, either version 3 of the License, or (at your option)
  any later version.  The code is distributed WITHOUT ANY WARRANTY;
  without even the implied warranty of MERCHANTABILITY or FITNESS
  FOR A PARTICULAR PURPOSE.  See the GNU GPL for more details.
 
  As additional permission under GNU GPL version 3 section 7, you
  may distribute non-source (e.g., minimized or compacted) forms of
  that code without the copy of the GNU GPL normally required by
  section 4, provided you include this license notice and a URL
  through which recipients can access the Corresponding Source.
 
  @licend  The above is the entire license notice
  for the JavaScript code in this page.
  */
 
 var $html = $("html, body");
 
 function moveCaretToEnd(el) {
         if (typeof el.selectionStart == "number") {
             el.selectionStart = el.selectionEnd = el.value.length;
         } else if (typeof el.createTextRange != "undefined") {
             el.focus();
             var range = el.createTextRange();
             range.collapse(false);
             range.select();
         }
 }
 
 function getForm() {
     return $('.post-form-w');
 }
 
 function closeForm() {
     var form = getForm();
-    form.hide();
+    //form.hide();
     form.insertAfter($('.thread'));
 }
 
 function addQuickReply(postId) {
     var textToAdd = '';
     var blockToInsert = null;
 
     if (postId != null) {
         var post = $('#' + postId);
 
         // If this is not OP, add reflink to the post
         if (!post.is(':first-child')) {
             textToAdd += '[post]' + postId + '[/post]\n';
         }
 
         blockToInsert = post;
     } else {
         blockToInsert = $('.thread');
     }
 
     var selection = window.getSelection().toString();
     if (selection.length > 0) {
         textToAdd += '[quote]' + selection + '[/quote]\n';
     }
 
     var textAreaId = 'textarea';
     $(textAreaId).val($(textAreaId).val()+ textToAdd);
 
     var form = getForm();
     form.insertAfter(blockToInsert);
     form.show();
 
     var textarea = document.getElementsByTagName('textarea')[0];
     $(textAreaId).focus();
     moveCaretToEnd(textarea);
 }
 
 function scrollToBottom() {
     $html.animate({scrollTop: $html.height()}, "fast");
 }

boards/templates/boards/post.html

@@ -1,91 +1,95 b''
 {% load i18n %}
 {% load board %}
 {% load cache %}
 
 {% get_current_language as LANGUAGE_CODE %}
 
 {% if thread.archived %}
     <div class="post archive_post" id="{{ post.id }}">
 {% elif bumpable %}
     <div class="post" id="{{ post.id }}">
 {% else %}
     <div class="post dead_post" id="{{ post.id }}">
 {% endif %}
 
 <div class="post-info">
     <a class="post_id" href="{{ post.get_url }}">({{ post.get_absolute_id }})</a>
     <span class="title">{{ post.title }}</span>
     <span class="pub_time"><time datetime="{{ post.pub_time|date:'c' }}">{{ post.pub_time|date:'r' }}</time></span>
     {% comment %}
         Thread death time needs to be shown only if the thread is alredy archived
         and this is an opening post (thread death time) or a post for popup
         (we don't see OP here so we show the death time in the post itself).
     {% endcomment %}
     {% if thread.archived %}
         {% if is_opening %}
         — <time datetime="{{ thread.bump_time|date:'c' }}">{{ thread.bump_time|date:'r' }}</time>
         {% endif %}
     {% endif %}
     {% if is_opening and need_open_link %}
-        <a class="link" href="{% url 'thread' post.id %}">{% trans "Open" %}</a>
+        {% if thread.archived %}
+            <a class="link" href="{% url 'thread' post.id %}">{% trans "Open" %}</a>
+        {% else %}
+            <a class="link" href="{% url 'thread' post.id %}#form">{% trans "Reply" %}</a>
+        {% endif %}
     {% endif %}
     {% if reply_link and not thread.archived %}
         <a href="#form" onclick="addQuickReply('{{ post.id }}'); return false;">{% trans 'Reply' %}</a>
     {% endif %}
 
     {% if moderator %}
         <span class="moderator_info">
             <a href="{% url 'admin:boards_post_change' post.id %}">{% trans 'Edit' %}</a>
             {% if is_opening %}
                 | <a href="{% url 'admin:boards_thread_change' thread.id %}">{% trans 'Edit thread' %}</a>
             {% endif %}
         </span>
     {% endif %}
 </div>
 {% comment %}
     Post images. Currently only 1 image can be posted and shown, but post model
     supports multiple.
 {%  endcomment %}
 {% if post.images.exists %}
     {% with post.images.all.0 as image %}
         {% autoescape off %}
             {{ image.get_view }}
         {% endautoescape %}
     {% endwith %}
 {% endif %}
 {% comment %}
     Post message (text)
 {% endcomment %}
 <div class="message">
     {% autoescape off %}
         {% if truncated %}
             {{ post.get_text|truncatewords_html:50 }}
         {% else %}
             {{ post.get_text }}
         {% endif %}
     {% endautoescape %}
     {% if post.is_referenced %}
         <div class="refmap">
             {% autoescape off %}
                 {% trans "Replies" %}: {{ post.refmap }}
             {% endautoescape %}
         </div>
     {% endif %}
 </div>
 {% comment %}
     Thread metadata: counters, tags etc
 {% endcomment %}
 {% if is_opening %}
     <div class="metadata">
         {% if is_opening and need_open_link %}
             {{ thread.get_reply_count }} {% trans 'messages' %},
             {{ thread.get_images_count }} {% trans 'images' %}.
         {% endif %}
         <span class="tags">
             {% autoescape off %}
                 {{ thread.get_tag_url_list }}
             {% endautoescape %}
         </span>
     </div>
 {% endif %}
 </div>

boards/templates/boards/thread_normal.html

@@ -1,68 +1,68 b''
 {% extends "boards/thread.html" %}
 
 {% load i18n %}
 {% load cache %}
 {% load static from staticfiles %}
 {% load board %}
 
 {% 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 and thread.has_post_limit %}
         <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 reply_link=True %}
         {% 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><a href="#" onClick="getForm().hide(); return false;">{% trans 'Close form' %}</a></div>
+                <div><a href="#" onClick="closeForm(); return false;">{% trans 'Close form' %}</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 thread_meta_panel %}
     <button id="autoupdate">{% trans 'Update' %}</button>
 {% endblock %}