# HG changeset patch
# User neko259 <neko259@gmail.com>
# Date 2015-03-03 21:52:58
# Node ID 23c5d871a1da774aa32d453f8aa86aa239df1805
# Parent  9c6dd86654a36101864ce99c02cbeaef6d534b13

Added button to update thread manually if websocket connection failed

diff --git a/boards/locale/ru/LC_MESSAGES/django.mo b/boards/locale/ru/LC_MESSAGES/django.mo
index 02e30cd8fb3eac12827b24ed29e949cb4a592265..2dc8581836ef4c9805664be5d306a9304d019c94
GIT binary patch
literal 6909
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

diff --git a/boards/locale/ru/LC_MESSAGES/django.po b/boards/locale/ru/LC_MESSAGES/django.po
--- a/boards/locale/ru/LC_MESSAGES/django.po
+++ b/boards/locale/ru/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-24 08:32+0200\n"
+"POT-Creation-Date: 2015-03-03 23:49+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -38,93 +38,93 @@ msgstr "разработчик javascript"
 msgid "designer"
 msgstr "дизайнер"
 
-#: forms.py:32
+#: forms.py:33
 msgid "Type message here. Use formatting panel for more advanced usage."
 msgstr ""
 "Вводите сообщение сюда. Используйте панель для более сложного форматирования."
 
-#: forms.py:33
+#: forms.py:34
 msgid "tag1 several_words_tag"
 msgstr "метка1 метка_из_нескольких_слов"
 
-#: forms.py:35
+#: forms.py:36
 msgid "Title"
 msgstr "Заголовок"
 
-#: forms.py:36
+#: forms.py:37
 msgid "Text"
 msgstr "Текст"
 
-#: forms.py:37
+#: forms.py:38
 msgid "Tag"
 msgstr "Метка"
 
-#: forms.py:38 templates/boards/base.html:38 templates/search/search.html:9
+#: forms.py:39 templates/boards/base.html:38 templates/search/search.html:9
 #: templates/search/search.html.py:13
 msgid "Search"
 msgstr "Поиск"
 
-#: forms.py:125
+#: forms.py:131
 msgid "Image"
 msgstr "Изображение"
 
-#: forms.py:128
+#: forms.py:134
 msgid "Image URL"
 msgstr "URL изображения"
 
-#: forms.py:134
+#: forms.py:140
 msgid "e-mail"
 msgstr ""
 
-#: forms.py:145
+#: forms.py:151
 #, python-format
 msgid "Title must have less than %s characters"
 msgstr "Заголовок должен иметь меньше %s символов"
 
-#: forms.py:154
+#: forms.py:160
 #, python-format
 msgid "Text must have less than %s characters"
 msgstr "Текст должен быть короче %s символов"
 
-#: forms.py:175
+#: forms.py:181
 msgid "Invalid URL"
 msgstr "Неверный URL"
 
-#: forms.py:212
+#: forms.py:218
 msgid "Either text or image must be entered."
 msgstr "Текст или картинка должны быть введены."
 
-#: forms.py:219 forms.py:261 forms.py:275
+#: forms.py:225 forms.py:267 forms.py:281
 #, python-format
 msgid "Image must be less than %s bytes"
 msgstr "Изображение должно быть менее %s байт"
 
-#: forms.py:235
+#: forms.py:241
 #, python-format
 msgid "Wait %s seconds after last posting"
 msgstr "Подождите %s секунд после последнего постинга"
 
-#: forms.py:296 templates/boards/rss/post.html:10 templates/boards/tags.html:7
+#: forms.py:302 templates/boards/rss/post.html:10 templates/boards/tags.html:7
 msgid "Tags"
 msgstr "Метки"
 
-#: forms.py:303
+#: forms.py:309
 msgid "Inappropriate characters in tags."
 msgstr "Недопустимые символы в метках."
 
-#: forms.py:314
+#: forms.py:320
 msgid "Need at least 1 required tag."
 msgstr "Нужна хотя бы 1 обязательная метка."
 
-#: forms.py:327
+#: forms.py:333
 msgid "Theme"
 msgstr "Тема"
 
-#: forms.py:328
+#: forms.py:334
 msgid "User name"
 msgstr "Имя пользователя"
 
-#: forms.py:334
+#: forms.py:340
 msgid "Inappropriate characters."
 msgstr "Недопустимые символы."
 
@@ -198,12 +198,12 @@ msgid "Insert your user id above"
 msgstr "Вставьте свой ID пользователя выше"
 
 #: templates/boards/notifications.html:16
-#: templates/boards/posting_general.html:85 templates/search/search.html:22
+#: templates/boards/posting_general.html:79 templates/search/search.html:22
 msgid "Previous page"
 msgstr "Предыдущая страница"
 
 #: templates/boards/notifications.html:26
-#: templates/boards/posting_general.html:125 templates/search/search.html:33
+#: templates/boards/posting_general.html:117 templates/search/search.html:33
 msgid "Next page"
 msgstr "Следующая страница"
 
@@ -241,51 +241,51 @@ msgstr "сообщений"
 msgid "images"
 msgstr "изображений"
 
-#: templates/boards/posting_general.html:56
+#: templates/boards/posting_general.html:52
 msgid "Show tag"
 msgstr "Показывать метку"
 
-#: templates/boards/posting_general.html:60
+#: templates/boards/posting_general.html:56
 msgid "Hide tag"
 msgstr "Скрывать метку"
 
-#: templates/boards/posting_general.html:67
+#: templates/boards/posting_general.html:63
 msgid "Edit tag"
 msgstr "Изменить метку"
 
-#: templates/boards/posting_general.html:70
+#: templates/boards/posting_general.html:66
 #, python-format
 msgid "This tag has %(thread_count)s threads and %(post_count)s posts."
 msgstr "С этой меткой есть %(thread_count)s тем и %(post_count)s сообщений."
 
-#: templates/boards/posting_general.html:99
+#: templates/boards/posting_general.html:93
 #, python-format
 msgid "Skipped %(count)s replies. Open thread to see all replies."
 msgstr "Пропущено %(count)s ответов. Откройте тред, чтобы увидеть все ответы."
 
-#: templates/boards/posting_general.html:130
+#: templates/boards/posting_general.html:122
 msgid "No threads exist. Create the first one!"
 msgstr "Нет тем. Создайте первую!"
 
-#: templates/boards/posting_general.html:136
+#: templates/boards/posting_general.html:128
 msgid "Create new thread"
 msgstr "Создать новую тему"
 
-#: templates/boards/posting_general.html:141 templates/boards/preview.html:16
-#: templates/boards/thread.html:54
+#: templates/boards/posting_general.html:133 templates/boards/preview.html:16
+#: templates/boards/thread.html:53
 msgid "Post"
 msgstr "Отправить"
 
-#: templates/boards/posting_general.html:146
+#: templates/boards/posting_general.html:139
 msgid "Tags must be delimited by spaces. Text or image is required."
 msgstr ""
 "Метки должны быть разделены пробелами. Текст или изображение обязательны."
 
-#: templates/boards/posting_general.html:149 templates/boards/thread.html:59
+#: templates/boards/posting_general.html:142 templates/boards/thread.html:59
 msgid "Text syntax"
 msgstr "Синтаксис текста"
 
-#: templates/boards/posting_general.html:161
+#: templates/boards/posting_general.html:154
 msgid "Pages:"
 msgstr "Страницы: "
 
@@ -305,11 +305,11 @@ msgstr "Вы модератор."
 msgid "Hidden tags:"
 msgstr "Скрытые метки:"
 
-#: templates/boards/settings.html:26
+#: templates/boards/settings.html:27
 msgid "No hidden tags."
 msgstr "Нет скрытых меток."
 
-#: templates/boards/settings.html:35
+#: templates/boards/settings.html:36
 msgid "Save"
 msgstr "Сохранить"
 
@@ -374,6 +374,10 @@ msgstr "сообщений до бамплимита"
 msgid "Reply to thread"
 msgstr "Ответить в тему"
 
+#: templates/boards/thread.html:85
+msgid "Update"
+msgstr "Обновить"
+
 #: templates/boards/thread.html:88 templates/boards/thread_gallery.html:61
 msgid "Last update: "
 msgstr "Последнее обновление: "
diff --git a/boards/static/js/thread_update.js b/boards/static/js/thread_update.js
--- a/boards/static/js/thread_update.js
+++ b/boards/static/js/thread_update.js
@@ -66,7 +66,7 @@ function connectWebsocket() {
 
         // For the case we closed the browser and missed some updates
         getThreadDiff();
-        $('#autoupdate').text('[+]');
+        $('#autoupdate').hide();
     });
 
     centrifuge.connect();
@@ -327,4 +327,6 @@ function processNewPost(post) {
 
         resetForm(form);
     }
+
+    $('#autoupdate').click(getThreadDiff);
 });
diff --git a/boards/templates/boards/thread.html b/boards/templates/boards/thread.html
--- a/boards/templates/boards/thread.html
+++ b/boards/templates/boards/thread.html
@@ -82,7 +82,7 @@
           data-ws-host="{{ ws_host }}"
           data-ws-port="{{ ws_port }}">
         {% cache 600 thread_meta thread.last_edit_time moderator LANGUAGE_CODE %}
-            <span id="autoupdate">[-]</span>
+            <button id="autoupdate">{% trans 'Update' %}</button>
             <span id="reply-count">{{ thread.get_reply_count }}</span>/{{ max_replies }} {% trans 'messages' %},
             <span id="image-count">{{ thread.get_images_count }}</span> {% trans 'images' %}.
             {% trans 'Last update: ' %}<span id="last-update">{{ thread.last_edit_time|date:'r' }}</span>
diff --git a/boards/templates/boards/thread_gallery.html b/boards/templates/boards/thread_gallery.html
--- a/boards/templates/boards/thread_gallery.html
+++ b/boards/templates/boards/thread_gallery.html
@@ -54,7 +54,7 @@
     {% 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 %}
+        {% cache 600 thread_gallery_meta thread.last_edit_time moderator LANGUAGE_CODE %}
             <span id="reply-count">{{ thread.get_reply_count }}</span>/{{ max_replies }}
             {% trans 'messages' %},
             <span id="image-count">{{ thread.get_images_count }}</span> {% trans 'images' %}.