Merged with 1.5 dev branch

boards/migrations/0017_auto__add_field_post_image_pre_width__add_field_post_image_pre_height.py

@@ -0,0 +1,92 b''
+# -*- coding: utf-8 -*-
+from south.utils import datetime_utils as datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Adding field 'Post.image_pre_width'
+        db.add_column(u'boards_post', 'image_pre_width',
+                      self.gf('django.db.models.fields.IntegerField')(default=0),
+                      keep_default=False)
+
+        # Adding field 'Post.image_pre_height'
+        db.add_column(u'boards_post', 'image_pre_height',
+                      self.gf('django.db.models.fields.IntegerField')(default=0),
+                      keep_default=False)
+
+
+    def backwards(self, orm):
+        # Deleting field 'Post.image_pre_width'
+        db.delete_column(u'boards_post', 'image_pre_width')
+
+        # Deleting field 'Post.image_pre_height'
+        db.delete_column(u'boards_post', 'image_pre_height')
+
+
+    models = {
+        'boards.ban': {
+            'Meta': {'object_name': 'Ban'},
+            'can_read': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'ip': ('django.db.models.fields.GenericIPAddressField', [], {'max_length': '39'}),
+            'reason': ('django.db.models.fields.CharField', [], {'default': "'Auto'", 'max_length': '200'})
+        },
+        'boards.post': {
+            'Meta': {'object_name': 'Post'},
+            '_text_rendered': ('django.db.models.fields.TextField', [], {}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'image': ('boards.thumbs.ImageWithThumbsField', [], {'max_length': '100', 'blank': 'True'}),
+            'image_height': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'image_pre_height': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'image_pre_width': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'image_width': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'last_edit_time': ('django.db.models.fields.DateTimeField', [], {}),
+            'poster_ip': ('django.db.models.fields.GenericIPAddressField', [], {'max_length': '39'}),
+            'poster_user_agent': ('django.db.models.fields.TextField', [], {}),
+            'pub_time': ('django.db.models.fields.DateTimeField', [], {}),
+            'referenced_posts': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'rfp+'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['boards.Post']"}),
+            'text': ('markupfield.fields.MarkupField', [], {'rendered_field': 'True'}),
+            'text_markup_type': ('django.db.models.fields.CharField', [], {'default': "'markdown'", 'max_length': '30'}),
+            'thread': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': "orm['boards.Post']", 'null': 'True'}),
+            'thread_new': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': "orm['boards.Thread']", 'null': 'True'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '50'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': "orm['boards.User']", 'null': 'True'})
+        },
+        'boards.setting': {
+            'Meta': {'object_name': 'Setting'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['boards.User']"}),
+            'value': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'boards.tag': {
+            'Meta': {'object_name': 'Tag'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'linked': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['boards.Tag']", 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'threads': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'tag+'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['boards.Thread']"})
+        },
+        'boards.thread': {
+            'Meta': {'object_name': 'Thread'},
+            'bump_time': ('django.db.models.fields.DateTimeField', [], {}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_edit_time': ('django.db.models.fields.DateTimeField', [], {}),
+            'replies': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'tre+'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['boards.Post']"}),
+            'tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['boards.Tag']", 'symmetrical': 'False'})
+        },
+        'boards.user': {
+            'Meta': {'object_name': 'User'},
+            'fav_tags': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['boards.Tag']", 'null': 'True', 'blank': 'True'}),
+            'fav_threads': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['boards.Post']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'rank': ('django.db.models.fields.IntegerField', [], {}),
+            'registration_time': ('django.db.models.fields.DateTimeField', [], {}),
+            'user_id': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        }
+    }
+
+    complete_apps = ['boards']
  No newline at end of file

boards/templates/boards/thread_gallery.html

@@ -0,0 +1,66 b''
+{% extends "boards/base.html" %}
+
+{% load i18n %}
+{% load cache %}
+{% load static from staticfiles %}
+{% load board %}
+
+{% block head %}
+    <title>Neboard - {{ thread.get_opening_post.get_title }}</title>
+{% endblock %}
+
+{% block content %}
+    {% spaceless %}
+    {% get_current_language as LANGUAGE_CODE %}
+
+    <script src="{% static 'js/thread.js' %}"></script>
+
+    {% 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_mode" href="{% url 'thread_mode' thread.get_opening_post.id 'gallery' %}">{% trans 'Gallery mode' %}</a>
+    </div>
+
+    <div id="posts-table">
+    {% for post in thread.get_replies %}
+        {% if post.image %}
+            <div class="gallery_image">
+                <div>
+                    <a
+                            class="thumb"
+                            href="{{ post.image.url }}"><img
+                            src="{{ post.image.url_200x150 }}"
+                            alt="{{ post.id }}"
+                            width="{{ post.image_pre_width }}"
+                            height="{{ post.image_pre_height }}"
+                            data-width="{{ post.image_width }}"
+                            data-height="{{ post.image_height }}"/>
+                    </a>
+                </div>
+                <div class="gallery_image_metadata">
+                    {{ post.image_width }}x{{ post.image_height }}
+                    {% image_actions post.image.url request.get_host %}
+                </div>
+            </div>
+        {% endif %}
+    {% endfor %}
+    </div>
+    {% endcache %}
+
+    {% endspaceless %}
+{% endblock %}
+
+{% block metapanel %}
+
+    {% 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 %}
+            <span id="reply-count">{{ thread.get_reply_count }}</span> {% trans 'replies' %},
+            <span id="image-count">{{ thread.get_images_count }}</span> {% trans 'images' %}.
+            {% trans 'Last update: ' %}{{ thread.last_edit_time }}
+            [<a href="rss/">RSS</a>]
+        {% endcache %}
+    </span>
+
+{% endblock %}

changelog.markdown

@@ -0,0 +1,7 b''
+# 1.5 Aker #
+* Saving image previews size. No space will be shown below images in some
+styles.
+* Showing notification in page title when new posts are loaded into the open
+thread.
+* Thread moderation fixes
+* Added new gallery with search links and image metadata
  No newline at end of file

boards/locale/ru/LC_MESSAGES/django.po

@@ -1,381 +1,379 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: 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"
 "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"
 
 #: authors.py:5
 msgid "author"
 msgstr "автор"
 
 #: authors.py:6
 msgid "developer"
 msgstr "разработчик"
 
 #: authors.py:7
 msgid "javascript developer"
 msgstr "разработчик javascript"
 
 #: authors.py:8
 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 минут после последнего входа"
 
 #: templates/boards/404.html:6
 msgid "Not found"
 msgstr "Не найдено"
 
 #: templates/boards/404.html:12
 msgid "This page does not exist"
 msgstr "Этой страницы не существует"
 
 #: templates/boards/authors.html:6 templates/boards/authors.html.py:12
 msgid "Authors"
 msgstr "Авторы"
 
 #: templates/boards/authors.html:25
 msgid "Distributed under the"
 msgstr "Распространяется под"
 
 #: templates/boards/authors.html:27
 msgid "license"
 msgstr "лицензией"
 
 #: templates/boards/authors.html:29
 msgid "Repository"
 msgstr "Репозиторий"
 
 #: templates/boards/base.html:14
 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 "Настройки"
 
 #: templates/boards/base.html:50 templates/boards/login.html:6
 #: templates/boards/login.html.py:21
 msgid "Login"
 msgstr "Вход"
 
 #: templates/boards/base.html:52
 #, python-format
 msgid "Speed: %(ppd)s posts per day"
 msgstr "Скорость: %(ppd)s сообщений в день"
 
 #: templates/boards/base.html:54
 msgid "Up"
 msgstr "Вверх"
 
 #: templates/boards/login.html:15
 msgid "User ID"
 msgstr "ID пользователя"
 
 #: templates/boards/login.html:24
 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 "Страницы: "
 
 #: templates/boards/settings.html:14
 msgid "User:"
 msgstr "Пользователь:"
 
 #: templates/boards/settings.html:16
 msgid "You are moderator."
 msgstr "Вы модератор."
 
 #: templates/boards/settings.html:19
 msgid "Posts:"
 msgstr "Сообщений:"
 
 #: templates/boards/settings.html:20
 msgid "First access:"
 msgstr "Первый доступ:"
 
 #: templates/boards/settings.html:22
 msgid "Last access:"
 msgstr "Последний доступ: "
 
 #: templates/boards/settings.html:31
 msgid "Save"
 msgstr "Сохранить"
 
 #: templates/boards/tags.html:24
 msgid "threads"
 msgstr "тем"
 
 #: templates/boards/tags.html:37
 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 "Последнее обновление: "
 
 #: templates/boards/rss/post.html:5
 msgid "Post image"
 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 "2 line breaks for a new line."
 msgstr "2 перевода строки создают новый абзац."
 
 #: templates/boards/staticpages/help.html:12
 msgid "Italic text"
 msgstr "Курсивный текст"
 
 #: templates/boards/staticpages/help.html:13
 msgid "Bold text"
 msgstr "Полужирный текст"
 
 #: templates/boards/staticpages/help.html:14
 msgid "Spoiler"
 msgstr "Спойлер"
 
 #: templates/boards/staticpages/help.html:15
 msgid "Comment"
 msgstr "Комментарий"
 
 #: templates/boards/staticpages/help.html:16
 msgid "Quote"
 msgstr "Цитата"
 
 #: templates/boards/staticpages/help.html:17
 msgid "Link to a post"
 msgstr "Ссылка на сообщение"
 
 #: templates/boards/staticpages/help.html:18
 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 "Тег: "
 
 #~ msgid "Remove"
 #~ msgstr "Удалить"
 
 #~ msgid "Add"
 #~ msgstr "Добавить"
 
 #~ msgid "Basic markdown syntax."
 #~ msgstr "Базовый синтаксис markdown."
 
 #~ msgid "Example: "
 #~ msgstr "Пример: "
 
 #~ msgid "tags"
 #~ msgstr "тегов"
 
 #~ msgid "Get!"
 #~ msgstr "Гет!"
 
 #~ msgid "View"
 #~ msgstr "Просмотр"
 
 #~ msgid "gets"
 #~ msgstr "гетов"

boards/locale/ru/LC_MESSAGES/djangojs.po

@@ -1,39 +1,43 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: 2013-11-13 17:25+0200\n"
+"POT-Creation-Date: 2013-12-21 21:45+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"
 "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/refpopup.js:60
+#: static/js/refpopup.js:57
 msgid "Loading..."
 msgstr "Загрузка..."
 
-#: static/js/refpopup.js:86
+#: static/js/refpopup.js:76
 msgid "Post not found"
 msgstr "Сообщение не найдено"
 
 #: static/js/thread.js:32
 msgid "Normal"
 msgstr "Нормальный"
 
 #: static/js/thread.js:33
 msgid "Gallery"
 msgstr "Галерея"
 
+#: static/js/thread_update.js:177
+msgid "[new posts]"
+msgstr "[новые посты]"
+
 #~ msgid "Replies"
 #~ msgstr "Ответы"

boards/middlewares.py

@@ -1,40 +1,41 b''
 from django.shortcuts import redirect
 from boards import views, utils
 from boards.models import Ban
 from django.utils.html import strip_spaces_between_tags
 from django.conf import settings
 
 RESPONSE_CONTENT_TYPE = 'Content-Type'
 
 TYPE_HTML = 'text/html'
 
 
 class BanMiddleware:
     """
     This is run before showing the thread. Banned users don't need to see
     anything
     """
 
     def process_view(self, request, view_func, view_args, view_kwargs):
 
         if view_func != views.you_are_banned:
             ip = utils.get_client_ip(request)
             bans = Ban.objects.filter(ip=ip)
 
             if bans.exists():
                 ban = bans[0]
                 if not ban.can_read:
                     return redirect(views.you_are_banned)
 
 
 class MinifyHTMLMiddleware(object):
     def process_response(self, request, response):
         try:
             compress_html = settings.COMPRESS_HTML
         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/models/post.py

@@ -1,374 +1,385 b''
 from datetime import datetime, timedelta
 from datetime import time as dtime
 import os
 from random import random
 import time
 import math
 import re
 from django.core.cache import cache
 
 from django.db import models
 from django.http import Http404
 from django.utils import timezone
 from markupfield.fields import MarkupField
 
 from neboard import settings
 from boards import thumbs
 
 APP_LABEL_BOARDS = 'boards'
 
 CACHE_KEY_PPD = 'ppd'
 
 POSTS_PER_DAY_RANGE = range(7)
 
 BAN_REASON_AUTO = 'Auto'
 
 IMAGE_THUMB_SIZE = (200, 150)
 
 TITLE_MAX_LENGTH = 50
 
 DEFAULT_MARKUP_TYPE = 'markdown'
 
 NO_PARENT = -1
 NO_IP = '0.0.0.0'
 UNKNOWN_UA = ''
 ALL_PAGES = -1
 IMAGES_DIRECTORY = 'images/'
 FILE_EXTENSION_DELIMITER = '.'
 
 SETTING_MODERATE = "moderate"
 
 REGEX_REPLY = re.compile('>>(\d+)')
 
 
 class PostManager(models.Manager):
 
     def create_post(self, title, text, image=None, thread=None,
                     ip=NO_IP, tags=None, user=None):
         """
         Create new post
         """
 
         posting_time = timezone.now()
         if not thread:
             thread = Thread.objects.create(bump_time=posting_time,
                                            last_edit_time=posting_time)
         else:
             thread.bump()
             thread.last_edit_time = posting_time
             thread.save()
 
         post = self.create(title=title,
                            text=text,
                            pub_time=posting_time,
                            thread_new=thread,
                            image=image,
                            poster_ip=ip,
                            poster_user_agent=UNKNOWN_UA, # TODO Get UA at last!
                            last_edit_time=posting_time,
                            user=user)
 
         thread.replies.add(post)
         if tags:
             linked_tags = []
             for tag in tags:
                 tag_linked_tags = tag.get_linked_tags()
                 if len(tag_linked_tags) > 0:
                     linked_tags.extend(tag_linked_tags)
 
             tags.extend(linked_tags)
             map(thread.add_tag, tags)
 
         self._delete_old_threads()
         self.connect_replies(post)
 
         return post
 
     def delete_post(self, post):
         """
-        Delete post and update its thread
+        Delete post and update or delete its thread
         """
+        
+        thread = post.thread_new
 
-        thread = post.thread_new
-        thread.last_edit_time = timezone.now()
-        thread.save()
+        if thread.get_opening_post() == self:
+            thread.replies.delete()
+
+            thread.delete()
+        else:
+            thread.last_edit_time = timezone.now()
+            thread.save()
 
         post.delete()
 
     def delete_posts_by_ip(self, ip):
         """
         Delete all posts of the author with same IP
         """
 
         posts = self.filter(poster_ip=ip)
         map(self.delete_post, posts)
 
     # TODO Move this method to thread manager
     def get_threads(self, tag=None, page=ALL_PAGES,
                     order_by='-bump_time'):
         if tag:
             threads = tag.threads
 
             if not threads.exists():
                 raise Http404
         else:
             threads = Thread.objects.all()
 
         threads = threads.order_by(order_by)
 
         if page != ALL_PAGES:
             thread_count = threads.count()
 
             if page < self._get_page_count(thread_count):
                 start_thread = page * settings.THREADS_PER_PAGE
                 end_thread = min(start_thread + settings.THREADS_PER_PAGE,
                                  thread_count)
                 threads = threads[start_thread:end_thread]
 
         return threads
 
     # TODO Move this method to thread manager
     def get_thread_page_count(self, tag=None):
         if tag:
             threads = Thread.objects.filter(tags=tag)
         else:
             threads = Thread.objects.all()
 
         return self._get_page_count(threads.count())
 
     # TODO Move this method to thread manager
     def _delete_old_threads(self):
         """
         Preserves maximum thread count. If there are too many threads,
         delete the old ones.
         """
 
         # TODO Move old threads to the archive instead of deleting them.
         # Maybe make some 'old' field in the model to indicate the thread
         # must not be shown and be able for replying.
 
         threads = Thread.objects.all()
         thread_count = threads.count()
 
         if thread_count > settings.MAX_THREAD_COUNT:
             num_threads_to_delete = thread_count - settings.MAX_THREAD_COUNT
             old_threads = threads[thread_count - num_threads_to_delete:]
 
             map(Thread.delete_with_posts, old_threads)
 
     def connect_replies(self, post):
         """
         Connect replies to a post to show them as a reflink map
         """
 
         for reply_number in re.finditer(REGEX_REPLY, post.text.raw):
             post_id = reply_number.group(1)
             ref_post = self.filter(id=post_id)
             if ref_post.count() > 0:
                 referenced_post = ref_post[0]
                 referenced_post.referenced_posts.add(post)
                 referenced_post.last_edit_time = post.pub_time
                 referenced_post.save()
 
     def _get_page_count(self, thread_count):
         """
         Get number of pages that will be needed for all threads
         """
 
         return int(math.ceil(thread_count / float(settings.THREADS_PER_PAGE)))
 
     def get_posts_per_day(self):
         """
         Get average count of posts per day for the last 7 days
         """
 
         today = datetime.now().date()
         ppd = cache.get(CACHE_KEY_PPD + str(today))
         if ppd:
             return ppd
 
         posts_per_days = []
         for i in POSTS_PER_DAY_RANGE:
             day_end = today - timedelta(i + 1)
             day_start = today - timedelta(i + 2)
 
             day_time_start = timezone.make_aware(datetime.combine(day_start,
                 dtime()), timezone.get_current_timezone())
             day_time_end = timezone.make_aware(datetime.combine(day_end,
                 dtime()), timezone.get_current_timezone())
 
             posts_per_days.append(float(self.filter(
                 pub_time__lte=day_time_end,
                 pub_time__gte=day_time_start).count()))
 
         ppd = (sum(posts_per_day for posts_per_day in posts_per_days) /
                len(posts_per_days))
         cache.set(CACHE_KEY_PPD, ppd)
         return ppd
 
 
 class Post(models.Model):
     """A post is a message."""
 
     objects = PostManager()
 
     class Meta:
         app_label = APP_LABEL_BOARDS
 
     # TODO Save original file name to some field
     def _update_image_filename(self, filename):
         """Get unique image filename"""
 
         path = IMAGES_DIRECTORY
         new_name = str(int(time.mktime(time.gmtime())))
         new_name += str(int(random() * 1000))
         new_name += FILE_EXTENSION_DELIMITER
         new_name += filename.split(FILE_EXTENSION_DELIMITER)[-1:][0]
 
         return os.path.join(path, new_name)
 
     title = models.CharField(max_length=TITLE_MAX_LENGTH)
     pub_time = models.DateTimeField()
     text = MarkupField(default_markup_type=DEFAULT_MARKUP_TYPE,
                        escape_html=False)
 
     image_width = models.IntegerField(default=0)
     image_height = models.IntegerField(default=0)
 
+    image_pre_width = models.IntegerField(default=0)
+    image_pre_height = models.IntegerField(default=0)
+
     image = thumbs.ImageWithThumbsField(upload_to=_update_image_filename,
                                         blank=True, sizes=(IMAGE_THUMB_SIZE,),
                                         width_field='image_width',
-                                        height_field='image_height')
+                                        height_field='image_height',
+                                        preview_width_field='image_pre_width',
+                                        preview_height_field='image_pre_height')
 
     poster_ip = models.GenericIPAddressField()
     poster_user_agent = models.TextField()
 
     thread = models.ForeignKey('Post', null=True, default=None)
     thread_new = models.ForeignKey('Thread', null=True, default=None)
     last_edit_time = models.DateTimeField()
     user = models.ForeignKey('User', null=True, default=None)
 
     referenced_posts = models.ManyToManyField('Post', symmetrical=False,
                                               null=True,
                                               blank=True, related_name='rfp+')
 
     def __unicode__(self):
         return '#' + str(self.id) + ' ' + self.title + ' (' + \
                self.text.raw[:50] + ')'
 
     def get_title(self):
         title = self.title
         if len(title) == 0:
             title = self.text.raw[:20]
 
         return title
 
     def get_sorted_referenced_posts(self):
         return self.referenced_posts.order_by('id')
 
     def is_referenced(self):
         return self.referenced_posts.all().exists()
 
     def is_opening(self):
         return self.thread_new.get_replies()[0] == self
 
 
 class Thread(models.Model):
 
     class Meta:
         app_label = APP_LABEL_BOARDS
 
     tags = models.ManyToManyField('Tag')
     bump_time = models.DateTimeField()
     last_edit_time = models.DateTimeField()
     replies = models.ManyToManyField('Post', symmetrical=False, null=True,
                                      blank=True, related_name='tre+')
 
     def get_tags(self):
         """
         Get a sorted tag list
         """
 
         return self.tags.order_by('name')
 
     def bump(self):
         """
         Bump (move to up) thread
         """
 
         if self.can_bump():
             self.bump_time = timezone.now()
 
     def get_reply_count(self):
         return self.replies.count()
 
     def get_images_count(self):
         return self.replies.filter(image_width__gt=0).count()
 
     def can_bump(self):
         """
         Check if the thread can be bumped by replying
         """
 
         post_count = self.get_reply_count()
 
         return post_count < settings.MAX_POSTS_PER_THREAD
 
     def delete_with_posts(self):
         """
         Completely delete thread and all its posts
         """
 
         if self.replies.count() > 0:
             map(Post.objects.delete_post, self.replies.all())
 
         self.delete()
 
     def get_last_replies(self):
         """
         Get last replies, not including opening post
         """
 
         if settings.LAST_REPLIES_COUNT > 0:
             reply_count = self.get_reply_count()
 
             if reply_count > 0:
                 reply_count_to_show = min(settings.LAST_REPLIES_COUNT,
                                           reply_count - 1)
                 last_replies = self.replies.all().order_by('pub_time')[
                                reply_count - reply_count_to_show:]
 
                 return last_replies
 
     def get_replies(self):
         """
         Get sorted thread posts
         """
 
         return self.replies.all().order_by('pub_time')
 
     def add_tag(self, tag):
         """
         Connect thread to a tag and tag to a thread
         """
 
         self.tags.add(tag)
         tag.threads.add(self)
 
     def get_opening_post(self):
         """
         Get first post of the thread
         """
 
         return self.get_replies()[0]
 
     def __unicode__(self):
         return str(self.get_replies()[0].id)
 
     def get_pub_time(self):
         """
         Thread does not have its own pub time, so we need to get it from
         the opening post
         """
 
         return self.get_opening_post().pub_time

boards/static/css/base.css

@@ -1,29 +1,33 b''
 .ui-button {
    display: none;
 }
 
 .ui-dialog-content {
     padding: 0;
     min-height: 0;
 }
 
 .mark_btn {
     cursor: pointer;
 }
 
 .img-full {
     position: fixed;
     z-index: 9999;
     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;
+}
  No newline at end of file

boards/static/css/md/base_page.css

@@ -1,358 +1,368 b''
 html {
     background: #555;
     color: #ffffff;
 }
 
 #admin_panel {
     background: #FF0000;
     color: #00FF00
 }
 
 .input_field {
 
 }
 
 .input_field_name {
 
 }
 
 .input_field_error {
     color: #FF0000;
 }
 
 .title {
     font-weight: bold;
     color: #ffcc00;
     font-size: 2ex;
 }
 
 .link, a {
     color: #afdcec;
 }
 
 .block {
     display: inline-block;
     vertical-align: top;
 }
 
 .tag {
     color: #b4cfec;
 }
 
 .post_id {
     color: #fff380;
 }
 
 .post, .dead_post, #posts-table {
     background: #333;
     margin: 5px;
     padding: 10px;
     border: solid 1px #888;
     clear: left;
     word-wrap: break-word;
 }
 
 .metadata {
     padding-top: 5px;
     margin-top: 10px;
     border-top: solid 1px #666;
     font-size: 0.9em;
     color: #ddd;
 }
 
 .navigation_panel, .tag_info {
     background: #444;
     margin: 5px;
     padding: 10px;
     border: solid 1px #888;
     color: #eee;
 }
 
 .navigation_panel .link {
     border-right: 1px solid #fff;
     font-weight: bold;
     margin-right: 1ex;
     padding-right: 1ex;
 }
 .navigation_panel .link:last-child {
     border-left: 1px solid #fff;
     border-right: none;
     float: right;
     margin-left: 1ex;
     margin-right: 0;
     padding-left: 1ex;
     padding-right: 0;
 }
 
 .navigation_panel::after, .post::after {
     clear: both;
     content: ".";
     display: block;
     height: 0;
     line-height: 0;
     visibility: hidden;
 }
 
 p {
     margin-top: .5em;
     margin-bottom: .5em;
 }
 
 .post-form-w {
     display: table;
     background: #333344;
     border: solid 1px #888;
     color: #fff;
     padding: 10px;
     margin: 5px;
 }
 
 .form-row {
     display: table-row;
 }
 
 .form-label, .form-input, .form-errors {
     display: table-cell;
 }
 
 .form-label {
     padding: .25em 1ex .25em 0;
     vertical-align: top;
 }
 
 .form-input {
     padding: .25em 0;
 }
 
 .form-errors {
     font-weight: bolder;
     vertical-align: middle;
 }
 
 .post-form input, .post-form textarea {
     background: #333;
     color: #fff;
     border: solid 1px;
     padding: 0;
     width: 100%;
     font: medium sans;
 }
 
 .form-submit {
     display: table;
     margin-bottom: 1ex;
 }
 
 .form-title {
     font-weight: bold;
     font-size: 2.5ex;
     text-decoration: underline;
 }
 
 input[type="submit"] {
     background: #222;
     border: solid 2px #fff;
     color: #fff;
     padding: 0.5ex;
 }
 
 input[type="submit"]:hover {
     background: #060;
 }
 
 blockquote {
     border-left: solid 2px;
     padding-left: 5px;
     color: #B1FB17;
     margin: 0;
 }
 
 .post > .image {
     float: left;
     margin: 0 1ex .5ex 0;
     min-width: 1px;
     text-align: center;
     display: table-row;
-
-    height: 150px;
 }
 
 .post > .metadata {
     clear: left;
 }
 
 .get {
     font-weight: bold;
     color: #d55;
 }
 
 * {
     text-decoration: none;
 }
 
 .dead_post {
     background-color: #442222;
 }
 
 .mark_btn {
     border: 1px solid;
     min-width: 2ex;
     padding: 2px 2ex;
 }
 
 .mark_btn:hover {
     background: #555;
 }
 
 .quote {
     color: #92cf38;
     font-style: italic;
 }
 
 .spoiler {
     background: white;
     color: white;
 }
 
 .spoiler:hover {
     color: black;
 }
 
 .comment {
     color: #eb2;
     font-style: italic;
 }
 
 a:hover {
     text-decoration: underline;
 }
 
 .last-replies {
     margin-left: 3ex;
 }
 
 .thread {
     margin-bottom: 3ex;
 }
 
 .post:target {
     border: solid 2px white;
 }
 
 pre{
     white-space:pre-wrap
 }
 
 li {
     list-style-position: inside;
 }
 
 .fancybox-skin {
     position: relative;
     background-color: #fff;
     color: #ddd;
     text-shadow: none;
 }
 
 .fancybox-image {
     border: 1px solid black;
 }
 
 .image-mode-tab {
     background: #444;
     color: #eee;
     display: table;
     margin: 5px;
     padding: 5px;
     border: 1px solid #888;
 }
 
 .image-mode-tab > label {
     margin: 0 1ex;
 }
 
 .image-mode-tab > label > input {
     margin-right: .5ex;
 }
 
 #posts-table {
     margin: 5px;
 }
 
 .tag_info {
     display: table;
 }
 
 .tag_info > h2 {
     margin: 0;
 }
 
 .post-info {
     color: #ddd;
 }
 
 .moderator_info {
     color: #e99d41;
     border: dashed 1px;
     padding: 3px;
 }
 
 .refmap {
     font-size: 0.9em;
     color: #ccc;
     margin-top: 1em;
 }
 
 .fav {
     color: yellow;
 }
 
 .not_fav {
     color: #ccc;
 }
 
 .role {
     text-decoration: underline;
 }
 
 .form-email {
     display: none;
 }
 
 .footer {
     margin: 5px;
 }
 
 .bar-value {
     background: rgba(50, 55, 164, 0.45);
     font-size: 0.9em;
     height: 1.5em;
 }
 
 .bar-bg {
     position: relative;
     border: solid 1px #888;
     margin: 5px;
     overflow: hidden;
 }
 
 .bar-text {
     padding: 2px;
     position: absolute;
     left: 0;
     top: 0;
 }
 
 .page_link {
     display: table;
     background: #444;
     margin: 5px;
     border: solid 1px #888;
     padding: 5px;
     font-weight: bolder;
     color: #eee;
 }
 
 .skipped_replies {
     margin: 5px;
 }
