Added ability to rollover thread

boards/locale/ru/LC_MESSAGES/djangojs.po

@@ -1,93 +1,97 b''
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-09-04 18:47+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: static/js/3party/jquery-ui.min.js:8
 msgid "'"
 msgstr ""
 
 #: static/js/refpopup.js:72
 msgid "Loading..."
 msgstr "Загрузка..."
 
 #: static/js/refpopup.js:91
 msgid "Post not found"
 msgstr "Сообщение не найдено"
 
 #: static/js/thread_update.js:261
 msgid "message"
 msgid_plural "messages"
 msgstr[0] "сообщение"
 msgstr[1] "сообщения"
 msgstr[2] "сообщений"
 
 #: static/js/thread_update.js:262
 msgid "image"
 msgid_plural "images"
 msgstr[0] "изображение"
 msgstr[1] "изображения"
 msgstr[2] "изображений"
 
 #: static/js/thread_update.js:445
 msgid "Sending message..."
 msgstr "Отправка сообщения..."
 
 #: static/js/thread_update.js:449
 msgid "Server error!"
 msgstr "Ошибка сервера!"
 
 msgid "Computing PoW..."
 msgstr "Расчёт PoW..."
 
 msgid "Duplicates search"
 msgstr "Поиск дубликатов"
 
 msgid "Add local sticker"
 msgstr "Добавить локальный стикер"
 
 msgid "Input sticker name"
 msgstr "Введите название стикера"
 
 msgid "Images posted: "
 msgstr "Вставленных изображений: "
 
 msgid "Ban and delete"
 msgstr "Забанить и удалить"
 
 msgid "Are you sure?"
 msgstr "Вы уверены?"
 
 msgid "Ban"
 msgstr "Забанить"
 
 msgid "Delete post"
 msgstr "Удалить пост"
 
 msgid "Delete thread"
 msgstr "Удалить тему"
 
 msgid "Edit"
 msgstr "Изменить"
 
 msgid "Edit thread"
 msgstr "Изменить тему"
 
 msgid "Hide/show"
 msgstr "Скрыть/показать"
+
+msgid "Rollover thread"
+msgstr "Перекатить тред"
+

boards/locale/uk/LC_MESSAGES/djangojs.po

@@ -1,93 +1,97 b''
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-09-04 18:47+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: static/js/3party/jquery-ui.min.js:8
 msgid "'"
 msgstr ""
 
 #: static/js/refpopup.js:72
 msgid "Loading..."
 msgstr "Завантаження..."
 
 #: static/js/refpopup.js:91
 msgid "Post not found"
 msgstr "Повідомлення не знайдене"
 
 #: static/js/thread_update.js:261
 msgid "message"
 msgid_plural "messages"
 msgstr[0] "повідомлення"
 msgstr[1] "повідомлення"
 msgstr[2] "повідомлень"
 
 #: static/js/thread_update.js:262
 msgid "image"
 msgid_plural "images"
 msgstr[0] "зображення"
 msgstr[1] "зображення"
 msgstr[2] "зображень"
 
 #: static/js/thread_update.js:445
 msgid "Sending message..."
 msgstr "Повідомлення надсилається..."
 
 #: static/js/thread_update.js:449
 msgid "Server error!"
 msgstr "Сервер нездужає! Заходьте пізніше!"
 
 msgid "Computing PoW..."
 msgstr "Розраховується PoW..."
 
 msgid "Duplicates search"
 msgstr "Пошук дублікатів"
 
 msgid "Add local sticker"
 msgstr "Додати локальний стікер"
 
 msgid "Input sticker name"
 msgstr "Введіть назву стікера"
 
 msgid "Images posted: "
 msgstr "Вставлених зображень: "
 
 msgid "Ban and delete"
 msgstr "Заблокувати й видалити"
 
 msgid "Are you sure?"
 msgstr "Чи ви певні?"
 
 msgid "Ban"
 msgstr "Заблокувати"
 
 msgid "Delete post"
 msgstr "Видалити повідомлення"
 
 msgid "Delete thread"
 msgstr "Вирвати нитку"
 
 msgid "Edit"
 msgstr "Змінити"
 
 msgid "Edit thread"
 msgstr "Змінити нитку"
 
 msgid "Hide/show"
 msgstr "Приховати/відобразити"
+
+msgid "Rollover thread"
+msgstr "Перекотити нитку"
+

boards/static/js/main.js

@@ -1,362 +1,371 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 ITEM_VOLUME_LEVEL = 'volumeLevel';
 var ITEM_HIDDEN_POSTS = 'hiddenPosts';
 
 var IMAGE_TYPES = ['image/png', 'image/jpg', 'image/jpeg', 'image/bmp', 'image/gif'];
 
 /**
  * An email is a hidden file to prevent spam bots from posting. It has to be
  * hidden.
  */
 function hideEmailFromForm() {
     $('.form-email').parent().parent().hide();
 }
 
 /**
  * Highlight code blocks with code highlighter
  */
 function highlightCode(node) {
     node.find('pre code').each(function(i, e) {
         hljs.highlightBlock(e);
     });
 }
 
 function updateFavPosts(data) {
     var includePostBody = $('#fav-panel').is(":visible");
 
     var allNewPostCount = 0;
 
     if (includePostBody) {
         var favoriteThreadPanel = $('#fav-panel');
         favoriteThreadPanel.empty();
     }
 
     $.each($.parseJSON(data), function (_, dict) {
         var newPostCount = dict.new_post_count;
         allNewPostCount += newPostCount;
 
         if (includePostBody) {
             var favThreadNode = $('<div class="post"></div>');
             favThreadNode.append($(dict.post_url));
             favThreadNode.append(' ');
             favThreadNode.append($('<span class="title">' + dict.title + '</span>'));
 
             if (newPostCount > 0) {
                 favThreadNode.append(' (<a href="' + dict.newest_post_link + '">+' + newPostCount + "</a>)");
             }
 
             favoriteThreadPanel.append(favThreadNode);
 
             addRefLinkPreview(favThreadNode[0]);
         }
     });
 
     var newPostCountNode = $('#new-fav-post-count');
     if (allNewPostCount > 0) {
         newPostCountNode.text('(+' + allNewPostCount + ')');
         newPostCountNode.show();
     } else {
         newPostCountNode.hide();
     }
 }
 
 function initFavPanel() {
     var favPanelButton = $('#fav-panel-btn');
     if (favPanelButton.length > 0 && typeof SharedWorker != 'undefined') {
         var worker = new SharedWorker($('body').attr('data-update-script'));
         worker.port.onmessage = function(e) {
             updateFavPosts(e.data);
         };
         worker.onerror = function(event){
             throw new Error(event.message + " (" + event.filename + ":" + event.lineno + ")");
         };
         worker.port.start();
 
         $(favPanelButton).click(function() {
             var favPanel = $('#fav-panel');
             favPanel.toggle();
 
             worker.port.postMessage({ includePostBody: favPanel.is(':visible')});
 
             return false;
         });
 
         $(document).on('keyup.removepic', function(e) {
             if(e.which === 27) {
                 $('#fav-panel').hide();
             }
         });
     }
 }
 
 function setVolumeLevel(level) {
     localStorage.setItem(ITEM_VOLUME_LEVEL, level);
 }
 
 function getVolumeLevel() {
     var level = localStorage.getItem(ITEM_VOLUME_LEVEL);
     if (level == null) {
         level = 1.0;
     }
     return level
 }
 
 function processVolumeUser(node) {
     if (!window.localStorage) return;
     node.prop("volume", getVolumeLevel());
     node.on('volumechange', function(event) {
         setVolumeLevel(event.target.volume);
         $("video,audio").prop("volume", getVolumeLevel());
     });
 }
 
 function getHiddenPosts() {
     var arr = Array();
     var hiddenPosts = localStorage.getItem(ITEM_HIDDEN_POSTS);
     if (hiddenPosts) {
         arr = JSON.parse(hiddenPosts);
     }
     return arr;
 }
 
 function processPostHiding(posts) {
     var hiddenPosts = getHiddenPosts();
 
     $.each(posts, function(index) {
         var post = $(this);
         if (hiddenPosts.indexOf(post.attr("id")) > -1) {
             post.toggleClass("hidden_post");
         }
     });
 }
 
 /**
  * Add all scripts than need to work on post, when the post is added to the
  * document.
  */
 function addScriptsToPost(post) {
     addRefLinkPreview(post[0]);
     highlightCode(post);
     processVolumeUser(post.find("video,audio"));
     processPostHiding([post]);
 }
 
 /**
  * Fix compatibility issues with some rare browsers
  */
 function compatibilityCrutches() {
     if (window.operamini) {
         $('#form textarea').each(function() { this.placeholder = ''; });
     }
 }
 
 function togglePostHidden(postId) {
     var hiddenPosts = getHiddenPosts();
 
     var elIndex = hiddenPosts.indexOf(postId);
     if (elIndex > -1) {
         hiddenPosts.splice(elIndex, 1);
     } else {
         hiddenPosts.push(postId);
     }
     localStorage.setItem(ITEM_HIDDEN_POSTS, JSON.stringify(hiddenPosts));
 
     $('#' + postId).toggleClass("hidden_post");
 }
 
 function addContextMenu() {
     $.contextMenu({
         selector: '.file-menu',
         trigger: 'left',
 
         build: function($trigger, e) {
             var fileSearchUrl = $trigger.data('search-url');
             var isImage = IMAGE_TYPES.indexOf($trigger.data('type')) > -1;
             var hasUrl = fileSearchUrl.length > 0;
             var id = $trigger.data('id');
             return {
                 items: {
                     duplicates: {
                         name: gettext('Duplicates search'),
                         callback: function(key, opts) {
                             window.location = '/feed/?image=' + $trigger.data('filename');
                         }
                     },
                     google: {
                         name: 'Google',
                         visible: isImage && hasUrl,
                         callback: function(key, opts) {
                             window.location = 'https://www.google.com/searchbyimage?image_url=' + fileSearchUrl;
                         }
                     },
                     iqdb: {
                         name: 'IQDB',
                         visible: isImage && hasUrl,
                         callback: function(key, opts) {
                             window.location = 'http://iqdb.org/?url=' + fileSearchUrl;
                         }
                     },
                     tineye: {
                         name: 'TinEye',
                         visible: isImage && hasUrl,
                         callback: function(key, opts) {
                             window.location = 'http://tineye.com/search?url=' + fileSearchUrl;
                         }
                     },
                     addAlias: {
                         name: gettext('Add local sticker'),
                         callback: function(key, opts) {
                             var alias = prompt(gettext('Input sticker name'));
                             if (alias) {
                                 window.location = '/stickers/?action=add&name=' + alias + '&id=' + id;
                             }
                         }
                     }
                 }
             };
         }
     });
 
     $.contextMenu({
         selector: '.post .post-menu',
         trigger: 'left',
         build: function($trigger, e) {
             var canEditPost = PERMS['change_post'];
             var canDeletePost = PERMS['delete_post'];
             var canEditThread = PERMS['change_thread'];
             var canDeleteThread = PERMS['delete_thread'];
 
             var post = $trigger.parents('.post');
 
             var isOpening = post.data('opening') === 'True';
             var threadId = post.data('thread-id');
             var hasGlobalId = post.data('has-global-id') === 'True';
 
             var posterIp = $trigger.siblings('.pub_time').attr('title');
             var hasIp = posterIp != null;
 
             var postId = post.attr('id');
 
             return {
                 items: {
                     hide: {
                         name: gettext('Hide/show'),
                         callback: function(key, opt) {
                             togglePostHidden(postId);
                         }
                     },
                     edit: {
                         name: gettext('Edit'),
                         callback: function(key, opt) {
                             window.location = '/admin/boards/post/' + postId + '/change/';
                         },
                         visible: canEditPost
                     },
                     deletePost: {
                         name: gettext('Delete post'),
                         callback: function(key, opt) {
                             window.location = '/admin/boards/post/' + postId + '/delete/';
                         },
                         visible: !isOpening && canDeletePost
                     },
                     editThread: {
                         name: gettext('Edit thread'),
                         callback: function(key, opt) {
                             window.location = '/admin/boards/thread/' + threadId + '/change/';
                         },
                         visible: isOpening && canEditThread
                     },
                     deleteThread: {
                         name: gettext('Delete thread'),
                         callback: function(key, opt) {
                             window.location = '/admin/boards/thread/' + threadId + '/delete/';
                         },
                         visible: isOpening && canDeleteThread
                     },
                     findByIp: {
                         name: 'IP = ' + posterIp,
                         callback: function(key, opt) {
                             window.location = '/feed/?ip=' + posterIp;
                         },
                         visible: canEditPost && hasIp
                     },
                     raw: {
                         name: 'RAW',
                         callback: function(key, opt) {
                             window.location = '/post_xml/' + postId;
                         },
                         visible: canEditPost && hasGlobalId
                     },
                     ban: {
                         name: gettext('Ban'),
                         callback: function(key, opt) {
                             if (confirm(gettext('Are you sure?'))) {
                                 window.location = '/utils?method=ban&post_id=' + postId;
                             }
                         },
                         visible: canEditPost && hasIp
                     },
                     banAndDelete: {
                         name: gettext('Ban and delete'),
                         callback: function(key, opt) {
                             if (confirm(gettext('Are you sure?'))) {
                                 window.location = '/utils?method=ban_and_delete&post_id=' + postId;
                             }
                         },
                         visible: hasIp && canDeletePost
+                    },
+                    rollover: {
+                        name: gettext('Rollover thread'),
+                        callback: function(key, opt) {
+                            if (confirm(gettext('Are you sure?'))) {
+                                window.location = '/all/?t_from_id=' + postId + '#form';
+                            }
+                        },
+                        visible: isOpening
                     }
                 }
             };
         }
     });
 }
 
 $( document ).ready(function() {
     hideEmailFromForm();
 
     $("a[href='#top']").click(function() {
         $("html, body").animate({ scrollTop: 0 }, "slow");
         return false;
     });
 
     addImgPreview();
 
     addRefLinkPreview();
 
     highlightCode($(document));
 
     initFavPanel();
 
     var volumeUsers = $("video,audio");
     processVolumeUser(volumeUsers);
 
     addContextMenu();
 
     compatibilityCrutches();
 
     processPostHiding($('.post'));
 });

boards/views/all_threads.py

@@ -1,136 +1,151 b''
 from django.core.paginator import EmptyPage
 from django.http import Http404
 from django.shortcuts import render, redirect
 from django.urls import reverse
 from django.utils.decorators import method_decorator
 from django.views.decorators.csrf import csrf_protect
 
 from boards import settings
 from boards.abstracts.constants import PARAM_PAGE
 from boards.abstracts.paginator import get_paginator
 from boards.abstracts.settingsmanager import get_settings_manager, \
     SETTING_ONLY_FAVORITES, SETTING_SUBSCRIBE_BY_DEFAULT
 from boards.forms import ThreadForm, PlainErrorList
 from boards.models import Post, Thread
 from boards.settings import SECTION_VIEW
 from boards.views.base import BaseBoardView, CONTEXT_FORM
 from boards.views.mixins import PaginatedMixin, \
     DispatcherMixin, PARAMETER_METHOD
 
 ORDER_BUMP = 'bump'
 
 PARAM_ORDER = 'order'
 
 FORM_TAGS = 'tags'
 FORM_TEXT = 'text'
 FORM_TITLE = 'title'
 FORM_IMAGE = 'image'
 FORM_THREADS = 'threads'
 
 TAG_DELIMITER = ' '
 
 PARAMETER_CURRENT_PAGE = 'current_page'
 PARAMETER_PAGINATOR = 'paginator'
 PARAMETER_THREADS = 'threads'
 PARAMETER_ADDITIONAL = 'additional_params'
 PARAMETER_RSS_URL = 'rss_url'
 
 TEMPLATE = 'boards/all_threads.html'
 DEFAULT_PAGE = 1
 
 
 class AllThreadsView(BaseBoardView, PaginatedMixin, DispatcherMixin):
 
     tag_name = ''
 
     def __init__(self):
         self.settings_manager = None
         super(AllThreadsView, self).__init__()
 
     @method_decorator(csrf_protect)
     def get(self, request, form: ThreadForm=None):
         page = request.GET.get(PARAM_PAGE, DEFAULT_PAGE)
 
         params = self.get_context_data(request=request)
 
         subscribe_by_default = get_settings_manager(request).get_setting(
             SETTING_SUBSCRIBE_BY_DEFAULT, False)
 
         if not form:
-            form = ThreadForm(error_class=PlainErrorList,
-                              initial={FORM_TAGS: self.tag_name,
-                                       'subscribe': subscribe_by_default})
+            t_from_id = request.GET.get('t_from_id')
+            if t_from_id:
+                source_op = Post.objects.get(id=int(t_from_id))
+                tags_str = ' '.join([tag.get_name() for tag in source_op.get_thread().get_tags()])
+                post_link = '[post]{}[/post]'.format(source_op.id)  #FIXME To constants
+                new_title = source_op.get_title() + ' NEW'  # TODO More intelligent name change
+
+                form = ThreadForm(error_class=PlainErrorList,
+                                  initial={
+                                      FORM_TAGS: tags_str,
+                                      'subscribe': subscribe_by_default,
+                                      FORM_TEXT: post_link,
+                                      FORM_TITLE: new_title,
+                                      })
+            else:
+                form = ThreadForm(error_class=PlainErrorList,
+                                  initial={FORM_TAGS: self.tag_name,
+                                           'subscribe': subscribe_by_default})
 
         self.settings_manager = get_settings_manager(request)
 
         threads = self.get_threads()
 
         order = request.GET.get(PARAM_ORDER, ORDER_BUMP)
         if order == ORDER_BUMP:
             threads = threads.order_by('-bump_time')
         else:
             threads = threads.filter(replies__opening=True)\
                 .order_by('-replies__pub_time')
         threads = threads.distinct()
 
         paginator = get_paginator(threads, settings.get_int(
             SECTION_VIEW, 'ThreadsPerPage'),
                                   link=self.get_reverse_url(),
                                   params=request.GET.dict())
         paginator.current_page = int(page)
 
         try:
             threads = paginator.page(page).object_list
         except EmptyPage:
             raise Http404()
 
         params[PARAMETER_THREADS] = threads
         params[CONTEXT_FORM] = form
         params[PARAMETER_RSS_URL] = self.get_rss_url()
 
         params.update(self.get_page_context(paginator, page))
 
         return render(request, TEMPLATE, params)
 
     @method_decorator(csrf_protect)
     def post(self, request):
         if PARAMETER_METHOD in request.POST:
             self.dispatch_method(request)
 
             return redirect(self.get_reverse_url())
 
         form = ThreadForm(request.POST, request.FILES,
                           error_class=PlainErrorList, session=request.session)
 
         if form.is_valid():
             return Post.objects.create_from_form(request, form, None)
         if form.need_to_ban:
             # Ban user because he is suspected to be a bot
             self._ban_current_user(request)
 
         return self.get(request, form)
 
     def get_reverse_url(self):
         return reverse('index')
 
     def get_threads(self):
         """
         Gets list of threads that will be shown on a page.
         """
 
         threads = Thread.objects\
             .exclude(tags__in=self.settings_manager.get_hidden_tags())
         if self.settings_manager.get_setting(SETTING_ONLY_FAVORITES):
             fav_tags = self.settings_manager.get_fav_tags()
             if len(fav_tags) > 0:
                 threads = threads.filter(tags__in=fav_tags)
 
         return threads
 
     def get_rss_url(self):
         return self.get_reverse_url() + 'rss/'
 
     def toggle_fav(self, request):
         settings_manager = get_settings_manager(request)
         settings_manager.set_setting(SETTING_ONLY_FAVORITES,
                 not settings_manager.get_setting(SETTING_ONLY_FAVORITES, False))