Updating bumplimit progress on thread update

boards/static/js/thread_update.js

@@ -1,127 +1,147 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 THREAD_UPDATE_DELAY = 10000;
 
 var loading = false;
 var lastUpdateTime = null;
 
 function blink(node) {
     var blinkCount = 2;
     var blinkDelay = 250;
 
     var nodeToAnimate = node;
     for (var i = 0; i < blinkCount; i++) {
         nodeToAnimate = nodeToAnimate.fadeOut(blinkDelay).fadeIn(blinkDelay);
     }
 }
 
 function updateThread() {
     if (loading) {
         return;
     }
 
     loading = true;
 
     var threadPosts = $('div.thread').children('.post');
 
     var lastPost = threadPosts.last();
     var threadId = threadPosts.first().attr('id');
 
     var diffUrl = '/api/diff_thread/' + threadId + '/' + lastUpdateTime + '/';
     $.getJSON(diffUrl)
         .success(function(data) {
             var bottom = isPageBottom();
 
             var addedPosts = data.added;
-
             for (var i = 0; i < addedPosts.length; i++) {
                 var postText = addedPosts[i];
 
                 var post = $(postText);
                 post.appendTo(lastPost.parent());
                 addRefLinkPreview(post[0]);
 
                 lastPost = post;
                 blink(post);
             }
 
             var updatedPosts = data.updated;
             for (var i = 0; i < updatedPosts.length; i++) {
                 var postText = updatedPosts[i];
 
                 var post = $(postText);
                 var postId = post.attr('id');
 
                 var oldPost = $('div.thread').children('.post[id=' + postId + ']');
                 
                 oldPost.replaceWith(post);
                 addRefLinkPreview(post[0]);
 
                 blink(post);
             }
             
             // TODO Process deleted posts
 
             lastUpdateTime = data.last_update;
             loading = false;
 
             if (bottom) {
                 var $target = $('html,body');
                 $target.animate({scrollTop: $target.height()}, 1000);
             }
 
             $('#reply-count').text(getReplyCount());
             $('#image-count').text(getImageCount());
+
+            updateBumplimitProgress(data.added.length + data.updated.length);
         })
         .error(function(data) {
             // TODO Show error message that server is unavailable?
 
             loading = false;
         });
 }
 
 function isPageBottom() {
     var scroll = $(window).scrollTop() / ($(document).height()
         - $(window).height())
 
     return scroll == 1
 }
 
 function initAutoupdate() {
     loading = false;
 
     lastUpdateTime = $('.metapanel').attr('data-last-update');
 
     setInterval(updateThread, THREAD_UPDATE_DELAY);
 }
 
 function getReplyCount() {
     return $('.thread').children('.post').length
 }
 
 function getImageCount() {
     return $('.thread').find('img').length
 }
+
+function updateBumplimitProgress(postDelta) {
+    var progressBar = $('#bumplimit_progress');
+    if (progressBar) {
+        var postsToLimitElement = $('#left_to_limit');
+
+        var oldPostsToLimit = parseInt(postsToLimitElement.text());
+        var postCount = getReplyCount();
+        var bumplimit = postCount - postDelta + oldPostsToLimit;
+
+        var newPostsToLimit = bumplimit - postCount;
+        if (newPostsToLimit < 0) {
+            progressBar.remove();
+        } else {
+            postsToLimitElement.text(newPostsToLimit);
+            progressBar.width((100 - postCount / bumplimit * 100.0) + '%');
+        }
+    }
+}
  No newline at end of file

boards/templates/boards/post.html

@@ -1,68 +1,70 b''
 {% load i18n %}
 {% load board %}
 