+
+.current_page, .current_mode {
+    border: solid 1px #afdcec;
+    padding: 2px;
+}
+
+.gallery_image {
+    border: solid 1px;
+    padding: 0.5ex;
+    margin: 0.5ex;
+    text-align: center;
+}
  No newline at end of file

boards/static/css/pg/base_page.css

@@ -1,344 +1,347 b''
 html {
     background: rgb(238, 238, 238);
     color: rgb(51, 51, 51);
 }
 
 #admin_panel {
     background: #FF0000;
     color: #00FF00
 }
 
 .input_field {
 
 }
 
 .input_field_name {
 
 }
 
 .input_field_error {
     color: #FF0000;
 }
 
 
 .title {
     font-weight: bold;
     color: #333;
     font-size: 2ex;
 }
 
 .link, a {
     color: rgb(255, 102, 0);
 }
 
 .block {
     display: inline-block;
     vertical-align: top;
 }
 
 .tag {
     color: #222;
 }
 
 .post_id:hover {
     color: #11f;
 }
 
 .post_id {
     color: #444;
 }
 
 .post, .dead_post, #posts-table {
     margin: 5px;
     padding: 10px;
     background: rgb(221, 221, 221);
     border: 1px solid rgb(204, 204, 204);
     border-radius: 5px 5px 5px 5px;
     clear: left;
     word-wrap: break-word;
     display: table;
 }
 
 .metadata {
     padding: 5px;
     margin-top: 10px;
     border: solid 1px #666;
     font-size: 0.9em;
     display: table;
 }
 
 .navigation_panel, .tag_info, .page_link {
     margin: 5px;
     padding: 10px;
     border: 1px solid rgb(204, 204, 204);
     border-radius: 5px 5px 5px 5px;
 }
 
 .navigation_panel .link {
     border-right: 1px solid #000;
     font-weight: bold;
     margin-right: 1ex;
     padding-right: 1ex;
 }
 .navigation_panel .link:last-child {
     border-left: 1px solid #000;
     border-right: none;
     float: right;
     margin-left: 1ex;
     margin-right: 0;
     padding-left: 1ex;
     padding-right: 0;
 }
 
 .navigation_panel::after, .post::after {
     clear: both;
     content: ".";
     display: block;
     height: 0;
     line-height: 0;
     visibility: hidden;
 }
 
 p {
     margin-top: .5em;
     margin-bottom: .5em;
 }
 
 .post-form-w {
     display: table;
     padding: 10px;
     margin: 5px
 }
 
 .form-row {
     display: table-row;
 }
 
 .form-label, .form-input, .form-errors {
     display: table-cell;
 }
 
 .form-label {
     padding: .25em 1ex .25em 0;
     vertical-align: top;
 }
 
 .form-input {
     padding: .25em 0;
 }
 
 .form-errors {
     padding-left: 1ex;
     font-weight: bold;
     vertical-align: middle;
 }
 
 .post-form input, .post-form textarea {
     background: #fff;
     color: #000;
     border: solid 1px;
     padding: 0;
     width: 100%;
     font: medium sans;
 }
 
 .form-submit {
     border-bottom: 2px solid #ddd;
     margin-bottom: .5em;
     padding-bottom: .5em;
 }
 
 .form-title {
     font-weight: bold;
 }
 
 input[type="submit"] {
     background: #fff;
     border: solid 1px #000;
     color: #000;
 }
 
 blockquote {
     border-left: solid 2px;
     padding-left: 5px;
     color: #B1FB17;
     margin: 0;
 }
 
 .post > .image {
     float: left;
     margin: 0 1ex .5ex 0;
     min-width: 1px;
     text-align: center;
     display: table-row;
-
-    height: 150px;
 }
 
 .post > .metadata {
     clear: left;
 }
 
 .get {
     font-weight: bold;
     color: #d55;
 }
 
 * {
     text-decoration: none;
 }
 
 .dead_post {
     background-color: #ecc;
 }
 
 .quote {
     color: #080;
     font-style: italic;
 }
 
 .spoiler {
     background: white;
     color: white;
 }
 
 .spoiler:hover {
     color: black;
 }
 
 .comment {
     color: #8B6914;
     font-style: italic;
 }
 
 a:hover {
     text-decoration: underline;
 }
 
 .last-replies {
     margin-left: 3ex;
 }
 
 .thread {
     margin-bottom: 3ex;
 }
 
 .post:target {
     border: solid 2px black;
 }
 
 pre{
     white-space:pre-wrap
 }
 
 li {
     list-style-position: inside;
 }
 
 .fancybox-skin {
     position: relative;
     background-color: #fff;
     color: #ddd;
     text-shadow: none;
 }
 
 .fancybox-image {
     border: 1px solid black;
 }
 
 .image-mode-tab {
     display: table;
     margin: 5px;
     padding: 5px;
     background: rgb(221, 221, 221);
     border: 1px solid rgb(204, 204, 204);
     border-radius: 5px 5px 5px 5px;
 }
 
 .image-mode-tab > label {
     margin: 0 1ex;
 }
 
 .image-mode-tab > label > input {
     margin-right: .5ex;
 }
 
 #posts-table {
     margin: 5px;
 }
 
 .tag_info, .page_link {
     display: table;
 }
 
 .tag_info > h2 {
     margin: 0;
 }
 
 .moderator_info {
     color: #e99d41;
     border: dashed 1px;
     padding: 3px;
 }
 
 .refmap {
     font-size: 0.9em;
     color: #444;
     margin-top: 1em;
 }
 
 input[type="submit"]:hover {
         background: #ccc;
 }
 
 
 .fav {
     color: rgb(255, 102, 0);
 }
 
 .not_fav {
     color: #555;
 }
 
 .role {
     text-decoration: underline;
 }
 
 .form-email {
     display: none;
 }
 
 .mark_btn {
     padding: 2px 2ex;
     border: 1px solid;
 }
 
 .mark_btn:hover {
     background: #ccc;
 }
 
 .bar-value {
     background: rgba(251, 199, 16, 0.61);
     padding: 2px;
     font-size: 0.9em;
     height: 1.5em;
 }
 
 .bar-bg {
     position: relative;
     border: 1px solid rgb(204, 204, 204);
     border-radius: 5px 5px 5px 5px;
     margin: 5px;
     overflow: hidden;
 }
 
 .bar-text {
     padding: 2px;
     position: absolute;
     left: 0;
     top: 0;
 }
 
 .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

@@ -1,333 +1,357 b''
 * {
     font-size: inherit;
     margin: 0;
     padding: 0;
 }
 html {
     background: #fff;
     color: #000;
     font: medium sans-serif;
 }
 a {
     color: inherit;
     text-decoration: underline;
 }
 li {
     list-style-position: inside;
 }
 
 #admin_panel {
     background: #182F6F;
     color: #fff;
     padding: .5ex 1ex .5ex 1ex;
 }
 
 .navigation_panel {
     background: #182F6F;
     color: #B4CFEC;
     margin-bottom: 1em;
     padding: .5ex 1ex 1ex 1ex;
 }
 .navigation_panel::after {
     clear: both;
     content: ".";
     display: block;
     height: 0;
     line-height: 0;
     visibility: hidden;
 }
 
 .navigation_panel a:link, .navigation_panel a:visited, .navigation_panel a:hover {
     text-decoration: none;
 }
 
 .navigation_panel .link {
     border-right: 1px solid #fff;
     color: #fff;
     font-weight: bold;
     margin-right: 1ex;
     padding-right: 1ex;
 }
 .navigation_panel .link:last-child {
     border-left: 1px solid #fff;
     border-right: none;
     float: right;
     margin-left: 1ex;
     margin-right: 0;
     padding-left: 1ex;
     padding-right: 0;
 }
 
 .navigation_panel .tag {
     color: #fff;
 }
 
 .input_field {
 
 }
 
 .input_field_name {
 
 }
 
 .input_field_error {
     color: #FF0000;
 }
 
 
 .title {
     color: #182F6F;
     font-weight: bold;
 }
 
 .post-form-w {
     background: #182F6F;
     border-radius: 1ex;
     color: #fff;
     margin: 1em 1ex;
     padding: 1ex;
 }
 .post-form {
     display: table;
     border-collapse: collapse;
     width: 100%;
 
 }
 .form-row {
     display: table-row;
 }
 .form-label, .form-input {
     display: table-cell;
     vertical-align: top;
 }
 .form-label {
     padding: .25em 1ex .25em 0;
 }
 .form-input {
     padding: .25em 0;
 }
 .form-input > * {
     background: #fff;
     color: #000;
     border: none;
     padding: 0;
     resize: vertical;
     width: 100%;
 }
 .form-submit {
     border-bottom: 1px solid #666;
     margin-bottom: .5em;
     padding-bottom: .5em;
 }
 .form-title {
     font-weight: bold;
     margin-bottom: .5em;
 }
 .post-form .settings_item {
     margin: .5em 0;
 }
 .form-submit input {
     margin-top: .5em;
     padding: .2em 1ex;
 }
 .form-label {
     text-align: right;
 }
 
 .block {
     display: inline-block;
     vertical-align: top;
 }
 
 .post_id {
     color: #a00;
 }
 
 .post {
     clear: left;
     margin: 0 1ex 1em 1ex;
     overflow-x: auto;
     word-wrap: break-word;
     background: #FFF;
     padding: 1ex;
     border: 1px solid #666;
     box-shadow: 1px 1px 2px 1px #666;
 }
 
 #posts > .post:last-child {
     border-bottom: none;
     padding-bottom: 0;
 }
 
 .metadata {
     background: #C0E4E8;
     border: 1px solid #7F9699;
     border-radius: .4ex;
     display: table;
     margin-top: .5em;
     padding: .4em;
 }
 
 .post ul, .post ol {
     margin: .5em 0 .5em 3ex;
 }
 .post li {
     margin: .2em 0;
 }
 .post p {
     margin: .5em 0;
 }
 .post blockquote {
     border-left: 3px solid #182F6F;
     margin: .5em 0 .5em 3ex;
     padding-left: 1ex;
 }
 .post blockquote > blockquote {
     padding-top: .1em;
 }
 
 .post > .image {
     float: left;
     margin-right: 1ex;
 }
 .post > .metadata {
     clear: left;
 }
 
 .post > .message .get {
     color: #182F6F; font-weight: bold;
 }
 
 .dead_post > .metadata {
     background: #eee;
 }
 
 .quote {
     color: #182F6F;
 }
 
 .spoiler {
     background: black;
     color: black;
 }
 
 .spoiler:hover {
     background: #ffffff;
 }
 
 .comment {
     color: #557055;
 }
 
 .last-replies {
     margin-left: 6ex;
 }
 
 .thread > .post > .message > .post-info {
     border-bottom: 1px solid #ccc;
     padding-bottom: .5em;
 }
 
 :target .post_id {
     background: #182F6F;
     color: #FFF;
     text-decoration: none;
 }
 
 .image-mode-tab {
     background: #182F6F;
     color: #FFF;
     display: table;
     margin: 1em auto 1em 0;
     padding: .2em .5ex;
 }
 
 .image-mode-tab > label {
     margin: 0 1ex;
 }
 
 .image-mode-tab > label > input {
     margin-right: .5ex;
 }
 
 .tag_info, .page_link {
     margin: 1em 0;
     text-align: center;
 }
 
 .form-errors {
     margin-left: 1ex;
 }
 
 .moderator_info {
     font-weight: bold;
     float: right;
 }
 
 .refmap {
     border: 1px dashed #aaa;
     padding: 0.5em;
     display: table;
 }
 
 .fav {
     color: blue;
 }
 
 .not_fav {
     color: #ccc;
 }
 
 .role {
     text-decoration: underline;
 }
 
 .form-email {
     display: none;
 }
 
 .bar-value {
     background: #E3E7F2;
     padding: .1em 1ex;
     moz-box-sizing: border-box;
     box-sizing: border-box;
     height: 1.5em;
 }
 
 .bar-bg {
     background: #EA4649;
     border: 1px solid #666;
     margin: 0 1ex 1em 1ex;
     position: relative;
     overflow: hidden;
 }
 
 .bar-text {
     padding: 2px;
     position: absolute;
     left: 0;
     top: 0;
 }
 
 .skipped_replies {
     margin: 1ex;
 }
 
 #mark-panel {
     background: #eee;
     border-bottom: 1px solid #182F6F;
 }
 
 .mark_btn {
     display: inline-block;
     padding: .2em 1ex;
     border-left: 1px solid #182F6F;
 }
 
 .mark_btn:first-child {
     border-left: none;
 }
 
 .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;
+}
+
+.gallery_image_metadata {
+    margin-bottom: 1em;
 }
  No newline at end of file

boards/static/js/thread.js

@@ -1,81 +1,47 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.
  */
 
-function addGalleryPanel() {
-    var gallery = $('a[class="thumb"]').clone(true),
-        normal = $('.post').clone(true);
-
-    $('.navigation_panel').filter(':first').after(
-        '<div class="image-mode-tab" role="radiogroup" aria-label="Image mode2">' +
-        '<label><input type="radio" class="image-mode-normal" name="image-mode" value="0" checked="checked"/>'+ gettext('Normal') +'</label>' +
-        '<label><input type="radio" class="image-mode-table" name="image-mode" value="1"/>'+ gettext('Gallery') +'</label>' +
-        '</div>'
-    );
-
-    $('input[name="image-mode"]').change(function() {
-        //gallery mode
-        if($(this).val() === '1') {
-            $('.thread').replaceWith(
-                $('<div id="posts-table"></div>').append(gallery)
-            );
-        }
-        //normal mode
-        else {
-            $('#posts-table').replaceWith(
-                $('<div class="thread"></div>').append(normal)
-            );
-        }
-    });
-}
-
 function moveCaretToEnd(el) {
         if (typeof el.selectionStart == "number") {
             el.selectionStart = el.selectionEnd = el.value.length;
         } else if (typeof el.createTextRange != "undefined") {
             el.focus();
             var range = el.createTextRange();
             range.collapse(false);
             range.select();
         }
 }
 
 function addQuickReply(postId) {
     var textToAdd = '>>' + postId + '\n\n';
     var textAreaId = 'textarea';
     $(textAreaId).val($(textAreaId).val()+ textToAdd);
 
     var textarea = document.getElementsByTagName('textarea')[0];
     $(textAreaId).focus();
     moveCaretToEnd(textarea);
 
     $("html, body").animate({ scrollTop: $(textAreaId).offset().top }, "slow");
 }
-
-
-
-$(document).ready(function(){
-    addGalleryPanel();
-    initAutoupdate();
-});

boards/static/js/thread_update.js

@@ -1,164 +1,192 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 THREAD_UPDATE_DELAY = 10000;
 
 var loading = false;
 var lastUpdateTime = null;
 
 function blink(node) {
     var blinkCount = 2;
     var blinkDelay = 250;
 
     var nodeToAnimate = node;
     for (var i = 0; i < blinkCount; i++) {
         nodeToAnimate = nodeToAnimate.fadeOut(blinkDelay).fadeIn(blinkDelay);
     }
 }
 
 function updateThread() {
     if (loading) {
         return;
     }
 
     loading = true;
 
     var threadPosts = $('div.thread').children('.post');
 
     var lastPost = threadPosts.last();
     var threadId = threadPosts.first().attr('id');
 
     var diffUrl = '/api/diff_thread/' + threadId + '/' + lastUpdateTime + '/';
     $.getJSON(diffUrl)
         .success(function(data) {
             var bottom = isPageBottom();
 
             var addedPosts = data.added;
             for (var i = 0; i < addedPosts.length; i++) {
                 var postText = addedPosts[i];
 
                 var post = $(postText);
                 post.appendTo(lastPost.parent());
                 addRefLinkPreview(post[0]);
 
                 lastPost = post;
                 blink(post);
             }
 
             var updatedPosts = data.updated;
             for (var i = 0; i < updatedPosts.length; i++) {
                 var postText = updatedPosts[i];
 
                 var post = $(postText);
                 var postId = post.attr('id');
 
                 var oldPost = $('div.thread').children('.post[id=' + postId + ']');
                 
                 oldPost.replaceWith(post);
                 addRefLinkPreview(post[0]);
 
                 blink(post);
             }
             
             // TODO Process deleted posts
 
             lastUpdateTime = data.last_update;
             loading = false;
 
             if (bottom) {
                 var $target = $('html,body');
                 $target.animate({scrollTop: $target.height()}, 1000);
             }
 
             $('#reply-count').text(getReplyCount());
             $('#image-count').text(getImageCount());
 
             updateBumplimitProgress(data.added.length);
             updatePostBumpableStatus();
+
+            if (data.added.length + data.updated.length > 0) {
+                showNewPostsTitle();
+            }
         })
         .error(function(data) {
             // TODO Show error message that server is unavailable?
 
             loading = false;
         });
 }
 
 function isPageBottom() {
     var scroll = $(window).scrollTop() / ($(document).height()
         - $(window).height())
 
     return scroll == 1
 }
 
 function initAutoupdate() {
     loading = false;
 
     lastUpdateTime = $('.metapanel').attr('data-last-update');
 
     setInterval(updateThread, THREAD_UPDATE_DELAY);
 }
 
 function getReplyCount() {
     return $('.thread').children('.post').length
 }
 
 function getImageCount() {
     return $('.thread').find('img').length
 }
 
 /**
  * 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) + '%');
         }
     }
 }
 
 /**
  * If the bumplimit is reached, add dead_post class to all posts
  */
 function updatePostBumpableStatus() {
     var postCount = getReplyCount();
     var postsToLimitElement = $('#left_to_limit');
     var postsToLimit = parseInt(postsToLimitElement.text());
 
     if (postsToLimit <= 0) {
         $('.thread').find('.post').addClass('dead_post');
     }
 }
+
+var documentOriginalTitle = '';
+/**
+ * Show 'new posts' text in the title if the document is not visible to a user
+ */
+function showNewPostsTitle() {
+    if (document.hidden) {
+        documentOriginalTitle = document.title;
+        document.title = gettext('[new posts]') + ' ' + document.title;
+
+        document.addEventListener('visibilitychange', function() {
+            if (documentOriginalTitle !== '') {
+                document.title = documentOriginalTitle;
+                documentOriginalTitle = '';
+            }
+
+            document.removeEventListener('visibilitychange', null);
+        });
+    }
+}
+
+$(document).ready(function(){
+    initAutoupdate();
+});

boards/templates/boards/posting_general.html

@@ -1,244 +1,254 b''
 {% extends "boards/base.html" %}
 
 {% load i18n %}
 {% load cache %}
 {% load board %}
 {% load static %}
 
 {% block head %}
     {% if tag %}
         <title>Neboard - {{ tag.name }}</title>
     {% else %}
         <title>Neboard</title>
     {% endif %}
 
     {% if prev_page %}
         <link rel="next" href="
             {% if tag %}
                 {% url "tag" tag_name=tag page=prev_page %}
             {% else %}
                 {% url "index" page=prev_page %}
             {% endif %}
         " />
     {% endif %}
     {% if next_page %}
         <link rel="next" href="
             {% if tag %}
                 {% url "tag" tag_name=tag page=next_page %}
             {% else %}
                 {% url "index" page=next_page %}
             {% endif %}
         " />
     {% endif %}
 
 {% endblock %}
 
 {% block content %}
 
     {% get_current_language as LANGUAGE_CODE %}
 
 {% if tag %}
     <div class="tag_info">
         <h2>
             {% if tag in user.fav_tags.all %}
                 <a href="{% url 'tag_unsubscribe' tag.name %}?next={{ request.path }}"
                    class="fav">★</a>
             {% else %}
                 <a href="{% url 'tag_subscribe' tag.name %}?next={{ request.path }}"
                    class="not_fav">★</a>
             {% endif %}
             #{{ tag.name }}
         </h2>
     </div>
 {% endif %}
 
     {% if threads %}
         {% if prev_page %}
             <div class="page_link">
                 <a href="
             {% if tag %}
                 {% url "tag" tag_name=tag page=prev_page %}
             {% else %}
                 {% url "index" page=prev_page %}
             {% endif %}
                 ">{% trans "Previous page" %}</a>
             </div>
         {% endif %}
 
         {% for thread in threads %}
             {% cache 600 thread_short thread.id thread.thread.last_edit_time moderator LANGUAGE_CODE %}
             <div class="thread">
             {% if thread.bumpable %}
 		        <div class="post" id="{{ thread.op.id }}">
             {% else %}
 		        <div class="post dead_post" id="{{ thread.op.id }}">
             {% endif %}
             {% if thread.op.image %}
                 <div class="image">
                     <a class="thumb"
                        href="{{ thread.op.image.url }}"><img
                             src="{{ thread.op.image.url_200x150 }}"
                             alt="{{ thread.op.id }}"
+                            width="{{ thread.op.image_pre_width }}"
+                            height="{{ thread.op.image_pre_height }}"
                             data-width="{{ thread.op.image_width }}"
                             data-height="{{ thread.op.image_height }}"/>
                     </a>
                 </div>
             {% endif %}
             <div class="message">
                 <div class="post-info">
                     <span class="title">{{ thread.op.title }}</span>
                      <a class="post_id" href="{% url 'thread' thread.op.id %}"
                     >({{ thread.op.id }})</a>
                     [{{ thread.op.pub_time }}]
                     [<a class="link" href="
                     {% url 'thread' thread.op.id %}#form"
                         >{% trans "Reply" %}</a>]
 
                     {% if moderator %}
                         <span class="moderator_info">
                             [<a href="
                             {% url 'delete' post_id=thread.op.id %}?next={{ request.path }}"
                                 >{% trans 'Delete' %}</a>]
-                            ({{ thread.thread.poster_ip }})
+                            ({{ thread.op.poster_ip }})
                             [<a href="
                             {% url 'ban' post_id=thread.op.id %}?next={{ request.path }}"
                                 >{% trans 'Ban IP' %}</a>]
                         </span>
                     {% endif %}
                 </div>
                 {% autoescape off %}
                     {{ thread.op.text.rendered|truncatewords_html:50 }}
                 {% endautoescape %}
 		{% if thread.op.is_referenced %}
 		    <div class="refmap">
 			{% trans "Replies" %}:
 			{% for ref_post in thread.op.get_sorted_referenced_posts %}
 			<a href="{% post_url ref_post.id %}">&gt;&gt;{{ ref_post.id }}</a
                     >{% if not forloop.last %},{% endif %}
 			{% endfor %}
 		    </div>
 		{% endif %}
             </div>
             <div class="metadata">
                 {{ thread.thread.get_images_count }} {% trans 'images' %}.
                 {% if thread.thread.tags %}
                     <span class="tags">
                         {% for tag in thread.thread.get_tags %}
                             <a class="tag" href="
                                     {% url 'tag' tag_name=tag.name %}">
                                 #{{ tag.name }}</a
                                     >{% if not forloop.last %},{% endif %}
                         {% endfor %}
                     </span>
                 {% endif %}
             </div>
             </div>
             {% if thread.last_replies.exists %}
                 {% if thread.skipped_replies %}
                     <div class="skipped_replies">
                         <a href="{% url 'thread' thread.op.id %}">
                         {% blocktrans with count=thread.skipped_replies %}Skipped {{ count }} replies. Open thread to see all replies.{% endblocktrans %}
                         </a>
                     </div>
                 {% endif %}
                 <div class="last-replies">
                     {% for post in thread.last_replies %}
                         {% if thread.bumpable %}
                             <div class="post" id="{{ post.id }}">
                         {% else %}
                             <div class="post dead_post" id="{{ post.id }}">
                         {% endif %}
                             {% if post.image %}
                                 <div class="image">
                                     <a class="thumb"
                                        href="{{ post.image.url }}"><img
                                             src=" {{ post.image.url_200x150 }}"
                                             alt="{{ post.id }}"
+                                            width="{{ post.image_pre_width }}"
+                                            height="{{ post.image_pre_height }}"
                                             data-width="{{ post.image_width }}"
                                             data-height="{{ post.image_height }}"/>
                                     </a>
                                 </div>
                             {% endif %}
                             <div class="message">
                                 <div class="post-info">
                                     <span class="title">{{ post.title }}</span>
                                     <a class="post_id" href="
                                 {% url 'thread' thread.op.id %}#{{ post.id }}">
                                         ({{ post.id }})</a>
                                     [{{ post.pub_time }}]
                                 </div>
                                 {% autoescape off %}
                                     {{ post.text.rendered|truncatewords_html:50 }}
                                 {% endautoescape %}
                         </div>
                     {% if post.is_referenced %}
                         <div class="refmap">
                             {% trans "Replies" %}:
                             {% for ref_post in post.get_sorted_referenced_posts %}
                                 <a href="{% post_url ref_post.id %}">&gt;&gt;{{ ref_post.id }}</a
                                         >{% if not forloop.last %},{% endif %}
                             {% endfor %}
                         </div>
                     {% endif %}
                         </div>
                     {% endfor %}
                 </div>
             {% endif %}
         </div>
         {% endcache %}
         {% endfor %}
 
         {% if next_page %}
             <div class="page_link">
                 <a href="
             {% if tag %}
                 {% url "tag" tag_name=tag page=next_page %}
             {% else %}
                 {% url "index" page=next_page %}
             {% endif %}
                 ">{% trans "Next page" %}</a>
             </div>
         {% endif %}
     {% else %}
         <div class="post">
             {% trans 'No threads exist. Create the first one!' %}</div>
     {% endif %}
 
     <div class="post-form-w">
         <script src="{% static 'js/panel.js' %}"></script>
         <div class="post-form">
             <div class="form-title">{% trans "Create new thread" %}</div>
             <form enctype="multipart/form-data" method="post">{% csrf_token %}
                 {{ form.as_div }}
                 <div class="form-submit">
                     <input type="submit" value="{% trans "Post" %}"/>
                 </div>
             </form>
             <div>
                 {% trans 'Tags must be delimited by spaces. Text or image is required.' %}
             </div>
             <div><a href="{% url "staticpage" name="help" %}">
                 {% trans 'Text syntax' %}</a></div>
         </div>
     </div>
 
 {% endblock %}
 
 {% block metapanel %}
 
     <span class="metapanel">
-        <b><a href="{% url "authors" %}">Neboard</a> 1.4.1</b>
-        {% trans "Pages:" %}
+        <b><a href="{% url "authors" %}">Neboard</a> 1.5 Aker</b>
+        {% trans "Pages:" %}[
         {% for page in pages %}
-            [<a href="
+            <a
+                {% ifequal page current_page %}
+                    class="current_page"
+                {% endifequal %}
+                href="
             {% if tag %}
                 {% url "tag" tag_name=tag page=page %}
             {% else %}
                 {% url "index" page=page %}
             {% endif %}
-            ">{{ page }}</a>]
+            ">{{ page }}</a>
+            {% if not forloop.last %},{% endif %}
         {% endfor %}
+        ]
         [<a href="rss/">RSS</a>]
     </span>
 
 {% endblock %}

boards/templates/boards/thread.html

@@ -1,128 +1,136 b''
 {% extends "boards/base.html" %}
 
 {% load i18n %}
 {% load cache %}
 {% load static from staticfiles %}
 {% load board %}
 
 {% block head %}
-    <title>Neboard - {{ thread.get_replies.0.get_title }}</title>
+    <title>Neboard - {{ thread.get_opening_post.get_title }}</title>
 {% endblock %}
 
 {% block content %}
     {% spaceless %}
     {% get_current_language as LANGUAGE_CODE %}
 
     <script src="{% static 'js/thread_update.js' %}"></script>
     <script src="{% static 'js/thread.js' %}"></script>
 
     {% cache 600 thread_view thread.id thread.last_edit_time moderator LANGUAGE_CODE %}
+
+        <div class="image-mode-tab">
+            <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>
+
         {% if bumpable %}
             <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_replies %}
         {% if bumpable %}
             <div class="post" id="{{ post.id }}">
         {% else %}
             <div class="post dead_post" id="{{ post.id }}">
         {% endif %}
         {% if post.image %}
             <div class="image">
                 <a
                         class="thumb"
                         href="{{ post.image.url }}"><img
                         src="{{ post.image.url_200x150 }}"
                         alt="{{ post.id }}"
