Added style for page selectors and mode selector to the white theme. Fixed middleware issue with static files

boards/locale/ru/LC_MESSAGES/django.po

@@ -7,7 +7,7 b' 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 <[e-mail]>\n"
@@ -34,77 +34,72 b' msgstr "\xd1\x80\xd0\xb0\xd0\xb7\xd1\x80\xd0\xb0\xd0\xb1\xd0\xbe\xd1\x82\xd1\x87\xd0\xb8\xd0\xba 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 b' msgstr "\xd0\xa0\xd0\xb5\xd0\xbf\xd0\xbe\xd0\xb7\xd0\xb8\xd1\x82\xd0\xbe\xd1\x80\xd0\xb8\xd0\xb9"'
 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 b' msgstr "ID \xd0\xbf\xd0\xbe\xd0\xbb\xd1\x8c\xd0\xb7\xd0\xbe\xd0\xb2\xd0\xb0\xd1\x82\xd0\xb5\xd0\xbb\xd1\x8f"'
 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 b' msgstr "\xd1\x82\xd0\xb5\xd0\xbc"'
 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 b' msgstr "\xd0\xa1\xd1\x81\xd1\x8b\xd0\xbb\xd0\xba\xd0\xb0 \xd0\xbd\xd0\xb0 \xd1\x81\xd0\xbe\xd0\xbe\xd0\xb1\xd1\x89\xd0\xb5\xd0\xbd\xd0\xb8\xd0\xb5"'
 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 "Тег: "
 

boards/middlewares.py

@@ -34,7 +34,8 b' 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

boards/static/css/md/base_page.css

@@ -355,7 +355,7 b' li {'
     margin: 5px;
 }
 
-.current_page {
+.current_page, .current_mode {
     border: solid 1px #afdcec;
     padding: 2px;
 }
  No newline at end of file

boards/static/css/pg/base_page.css

@@ -340,3 +340,8 b' input[type="submit"]:hover {'
 .skipped_replies {
     margin: 5px;
 }
+
+.current_page, .current_mode {
+    border: solid 1px #000;
+    padding: 2px;
+}
  No newline at end of file

boards/static/css/sw/base_page.css

@@ -330,4 +330,24 b' 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

boards/templates/boards/thread.html

@@ -19,7 +19,7 b''
     {% 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>
 

boards/templates/boards/thread_gallery.html

@@ -18,7 +18,7 b''
     {% 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">