Allow resetting form manually

boards/locale/ru/LC_MESSAGES/django.po

@@ -1,592 +1,592 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.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-10-09 23:21+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: ru\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"
 
 #: admin.py:22
 msgid "{} posters were banned"
 msgstr ""
 
 #: authors.py:9
 msgid "author"
 msgstr "автор"
 
 #: authors.py:10
 msgid "developer"
 msgstr "разработчик"
 
 #: authors.py:11
 msgid "javascript developer"
 msgstr "разработчик javascript"
 
 #: authors.py:12
 msgid "designer"
 msgstr "дизайнер"
 
 #: forms.py:30
 msgid "Type message here. Use formatting panel for more advanced usage."
 msgstr ""
 "Вводите сообщение сюда. Используйте панель для более сложного форматирования."
 
 #: forms.py:31
 msgid "music images i_dont_like_tags"
 msgstr "музыка картинки теги_не_нужны"
 
 #: forms.py:33
 msgid "Title"
 msgstr "Заголовок"
 
 #: forms.py:34
 msgid "Text"
 msgstr "Текст"
 
 #: forms.py:35
 msgid "Tag"
 msgstr "Метка"
 
 #: forms.py:36 templates/boards/base.html:40 templates/search/search.html:7
 msgid "Search"
 msgstr "Поиск"
 
 #: forms.py:48
 msgid "File 1"
 msgstr "Файл 1"
 
 #: forms.py:48
 msgid "File 2"
 msgstr "Файл 2"
 
 #: forms.py:142
 msgid "File URL"
 msgstr "URL файла"
 
 #: forms.py:148
 msgid "e-mail"
 msgstr ""
 
 #: forms.py:151
 msgid "Additional threads"
 msgstr "Дополнительные темы"
 
 #: forms.py:162
 #, python-format
 msgid "Title must have less than %s characters"
 msgstr "Заголовок должен иметь меньше %s символов"
 
 #: forms.py:172
 #, python-format
 msgid "Text must have less than %s characters"
 msgstr "Текст должен быть короче %s символов"
 
 #: forms.py:192
 msgid "Invalid URL"
 msgstr "Неверный URL"
 
 #: forms.py:213
 msgid "Invalid additional thread list"
 msgstr "Неверный список дополнительных тем"
 
 #: forms.py:258
 msgid "Either text or file must be entered."
 msgstr "Текст или файл должны быть введены."
 
 #: forms.py:317 templates/boards/all_threads.html:153
 #: templates/boards/rss/post.html:10 templates/boards/tags.html:6
 msgid "Tags"
 msgstr "Метки"
 
 #: forms.py:324
 msgid "Inappropriate characters in tags."
 msgstr "Недопустимые символы в метках."
 
 #: forms.py:344
 msgid "Need at least one section."
 msgstr "Нужен хотя бы один раздел."
 
 #: forms.py:356
 msgid "Theme"
 msgstr "Тема"
 
 #: forms.py:357
 msgid "Image view mode"
 msgstr "Режим просмотра изображений"
 
 #: forms.py:358
 msgid "User name"
 msgstr "Имя пользователя"
 
 #: forms.py:359
 msgid "Time zone"
 msgstr "Часовой пояс"
 
 #: forms.py:365
 msgid "Inappropriate characters."
 msgstr "Недопустимые символы."
 
 #: templates/boards/404.html:6
 msgid "Not found"
 msgstr "Не найдено"
 
 #: templates/boards/404.html:12
 msgid "This page does not exist"
 msgstr "Этой страницы не существует"
 
 #: templates/boards/all_threads.html:35
 msgid "Details"
 msgstr "Подробности"
 
 #: templates/boards/all_threads.html:69
 msgid "Edit tag"
 msgstr "Изменить метку"
 
 #: templates/boards/all_threads.html:76
 #, python-format
 msgid "%(count)s active thread"
 msgid_plural "%(count)s active threads"
 msgstr[0] "%(count)s активная тема"
 msgstr[1] "%(count)s активные темы"
 msgstr[2] "%(count)s активных тем"
 
 #: templates/boards/all_threads.html:76
 #, python-format
 msgid "%(count)s thread in bumplimit"
 msgid_plural "%(count)s threads in bumplimit"
 msgstr[0] "%(count)s тема в бамплимите"
 msgstr[1] "%(count)s темы в бамплимите"
 msgstr[2] "%(count)s тем в бамплимите"
 
 #: templates/boards/all_threads.html:77
 #, python-format
 msgid "%(count)s archived thread"
 msgid_plural "%(count)s archived thread"
 msgstr[0] "%(count)s архивная тема"
 msgstr[1] "%(count)s архивные темы"
 msgstr[2] "%(count)s архивных тем"
 
 #: templates/boards/all_threads.html:78 templates/boards/post.html:102
 #, python-format
 #| msgid "%(count)s message"
 #| msgid_plural "%(count)s messages"
 msgid "%(count)s message"
 msgid_plural "%(count)s messages"
 msgstr[0] "%(count)s сообщение"
 msgstr[1] "%(count)s сообщения"
 msgstr[2] "%(count)s сообщений"
 
 #: templates/boards/all_threads.html:95 templates/boards/feed.html:30
 #: templates/boards/notifications.html:17 templates/search/search.html:26
 msgid "Previous page"
 msgstr "Предыдущая страница"
 
 #: templates/boards/all_threads.html:109
 #, python-format
 msgid "Skipped %(count)s reply. Open thread to see all replies."
 msgid_plural "Skipped %(count)s replies. Open thread to see all replies."
 msgstr[0] "Пропущен %(count)s ответ. Откройте тред, чтобы увидеть все ответы."
 msgstr[1] ""
 "Пропущено %(count)s ответа. Откройте тред, чтобы увидеть все ответы."
 msgstr[2] ""
 "Пропущено %(count)s ответов. Откройте тред, чтобы увидеть все ответы."
 
 #: templates/boards/all_threads.html:127 templates/boards/feed.html:40
 #: templates/boards/notifications.html:27 templates/search/search.html:37
 msgid "Next page"
 msgstr "Следующая страница"
 
 #: templates/boards/all_threads.html:132
 msgid "No threads exist. Create the first one!"
 msgstr "Нет тем. Создайте первую!"
 
 #: templates/boards/all_threads.html:138
 msgid "Create new thread"
 msgstr "Создать новую тему"
 
 #: templates/boards/all_threads.html:143 templates/boards/preview.html:16
 #: templates/boards/thread_normal.html:51
 msgid "Post"
 msgstr "Отправить"
 
 #: templates/boards/all_threads.html:144 templates/boards/preview.html:6
 #: templates/boards/staticpages/help.html:21
 #: templates/boards/thread_normal.html:52
 msgid "Preview"
 msgstr "Предпросмотр"
 
 #: templates/boards/all_threads.html:149
 msgid "Tags must be delimited by spaces. Text or image is required."
 msgstr ""
 "Метки должны быть разделены пробелами. Текст или изображение обязательны."
 
 #: templates/boards/all_threads.html:152 templates/boards/thread_normal.html:58
 msgid "Text syntax"
 msgstr "Синтаксис текста"
 
 #: templates/boards/all_threads.html:166 templates/boards/feed.html:53
 msgid "Pages:"
 msgstr "Страницы: "
 
 #: templates/boards/authors.html:6 templates/boards/authors.html.py:12
 msgid "Authors"
 msgstr "Авторы"
 
 #: templates/boards/authors.html:26
 msgid "Distributed under the"
 msgstr "Распространяется под"
 
 #: templates/boards/authors.html:28
 msgid "license"
 msgstr "лицензией"
 
 #: templates/boards/authors.html:30
 msgid "Repository"
 msgstr "Репозиторий"
 
 #: templates/boards/base.html:14 templates/boards/base.html.py:41
 msgid "Feed"
 msgstr "Лента"
 
 #: templates/boards/base.html:31
 msgid "All threads"
 msgstr "Все темы"
 
 #: templates/boards/base.html:37
 msgid "Add tags"
 msgstr "Добавить метки"
 
 #: templates/boards/base.html:39
 msgid "Tag management"
 msgstr "Управление метками"
 
 #: templates/boards/base.html:39
 msgid "tags"
 msgstr "метки"
 
 #: templates/boards/base.html:40
 msgid "search"
 msgstr "поиск"
 
 #: templates/boards/base.html:41 templates/boards/feed.html:11
 msgid "feed"
 msgstr "лента"
 
 #: templates/boards/base.html:42 templates/boards/random.html:6
 msgid "Random images"
 msgstr "Случайные изображения"
 
 #: templates/boards/base.html:42
 msgid "random"
 msgstr "случайные"
 
 #: templates/boards/base.html:44
 msgid "favorites"
 msgstr "избранное"
 
 #: templates/boards/base.html:48 templates/boards/base.html.py:49
 #: templates/boards/notifications.html:8
 msgid "Notifications"
 msgstr "Уведомления"
 
 #: templates/boards/base.html:56 templates/boards/settings.html:8
 msgid "Settings"
 msgstr "Настройки"
 
 #: templates/boards/base.html:59
 msgid "Loading..."
 msgstr "Загрузка..."
 
 #: templates/boards/base.html:71
 msgid "Admin"
 msgstr "Администрирование"
 
 #: templates/boards/base.html:73
 #, python-format
 msgid "Speed: %(ppd)s posts per day"
 msgstr "Скорость: %(ppd)s сообщений в день"
 
 #: templates/boards/base.html:75
 msgid "Up"
 msgstr "Вверх"
 
 #: templates/boards/feed.html:45
 msgid "No posts exist. Create the first one!"
 msgstr "Нет сообщений. Создайте первое!"
 
 #: templates/boards/post.html:33
 msgid "Open"
 msgstr "Открыть"
 
 #: templates/boards/post.html:35 templates/boards/post.html.py:46
 msgid "Reply"
 msgstr "Ответить"
 
 #: templates/boards/post.html:41
 msgid " in "
 msgstr " в "
 
 #: templates/boards/post.html:51
 msgid "Edit"
 msgstr "Изменить"
 
 #: templates/boards/post.html:53
 msgid "Edit thread"
 msgstr "Изменить тему"
 
 #: templates/boards/post.html:91
 msgid "Replies"
 msgstr "Ответы"
 
 #: templates/boards/post.html:103
 #, python-format
 msgid "%(count)s image"
 msgid_plural "%(count)s images"
 msgstr[0] "%(count)s изображение"
 msgstr[1] "%(count)s изображения"
 msgstr[2] "%(count)s изображений"
 
 #: templates/boards/rss/post.html:5
 msgid "Post image"
 msgstr "Изображение сообщения"
 
 #: templates/boards/settings.html:15
 msgid "You are moderator."
 msgstr "Вы модератор."
 
 #: templates/boards/settings.html:19
 msgid "Hidden tags:"
 msgstr "Скрытые метки:"
 
 #: templates/boards/settings.html:25
 msgid "No hidden tags."
 msgstr "Нет скрытых меток."
 
 #: templates/boards/settings.html:34
 msgid "Save"
 msgstr "Сохранить"
 
 #: templates/boards/staticpages/banned.html:6
 msgid "Banned"
 msgstr "Заблокирован"
 
 #: templates/boards/staticpages/banned.html:11
 msgid "Your IP address has been banned. Contact the administrator"
 msgstr "Ваш IP адрес был заблокирован. Свяжитесь с администратором"
 
 #: templates/boards/staticpages/help.html:6
 #: templates/boards/staticpages/help.html:10
 msgid "Syntax"
 msgstr "Синтаксис"
 
 #: templates/boards/staticpages/help.html:11
 msgid "Italic text"
 msgstr "Курсивный текст"
 
 #: templates/boards/staticpages/help.html:12
 msgid "Bold text"
 msgstr "Полужирный текст"
 
 #: templates/boards/staticpages/help.html:13
 msgid "Spoiler"
 msgstr "Спойлер"
 
 #: templates/boards/staticpages/help.html:14
 msgid "Link to a post"
 msgstr "Ссылка на сообщение"
 
 #: templates/boards/staticpages/help.html:15
 msgid "Strikethrough text"
 msgstr "Зачеркнутый текст"
 
 #: templates/boards/staticpages/help.html:16
 msgid "Comment"
 msgstr "Комментарий"
 
 #: templates/boards/staticpages/help.html:17
 #: templates/boards/staticpages/help.html:18
 msgid "Quote"
 msgstr "Цитата"
 
 #: templates/boards/staticpages/help.html:21
 msgid "You can try pasting the text and previewing the result here:"
 msgstr "Вы можете попробовать вставить текст и проверить результат здесь:"
 
 #: templates/boards/tags.html:17
 msgid "Sections:"
 msgstr "Разделы:"
 
 #: templates/boards/tags.html:30
 msgid "Other tags:"
 msgstr "Другие метки:"
 
 #: templates/boards/tags.html:43
 msgid "All tags..."
 msgstr "Все метки..."
 
 #: templates/boards/thread.html:14
 msgid "Normal"
 msgstr "Нормальный"
 
 #: templates/boards/thread.html:15
 msgid "Gallery"
 msgstr "Галерея"
 
 #: templates/boards/thread.html:16
 msgid "Tree"
 msgstr "Дерево"
 
 #: templates/boards/thread.html:35
 msgid "message"
 msgid_plural "messages"
 msgstr[0] "сообщение"
 msgstr[1] "сообщения"
 msgstr[2] "сообщений"
 
 #: templates/boards/thread.html:38
 msgid "image"
 msgid_plural "images"
 msgstr[0] "изображение"
 msgstr[1] "изображения"
 msgstr[2] "изображений"
 
 #: templates/boards/thread.html:40
 msgid "Last update: "
 msgstr "Последнее обновление: "
 
 #: templates/boards/thread_gallery.html:36
 msgid "No images."
 msgstr "Нет изображений."
 
 #: templates/boards/thread_normal.html:30
 msgid "posts to bumplimit"
 msgstr "сообщений до бамплимита"
 
 #: templates/boards/thread_normal.html:44
 msgid "Reply to thread"
 msgstr "Ответить в тему"
 
 #: templates/boards/thread_normal.html:44
 msgid "to message "
 msgstr "на сообщение"
 
 #: templates/boards/thread_normal.html:59
-msgid "Close form"
-msgstr "Закрыть форму"
+msgid "Reset form"
+msgstr "Сбросить форму"
 
 #: templates/search/search.html:17
 msgid "Ok"
 msgstr "Ок"
 
 #: utils.py:120
 #, python-format
 msgid "File must be less than %s but is %s."
 msgstr "Файл должен быть менее %s, но его размер %s."
 
 msgid "Please wait %(delay)d second before sending message"
 msgid_plural "Please wait %(delay)d seconds before sending message"
 msgstr[0] "Пожалуйста подождите %(delay)d секунду перед отправкой сообщения"
 msgstr[1] "Пожалуйста подождите %(delay)d секунды перед отправкой сообщения"
 msgstr[2] "Пожалуйста подождите %(delay)d секунд перед отправкой сообщения"
 
 msgid "New threads"
 msgstr "Новые темы"
 
 #, python-format
 msgid "Max file size is %(size)s."
 msgstr "Максимальный размер файла %(size)s."
 
 msgid "Size of media:"
 msgstr "Размер медиа:"
 
 msgid "Statistics"
 msgstr "Статистика"
 
 msgid "Invalid PoW."
 msgstr "Неверный PoW."
 
 msgid "Stale PoW."
 msgstr "PoW устарел."
 
 msgid "Show"
 msgstr "Показывать"
 
 msgid "Hide"
 msgstr "Скрывать"
 
 msgid "Add to favorites"
 msgstr "Добавить в избранное"
 
 msgid "Remove from favorites"
 msgstr "Убрать из избранного"
 
 msgid "Monochrome"
 msgstr "Монохромный"
 
 msgid "Subsections: "
 msgstr "Подразделы: "
 
 msgid "Change file source"
 msgstr "Изменить источник файла"
 
 msgid "interesting"
 msgstr "интересное"
 
 msgid "images"
 msgstr "изображения"
 
 msgid "Delete post"
 msgstr "Удалить пост"
 
 msgid "Delete thread"
 msgstr "Удалить тему"
 
 msgid "Messages per day/week/month:"
 msgstr "Сообщений за день/неделю/месяц:"
 
 msgid "Subscribe to thread"
 msgstr "Подписаться на тему"
 
 msgid "Active threads:"
 msgstr "Активные темы:"
 
 msgid "No active threads today."
 msgstr "Сегодня нет активных тем."
 
 msgid "Insert URLs on separate lines."
 msgstr "Вставляйте ссылки на отдельных строках."
 
 msgid "You can post no more than %(files)d file."
 msgid_plural "You can post no more than %(files)d files."
 msgstr[0] "Вы можете отправить не более %(files)d файла."
 msgstr[1] "Вы можете отправить не более %(files)d файлов."
 msgstr[2] "Вы можете отправить не более %(files)d файлов."
 
 #, python-format
 msgid "Max file number is %(max_files)s."
 msgstr "Максимальное количество файлов %(max_files)s."
 
 msgid "Moderation"
 msgstr "Модерация"
 
 msgid "Check for duplicates"
 msgstr "Проверять на дубликаты"
 
 msgid "Some files are already present on the board."
 msgstr "Некоторые файлы уже присутствуют на борде."
 
 msgid "Do not download URLs"
 msgstr "Не загружать ссылки"
 