+                        width="{{ post.image_pre_width }}"
+                        height="{{ post.image_pre_height }}"
                         data-width="{{ post.image_width }}"
                         data-height="{{ post.image_height }}"/>
                 </a>
             </div>
         {% endif %}
         <div class="message">
             <div class="post-info">
                 <span class="title">{{ post.title }}</span>
                 <a class="post_id" href="#{{ post.id }}">
                     ({{ post.id }})</a>
                 [{{ post.pub_time }}]
             [<a href="#" onclick="javascript:addQuickReply('{{ post.id }}')
                 ; return false;">&gt;&gt;</a>]
 
                 {% if moderator %}
                     <span class="moderator_info">
                         [<a href="{% url 'delete' post_id=post.id %}"
                             >{% trans 'Delete' %}</a>]
                         ({{ post.poster_ip }})
                         [<a href="{% url 'ban' post_id=post.id %}?next={{ request.path }}"
                             >{% trans 'Ban IP' %}</a>]
                     </span>
                 {% endif %}
             </div>
             {% autoescape off %}
             {{ post.text.rendered }}
             {% endautoescape %}
     {% if post.is_referenced %}
         <div class="refmap">
         {% trans "Replies" %}:
         {% for ref_post in post.get_sorted_referenced_posts %}
         <a href="{% post_url ref_post.id %}">&gt;&gt;{{ ref_post.id }}</a
                 >{% if not forloop.last %},{% endif %}
         {% endfor %}
         </div>
     {% endif %}
         </div>
         {% if forloop.first %}
             <div class="metadata">
                 <span class="tags">
                     {% for tag in thread.get_tags %}
                         <a class="tag" href="{% url 'tag' tag.name %}">
                             #{{ tag.name }}</a
                                 >{% if not forloop.last %},{% endif %}
                     {% endfor %}
                 </span>
             </div>
         {% endif %}
         </div>
     {% endfor %}
     </div>
     {% endcache %}
 
     <div class="post-form-w">
         <script src="{% static 'js/panel.js' %}"></script>
         <div class="form-title">{% trans "Reply to thread" %} #{{ thread.get_opening_post.id }}</div>
         <div class="post-form">
             <form id="form" enctype="multipart/form-data" method="post"
                     >{% csrf_token %}
                 {{ form.as_div }}
                 <div class="form-submit">
                     <input type="submit" value="{% trans "Post" %}"/>
                 </div>
             </form>
             <div><a href="{% url "staticpage" name="help" %}">
                 {% trans 'Text syntax' %}</a></div>
         </div>
     </div>
 
     {% endspaceless %}
 {% endblock %}
 
 {% block metapanel %}
 
     {% 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 %}
             <span id="reply-count">{{ thread.get_reply_count }}</span> {% trans 'replies' %},
             <span id="image-count">{{ thread.get_images_count }}</span> {% trans 'images' %}.
             {% trans 'Last update: ' %}{{ thread.last_edit_time }}
             [<a href="rss/">RSS</a>]
         {% endcache %}
     </span>
 
 {% endblock %}

boards/templatetags/board.py

@@ -1,23 +1,49 b''
 from django.core.urlresolvers import reverse
 from django.shortcuts import get_object_or_404
 from boards.models import Post
 from boards.views import thread
 from django import template
 
 register = template.Library()
 
+actions = [
+    {
+        'name': 'google',
+        'link': 'http://google.com/searchbyimage?image_url=%s',
+    },
+    {
+        'name': 'iqdb',
+        'link': 'http://iqdb.org/?url=%s',
+    },
+]
+
 
 @register.simple_tag(name='post_url')
 def post_url(*args, **kwargs):
     post_id = args[0]
 
     post = get_object_or_404(Post, id=post_id)
 
     if not post.is_opening():
         link = reverse(thread, kwargs={
             'post_id': post.thread_new.get_opening_post().id}) + '#' + str(
             post_id)
     else:
         link = reverse(thread, kwargs={'post_id': post_id})
 
     return link
+
+
[e-mail]_tag(name='image_actions')
+def image_actions(*args, **kwargs):
+    image_link = args[0]
+    if len(args) > 1:
+        image_link = 'http://' + args[1] + image_link # TODO https?
+
+    result = ''
+
+    for action in actions:
+        result += '[<a href="' + action['link'] % image_link + '">' + \
+                  action['name'] + '</a>]'
+
+    return result

boards/thumbs.py

@@ -1,173 +1,216 b''
 # -*- encoding: utf-8 -*-
 """
 django-thumbs by Antonio Melé
 http://django.es
 """
+from django.core.files.images import ImageFile
 from django.db.models import ImageField
 from django.db.models.fields.files import ImageFieldFile
 from PIL import Image
 from django.core.files.base import ContentFile
 import cStringIO
 
 
 def generate_thumb(img, thumb_size, format):
     """
     Generates a thumbnail image and returns a ContentFile object with the thumbnail
-    
+
     Parameters:
     ===========
     img         File object
-    
+
     thumb_size  desired thumbnail size, ie: (200,120)
-    
+
     format      format of the original image ('jpeg','gif','png',...)
                 (this format will be used for the generated thumbnail, too)
     """
 
     img.seek(0) # see http://code.djangoproject.com/ticket/8222 for details
     image = Image.open(img)
 
     # get size
     thumb_w, thumb_h = thumb_size
     # If you want to generate a square thumbnail
     if thumb_w == thumb_h:
         # quad
         xsize, ysize = image.size
         # get minimum size
         minsize = min(xsize, ysize)
         # largest square possible in the image
         xnewsize = (xsize - minsize) / 2
         ynewsize = (ysize - minsize) / 2
         # crop it
         image2 = image.crop(
             (xnewsize, ynewsize, xsize - xnewsize, ysize - ynewsize))
-        # load is necessary after crop                
+        # load is necessary after crop
         image2.load()
         # thumbnail of the cropped image (with ANTIALIAS to make it look better)
         image2.thumbnail(thumb_size, Image.ANTIALIAS)
     else:
         # not quad
         image2 = image
         image2.thumbnail(thumb_size, Image.ANTIALIAS)
 
     io = cStringIO.StringIO()
     # PNG and GIF are the same, JPG is JPEG
     if format.upper() == 'JPG':
         format = 'JPEG'
 
     image2.save(io, format)
     return ContentFile(io.getvalue())
 
 
 class ImageWithThumbsFieldFile(ImageFieldFile):
     """
     See ImageWithThumbsField for usage example
     """
 
     def __init__(self, *args, **kwargs):
         super(ImageWithThumbsFieldFile, self).__init__(*args, **kwargs)
         self.sizes = self.field.sizes
 
         if self.sizes:
             def get_size(self, size):
                 if not self:
                     return ''
                 else:
                     split = self.url.rsplit('.', 1)
                     thumb_url = '%s.%sx%s.%s' % (split[0], w, h, split[1])
                     return thumb_url
 
             for size in self.sizes:
                 (w, h) = size
                 setattr(self, 'url_%sx%s' % (w, h), get_size(self, size))
 
     def save(self, name, content, save=True):
         super(ImageWithThumbsFieldFile, self).save(name, content, save)
 
         if self.sizes:
             for size in self.sizes:
                 (w, h) = size
                 split = self.name.rsplit('.', 1)
                 thumb_name = '%s.%sx%s.%s' % (split[0], w, h, split[1])
 
                 # you can use another thumbnailing function if you like
                 thumb_content = generate_thumb(content, size, split[1])
 
                 thumb_name_ = self.storage.save(thumb_name, thumb_content)
 
                 if not thumb_name == thumb_name_:
                     raise ValueError(
                         'There is already a file named %s' % thumb_name)
 
     def delete(self, save=True):
         name = self.name
         super(ImageWithThumbsFieldFile, self).delete(save)
         if self.sizes:
             for size in self.sizes:
                 (w, h) = size
                 split = name.rsplit('.', 1)
                 thumb_name = '%s.%sx%s.%s' % (split[0], w, h, split[1])
                 try:
                     self.storage.delete(thumb_name)
                 except:
                     pass
 
 
 class ImageWithThumbsField(ImageField):
     attr_class = ImageWithThumbsFieldFile
     """
     Usage example:
     ==============
     photo = ImageWithThumbsField(upload_to='images', sizes=((125,125),(300,200),)
     
     To retrieve image URL, exactly the same way as with ImageField:
         my_object.photo.url
     To retrieve thumbnails URL's just add the size to it:
         my_object.photo.url_125x125
         my_object.photo.url_300x200
     
     Note: The 'sizes' attribute is not required. If you don't provide it, 
     ImageWithThumbsField will act as a normal ImageField
         
     How it works:
     =============
     For each size in the 'sizes' atribute of the field it generates a 
     thumbnail with that size and stores it following this format:
     
     available_filename.[width]x[height].extension
 
     Where 'available_filename' is the available filename returned by the storage
     backend for saving the original file.
     
     Following the usage example above: For storing a file called "photo.jpg" it saves:
     photo.jpg          (original file)
     photo.125x125.jpg  (first thumbnail)
     photo.300x200.jpg  (second thumbnail)
     
     With the default storage backend if photo.jpg already exists it will use these filenames:
     photo_.jpg
     photo_.125x125.jpg
     photo_.300x200.jpg
     
     Note: django-thumbs assumes that if filename "any_filename.jpg" is available 
     filenames with this format "any_filename.[widht]x[height].jpg" will be available, too.
     
     To do:
     ======
     Add method to regenerate thubmnails
 
     
     """
 
     def __init__(self, verbose_name=None, name=None, width_field=None,
-                 height_field=None, sizes=None, **kwargs):
+                 height_field=None, sizes=None,
+                 preview_width_field=None, preview_height_field=None,
+                 **kwargs):
         self.verbose_name = verbose_name
         self.name = name
         self.width_field = width_field
         self.height_field = height_field
         self.sizes = sizes
         super(ImageField, self).__init__(**kwargs)
 
+        if sizes is not None and len(sizes) == 1:
+            self.preview_width_field = preview_width_field
+            self.preview_height_field = preview_height_field
+
+    def update_dimension_fields(self, instance, force=False, *args, **kwargs):
+        """
+        Update original image dimension fields and thumb dimension fields
+        (only if 1 thumb size is defined)
+        """
+
+        super(ImageWithThumbsField, self).update_dimension_fields(instance,
+                                                                   force, *args,
+                                                                   **kwargs)
+        thumb_width_field = self.preview_width_field
+        thumb_height_field = self.preview_height_field
+
+        if thumb_width_field is None or thumb_height_field is None \
+                or len(self.sizes) != 1:
+            return
+
+        original_width = getattr(instance, self.width_field)
+        original_height = getattr(instance, self.height_field)
+
+        if original_width > 0 and original_height > 0:
+            thumb_width, thumb_height = self.sizes[0]
+
+            w_scale = float(thumb_width) / original_width
+            h_scale = float(thumb_height) / original_height
+            scale_ratio = min(w_scale, h_scale)
+
+            if scale_ratio >= 1:
+                thumb_width_ratio = original_width
+                thumb_height_ratio = original_height
+            else:
+                thumb_width_ratio = int(original_width * scale_ratio)
+                thumb_height_ratio = int(original_height * scale_ratio)
+
+            setattr(instance, thumb_width_field, thumb_width_ratio)
+            setattr(instance, thumb_height_field, thumb_height_ratio)
+
 
 from south.modelsinspector import add_introspection_rules
 add_introspection_rules([], ["^boards\.thumbs\.ImageWithThumbsField"])

