u/bodqhrohro/swineboard Commit - r1327:f297fac2

Added link to the first unread post in the favorite thread

neko259 -

r1327:f297fac2 default

parent child

boards/context_processors.py

0 +13 -4

             from boards.abstracts.settingsmanager import get_settings_manager, \
                 SETTING_USERNAME, SETTING_LAST_NOTIFICATION_ID, SETTING_IMAGE_VIEWER
             from boards.models.user import Notification
             __author__ = 'neko259'
             from boards import settings, utils
             from boards.models import Post, Tag
             CONTEXT_SITE_NAME = 'site_name'
             CONTEXT_VERSION = 'version'
             CONTEXT_MODERATOR = 'moderator'
             CONTEXT_THEME_CSS = 'theme_css'
             CONTEXT_THEME = 'theme'
             CONTEXT_PPD = 'posts_per_day'
             CONTEXT_TAGS = 'tags'
             CONTEXT_USER = 'user'
             CONTEXT_NEW_NOTIFICATIONS_COUNT = 'new_notifications_count'
             CONTEXT_USERNAME = 'username'
             CONTEXT_TAGS_STR = 'tags_str'
             CONTEXT_IMAGE_VIEWER = 'image_viewer'
             CONTEXT_FAV_THREADS = 'fav_threads'
             def get_notifications(context, request):
                 settings_manager = get_settings_manager(request)
                 username = settings_manager.get_setting(SETTING_USERNAME)
                 new_notifications_count = 0
                 if username is not None and len(username) > 0:
                     last_notification_id = settings_manager.get_setting(
                         SETTING_LAST_NOTIFICATION_ID)
                     new_notifications_count = Notification.objects.get_notification_posts(
                             username=username, last=last_notification_id).count()
                 context[CONTEXT_NEW_NOTIFICATIONS_COUNT] = new_notifications_count
                 context[CONTEXT_USERNAME] = username
             def user_and_ui_processor(request):
                 context = dict()
                 context[CONTEXT_PPD] = float(Post.objects.get_posts_per_day())
                 settings_manager = get_settings_manager(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
                 context[CONTEXT_THEME_CSS] = 'css/' + theme + '/base_page.css'
                 # This shows the moderator panel
                 context[CONTEXT_MODERATOR] = utils.is_moderator(request)
                 context[CONTEXT_VERSION] = settings.get('Version', 'Version')
                 context[CONTEXT_SITE_NAME] = settings.get('Version', 'SiteName')
                 context[CONTEXT_IMAGE_VIEWER] = settings_manager.get_setting(
                     SETTING_IMAGE_VIEWER,
                     default=settings.get('View', 'DefaultImageViewer'))
                 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[CONTEXT_FAV_THREADS] = [
-                        (post, post.get_thread().get_replies_newer(
+                    context_thread_list = []
-                            fav_threads_setting[str(post.id)]).count())
+                    for post in fav_threads:
-                        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/templates/boards/base.html

0 +1 -1

             {% load staticfiles %}
             {% load i18n %}
             {% load l10n %}
             {% load static from staticfiles %}
             <!DOCTYPE html>
             <html>
             <head>
                 <link rel="stylesheet" type="text/css" href="{% static 'css/base.css' %}" media="all"/>
                 <link rel="stylesheet" type="text/css" href="{% static 'css/3party/highlight.css' %}" media="all"/>
                 <link rel="stylesheet" type="text/css" href="{% static 'css/3party/jquery-ui.min.css' %}" media="all"/>
                 <link rel="stylesheet" type="text/css" href="{% static theme_css %}" media="all"/>
                 <link rel="alternate" type="application/rss+xml" href="rss/" title="{% trans 'Feed' %}"/>
                 <link rel="icon" type="image/png"
                     href="{% static 'favicon.png' %}">
                 <meta name="viewport" content="width=device-width, initial-scale=1"/>
                 <meta charset="utf-8"/>
                 {% block head %}{% endblock %}
             </head>
             <body data-image-viewer="{{ image_viewer }}">
                 <script src="{% static 'js/jquery-2.0.1.min.js' %}"></script>
                 <script src="{% static 'js/3party/jquery-ui.min.js' %}"></script>
                 <script src="{% static 'js/jquery.mousewheel.js' %}"></script>
                 <script src="{% url 'js_info_dict' %}"></script>
                 <div class="navigation_panel header">
                     <a class="link" href="{% url 'index' %}">{% trans "All threads" %}</a>
                     {% if tags_str %}
                         {% autoescape off %}
                             {{ tags_str }},
                         {% endautoescape %}
                     {% else %}
                         {% trans 'Add tags' %} →
                     {% endif %}
                     <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>
                     {% if username %}
                         <a class="right-link link" href="{% url 'notifications' username %}" title="{% trans 'Notifications' %}">
                             {% trans 'Notifications' %}
                             {% ifnotequal new_notifications_count 0 %}
                                 (<b>{{ new_notifications_count }}</b>)
                             {% endifnotequal %}
                         </a>
                     {% endif %}
                     <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.0.get_link_view|safe }}{% if thread.1 %} (+{{ thread.1 }}){% endif %}{% if not forloop.last %}, {% endif %}
+                            {{ 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 %}
                 {% block content %}{% endblock %}
                 <script src="{% static 'js/3party/highlight.min.js' %}"></script>
                 <script src="{% static 'js/popup.js' %}"></script>
                 <script src="{% static 'js/image.js' %}"></script>
                 <script src="{% static 'js/refpopup.js' %}"></script>
                 <script src="{% static 'js/main.js' %}"></script>
                 <div class="navigation_panel footer">
                     {% block metapanel %}{% endblock %}
                     [<a href="{% url 'admin:index' %}">{% trans 'Admin' %}</a>]
                     {% with ppd=posts_per_day|floatformat:2 %}
                         {% blocktrans %}Speed: {{ ppd }} posts per day{% endblocktrans %}
                     {% endwith %}
                     <a class="link" href="#top" id="up">{% trans 'Up' %}</a>
                 </div>
             </body>
             </html>

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages