diff --git a/boards/locale/ru/LC_MESSAGES/django.mo b/boards/locale/ru/LC_MESSAGES/django.mo
index c261e969a2581d88830e94887233446e14859117..2de823afe523dbf77810d57e518222190c44c25a
GIT binary patch
literal 5904
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
AoB#j-

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: 2013-11-27 12:34+0200\n"
+"POT-Creation-Date: 2013-12-24 20:39+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"
@@ -34,77 +34,72 @@ msgstr "разработчик javascript"
 msgid "designer"
 msgstr "дизайнер"
 
-#: forms.py:48 templates/boards/posting_general.html:209
-#: templates/boards/thread.html:101
+#: forms.py:72
 msgid "Title"
 msgstr "Заголовок"
 
-#: forms.py:50 templates/boards/posting_general.html:224
-#: templates/boards/thread.html:116
+#: forms.py:74
 msgid "Text"
 msgstr "Текст"
 
-#: forms.py:51 templates/boards/posting_general.html:229
-#: templates/boards/thread.html:121
+#: forms.py:75
 msgid "Image"
 msgstr "Изображение"
 
-#: forms.py:54 templates/boards/posting_general.html:239
-#: templates/boards/thread.html:126
+#: forms.py:78
 msgid "e-mail"
 msgstr ""
 
-#: forms.py:65
+#: forms.py:89
 #, python-format
 msgid "Title must have less than %s characters"
 msgstr "Заголовок должен иметь меньше %s символов"
 
-#: forms.py:74
+#: forms.py:98
 #, python-format
 msgid "Text must have less than %s characters"
 msgstr "Текст должен быть короче %s символов"
 
-#: forms.py:85
+#: forms.py:109
 #, python-format
 msgid "Image must be less than %s bytes"
 msgstr "Изображение должно быть менее %s байт"
 
-#: forms.py:112
+#: forms.py:136
 msgid "Either text or image must be entered."
 msgstr "Текст или картинка должны быть введены."
 
-#: forms.py:125
+#: forms.py:149
 #, python-format
 msgid "Wait %s seconds after last posting"
 msgstr "Подождите %s секунд после последнего постинга"
 
-#: forms.py:139 templates/boards/post.html:60
-#: templates/boards/posting_general.html:234 templates/boards/tags.html:6
+#: forms.py:163 templates/boards/post.html:61 templates/boards/tags.html:6
 #: templates/boards/rss/post.html:10
 msgid "Tags"
 msgstr "Теги"
 
-#: forms.py:147
+#: forms.py:171
 msgid "Inappropriate characters in tags."
 msgstr "Недопустимые символы в тегах."
 
-#: forms.py:175 forms.py:196
+#: forms.py:199 forms.py:220
 msgid "Captcha validation failed"
 msgstr "Проверка капчи провалена"
 
-#: forms.py:202
+#: forms.py:226
 msgid "Theme"
 msgstr "Тема"
 
-#: forms.py:207
+#: forms.py:231
 msgid "Enable moderation panel"
 msgstr "Включить панель модерации"
 
-#: forms.py:222
+#: forms.py:246
 msgid "No such user found"
 msgstr "Данный пользователь не найден"
 
-#: forms.py:236
+#: forms.py:260
 #, python-format
 msgid "Wait %s minutes after last login"
 msgstr "Подождите %s минут после последнего входа"
@@ -137,15 +132,15 @@ msgstr "Репозиторий"
 msgid "Feed"
 msgstr "Лента"
 
-#: templates/boards/base.html:36
+#: templates/boards/base.html:31
 msgid "All threads"
 msgstr "Все темы"
 
-#: templates/boards/base.html:41
+#: templates/boards/base.html:36
 msgid "Tag management"
 msgstr "Управление тегами"
 
-#: templates/boards/base.html:43
+#: templates/boards/base.html:38
 msgid "Settings"
 msgstr "Настройки"
 
@@ -171,92 +166,65 @@ msgstr "ID пользователя"
 msgid "Insert your user id above"
 msgstr "Вставьте свой ID пользователя выше"
 
-#: templates/boards/post.html:34 templates/boards/posting_general.html:100
-#: templates/boards/thread.html:59
+#: templates/boards/post.html:35 templates/boards/posting_general.html:103
+#: templates/boards/thread.html:68
 msgid "Delete"
 msgstr "Удалить"
 
-#: templates/boards/post.html:37 templates/boards/posting_general.html:104
-#: templates/boards/thread.html:62
+#: templates/boards/post.html:38 templates/boards/posting_general.html:107
+#: templates/boards/thread.html:71
 msgid "Ban IP"
 msgstr "Заблокировать IP"
 
