Added favorite thread popup

boards/context_processors.py

@@ -19,7 +19,7 b" CONTEXT_NEW_NOTIFICATIONS_COUNT = 'new_n"
 CONTEXT_USERNAME = 'username'
 CONTEXT_TAGS_STR = 'tags_str'
 CONTEXT_IMAGE_VIEWER = 'image_viewer'
-CONTEXT_FAV_THREADS = 'fav_threads'
+CONTEXT_HAS_FAV_THREADS = 'has_fav_threads'
 
 
 def get_notifications(context, request):
@@ -45,8 +45,6 b' def user_and_ui_processor(request):'
     fav_tags = settings_manager.get_fav_tags()
     context[CONTEXT_TAGS] = fav_tags
 
-    _get_fav_threads(context, settings_manager)
-
     context[CONTEXT_TAGS_STR] = Tag.objects.get_tag_url_list(fav_tags)
     theme = settings_manager.get_theme()
     context[CONTEXT_THEME] = theme
@@ -62,27 +60,9 b' def user_and_ui_processor(request):'
         SETTING_IMAGE_VIEWER,
         default=settings.get('View', 'DefaultImageViewer'))
 
+    context[CONTEXT_HAS_FAV_THREADS] =\
+        len(settings_manager.get_fav_threads()) > 0
+
     get_notifications(context, request)
 
     return context
-
-
-def _get_fav_threads(context, settings_manager):
-    fav_threads_setting = settings_manager.get_fav_threads()
-    if fav_threads_setting:
-        fav_threads = Post.objects.filter(
-            id__in=fav_threads_setting.keys()).only('url', 'id', 'thread')\
-            .select_related('thread')
-
-        context_thread_list = []
-        for post in fav_threads:
-            new_replies = post.get_thread().get_replies_newer(fav_threads_setting[str(post.id)])
-
-            element = dict()
-            element['post'] = post
-            element['count'] = new_replies.count()
-            if element['count'] > 0:
-                element['new_post'] = new_replies.first().get_absolute_url()
-            context_thread_list.append(element)
-        context[CONTEXT_FAV_THREADS] = context_thread_list
-

boards/locale/ru/LC_MESSAGES/django.po

@@ -478,3 +478,9 b' msgstr "\xd0\x9e\xd0\xba"'
 #, python-format
 msgid "File must be less than %s bytes"
 msgstr "Файл должен быть менее %s байт"
+
+msgid "favorites"
+msgstr "избранное"
+
+msgid "Loading..."
+msgstr "Загрузка..."
  No newline at end of file

boards/static/css/base.css

@@ -133,4 +133,13 b' textarea, input {'
 
 .tripcode {
     padding: 2px;
+}
+
+#fav-panel {
+    display: none;
+    margin: 1ex;
+}
+
+#new-fav-post-count {
+    display: none;
 }
  No newline at end of file

boards/static/css/md/base_page.css

@@ -563,3 +563,7 b' ul {'
 .tripcode {
     color: white;
 }
+
+#fav-panel {
+    border: 1px solid white;
+}

boards/static/js/main.js

@@ -23,6 +23,8 b''
  for the JavaScript code in this page.
  */
 