boards/urls.py

@@ -1,59 +1,60 b''
 from django.conf.urls import patterns, url, include
 from boards import views
 from boards.rss import AllThreadsFeed, TagThreadsFeed, ThreadPostsFeed
 from boards.views.api import api_get_threaddiff
 
 js_info_dict = {
     'packages': ('boards',),
 }
 
 urlpatterns = patterns('',
 
     # /boards/
     url(r'^$', views.index, name='index'),
     # /boards/page/
     url(r'^page/(?P<page>\w+)/$', views.index, name='index'),
 
     # login page
     url(r'^login/$', views.login, name='login'),
 
     # /boards/tag/tag_name/
     url(r'^tag/(?P<tag_name>\w+)/$', views.tag, name='tag'),
     # /boards/tag/tag_id/page/
     url(r'^tag/(?P<tag_name>\w+)/page/(?P<page>\w+)/$', views.tag, name='tag'),
 
     # /boards/tag/tag_name/unsubscribe/
     url(r'^tag/(?P<tag_name>\w+)/subscribe/$', views.tag_subscribe,
         name='tag_subscribe'),
     # /boards/tag/tag_name/unsubscribe/
     url(r'^tag/(?P<tag_name>\w+)/unsubscribe/$', views.tag_unsubscribe,
         name='tag_unsubscribe'),
 
     # /boards/thread/
     url(r'^thread/(?P<post_id>\w+)/$', views.thread, name='thread'),
+    url(r'^thread/(?P<post_id>\w+)/(?P<mode>\w+)/$', views.thread, name='thread_mode'),
     url(r'^settings/$', views.settings, name='settings'),
     url(r'^tags/$', views.all_tags, name='tags'),
     url(r'^captcha/', include('captcha.urls')),
     url(r'^jump/(?P<post_id>\w+)/$', views.jump_to_post, name='jumper'),
     url(r'^authors/$', views.authors, name='authors'),
     url(r'^delete/(?P<post_id>\w+)/$', views.delete, name='delete'),
     url(r'^ban/(?P<post_id>\w+)/$', views.ban, name='ban'),
 
     url(r'^banned/$', views.you_are_banned, name='banned'),
     url(r'^staticpage/(?P<name>\w+)/$', views.static_page, name='staticpage'),
 
     # RSS feeds
     url(r'^rss/$', AllThreadsFeed()),
     url(r'^page/(?P<page>\w+)/rss/$', AllThreadsFeed()),
     url(r'^tag/(?P<tag_name>\w+)/rss/$', TagThreadsFeed()),
     url(r'^tag/(?P<tag_name>\w+)/page/(?P<page>\w+)/rss/$', TagThreadsFeed()),
     url(r'^thread/(?P<post_id>\w+)/rss/$', ThreadPostsFeed()),
 
     # i18n
     url(r'^jsi18n/$', 'boards.views.cached_js_catalog', js_info_dict, name='js_info_dict'),
 
     # API
     url(r'^api/post/(?P<post_id>\w+)/$', views.get_post, name="get_post"),
     url(r'^api/diff_thread/(?P<thread_id>\w+)/(?P<last_update_time>\w+)/$',
         api_get_threaddiff, name="get_thread_diff"),
 )

boards/views/__init__.py

@@ -1,548 +1,559 b''
 __author__ = 'neko259'
 
 import hashlib
 import string
 import time
 import re
 
 from django.core import serializers
 from django.core.urlresolvers import reverse
-from django.http import HttpResponseRedirect
+from django.http import HttpResponseRedirect, Http404
 from django.http.response import HttpResponse
 from django.template import RequestContext
 from django.shortcuts import render, redirect, get_object_or_404
 from django.utils import timezone
 from django.db import transaction
 from django.views.decorators.cache import cache_page
 from django.views.i18n import javascript_catalog
 
 from boards import forms
 import boards
 from boards import utils
 from boards.forms import ThreadForm, PostForm, SettingsForm, PlainErrorList, \
     ThreadCaptchaForm, PostCaptchaForm, LoginForm, ModeratorSettingsForm
 from boards.models import Post, Tag, Ban, User
 from boards.models.post import SETTING_MODERATE, REGEX_REPLY
 from boards.models.user import RANK_USER
 from boards import authors
 from boards.utils import get_client_ip
 import neboard
 
 
 BAN_REASON_SPAM = 'Autoban: spam bot'
+MODE_GALLERY = 'gallery'
+MODE_NORMAL = 'normal'
 
 
 def index(request, page=0):
     context = _init_default_context(request)
 
     if utils.need_include_captcha(request):
         threadFormClass = ThreadCaptchaForm
         kwargs = {'request': request}
     else:
         threadFormClass = ThreadForm
         kwargs = {}
 
     if request.method == 'POST':
         form = threadFormClass(request.POST, request.FILES,
                                error_class=PlainErrorList, **kwargs)
         form.session = request.session
 
         if form.is_valid():
             return _new_post(request, form)
         if form.need_to_ban:
             # Ban user because he is suspected to be a bot
             _ban_current_user(request)
     else:
         form = threadFormClass(error_class=PlainErrorList, **kwargs)
 
     threads = []
     for thread_to_show in Post.objects.get_threads(page=int(page)):
         threads.append(_get_template_thread(thread_to_show))
 
     # TODO Make this generic for tag and threads list pages
     context['threads'] = None if len(threads) == 0 else threads
     context['form'] = form
+    context['current_page'] = int(page)
 
     page_count = Post.objects.get_thread_page_count()
     context['pages'] = range(page_count)
     page = int(page)
     if page < page_count - 1:
         context['next_page'] = str(page + 1)
     if page > 0:
         context['prev_page'] = str(page - 1)
 
     return render(request, 'boards/posting_general.html',
                   context)
 
 
 @transaction.atomic
 def _new_post(request, form, opening_post=None):
     """Add a new post (in thread or as a reply)."""
 
     ip = get_client_ip(request)
     is_banned = Ban.objects.filter(ip=ip).exists()
 
     if is_banned:
         return redirect(you_are_banned)
 
     data = form.cleaned_data
 
     title = data['title']
     text = data['text']
 
     text = _remove_invalid_links(text)
 
     if 'image' in data.keys():
         image = data['image']
     else:
         image = None
 
     tags = []
 
     if not opening_post:
         tag_strings = data['tags']
 
         if tag_strings:
             tag_strings = tag_strings.split(' ')
             for tag_name in tag_strings:
                 tag_name = string.lower(tag_name.strip())
                 if len(tag_name) > 0:
                     tag, created = Tag.objects.get_or_create(name=tag_name)
                     tags.append(tag)
         post_thread = None
     else:
         post_thread = opening_post.thread_new
 
     post = Post.objects.create_post(title=title, text=text, ip=ip,
                                     thread=post_thread, image=image,
                                     tags=tags, user=_get_user(request))
 
     thread_to_show = (opening_post.id if opening_post else post.id)
 
     if opening_post:
         return redirect(reverse(thread, kwargs={'post_id': thread_to_show}) +
                         '#' + str(post.id))
     else:
         return redirect(thread, post_id=thread_to_show)
 
 
 def tag(request, tag_name, page=0):
     """
     Get all tag threads. Threads are split in pages, so some page is
     requested. Default page is 0.
     """
 
     tag = get_object_or_404(Tag, name=tag_name)
     threads = []
     for thread_to_show in Post.objects.get_threads(page=int(page), tag=tag):
         threads.append(_get_template_thread(thread_to_show))
 
     if request.method == 'POST':
         form = ThreadForm(request.POST, request.FILES,
                           error_class=PlainErrorList)
         form.session = request.session
 
         if form.is_valid():
             return _new_post(request, form)
         if form.need_to_ban:
             # Ban user because he is suspected to be a bot
             _ban_current_user(request)
     else:
         form = forms.ThreadForm(initial={'tags': tag_name},
                                 error_class=PlainErrorList)
 
     context = _init_default_context(request)
     context['threads'] = None if len(threads) == 0 else threads
     context['tag'] = tag
+    context['current_page'] = int(page)
 
     page_count = Post.objects.get_thread_page_count(tag=tag)
     context['pages'] = range(page_count)
     page = int(page)
     if page < page_count - 1:
         context['next_page'] = str(page + 1)
     if page > 0:
         context['prev_page'] = str(page - 1)
 
     context['form'] = form
 
     return render(request, 'boards/posting_general.html',
                   context)
 
 
-def thread(request, post_id):
+def thread(request, post_id, mode=MODE_NORMAL):
     """Get all thread posts"""
 
     if utils.need_include_captcha(request):
         postFormClass = PostCaptchaForm
         kwargs = {'request': request}
     else:
         postFormClass = PostForm
         kwargs = {}
 
     if request.method == 'POST':
         form = postFormClass(request.POST, request.FILES,
                              error_class=PlainErrorList, **kwargs)
         form.session = request.session
 
         opening_post = get_object_or_404(Post, id=post_id)
         if form.is_valid():
             return _new_post(request, form, opening_post)
         if form.need_to_ban:
             # Ban user because he is suspected to be a bot
             _ban_current_user(request)
     else:
         form = postFormClass(error_class=PlainErrorList, **kwargs)
 
     thread_to_show = get_object_or_404(Post, id=post_id).thread_new
 
     context = _init_default_context(request)
 
     posts = thread_to_show.get_replies()
     context['form'] = form
     context['bumpable'] = thread_to_show.can_bump()
     if context['bumpable']:
         context['posts_left'] = neboard.settings.MAX_POSTS_PER_THREAD - posts \
             .count()
         context['bumplimit_progress'] = str(
             float(context['posts_left']) /
             neboard.settings.MAX_POSTS_PER_THREAD * 100)
     context["last_update"] = _datetime_to_epoch(thread_to_show.last_edit_time)
     context["thread"] = thread_to_show
 