-#: templates/boards/post.html:50 templates/boards/posting_general.html:113
-#: templates/boards/posting_general.html:172 templates/boards/thread.html:71
+#: templates/boards/post.html:51 templates/boards/posting_general.html:116
+#: templates/boards/posting_general.html:180 templates/boards/thread.html:80
 msgid "Replies"
 msgstr "Ответы"
 
-#: templates/boards/posting_general.html:63
+#: templates/boards/posting_general.html:64
 msgid "Previous page"
 msgstr "Предыдущая страница"
 
-#: templates/boards/posting_general.html:94
+#: templates/boards/posting_general.html:97
 msgid "Reply"
 msgstr "Ответ"
 
-#: templates/boards/posting_general.html:122 templates/boards/thread.html:154
-msgid "replies"
-msgstr "ответов"
-
-#: templates/boards/posting_general.html:123 templates/boards/thread.html:155
+#: templates/boards/posting_general.html:125 templates/boards/thread.html:130
+#: templates/boards/thread_gallery.html:52
 msgid "images"
 msgstr "изображений"
 
-#: templates/boards/posting_general.html:138
+#: templates/boards/posting_general.html:142
 #, python-format
 msgid "Skipped %(count)s replies. Open thread to see all replies."
 msgstr "Пропущено %(count)s ответов. Откройте тред, чтобы увидеть все ответы."
 
-#: templates/boards/posting_general.html:195
+#: templates/boards/posting_general.html:203
 msgid "Next page"
 msgstr "Следующая страница"
 
-#: templates/boards/posting_general.html:200
+#: templates/boards/posting_general.html:208
 msgid "No threads exist. Create the first one!"
 msgstr "Нет тем. Создайте первую!"
 
-#: templates/boards/posting_general.html:206
+#: templates/boards/posting_general.html:214
 msgid "Create new thread"
 msgstr "Создать новую тему"
 
-#: templates/boards/posting_general.html:214 templates/boards/thread.html:106
-msgid "Formatting"
-msgstr "Форматирование"
-
-#: templates/boards/posting_general.html:216 templates/boards/thread.html:108
-msgid "quote"
-msgstr "цитата"
-
-#: templates/boards/posting_general.html:217 templates/boards/thread.html:109
-msgid "italic"
-msgstr "курсив"
-
-#: templates/boards/posting_general.html:218 templates/boards/thread.html:110
-msgid "bold"
-msgstr "полужирный"
-
-#: templates/boards/posting_general.html:219 templates/boards/thread.html:111
-msgid "spoiler"
-msgstr "спойлер"
-
-#: templates/boards/posting_general.html:220 templates/boards/thread.html:112
-msgid "comment"
-msgstr "комментарий"
-
-#: templates/boards/posting_general.html:252 templates/boards/thread.html:140
+#: templates/boards/posting_general.html:218 templates/boards/thread.html:112
 msgid "Post"
 msgstr "Отправить"
 
-#: templates/boards/posting_general.html:254
+#: templates/boards/posting_general.html:222
 msgid "Tags must be delimited by spaces. Text or image is required."
 msgstr ""
 "Теги должны быть разделены пробелами. Текст или изображение обязательны."
 
-#: templates/boards/posting_general.html:257 templates/boards/thread.html:142
+#: templates/boards/posting_general.html:225 templates/boards/thread.html:116
 msgid "Text syntax"
 msgstr "Синтаксис текста"
 
-#: templates/boards/posting_general.html:267
+#: templates/boards/posting_general.html:235
 msgid "Pages:"
 msgstr "Страницы: "
 
@@ -292,15 +260,27 @@ msgstr "тем"
 msgid "No tags found."
 msgstr "Теги не найдены."
 
-#: templates/boards/thread.html:24
+#: templates/boards/thread.html:22 templates/boards/thread_gallery.html:20
+msgid "Normal mode"
+msgstr "Нормальный режим"
+
+#: templates/boards/thread.html:23 templates/boards/thread_gallery.html:21
+msgid "Gallery mode"
+msgstr "Режим галереи"
+
+#: templates/boards/thread.html:31
 msgid "posts to bumplimit"
 msgstr "сообщений до бамплимита"
 
-#: templates/boards/thread.html:98
+#: templates/boards/thread.html:106
 msgid "Reply to thread"
 msgstr "Ответить в тему"
 