boards/static/css/base.css

@@ -1,203 +1,199 b''
 .ui-button {
    display: none;
 }
 
 .ui-dialog-content {
     padding: 0;
     min-height: 0;
 }
 
 .mark_btn {
     cursor: pointer;
 }
 
 .img-full {
     position: fixed;
     background-color: #CCC;
     border: 1px solid #000;
     cursor: pointer;
 }
 
 .strikethrough {
     text-decoration: line-through;
 }
 
 .post_preview {
     z-index: 300;
     position:absolute;
 }
 
 .gallery_image {
     display: inline-block;
 }
 
 @media print {
     .post-form-w {
         display: none;
     }
 }
 
 input[name="image"] {
      display: block;
      width: 100px;
      height: 100px;
      cursor: pointer;
      position: absolute;
      opacity: 0;
      z-index: 1;
 }
 
 .file_wrap {
      width: 100px;
      height: 100px;
      border: solid 1px white;
      display: inline-block;
 }
 
 form > .file_wrap {
     float: left;
 }
 
 .file-thumb {
     width: 100px;
     height: 100px;
     background-size: cover;
     background-position: center;
 }
 
 .compact-form-text {
     margin-left:110px;
 }
 
 textarea, input {
     -moz-box-sizing: border-box;
     -webkit-box-sizing: border-box;
     box-sizing: border-box;
 }
 
 .compact-form-text > textarea {
     height: 100px;
     width: 100%;
 }
 
 .post-button-form {
     display: inline;
 }
 
 .post-button-form > button, #autoupdate {
     border: none;
     margin: inherit;
     padding: inherit;
     background: none;
     font-size: inherit;
     cursor: pointer;
 }
 
-#form-close-button {
-    display: none;
-}
-
 .post-image-full {
     width: 100%;
     height: auto;
 }
 
 #preview-text {
     display: none;
 }
 
 .random-images-table {
     text-align: center;
 }
 
 .random-images-table > div {
     margin-left: auto;
     margin-right: auto;
 }
 
 .tag-image, .tag-text-data {
     display: inline-block;
 }
 
 .tag-text-data > h2 {
     margin: 0;
 }
 
 .tag-image {
     margin-right: 5px;
 }
 
 .reply-to-message {
     display: none;
 }
 
 .tripcode {
     padding: 2px;
 }
 
 #fav-panel {
     display: none;
     margin: 1ex;
 }
 
 .hidden_post {
     opacity: 0.2;
 }
 
 .hidden_post:hover {
     opacity: 1;
 }
 
 .monochrome > .image > .thumb > img {
     filter: grayscale(100%);
     -webkit-filter: grayscale(100%);
 }
 
 #quote-button {
     position: absolute;
     display: none;
     cursor: pointer;
     z-index: 400;
 }
 
 .required-field:before {
     content: '* ';
 }
 
 .hint {
     border-bottom: dashed 1px;
     cursor: help;
 }
 
 .url-image:hover {
     filter: invert(100%);
 }
 
 .landing-tags, .landing-images {
     max-width: 800px;
     margin-left: auto;
     margin-right: auto;
 }
 
 .landing-images {
     text-align: center;
 }
 
 .landing-threads {
     margin-left: auto;
     margin-right: auto;
     text-align: center;
     display: flex;
     flex-wrap: wrap;
     justify-content: space-around;
 }
 
 .landing-threads > .thread-short {
     display: inline-block;
     width: 240px;
 }
 
 audio {
     width: 200px;
 }
 

boards/static/js/thread.js

@@ -1,155 +1,165 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 CLOSE_BUTTON = '#form-close-button';
 var REPLY_TO_MSG = '.reply-to-message';
 var REPLY_TO_MSG_ID = '#reply-to-message-id';
 
 var $html = $("html, body");
 
 function moveCaretToEnd(el) {
     var newPos = el.val().length;
     el[0].setSelectionRange(newPos, newPos);
 }
 
 function getForm() {
     return $('.post-form-w');
 }
 
-function resetFormPosition() {
+/**
+ * Clear all entered values in the form fields
+ */
+function resetForm() {
     var form = getForm();
+
+    form.find('input:text, input:password, input:file, select, textarea').val('');
+    form.find('input:radio, input:checkbox').removeAttr('checked').removeAttr('selected');
+    $('.file_wrap').find('.file-thumb').remove();
+    $('#preview-text').hide();
+
+    resetFormPosition(form);
+}
+
+function resetFormPosition(form) {
     form.insertAfter($('.thread'));
 
-    $(CLOSE_BUTTON).hide();
     $(REPLY_TO_MSG).hide();
 }
 
 function showFormAfter(blockToInsertAfter) {
     var form = getForm();
     form.insertAfter(blockToInsertAfter);
 
-    $(CLOSE_BUTTON).show();
     form.show();
     $(REPLY_TO_MSG_ID).text(blockToInsertAfter.attr('id'));
     $(REPLY_TO_MSG).show();
 }
 
 function addQuickReply(postId) {
     var blockToInsert = null;
     var textAreaJq = getPostTextarea();
     var postLinkRaw = '[post]' + postId + '[/post]'
     var textToAdd = '';
 
     if (postId != null) {
         var post = $('#' + postId);
 
         // If this is not OP, add reflink to the post. If there already is
         // the same reflink, don't add it again.
         var postText = textAreaJq.val();
         if (!post.is(':first-child') && postText.indexOf(postLinkRaw) < 0) {
             // Insert line break if none is present.
             if (postText.length > 0 && !postText.endsWith('\n') && !postText.endsWith('\r')) {
                 textToAdd += '\n';
             }
             textToAdd += postLinkRaw + '\n';
         }
 
         textAreaJq.val(textAreaJq.val()+ textToAdd);
         blockToInsert = post;
     } else {
         blockToInsert = $('.thread');
     }
     showFormAfter(blockToInsert);
 
     textAreaJq.focus();
 
     moveCaretToEnd(textAreaJq);
 }
 
 function addQuickQuote() {
     var textAreaJq = getPostTextarea();
 
     var quoteButton = $("#quote-button");
     var postId = quoteButton.attr('data-post-id');
     if (postId != null) {
         addQuickReply(postId);
     }
 
     var textToAdd = '';
     var selection = window.getSelection().toString();
     if (selection.length == 0) {
         selection = quoteButton.attr('data-text');
     }
     if (selection.length > 0) {
         textToAdd += '[quote]' + selection + '[/quote]\n';
     }
 
     textAreaJq.val(textAreaJq.val() + textToAdd);
 
     textAreaJq.focus();
 
     moveCaretToEnd(textAreaJq);
 }
 
 function scrollToBottom() {
     $html.animate({scrollTop: $html.height()}, "fast");
 }
 
 function showQuoteButton() {
     var selection = window.getSelection().getRangeAt(0).getBoundingClientRect();
     var quoteButton = $("#quote-button");
     if (selection.width > 0) {
         // quoteButton.offset({ top: selection.top - selection.height, left: selection.left });
         quoteButton.css({top: selection.top + $(window).scrollTop() - 30, left: selection.left});
         quoteButton.show();
 
         var text = window.getSelection().toString();
         quoteButton.attr('data-text', text);
 
         var rect = window.getSelection().getRangeAt(0).getBoundingClientRect();
         var element = $(document.elementFromPoint(rect.x, rect.y));
         var postId = null;
         if (element.hasClass('post')) {
             postId = element.attr('id');
         } else {
             var postParent = element.parents('.post');
             if (postParent.length > 0) {
                 postId = postParent.attr('id');
             }
         }
         quoteButton.attr('data-post-id', postId);
     } else {
         quoteButton.hide();
     }
 }
 
 $(document).ready(function() {
     $('body').on('mouseup', function() {
         showQuoteButton();
     });
     $("#quote-button").click(function() {
         addQuickQuote();
     })
 });

boards/static/js/thread_update.js

@@ -1,399 +1,388 b''
 /*
  @licstart  The following is the entire license notice for the
  JavaScript code in this page.
 
 
  Copyright (C) 2013-2014  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 CLASS_POST = '.post';
 
 var POST_ADDED = 0;
 var POST_UPDATED = 1;
 
 // TODO These need to be syncronized with board settings.
 var JS_AUTOUPDATE_PERIOD = 20000;
 // TODO This needs to be the same for attachment download time limit.
 var POST_AJAX_TIMEOUT = 30000;
 var BLINK_SPEED = 500;
 
 var ALLOWED_FOR_PARTIAL_UPDATE = [
     'refmap',
     'post-info'
 ];
 
 var ATTR_CLASS = 'class';
 var ATTR_UID = 'data-uid';
 
 var unreadPosts = 0;
 var documentOriginalTitle = '';
 
 // Thread ID does not change, can be stored one time
 var threadId = $('div.thread').children(CLASS_POST).first().attr('id');
 var blinkColor = $('<div class="post-blink"></div>').css('background-color');
 
 /**
  * Get diff of the posts from the current thread timestamp.
  * This is required if the browser was closed and some post updates were
  * missed.
  */
 function getThreadDiff() {
     var all_posts = $('.post');
 
     var uids = '';
     var posts = all_posts;
     for (var i = 0; i < posts.length; i++) {
         uids += posts[i].getAttribute('data-uid') + ' ';
     }
 
     var data = {
         uids: uids,
         thread: threadId
     };
 
     var diffUrl = '/api/diff_thread/';
 
     $.post(diffUrl,
         data,
         function(data) {
             var updatedPosts = data.updated;
             var addedPostCount = 0;
 
             for (var i = 0; i < updatedPosts.length; i++) {
                 var postText = updatedPosts[i];
                 var post = $(postText);
 
                 if (updatePost(post) == POST_ADDED) {
                     addedPostCount++;
                 }
             }
 
             var hasMetaUpdates = updatedPosts.length > 0;
             if (hasMetaUpdates) {
                 updateMetadataPanel();
             }
 
             if (addedPostCount > 0) {
                 updateBumplimitProgress(addedPostCount);
             }
 
             if (updatedPosts.length > 0) {
                 showNewPostsTitle(addedPostCount);
             }
 
             // TODO Process removed posts if any
             $('.metapanel').attr('data-last-update', data.last_update);
 
             if (data.subscribed == 'True') {
                 var favButton = $('#thread-fav-button .not_fav');
 
                 if (favButton.length > 0) {
                     favButton.attr('value', 'unsubscribe');
                     favButton.removeClass('not_fav');
                     favButton.addClass('fav');
                 }
             }
         },
         'json'
     )
 }
 
 /**
  * Add or update the post on html page.
  */
 function updatePost(postHtml) {
     // This needs to be set on start because the page is scrolled after posts
     // are added or updated
     var bottom = isPageBottom();
 
     var post = $(postHtml);
 
     var threadBlock = $('div.thread');
 
     var postId = post.attr('id');
 
     // If the post already exists, replace it. Otherwise add as a new one.
     var existingPosts = threadBlock.children('.post[id=' + postId + ']');
 
     var type;
 
     if (existingPosts.size() > 0) {
         replacePartial(existingPosts.first(), post, false);
         post = existingPosts.first();
 
         type = POST_UPDATED;
     } else {
         post.appendTo(threadBlock);
 
         if (bottom) {
             scrollToBottom();
         }
 
         type = POST_ADDED;
     }
 
     processNewPost(post);
 
     return type;
 }
 
 /**
  * Initiate a blinking animation on a node to show it was updated.
  */
 function blink(node) {
     node.effect('highlight', { color: blinkColor }, BLINK_SPEED);
 }
 
 function isPageBottom() {
     var scroll = $(window).scrollTop() / ($(document).height()
         - $(window).height());
 
     return scroll == 1
 }
 
 function enableJsUpdate() {
     setInterval(getThreadDiff, JS_AUTOUPDATE_PERIOD);
     return true;
 }
 
 function initAutoupdate() {
     return enableJsUpdate();
 }
 
 function getReplyCount() {
     return $('.thread').children(CLASS_POST).length
 }
 
 function getImageCount() {
     return $('.thread').find('img').length
 }
 
 /**
  * Update post count, images count and last update time in the metadata
  * panel.
  */
 function updateMetadataPanel() {
     var replyCountField = $('#reply-count');
     var imageCountField = $('#image-count');
 
     var replyCount = getReplyCount();
     replyCountField.text(replyCount);
     var imageCount = getImageCount();
     imageCountField.text(imageCount);
 
     var lastUpdate = $('.post:last').children('.post-info').first()
         .children('.pub_time').first().html();
     if (lastUpdate !== '') {
         var lastUpdateField = $('#last-update');
         lastUpdateField.html(lastUpdate);
         blink(lastUpdateField);
     }
 
     blink(replyCountField);
     blink(imageCountField);
 }
 
 /**
  * Update bumplimit progress bar
  */
 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) {
             $('.bar-bg').remove();
         } else {
             postsToLimitElement.text(newPostsToLimit);
             progressBar.width((100 - postCount / bumplimit * 100.0) + '%');
         }
     }
 }
 
 /**
  * Show 'new posts' text in the title if the document is not visible to a user
  */
 function showNewPostsTitle(newPostCount) {
     if (document.hidden) {
         if (documentOriginalTitle === '') {
             documentOriginalTitle = document.title;
         }
         unreadPosts = unreadPosts + newPostCount;
 
         var newTitle = null;
         if (unreadPosts > 0) {
             newTitle = '[' + unreadPosts + '] ';
         } else {
             newTitle = '* ';
         }
         newTitle += documentOriginalTitle;
 
         document.title = newTitle;
 
         document.addEventListener('visibilitychange', function() {
             if (documentOriginalTitle !== '') {
                 document.title = documentOriginalTitle;
                 documentOriginalTitle = '';
                 unreadPosts = 0;
             }
 
             document.removeEventListener('visibilitychange', null);
         });
     }
 }
 
-/**
- * Clear all entered values in the form fields
- */
-function resetForm(form) {
-    form.find('input:text, input:password, input:file, select, textarea').val('');
-    form.find('input:radio, input:checkbox')
-             .removeAttr('checked').removeAttr('selected');
-    $('.file_wrap').find('.file-thumb').remove();
-    $('#preview-text').hide();
-}
 
 /**
  * When the form is posted, this method will be run as a callback
  */
 function updateOnPost(response, statusText, xhr, form) {
     var json = $.parseJSON(response);
     var status = json.status;
 
     showAsErrors(form, '');
     $('.post-form-w').unblock();
 
     if (status === 'ok') {
-        resetFormPosition();
-        resetForm(form);
+        resetForm();
         getThreadDiff();
         scrollToBottom();
     } else {
         var errors = json.errors;
         for (var i = 0; i < errors.length; i++) {
             var fieldErrors = errors[i];
 
             var error = fieldErrors.errors;
 
             showAsErrors(form, error);
         }
     }
 }
 
 
 /**
  * Run js methods that are usually run on the document, on the new post
  */
 function processNewPost(post) {
     addScriptsToPost(post);
     blink(post);
 }
 
 function replacePartial(oldNode, newNode, recursive) {
     if (!equalNodes(oldNode, newNode)) {
         // Update parent node attributes
         updateNodeAttr(oldNode, newNode, ATTR_CLASS);
         updateNodeAttr(oldNode, newNode, ATTR_UID);
 
         // Replace children
         var children = oldNode.children();
         if (children.length == 0) {
             oldNode.replaceWith(newNode);
         } else {
             var newChildren = newNode.children();
             newChildren.each(function(i) {
                 var newChild = newChildren.eq(i);
                 var newChildClass = newChild.attr(ATTR_CLASS);
 
                 // Update only certain allowed blocks (e.g. not images)
                 if (ALLOWED_FOR_PARTIAL_UPDATE.indexOf(newChildClass) > -1) {
                     var oldChild = oldNode.children('.' + newChildClass);
 
                     if (oldChild.length == 0) {
                         oldNode.append(newChild);
                     } else {
                         if (!equalNodes(oldChild, newChild)) {
                             if (recursive) {
                                 replacePartial(oldChild, newChild, false);
                             } else {
                                 oldChild.replaceWith(newChild);
                             }
                         }
                     }
                 }
             });
         }
     }
 }
 
 /**
  * Compare nodes by content
  */
 function equalNodes(node1, node2) {
     return node1[0].outerHTML == node2[0].outerHTML;
 }
 
 /**
  * Update attribute of a node if it has changed
  */
 function updateNodeAttr(oldNode, newNode, attrName) {
     var oldAttr = oldNode.attr(attrName);
     var newAttr = newNode.attr(attrName);
     if (oldAttr != newAttr) {
         oldNode.attr(attrName, newAttr);
     }
 }
 
 $(document).ready(function() {
     if (initAutoupdate()) {
         // Post form data over AJAX
         var threadId = $('div.thread').children('.post').first().attr('id');
 
         var form = $('#form');
 
         if (form.length > 0) {
             var options = {
                 beforeSubmit: function(arr, form, options) {
                     $('.post-form-w').block({ message: gettext('Sending message...') });
                 },
                 success: updateOnPost,
                 error: function(xhr, textStatus, errorString) {
                     var errorText = gettext('Server error: ') + textStatus;
                     if (errorString) {
                         errorText += ' / ' + errorString;
                     }
                     showAsErrors(form, errorText);
                     $('.post-form-w').unblock();
                 },
                 url: '/api/add_post/' + threadId + '/',
                 timeout: POST_AJAX_TIMEOUT
             };
 
             form.ajaxForm(options);
 
-            resetForm(form);
+            resetForm();
         }
     }
 });

boards/templates/boards/thread_normal.html

@@ -1,81 +1,81 b''
 {% extends "boards/thread.html" %}
 
 {% load i18n %}
 {% load static from staticfiles %}
 {% load board %}
 {% load tz %}
 
 {% block thread_content %}
     {% get_current_language as LANGUAGE_CODE %}
     {% get_current_timezone as TIME_ZONE %}
 
     <div id="quote-button">{% trans 'Quote' %}</div>
 
     <div class="tag_info">
         <h2>
             <form action="{% url 'thread' opening_post.id %}" method="post" class="post-button-form">
                 {% csrf_token %}
                 {% if is_favorite %}
                     <button id="thread-fav-button" name="method" value="unsubscribe" class="fav">★</button>
                 {% else %}
                     <button id="thread-fav-button" name="method" value="subscribe" class="not_fav">★</button>
                 {% endif %}
             </form>
             {{ opening_post.get_title_or_text }}
         </h2>
     </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_viewable_replies %}
             {% post_view post reply_link=True thread=thread %}
         {% endfor %}
     </div>
 
     {% if not thread.is_archived %}
         <div class="post-form-w">
             <script src="{% static 'js/panel.js' %}"></script>
             <div class="form-title">{% trans "Reply to thread" %} #{{ opening_post.id }}<span class="reply-to-message"> {% trans "to message " %} #<span id="reply-to-message-id"></span></span></div>
             <div class="post-form" id="compact-form" data-hasher="{% static 'js/3party/sha256.js' %}"
                        data-pow-script="{% static 'js/proof_of_work.js' %}">
                 <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" %}"/>
                             <button id="preview-button" type="button" onclick="return false;">{% trans 'Preview' %}</button>
                         </div>
                     </form>
                 </div>
                 <div id="preview-text"></div>
                 <div>
                     {% with size=max_file_size|filesizeformat %}
                         {% blocktrans %}Max file size is {{ size }}.{% endblocktrans %}
                     {% endwith %}
                     {% blocktrans %}Max file number is {{ max_files }}.{% endblocktrans %}
                 </div>
                 <div><a href="{% url "staticpage" name="help" %}">
                     {% trans 'Text syntax' %}</a></div>
-                <div><a id="form-close-button" href="#" onClick="resetFormPosition(); return false;">{% trans 'Close form' %}</a></div>
+                <div><a href="#" onClick="resetForm(); return false;">{% trans 'Reset form' %}</a></div>
             </div>
         </div>
 
         <script src="{% static 'js/form.js' %}"></script>
         <script src="{% static 'js/jquery.form.min.js' %}"></script>
         <script src="{% static 'js/3party/jquery.blockUI.js' %}"></script>
         <script src="{% static 'js/thread.js' %}"></script>
         <script src="{% static 'js/thread_update.js' %}"></script>
     {% endif %}
 
     <script src="{% static 'js/3party/centrifuge.js' %}"></script>
 {% endblock %}