+{% spaceless %}
 {% if can_bump %}
     <div class="post" id="{{ post.id }}">
 {% else %}
     <div class="post dead_post" id="{{ post.id }}">
 {% endif %}
 
 {% if post.image %}
     <div class="image">
         <a
                 class="thumb"
                 href="{{ post.image.url }}"><img
                 src="{{ post.image.url_200x150 }}"
                 alt="{{ post.id }}"
                 data-width="{{ post.image_width }}"
                 data-height="{{ post.image_height }}"/>
         </a>
     </div>
 {% endif %}
 <div class="message">
     <div class="post-info">
         <span class="title">{{ post.title }}</span>
         <a class="post_id" href="#{{ post.id }}">
             ({{ post.id }})</a>
         [{{ post.pub_time }}]
         [<a href="#" onclick="javascript:addQuickReply('{{ post.id }}')
             ; return false;">&gt;&gt;</a>]
 
         {% if moderator %}
             <span class="moderator_info">
                             [<a href="{% url 'delete' post_id=post.id %}"
                     >{% trans 'Delete' %}</a>]
                             ({{ post.poster_ip }})
                             [<a href="{% url 'ban' post_id=post.id %}?next={{ request.path }}"
                     >{% trans 'Ban IP' %}</a>]
                         </span>
         {% endif %}
     </div>
     {% autoescape off %}
         {% if truncated %}
             {{ post.text.rendered|truncatewords_html:50 }}
         {% else %}
             {{ post.text.rendered }}
         {% endif %}
     {% endautoescape %}
     {% if post.is_referenced %}
         <div class="refmap">
         {% trans "Replies" %}:
         {% for ref_post in post.get_sorted_referenced_posts %}
         <a href="{% post_url ref_post.id %}">&gt;&gt;{{ ref_post.id }}</a
             >{% if not forloop.last %},{% endif %}
         {% endfor %}
         </div>
     {% endif %}
 </div>
 {% if post.thread.tags.exists %}
     <div class="metadata">
         <span class="tags">{% trans 'Tags' %}:
             {% for tag in post.thread.get_tags %}
                 <a class="tag" href="{% url 'tag' tag.name %}">
                     {{ tag.name }}</a>
             {% endfor %}
         </span>
     </div>
 {% endif %}
 </div>
+{% endspaceless %}
  No newline at end of file

boards/templates/boards/thread.html

@@ -1,161 +1,163 b''
 {% extends "boards/base.html" %}
 
 {% load i18n %}
 {% load cache %}
 {% load static from staticfiles %}
 {% load board %}
 
 {% block head %}
     <title>Neboard - {{ thread.get_replies.0.get_title }}</title>
 {% endblock %}
 
 {% block content %}
+    {% spaceless %}
     {% get_current_language as LANGUAGE_CODE %}
 
     <script src="{% static 'js/thread_update.js' %}"></script>
     <script src="{% static 'js/thread.js' %}"></script>
 
     {% cache 600 thread_view thread.id thread.last_edit_time moderator LANGUAGE_CODE %}
         {% if bumpable %}
             <div class="bar-bg">
-                <div class="bar-value" style="width:{{ bumplimit_progress }}%">
+                <div class="bar-value" style="width:{{ bumplimit_progress }}%" id="bumplimit_progress">
                 </div>
                 <div class="bar-text">
-                    {{ posts_left }} {% trans 'posts to bumplimit' %}
+                    <span id="left_to_limit">{{ posts_left }}</span> {% trans 'posts to bumplimit' %}
                 </div>
             </div>
         {% endif %}
     <div class="thread">
     {% for post in thread.get_replies %}
         {% if bumpable %}
             <div class="post" id="{{ post.id }}">
         {% else %}
             <div class="post dead_post" id="{{ post.id }}">
         {% endif %}
         {% if post.image %}
             <div class="image">
                 <a
                         class="thumb"
                         href="{{ post.image.url }}"><img
                         src="{{ post.image.url_200x150 }}"
                         alt="{{ post.id }}"
                         data-width="{{ post.image_width }}"
                         data-height="{{ post.image_height }}"/>
                 </a>
             </div>
         {% endif %}
         <div class="message">
             <div class="post-info">
                 <span class="title">{{ post.title }}</span>
                 <a class="post_id" href="#{{ post.id }}">
                     ({{ post.id }})</a>
                 [{{ post.pub_time }}]
             [<a href="#" onclick="javascript:addQuickReply('{{ post.id }}')
                 ; return false;">&gt;&gt;</a>]
 
                 {% if moderator %}
                     <span class="moderator_info">
                         [<a href="{% url 'delete' post_id=post.id %}"
                             >{% trans 'Delete' %}</a>]
                         ({{ post.poster_ip }})
                         [<a href="{% url 'ban' post_id=post.id %}?next={{ request.path }}"
                             >{% trans 'Ban IP' %}</a>]
                     </span>
                 {% endif %}
             </div>
             {% autoescape off %}
             {{ post.text.rendered }}
             {% endautoescape %}
     {% if post.is_referenced %}
         <div class="refmap">
         {% trans "Replies" %}:
         {% for ref_post in post.get_sorted_referenced_posts %}
         <a href="{% post_url ref_post.id %}">&gt;&gt;{{ ref_post.id }}</a
                 >{% if not forloop.last %},{% endif %}
         {% endfor %}
         </div>
     {% endif %}
         </div>
         {% if forloop.first %}
             <div class="metadata">
                 <span class="tags">
                     {% for tag in thread.get_tags %}
                         <a class="tag" href="{% url 'tag' tag.name %}">
                             #{{ tag.name }}</a
                                 >{% if not forloop.last %},{% endif %}
                     {% endfor %}
                 </span>
             </div>
         {% endif %}
         </div>
     {% endfor %}
     </div>
     {% endcache %}
 
     <form id="form" enctype="multipart/form-data" method="post"
             >{% csrf_token %}
         <div class="post-form-w">
         <div class="form-title">{% trans "Reply to thread" %} #{{ thread.get_opening_post.id }}</div>
             <div class="post-form">
                 <div class="form-row">
                     <div class="form-label">{% trans 'Title' %}</div>
                     <div class="form-input">{{ form.title }}</div>
                     <div class="form-errors">{{ form.title.errors }}</div>
                 </div>
                 <div class="form-row">
                     <div class="form-label">{% trans 'Formatting' %}</div>
                     <div class="form-input" id="mark_panel">
                         <span class="mark_btn" id="quote"><span class="quote">&gt;{% trans 'quote' %}</span></span>
                         <span class="mark_btn" id="italic"><i>{% trans 'italic' %}</i></span>
                         <span class="mark_btn" id="bold"><b>{% trans 'bold' %}</b></span>
                         <span class="mark_btn" id="spoiler"><span class="spoiler">{% trans 'spoiler' %}</span></span>
                         <span class="mark_btn" id="comment"><span class="comment">// {% trans 'comment' %}</span></span>
                     </div>
                 </div>
                 <div class="form-row">
                     <div class="form-label">{% trans 'Text' %}</div>
                     <div class="form-input">{{ form.text }}</div>
                     <div class="form-errors">{{ form.text.errors }}</div>
                 </div>
                 <div class="form-row">
                     <div class="form-label">{% trans 'Image' %}</div>
                     <div class="form-input">{{ form.image }}</div>
                     <div class="form-errors">{{ form.image.errors }}</div>
                 </div>
                 <div class="form-row form-email">
                     <div class="form-label">{% trans 'e-mail' %}</div>
                     <div class="form-input">{{ form.email }}</div>
                     <div class="form-errors">{{ form.email.errors }}</div>
                 </div>
                 <div class="form-row">
                     {{ form.captcha }}
                     <div class="form-errors">{{ form.captcha.errors }}</div>
                 </div>
                 <div class="form-row">
                     <div class="form-errors">{{ form.other.errors }}</div>
                 </div>
             </div>
 
             <div class="form-submit"><input type="submit"
                                             value="{% trans "Post" %}"/></div>
             <div><a href="{% url "staticpage" name="help" %}">
                 {% trans 'Text syntax' %}</a></div>
         </div>
     </form>
 
+    {% endspaceless %}
 {% endblock %}
 
 {% block metapanel %}
 
     {% get_current_language as LANGUAGE_CODE %}
 
     <span class="metapanel" data-last-update="{{ last_update }}">
         {% cache 600 thread_meta thread.last_edit_time moderator LANGUAGE_CODE %}
             <span id="reply-count">{{ thread.get_reply_count }}</span> {% trans 'replies' %},
             <span id="image-count">{{ thread.get_images_count }}</span> {% trans 'images' %}.
             {% trans 'Last update: ' %}{{ thread.last_edit_time }}
             [<a href="rss/">RSS</a>]
         {% endcache %}
     </span>
 
 {% endblock %}