-#: templates/boards/thread.html:156
+#: templates/boards/thread.html:129 templates/boards/thread_gallery.html:51
+msgid "replies"
+msgstr "ответов"
+
+#: templates/boards/thread.html:131 templates/boards/thread_gallery.html:53
 msgid "Last update: "
 msgstr "Последнее обновление: "
 
@@ -353,6 +333,24 @@ msgstr "Ссылка на сообщение"
 msgid "Strikethrough text"
 msgstr "Зачеркнутый текст"
 
+#~ msgid "Formatting"
+#~ msgstr "Форматирование"
+
+#~ msgid "quote"
+#~ msgstr "цитата"
+
+#~ msgid "italic"
+#~ msgstr "курсив"
+
+#~ msgid "bold"
+#~ msgstr "полужирный"
+
+#~ msgid "spoiler"
+#~ msgstr "спойлер"
+
+#~ msgid "comment"
+#~ msgstr "комментарий"
+
 #~ msgid "Tag: "
 #~ msgstr "Тег: "
 
diff --git a/boards/middlewares.py b/boards/middlewares.py
--- a/boards/middlewares.py
+++ b/boards/middlewares.py
@@ -34,7 +34,8 @@ class MinifyHTMLMiddleware(object):
         except AttributeError:
             compress_html = False
 
-        if TYPE_HTML in response[RESPONSE_CONTENT_TYPE] and compress_html:
+        if RESPONSE_CONTENT_TYPE in response\
+            and TYPE_HTML in response[RESPONSE_CONTENT_TYPE] and compress_html:
             response.content = strip_spaces_between_tags(
                 response.content.strip())
         return response
\ No newline at end of file
diff --git a/boards/static/css/md/base_page.css b/boards/static/css/md/base_page.css
--- a/boards/static/css/md/base_page.css
+++ b/boards/static/css/md/base_page.css
@@ -355,7 +355,7 @@ li {
     margin: 5px;
 }
 
-.current_page {
+.current_page, .current_mode {
     border: solid 1px #afdcec;
     padding: 2px;
 }
\ No newline at end of file
diff --git a/boards/static/css/pg/base_page.css b/boards/static/css/pg/base_page.css
--- a/boards/static/css/pg/base_page.css
+++ b/boards/static/css/pg/base_page.css
@@ -340,3 +340,8 @@ input[type="submit"]:hover {
 .skipped_replies {
     margin: 5px;
 }
+
+.current_page, .current_mode {
+    border: solid 1px #000;
+    padding: 2px;
+}
\ No newline at end of file
diff --git a/boards/static/css/sw/base_page.css b/boards/static/css/sw/base_page.css
--- a/boards/static/css/sw/base_page.css
+++ b/boards/static/css/sw/base_page.css
@@ -330,4 +330,24 @@ li {
 
 .mark_btn:last-child {
     border-right: 1px solid #182F6F;
+}
+
+.current_page {
+    border-bottom: 1px solid #FFF;
+    padding: 0px 0.5ex;
+}
+
+.image-mode-tab a {
+    text-decoration: none;
+}
+.image-mode-tab .current_mode::before {
+    content: "✓ ";
+    padding: 0 0 0 .5ex;
+    color: #182F6F;
+    background: #FFF;
+}
+.image-mode-tab .current_mode {
+    padding: 0 .5ex 0 0;
+    color: #182F6F;
+    background: #FFF;
 }
\ No newline at end of file
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
@@ -19,7 +19,7 @@
     {% cache 600 thread_view thread.id thread.last_edit_time moderator LANGUAGE_CODE %}
 
         <div class="image-mode-tab">
-            <a class="current_page" href="{% url 'thread' thread.get_opening_post.id %}">{% trans 'Normal mode' %}</a>,
+            <a class="current_mode" href="{% url 'thread' thread.get_opening_post.id %}">{% trans 'Normal mode' %}</a>,
             <a href="{% url 'thread_mode' thread.get_opening_post.id 'gallery' %}">{% trans 'Gallery mode' %}</a>
         </div>
 
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
@@ -18,7 +18,7 @@
     {% cache 600 thread_gallery_view thread.id thread.last_edit_time LANGUAGE_CODE %}
     <div class="image-mode-tab">
         <a href="{% url 'thread' thread.get_opening_post.id %}">{% trans 'Normal mode' %}</a>,
-        <a class="current_page" href="{% url 'thread_mode' thread.get_opening_post.id 'gallery' %}">{% trans 'Gallery mode' %}</a>
+        <a class="current_mode" href="{% url 'thread_mode' thread.get_opening_post.id 'gallery' %}">{% trans 'Gallery mode' %}</a>
     </div>
 
     <div id="posts-table">