-    return render(request, 'boards/thread.html', context)
+    if MODE_NORMAL == mode:
+        document = 'boards/thread.html'
+    elif MODE_GALLERY == mode:
+        document = 'boards/thread_gallery.html'
+    else:
+        raise Http404
+
+    return render(request, document, context)
 
 
 def login(request):
     """Log in with user id"""
 
     context = _init_default_context(request)
 
     if request.method == 'POST':
         form = LoginForm(request.POST, request.FILES,
                          error_class=PlainErrorList)
         form.session = request.session
 
         if form.is_valid():
             user = User.objects.get(user_id=form.cleaned_data['user_id'])
             request.session['user_id'] = user.id
             return redirect(index)
 
     else:
         form = LoginForm()
 
     context['form'] = form
 
     return render(request, 'boards/login.html', context)
 
 
 def settings(request):
     """User's settings"""
 
     context = _init_default_context(request)
     user = _get_user(request)
     is_moderator = user.is_moderator()
 
     if request.method == 'POST':
         with transaction.atomic():
             if is_moderator:
                 form = ModeratorSettingsForm(request.POST,
                                              error_class=PlainErrorList)
             else:
                 form = SettingsForm(request.POST, error_class=PlainErrorList)
 
             if form.is_valid():
                 selected_theme = form.cleaned_data['theme']
 
                 user.save_setting('theme', selected_theme)
 
                 if is_moderator:
                     moderate = form.cleaned_data['moderate']
                     user.save_setting(SETTING_MODERATE, moderate)
 
             return redirect(settings)
     else:
         selected_theme = _get_theme(request)
 
         if is_moderator:
             form = ModeratorSettingsForm(initial={'theme': selected_theme,
                                                   'moderate': context['moderator']},
                                          error_class=PlainErrorList)
         else:
             form = SettingsForm(initial={'theme': selected_theme},
                                 error_class=PlainErrorList)
 
     context['form'] = form
 
     return render(request, 'boards/settings.html', context)
 
 
 def all_tags(request):
     """All tags list"""
 
     context = _init_default_context(request)
     context['all_tags'] = Tag.objects.get_not_empty_tags()
 
     return render(request, 'boards/tags.html', context)
 
 
 def jump_to_post(request, post_id):
     """Determine thread in which the requested post is and open it's page"""
 
     post = get_object_or_404(Post, id=post_id)
 
     if not post.thread:
         return redirect(thread, post_id=post.id)
     else:
         return redirect(reverse(thread, kwargs={'post_id': post.thread.id})
                         + '#' + str(post.id))
 
 
 def authors(request):
     """Show authors list"""
 
     context = _init_default_context(request)
     context['authors'] = boards.authors.authors
 
     return render(request, 'boards/authors.html', context)
 
 
 @transaction.atomic
 def delete(request, post_id):
     """Delete post"""
 
     user = _get_user(request)
     post = get_object_or_404(Post, id=post_id)
 
     if user.is_moderator():
         # TODO Show confirmation page before deletion
         Post.objects.delete_post(post)
 
     if not post.thread:
         return _redirect_to_next(request)
     else:
         return redirect(thread, post_id=post.thread.id)
 
 
 @transaction.atomic
 def ban(request, post_id):
     """Ban user"""
 
     user = _get_user(request)
     post = get_object_or_404(Post, id=post_id)
 
     if user.is_moderator():
         # TODO Show confirmation page before ban
         ban, created = Ban.objects.get_or_create(ip=post.poster_ip)
         if created:
             ban.reason = 'Banned for post ' + str(post_id)
             ban.save()
 
     return _redirect_to_next(request)
 
 
 def you_are_banned(request):
     """Show the page that notifies that user is banned"""
 
     context = _init_default_context(request)
 
     ban = get_object_or_404(Ban, ip=utils.get_client_ip(request))
     context['ban_reason'] = ban.reason
     return render(request, 'boards/staticpages/banned.html', context)
 
 
 def page_404(request):
     """Show page 404 (not found error)"""
 
     context = _init_default_context(request)
     return render(request, 'boards/404.html', context)
 
 
 @transaction.atomic
 def tag_subscribe(request, tag_name):
     """Add tag to favorites"""
 
     user = _get_user(request)
     tag = get_object_or_404(Tag, name=tag_name)
 
     if not tag in user.fav_tags.all():
         user.add_tag(tag)
 
     return _redirect_to_next(request)
 
 
 @transaction.atomic
 def tag_unsubscribe(request, tag_name):
     """Remove tag from favorites"""
 
     user = _get_user(request)
     tag = get_object_or_404(Tag, name=tag_name)
 
     if tag in user.fav_tags.all():
         user.remove_tag(tag)
 
     return _redirect_to_next(request)
 
 
 def static_page(request, name):
     """Show a static page that needs only tags list and a CSS"""
 
     context = _init_default_context(request)
     return render(request, 'boards/staticpages/' + name + '.html', context)
 
 
 def api_get_post(request, post_id):
     """
     Get the JSON of a post. This can be
     used as and API for external clients.
     """
 
     post = get_object_or_404(Post, id=post_id)
 
     json = serializers.serialize("json", [post], fields=(
         "pub_time", "_text_rendered", "title", "text", "image",
         "image_width", "image_height", "replies", "tags"
     ))
 
     return HttpResponse(content=json)
 
 
 def get_post(request, post_id):
     """Get the html of a post. Used for popups."""
 
     post = get_object_or_404(Post, id=post_id)
     thread = post.thread_new
 
     context = RequestContext(request)
     context["post"] = post
     context["can_bump"] = thread.can_bump()
     if "truncated" in request.GET:
         context["truncated"] = True
 
     return render(request, 'boards/post.html', context)
 
 @cache_page(86400)
 def cached_js_catalog(request, domain='djangojs', packages=None):
     return javascript_catalog(request, domain, packages)
 
 
 def _get_theme(request, user=None):
     """Get user's CSS theme"""
 
     if not user:
         user = _get_user(request)
     theme = user.get_setting('theme')
     if not theme:
         theme = neboard.settings.DEFAULT_THEME
 
     return theme
 
 
 def _init_default_context(request):
     """Create context with default values that are used in most views"""
 
     context = RequestContext(request)
 
     user = _get_user(request)
     context['user'] = user
     context['tags'] = user.get_sorted_fav_tags()
     context['posts_per_day'] = float(Post.objects.get_posts_per_day())
 
     theme = _get_theme(request, user)
     context['theme'] = theme
     context['theme_css'] = 'css/' + theme + '/base_page.css'
 
     # This shows the moderator panel
     moderate = user.get_setting(SETTING_MODERATE)
     if moderate == 'True':
         context['moderator'] = user.is_moderator()
     else:
         context['moderator'] = False
 
     return context
 
 
 def _get_user(request):
     """
     Get current user from the session. If the user does not exist, create
     a new one.
     """
 
     session = request.session
     if not 'user_id' in session:
         request.session.save()
 
         md5 = hashlib.md5()
         md5.update(session.session_key)
         new_id = md5.hexdigest()
 
         time_now = timezone.now()
         user = User.objects.create(user_id=new_id, rank=RANK_USER,
                                    registration_time=time_now)
 
         session['user_id'] = user.id
     else:
         user = User.objects.get(id=session['user_id'])
 
     return user
 
 
 def _redirect_to_next(request):
     """
     If a 'next' parameter was specified, redirect to the next page. This is
     used when the user is required to return to some page after the current
     view has finished its work.
     """
 
     if 'next' in request.GET:
         next_page = request.GET['next']
         return HttpResponseRedirect(next_page)
     else:
         return redirect(index)
 
 
 @transaction.atomic
 def _ban_current_user(request):
     """Add current user to the IP ban list"""
 
     ip = utils.get_client_ip(request)
     ban, created = Ban.objects.get_or_create(ip=ip)
     if created:
         ban.can_read = False
         ban.reason = BAN_REASON_SPAM
     ban.save()
 
 
 def _remove_invalid_links(text):
     """
     Replace invalid links in posts so that they won't be parsed.
     Invalid links are links to non-existent posts
     """
 
     for reply_number in re.finditer(REGEX_REPLY, text):
         post_id = reply_number.group(1)
         post = Post.objects.filter(id=post_id)
         if not post.exists():
             text = string.replace(text, '>>' + post_id, post_id)
 
     return text
 
 
 def _datetime_to_epoch(datetime):
     return int(time.mktime(timezone.localtime(
         datetime,timezone.get_current_timezone()).timetuple())
                * 1000000 + datetime.microsecond)
 
 
 def _get_template_thread(thread_to_show):
     """Get template values for thread"""
 
     last_replies = thread_to_show.get_last_replies()
     skipped_replies_count = thread_to_show.get_replies().count() \
                             - len(last_replies) - 1
     return {
         'thread': thread_to_show,
         'op': thread_to_show.get_replies()[0],
         'bumpable': thread_to_show.can_bump(),
         'last_replies': last_replies,
         'skipped_replies': skipped_replies_count,
         }

readme.markdown

@@ -1,46 +1,55 b''
 # INTRO #
 
 This project aims to create centralized forum-like discussion platform with
 anonymity in mind.
 
 Main repository: https://bitbucket.org/neko259/neboard/
 
 Site: http://neboard.me/
 
 # DEPENDENCIES #
 
 ## REQUIRED ##
 
 * pillow
 * django >= 1.6
 * django_cleanup
 * django-markupfield
 * markdown
 * python-markdown
 * django-simple-captcha
 * line-profiler
 
 ## OPTIONAL ##
 
 * django-debug-toolbar
 
 # INSTALLATION #
 
 1. Install all dependencies over pip or system-wide
-2. Setup a database in neboard/settings.py
+2. Setup a database in `neboard/settings.py`
 3. Run `./manage.py syncdb` and ensure the database was created
 4. Run `./manage.py migrate boards` to apply all south migrations
 
 # RUNNING #
 
 You can run the server using django default embedded webserver by running
 
     ./manage.py runserver <address>:<port>
 
 See django-admin command help for details
 
 Also consider using wsgi or fcgi interfaces on production servers.
 
+# UPGRADE #
+
+1. Backup your project data.
+2. Save the settings in `neboard/settings.py` and `boards/settings.py`
+3. Copy the project contents over the old project directory
+4. Run migrations by `./manage.py migrate boards`
+
+You can also just clone the mercurial project and pull it to update
+
 # CONCLUSION #
 
 Enjoy our software and thank you!

todo.txt

@@ -1,50 +1,50 b''
 = Features =
 [DONE] Connecting tags to each other
 [DONE] Connect posts to the replies (in messages), get rid of the JS reply map
 [DONE] Better django admin pages to simplify admin operations
 [DONE] Regen script to update all posts
 [DONE] Remove jump links from refmaps
 [DONE] Ban reasons. Split bans into 2 types "read-only" and "read
 denied". Use second only for autoban for spam
 [DONE] Clean up tests and make them run ALWAYS
 [DONE] Use transactions in tests
 [DONE] Thread autoupdate (JS + API)
 [DONE] Split up post model into post and thread,
 and move everything that is used only in 1st post to thread model.
 [DONE] Show board speed in the lower panel (posts per day)
+[DONE] Save image thumbnails size to the separate field
 
 [NOT STARTED] Tree view (JS)
 [NOT STARTED] Adding tags to images filename
 [NOT STARTED] Federative network for s2s communication
 [NOT STARTED] XMPP gate
 [NOT STARTED] Bitmessage gate
 [NOT STARTED] Notification engine
 [NOT STARTED] Javascript disabling engine
 [NOT STARTED] Group tags by first letter in all tags list
 [NOT STARTED] Character counter in the post field
-[NOT STARTED] Save image thumbnails size to the separate field
 [NOT STARTED] Whitelist functionality. Permin autoban of an address
 [NOT STARTED] Statistics module. Count views (optional, may result in bad
  performance), posts per day/week/month, users (or IPs)
 [NOT STARTED] Quote button next to "reply" for posts in thread to include full
 post or its part (delimited by N characters) into quote of the new post.
 [NOT STARTED] Ban confirmation page with reason
 [NOT STARTED] Post deletion confirmation page
 [NOT STARTED] Moderating page. Tags editing and adding
 [NOT STARTED] Get thread graph image using pygraphviz
 [NOT STARTED] Creating post via AJAX without reloading page
 [NOT STARTED] Subscribing to tag via AJAX
 [NOT STARTED] Count posts by user not by current active posts, but by adding 1
 on evety posting
 
 = Bugs =
 [DONE] Fix bug with creating threads from tag view
 [DONE] Quote characters within quote causes quote parsing to fail
 
 [IN PROGRESS] Replies, images, last update time in bottom panel doesn't change when
 thread updates (last update changing left)
 
 = Testing =
 [NOT STARTED] Make tests for every view
 [NOT STARTED] Make tests for every model
 [NOT STARTED] Make tests for every form