+var FAV_POST_UPDATE_PERIOD = 10000;
+
 /**
  * An email is a hidden file to prevent spam bots from posting. It has to be
  * hidden.
@@ -40,6 +42,72 b' function highlightCode(node) {'
     });
 }
 
+function updateFavPosts() {
+    var includePostBody = $('#fav-panel').is(":visible");
+    var url = '/api/new_posts/';
+    if (includePostBody) {
+        url += '?include_posts'
+    }
+    $.getJSON(url,
+        function(data) {
+            var allNewPostCount = 0;
+
+            if (includePostBody) {
+                var favoriteThreadPanel = $('#fav-panel');
+                favoriteThreadPanel.empty();
+            }
+
+            $.each(data, function (_, dict) {
+                var newPostCount = dict.new_post_count;
+                allNewPostCount += newPostCount;
+
+                if (includePostBody) {
+                    var post = $(dict.post);
+
+                    var id = post.find('.post_id');
+                    var title = post.find('.title');
+
+                    var favThreadNode = $('<div class="post"></div>');
+                    favThreadNode.append(id);
+                    favThreadNode.append(' ');
+                    favThreadNode.append(title);
+
+                    if (newPostCount > 0) {
+                        favThreadNode.append(' (<a href="' + dict.newest_post_link + '">+' + newPostCount + "</a>)");
+                    }
+
+                    favoriteThreadPanel.append(favThreadNode);
+                }
+            });
+
+            var newPostCountNode = $('#new-fav-post-count');
+            if (allNewPostCount > 0) {
+                newPostCountNode.text('(+' + allNewPostCount + ')');
+                newPostCountNode.show();
+            } else {
+                newPostCountNode.hide();
+            }
+        }
+    );
+}
+
+function initFavPanel() {
+    updateFavPosts();
+    setInterval(updateFavPosts, FAV_POST_UPDATE_PERIOD);
+    $('#fav-panel-btn').click(function() {
+        $('#fav-panel').toggle();
+        updateFavPosts();
+
+        return false;
+    });
+
+    $(document).on('keyup.removepic', function(e) {
+        if(e.which === 27) {
+            $('#fav-panel').hide();
+        }
+    });
+}
+
 $( document ).ready(function() {
     hideEmailFromForm();
 
@@ -53,4 +121,6 b' function highlightCode(node) {'
     addRefLinkPreview();
 
     highlightCode($(document));
+
+    initFavPanel();
 });

boards/static/js/thread_update.js

@@ -113,7 +113,7 b' function getThreadDiff() {'
     var data = {
         uids: uids,
         thread: threadId
-    }
+    };
 
     var diffUrl = '/api/diff_thread/';
 

boards/templates/boards/base.html

@@ -39,7 +39,10 b''
         <a href="{% url 'tags' 'required'%}" title="{% trans 'Tag management' %}">{% trans "tags" %}</a>,
         <a href="{% url 'search' %}" title="{% trans 'Search' %}">{% trans 'search' %}</a>,
         <a href="{% url 'feed' %}" title="{% trans 'Feed' %}">{% trans 'feed' %}</a>,
-        <a href="{% url 'random' %}" title="{% trans 'Random images' %}">{% trans 'random' %}</a>
+        <a href="{% url 'random' %}" title="{% trans 'Random images' %}">{% trans 'random' %}</a>{% if has_fav_threads %},
+
+            <a href="#" id="fav-panel-btn">{% trans 'favorites' %} <span id="new-fav-post-count"></span></a>
+        {% endif %}
 
         {% if username %}
             <a class="right-link link" href="{% url 'notifications' username %}" title="{% trans 'Notifications' %}">
@@ -53,17 +56,7 b''
         <a class="right-link link" href="{% url 'settings' %}">{% trans 'Settings' %}</a>
     </div>
 
-    {% if fav_threads %}
-        <div class="image-mode-tab">
-            ★
-            {% for thread in fav_threads %}
-                {% comment  %}
-                If there are new posts in the thread, show their count.
-                {% endcomment %}
-                {{ thread.post.get_link_view|safe }}{% if thread.count %} (<a href="{{ thread.new_post }}">+{{ thread.count }}</a>){% endif %}{% if not forloop.last %}, {% endif %}
-            {% endfor %}
-        </div>
-    {% endif %}
+    <div id="fav-panel"><div class="post">{% trans "Loading..." %}</div></div>
 
     {% block content %}{% endblock %}
 

boards/urls.py

@@ -69,6 +69,7 b" urlpatterns = patterns('',"
     url(r'^api/notifications/(?P<username>\w+)/$', api.api_get_notifications,
             name='api_notifications'),
     url(r'^api/preview/$', api.api_get_preview, name='preview'),
+    url(r'^api/new_posts/$', api.api_get_new_posts, name='new_posts'),
 
     # Search
     url(r'^search/$', BoardSearchView.as_view(), name='search'),

boards/views/api.py

@@ -1,3 +1,4 b''
+from collections import OrderedDict
 import json
 import logging
 
@@ -58,8 +59,8 b' def api_get_threaddiff(request):'
     diff_type = request.GET.get(PARAMETER_DIFF_TYPE, DIFF_TYPE_HTML)
 
     for post in posts:
-        json_data[PARAMETER_UPDATED].append(get_post_data(post.id, diff_type,
-            request))
+        json_data[PARAMETER_UPDATED].append(post.get_post_data(
+            format_type=diff_type, request=request))
     json_data[PARAMETER_LAST_UPDATE] = str(thread.last_edit_time)
 
     # If the tag is favorite, update the counter
@@ -151,7 +152,7 b' def api_get_threads(request, count):'
         opening_post = thread.get_opening_post()
 
         # TODO Add tags, replies and images count
-        post_data = get_post_data(opening_post.id, include_last_update=True)
+        post_data = opening_post.get_post_data(include_last_update=True)
         post_data['bumpable'] = thread.can_bump()
         post_data['archived'] = thread.archived
 
@@ -197,7 +198,7 b' def api_get_thread_posts(request, openin'
     json_post_list = []
 
     for post in posts:
-        json_post_list.append(get_post_data(post.id))
+        json_post_list.append(post.get_post_data())
     json_data['last_update'] = datetime_to_epoch(thread.last_edit_time)
     json_data['posts'] = json_post_list
 
@@ -213,7 +214,7 b' def api_get_notifications(request, usern'
 
     json_post_list = []
     for post in posts:
-        json_post_list.append(get_post_data(post.id))
+        json_post_list.append(post.get_post_data())
     return HttpResponse(content=json.dumps(json_post_list))
 
 
@@ -233,16 +234,41 b' def api_get_post(request, post_id):'
     return HttpResponse(content=json)
 
 
-# TODO Remove this method and use post method directly
-def get_post_data(post_id, format_type=DIFF_TYPE_JSON, request=None,
-                  include_last_update=False):
-    post = get_object_or_404(Post, id=post_id)
-    return post.get_post_data(format_type=format_type, request=request,
-                              include_last_update=include_last_update)
-
-
 def api_get_preview(request):
     raw_text = request.POST['raw_text']
 
     parser = Parser()
     return HttpResponse(content=parser.parse(parser.preparse(raw_text)))
+
+
+def api_get_new_posts(request):
+    """
+    Gets favorite threads and unread posts count.
+    """
+    posts = list()
+
+    include_posts = 'include_posts' in request.GET
+
+    settings_manager = get_settings_manager(request)
+    fav_threads = settings_manager.get_fav_threads()
+    fav_thread_ops = Post.objects.filter(id__in=fav_threads.keys())\
+        .order_by('-pub_time').prefetch_related('thread')
+
+    for op in fav_thread_ops:
+        last_read_post = fav_threads[str(op.id)]
+        new_posts = op.get_thread().get_replies_newer(last_read_post)
+        new_post_count = new_posts.count()
+        fav_thread_dict = dict()
+        fav_thread_dict['id'] = op.id
+        fav_thread_dict['new_post_count'] = new_post_count
+
+        if include_posts:
+            fav_thread_dict['post'] = op.get_post_data(
+                format_type=DIFF_TYPE_HTML)
+            if new_post_count > 0:
+                fav_thread_dict['newest_post_link'] = new_posts.first()\
+                    .get_absolute_url()
+
+        posts.append(fav_thread_dict)
+
+    return HttpResponse(content=json.dumps(posts))