Merged with default branch

boards/locale/ru/LC_MESSAGES/djangojs.po

@@ -0,0 +1,32 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-08-27 23:21+0300\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <[e-mail]>\n"
+"Language: \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/thread.js:17
+msgid "Normal"
+msgstr "Нормальный"
+
+#: static/js/thread.js:24
+msgid "Gallery"
+msgstr "Галерея"
+
+#: static/js/thread.js:125
+msgid "Replies"
+msgstr "Ответы"

boards/migrations/0001_initial.py

@@ -0,0 +1,95 b''
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Adding model 'Tag'
+        db.create_table(u'boards_tag', (
+            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('name', self.gf('django.db.models.fields.CharField')(max_length=100)),
+        ))
+        db.send_create_signal(u'boards', ['Tag'])
+
+        # Adding model 'Post'
+        db.create_table(u'boards_post', (
+            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('title', self.gf('django.db.models.fields.CharField')(max_length=50)),
+            ('pub_time', self.gf('django.db.models.fields.DateTimeField')()),
+            ('text', self.gf('markupfield.fields.MarkupField')(rendered_field=True)),
+            ('text_markup_type', self.gf('django.db.models.fields.CharField')(default='markdown', max_length=30)),
+            ('image', self.gf('boards.thumbs.ImageWithThumbsField')(max_length=100, blank=True)),
+            ('poster_ip', self.gf('django.db.models.fields.IPAddressField')(max_length=15)),
+            ('_text_rendered', self.gf('django.db.models.fields.TextField')()),
+            ('poster_user_agent', self.gf('django.db.models.fields.TextField')()),
+            ('parent', self.gf('django.db.models.fields.BigIntegerField')()),
+            ('last_edit_time', self.gf('django.db.models.fields.DateTimeField')()),
+        ))
+        db.send_create_signal(u'boards', ['Post'])
+
+        # Adding M2M table for field tags on 'Post'
+        m2m_table_name = db.shorten_name(u'boards_post_tags')
+        db.create_table(m2m_table_name, (
+            ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)),
+            ('post', models.ForeignKey(orm[u'boards.post'], null=False)),
+            ('tag', models.ForeignKey(orm[u'boards.tag'], null=False))
+        ))
+        db.create_unique(m2m_table_name, ['post_id', 'tag_id'])
+
+        # Adding model 'Admin'
+        db.create_table(u'boards_admin', (
+            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('name', self.gf('django.db.models.fields.CharField')(max_length=100)),
+            ('password', self.gf('django.db.models.fields.CharField')(max_length=100)),
+        ))
+        db.send_create_signal(u'boards', ['Admin'])
+
+
+    def backwards(self, orm):
+        # Deleting model 'Tag'
+        db.delete_table(u'boards_tag')
+
+        # Deleting model 'Post'
+        db.delete_table(u'boards_post')
+
+        # Removing M2M table for field tags on 'Post'
+        db.delete_table(db.shorten_name(u'boards_post_tags'))
+
+        # Deleting model 'Admin'
+        db.delete_table(u'boards_admin')
+
+
+    models = {
+        u'boards.admin': {
+            'Meta': {'object_name': 'Admin'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        u'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'}),
+            'last_edit_time': ('django.db.models.fields.DateTimeField', [], {}),
+            'parent': ('django.db.models.fields.BigIntegerField', [], {}),
+            'poster_ip': ('django.db.models.fields.IPAddressField', [], {'max_length': '15'}),
+            'poster_user_agent': ('django.db.models.fields.TextField', [], {}),
+            'pub_time': ('django.db.models.fields.DateTimeField', [], {}),
+            'tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['boards.Tag']", 'symmetrical': 'False'}),
+            'text': ('markupfield.fields.MarkupField', [], {'rendered_field': 'True'}),
+            'text_markup_type': ('django.db.models.fields.CharField', [], {'default': "'markdown'", 'max_length': '30'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        u'boards.tag': {
+            'Meta': {'object_name': 'Tag'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        }
+    }
+
+    complete_apps = ['boards']
  No newline at end of file

boards/migrations/0002_auto__add_ban__chg_field_post_poster_ip.py

@@ -0,0 +1,64 b''
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Adding model 'Ban'
+        db.create_table(u'boards_ban', (
+            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('ip', self.gf('django.db.models.fields.GenericIPAddressField')(max_length=39)),
+        ))
+        db.send_create_signal(u'boards', ['Ban'])
+
+
+        # Changing field 'Post.poster_ip'
+        db.alter_column(u'boards_post', 'poster_ip', self.gf('django.db.models.fields.GenericIPAddressField')(max_length=39))
+
+    def backwards(self, orm):
+        # Deleting model 'Ban'
+        db.delete_table(u'boards_ban')
+
+
+        # Changing field 'Post.poster_ip'
+        db.alter_column(u'boards_post', 'poster_ip', self.gf('django.db.models.fields.IPAddressField')(max_length=15))
+
+    models = {
+        u'boards.admin': {
+            'Meta': {'object_name': 'Admin'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        u'boards.ban': {
+            'Meta': {'object_name': 'Ban'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'ip': ('django.db.models.fields.GenericIPAddressField', [], {'max_length': '39'})
+        },
+        u'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'}),
+            'last_edit_time': ('django.db.models.fields.DateTimeField', [], {}),
+            'parent': ('django.db.models.fields.BigIntegerField', [], {}),
+            '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', [], {}),
+            'tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['boards.Tag']", 'symmetrical': 'False'}),
+            'text': ('markupfield.fields.MarkupField', [], {'rendered_field': 'True'}),
+            'text_markup_type': ('django.db.models.fields.CharField', [], {'default': "'markdown'", 'max_length': '30'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        u'boards.tag': {
+            'Meta': {'object_name': 'Tag'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        }
+    }
+
+    complete_apps = ['boards']
  No newline at end of file

boards/migrations/0003_auto__add_field_post_image_width__add_field_post_image_height.py

@@ -0,0 +1,66 b''
+# -*- coding: utf-8 -*-
+import 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_width'
+        db.add_column(u'boards_post', 'image_width',
+                      self.gf('django.db.models.fields.IntegerField')(default=0),
+                      keep_default=False)
+
+        # Adding field 'Post.image_height'
+        db.add_column(u'boards_post', 'image_height',
+                      self.gf('django.db.models.fields.IntegerField')(default=0),
+                      keep_default=False)
+
+
+    def backwards(self, orm):
+        # Deleting field 'Post.image_width'
+        db.delete_column(u'boards_post', 'image_width')
+
+        # Deleting field 'Post.image_height'
+        db.delete_column(u'boards_post', 'image_height')
+
+
+    models = {
+        u'boards.admin': {
+            'Meta': {'object_name': 'Admin'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        u'boards.ban': {
+            'Meta': {'object_name': 'Ban'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'ip': ('django.db.models.fields.GenericIPAddressField', [], {'max_length': '39'})
+        },
+        u'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', [], {}),
+            'image_width': ('django.db.models.fields.IntegerField', [], {}),
+            'last_edit_time': ('django.db.models.fields.DateTimeField', [], {}),
+            'parent': ('django.db.models.fields.BigIntegerField', [], {}),
+            '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', [], {}),
+            'tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['boards.Tag']", 'symmetrical': 'False'}),
+            'text': ('markupfield.fields.MarkupField', [], {'rendered_field': 'True'}),
+            'text_markup_type': ('django.db.models.fields.CharField', [], {'default': "'markdown'", 'max_length': '30'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        u'boards.tag': {
+            'Meta': {'object_name': 'Tag'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        }
+    }
+
+    complete_apps = ['boards']
  No newline at end of file

boards/static/js/refmaps.js

@@ -0,0 +1,38 b''
+function addRefLinkMap() {
+    var postByNum = [], refMap = [];
+
+    $('.post').each(function() {
+        var self = $(this);
+
+        var postNum = self.attr('id');
+        //add post by id
+        postByNum[postNum] = self;
+        //add ref link
+        self.find('p').children('a').each(function() {
+            if($(this).text().indexOf('>>') == 0) {
+                var refNum = $(this).text().match(/\d+/);
+
+                if(postByNum[refNum]) {
+                    if(!refMap[refNum])
+                        refMap[refNum] = [];
+
+                    //if !exist
+                    if((',' + refMap[refNum].toString() + ',').indexOf(',' + postNum + ',') < 0) {
+                        refMap[refNum].push(postNum);
+                    };
+                }
+            }
+        });
+    });
+
+    var label_replies = gettext('Replies') + ':';
+    for(var pNum in refMap) {
+        if(typeof refMap[pNum] === 'object') {
+            //append refmap panel
+            if(!$("#refmap_"+pNum).length) {
+                var data = label_replies + refMap[pNum].toString().replace(/(\d+)/g, ' <a href="/jump/$1/">>>$1</a>');
+                $('#'+pNum+'').find('.message').after($('<div class="refmap" id="refmap_'+pNum+'">'+data+'</div>'));
+            }
+        }
+    }
+}

boards/admin.py

@@ -1,6 +1,7 b''
 from django.contrib import admin
-from boards.models import Post, Tag, User
+from boards.models import Post, Tag, User, Ban
 
 admin.site.register(Post)
 admin.site.register(Tag)
 admin.site.register(User)
+admin.site.register(Ban)

boards/authors.py

@@ -10,5 +10,15 b' authors = {'
         'name': 'Ilyas Babayev',
         'contacts': ['[e-mail]'],
         'roles': ['author', 'developer'],
-    }
+    },
+    'ritsufag': {
+        'name': 'Aiko Kirino',
+        'contacts': ['[e-mail]'],
+        'roles': ['javascript developer', 'designer'],
+    },
+    'Tenno Seremel': {
+        'name': 'anonymous',
+        'contacts': ['[e-mail]'],
+        'roles': ['javascript developer', 'designer'],
+    },
 }
  No newline at end of file

boards/locale/ru/LC_MESSAGES/django.po

@@ -7,7 +7,7 b' msgid ""'
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-21 20:49+0300\n"
+"POT-Creation-Date: 2013-08-30 18:54+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -18,6 +18,14 b' msgstr ""'
 "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"
 
+#: 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
 msgid "Authors"
 msgstr "Авторы"
@@ -34,19 +42,27 b' msgstr "\xd0\xbb\xd0\xb8\xd1\x86\xd0\xb5\xd0\xbd\xd0\xb7\xd0\xb8\xd0\xb5\xd0\xb9"'
 msgid "Repository"
 msgstr "Репозиторий"
 
+#: templates/boards/banned.html:6
+msgid "Banned"
+msgstr "Заблокирован"
+
+#: templates/boards/banned.html:11
+msgid "Your IP address has been banned. Contact the administrator"
+msgstr "Ваш IP адрес был заблокирован. Свяжитесь с администратором"
+
 #: templates/boards/base.html:12
 msgid "Feed"
 msgstr "Лента"
 
-#: templates/boards/base.html:27
+#: templates/boards/base.html:36
 msgid "All threads"
 msgstr "Все темы"
 
-#: templates/boards/base.html:33
+#: templates/boards/base.html:42
 msgid "Settings"
 msgstr "Настройки"
 
-#: templates/boards/base.html:41
+#: templates/boards/base.html:50
 msgid "Up"
 msgstr "Вверх"
 
@@ -55,12 +71,12 b' msgid "Tag: "'
 msgstr "Тег: "
 
 #: templates/boards/posting_general.html:35
-#: templates/boards/posting_general.html:87 templates/boards/thread.html:27
+#: templates/boards/posting_general.html:81 templates/boards/thread.html:27
 #: templates/boards/rss/post.html:5
 msgid "Post image"
 msgstr "Изображение сообщения"
 
-#: templates/boards/posting_general.html:46
+#: templates/boards/posting_general.html:48
 msgid "Reply"
 msgstr "Ответ"
 
@@ -68,50 +84,50 b' msgstr "\xd0\x9e\xd1\x82\xd0\xb2\xd0\xb5\xd1\x82"'
 msgid "Delete"
 msgstr "Удалить"
 
-#: templates/boards/posting_general.html:61 templates/boards/thread.html:119
+#: templates/boards/posting_general.html:55 templates/boards/thread.html:108
 msgid "replies"
 msgstr "ответов"
 
-#: templates/boards/posting_general.html:62 templates/boards/thread.html:120
+#: templates/boards/posting_general.html:56 templates/boards/thread.html:109
 msgid "images"
 msgstr "изображений"
 
-#: templates/boards/posting_general.html:64
-#: templates/boards/posting_general.html:135 templates/boards/thread.html:59
+#: templates/boards/posting_general.html:58
+#: templates/boards/posting_general.html:131 templates/boards/thread.html:48
 #: templates/boards/rss/post.html:10
 msgid "Tags"
 msgstr "Теги"
 
-#: templates/boards/posting_general.html:117
+#: templates/boards/posting_general.html:113
 msgid "Create new thread"
 msgstr "Создать новую тему"
 
-#: templates/boards/posting_general.html:120 templates/boards/thread.html:81
+#: templates/boards/posting_general.html:116 templates/boards/thread.html:70
 msgid "Title"
 msgstr "Заголовок"
 
-#: templates/boards/posting_general.html:125 templates/boards/thread.html:86
+#: templates/boards/posting_general.html:121 templates/boards/thread.html:75
 msgid "Text"
 msgstr "Текст"
 
-#: templates/boards/posting_general.html:130 templates/boards/thread.html:91
+#: templates/boards/posting_general.html:126 templates/boards/thread.html:80
 msgid "Image"
 msgstr "Изображение"
 
-#: templates/boards/posting_general.html:145 templates/boards/thread.html:102
+#: templates/boards/posting_general.html:141 templates/boards/thread.html:91
 msgid "Post"
 msgstr "Отправить"
 
-#: templates/boards/posting_general.html:147
+#: templates/boards/posting_general.html:143
 msgid "Tags must be delimited by spaces. Text or image is required."
 msgstr ""
 "Теги должны быть разделены пробелами. Текст или изображение обязательны."
 
-#: templates/boards/posting_general.html:150 templates/boards/thread.html:104
+#: templates/boards/posting_general.html:146 templates/boards/thread.html:93
 msgid "Basic markdown syntax."
 msgstr "Базовый синтаксис markdown."
 
-#: templates/boards/posting_general.html:160
+#: templates/boards/posting_general.html:156
 msgid "Pages:"
 msgstr "Страницы: "
 
@@ -139,34 +155,37 b' msgstr "\xd1\x82\xd0\xb5\xd0\xb3\xd0\xbe\xd0\xb2"'
 msgid "Get!"
 msgstr "Гет!"
 
-#: templates/boards/thread.html:78
+#: templates/boards/thread.html:67
 msgid "Reply to thread"
 msgstr "Ответить в тему"
 
-#: templates/boards/thread.html:105
+#: templates/boards/thread.html:94
 msgid "Example: "
 msgstr "Пример: "
 
-#: templates/boards/thread.html:105
+#: templates/boards/thread.html:94
 msgid "italic"
 msgstr "курсив"
 
-#: templates/boards/thread.html:106
+#: templates/boards/thread.html:95
 msgid "bold"
 msgstr "полужирный"
 
-#: templates/boards/thread.html:107
+#: templates/boards/thread.html:96
 msgid "Quotes can be inserted with"
 msgstr "Цитаты могут быть вставлены при помощи"
 
-#: templates/boards/thread.html:108
+#: templates/boards/thread.html:97
 msgid "Links to answers can be inserted with"
 msgstr "Ссылки на ответы могут быть вставлены с помощью"
 
-#: templates/boards/thread.html:121
+#: templates/boards/thread.html:110
 msgid "Last update: "
 msgstr "Последнее обновление: "
 
+#~ msgid "Get!"
+#~ msgstr "Гет!"
+
 #~ msgid "View"
 #~ msgstr "Просмотр"
 
@@ -178,3 +197,9 b' msgstr "\xd0\x9f\xd0\xbe\xd1\x81\xd0\xbb\xd0\xb5\xd0\xb4\xd0\xbd\xd0\xb5\xd0\xb5 \xd0\xbe\xd0\xb1\xd0\xbd\xd0\xbe\xd0\xb2\xd0\xbb\xd0\xb5\xd0\xbd\xd0\xb8\xd0\xb5: "'
 
 #~ msgid "developer"
 #~ msgstr "разработчик"
+
+#~ msgid "javascript developer"
+#~ msgstr "разработчик javascript"
+
+#~ msgid "designer"
+#~ msgstr "дизайнер"

boards/models.py

@@ -27,14 +27,10 b' OPENING_POST_POPULARITY_WEIGHT = 2'
 IMAGES_DIRECTORY = 'images/'
 FILE_EXTENSION_DELIMITER = '.'
 
-REGEX_PRETTY = re.compile(r'^\d(0)+$')
-REGEX_SAME = re.compile(r'^(.)\1+$')
-
 RANK_ADMIN = 0
 RANK_MODERATOR = 10
 RANK_USER = 100
 
-
 class PostManager(models.Manager):
     def create_post(self, title, text, image=None, parent_id=NO_PARENT,
                     ip=NO_IP, tags=None, user=None):
@@ -218,9 +214,16 b' class Post(models.Model):'
     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 = thumbs.ImageWithThumbsField(upload_to=_update_image_filename,
-                                        blank=True, sizes=(IMAGE_THUMB_SIZE,))
-    poster_ip = models.IPAddressField()
+                                        blank=True, sizes=(IMAGE_THUMB_SIZE,),
+                                        width_field='image_width',
+                                        height_field='image_height')
+
+    poster_ip = models.GenericIPAddressField()
     poster_user_agent = models.TextField()
     parent = models.BigIntegerField()
     tags = models.ManyToManyField(Tag)
@@ -228,8 +231,8 b' class Post(models.Model):'
     user = models.ForeignKey(User, null=True, default=None)
 
     def __unicode__(self):
-        return '#' + str(self.id) + ' ' + self.title + ' (' + self.text.raw + \
-               ')'
+        return '#' + str(self.id) + ' ' + self.title + ' (' + \
+               self.text.raw[:50] + ')'
 
     def _get_replies(self):
         return Post.objects.filter(parent=self.id)
@@ -253,17 +256,6 b' class Post(models.Model):'
 
         return gets_count
 
-    def is_get(self):
-        """If the post has pretty id (1, 1000, 77777), than it is called GET"""
-
-        first = self.id == 1
-
-        id_str = str(self.id)
-        pretty = REGEX_PRETTY.match(id_str)
-        same_digits = REGEX_SAME.match(id_str)
-
-        return first or pretty or same_digits
-
     def can_bump(self):
         """Check if the thread can be bumped by replying"""
 
@@ -322,9 +314,14 b' class User(models.Model):'
     def __unicode__(self):
         return self.user_id
 
-
 class Setting(models.Model):
 
     name = models.CharField(max_length=50)
     value = models.CharField(max_length=50)
     user = models.ForeignKey(User)
+
+class Ban(models.Model):
+    ip = models.GenericIPAddressField()
+
+    def __unicode__(self):
+        return self.ip

boards/static/css/md/base_page.css

@@ -47,7 +47,7 b' html {'
     background: #333;
     margin: 5px;
     padding: 10px;
-    border-radius: 5px;
+    border: solid 1px #888;
     clear: left;
     word-wrap: break-word;
 }
@@ -65,7 +65,7 b' html {'
     background: #444;
     margin: 5px;
     padding: 10px;
-    border-radius: 5px;
+    border: solid 1px #888;
     color: #eee;
 }
 
@@ -102,7 +102,7 b' p {'
 .post-form-w {
     display: table;
     background: #333344;
-    border-radius: 5px;
+    border: solid 1px #888;
     color: #fff;
     padding: 10px;
     margin: 5px
@@ -166,7 +166,6 b' blockquote {'
     float: left;
     margin: 0 1ex .5ex 0;
     min-width: 1px;
-    height: 150px;
     text-align: center;
     display: table-row;
 }
@@ -190,6 +189,7 b' blockquote {'
 
 .quote {
     color: #92cf38;
+    font-style: italic;
 }
 
 .spoiler {
@@ -198,7 +198,7 b' blockquote {'
 }
 
 .spoiler:hover {
-    background: black;
+    color: black;
 }
 
 .comment {
@@ -247,7 +247,7 b' li {'
     display: table;
     margin: 5px;
     padding: 5px;
-    border-radius: 5px;
+    border: 1px solid #888;
 }
 
 .image-mode-tab > label {
@@ -277,4 +277,10 b' li {'
 .moderator_info {
     color: #e99d41;
     float: right;
-}
  No newline at end of file
+}
+
+.refmap {
+    font-size: 0.9em;
+    color: #ccc;
+    margin-top: 1em;
+}

boards/static/css/sw/base_page.css

@@ -266,4 +266,10 b' li {'
 .moderator_info {
     font-weight: bold;
     float: right;
-}
  No newline at end of file
+}
+
+.refmap {
+    border: 1px dashed #aaa;
+    padding: 0.5em;
+    display: table;
+}

boards/static/js/main.js

@@ -7,8 +7,10 b''
     $(".fancy").fancybox({
         closeBtn: false,
         closeClick: true,
-        padding: 7,
+        padding: 0,
         openEffect: 'none',
         closeEffect: 'none'
     });
-})
  No newline at end of file
+
+    addRefLinkMap();
+})

boards/static/js/thread.js

@@ -13,12 +13,16 b' function add_panel(after)'
 
     tab = $('<input type="radio" class="image-mode-normal" name="image-mode" value="0" checked="checked"/>');
     tab.on("change", tab_handler);
-    tab = $('<label>Normal</label>').prepend(tab);
+
+    var label_normal = gettext('Normal');
+    tab = $('<label>' + label_normal + '</label>').prepend(tab);
     tab_bar.append(tab);
 
     tab = $('<input type="radio" class="image-mode-table" name="image-mode" value="1"/>');
     tab.on("change", tab_handler);
-    tab = $('<label>Gallery</label>').prepend(tab);
+
+    var label_gallery = gettext('Gallery');
+    tab = $('<label>' + label_gallery + '</label>').prepend(tab);
     tab_bar.append(tab);
 
     tab_bar.insertAfter(nav_top);
@@ -68,13 +72,32 b' function make_table_dom()'
     );
 }
 
+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';
-    $('#id_text').val($('#id_text').val()+ textToAdd);
+    var textAreaId = '#id_text';
+    $(textAreaId).val($(textAreaId).val()+ textToAdd);
 
-    $("html, body").animate({ scrollTop: $('#id_text').offset().top }, "slow");
+    var textarea = document.getElementById('id_text');
+    $(textAreaId).focus();
+    moveCaretToEnd(textarea);
+
+    $("html, body").animate({ scrollTop: $(textAreaId).offset().top }, "slow");
 }
 
+
+
 $(document).ready(function(){
     add_panel('.navigation_panel');
-});
  No newline at end of file
+    addRefLinkMap();
+});

boards/templates/boards/404.html

@@ -3,28 +3,12 b''
 {% load i18n %}
 
 {% block head %}
-    <title>{% trans "Authors" %}</title>
+    <title>{% trans "Not found" %}</title>
 {% endblock %}
 
 {% block content %}
     <div class="post">
-        <h2>Authors</h2>
-        {% for nick, values in authors.items %}
-            <p>
-                <b>{{ nick }}</b> ({{ values.name }}):
-                {% for value in values.contacts %}
-                    <a href="mailto:{{ value }}">{{ value }}</a>
-                {% endfor %} -
-                {% for role in values.roles %}
-                    {% trans role %}
-                {% endfor %}
-            </p>
-        {% endfor %}
-        <br />
-        <p>{% trans "Distributed under the" %}
-            <a href="http://www.gnu.org/licenses/gpl.html" >GNU GPLv3</a>
-            {% trans "license" %}</p>
-        <p><a href="https://bitbucket.org/neko259/neboard">
-            {% trans "Repository" %}</a></p>
+        <p><img src="{{ STATIC_URL }}images/404.png" width="200" /></p>
+        <p>{% trans 'This page does not exist' %}</p>
     </div>
 {% endblock %}
  No newline at end of file

boards/templates/boards/banned.html

@@ -3,28 +3,11 b''
 {% load i18n %}
 
 {% block head %}
-    <title>{% trans "Authors" %}</title>
+    <title>{% trans "Banned" %}</title>
 {% endblock %}
 
 {% block content %}
     <div class="post">
-        <h2>Authors</h2>
-        {% for nick, values in authors.items %}
-            <p>
-                <b>{{ nick }}</b> ({{ values.name }}):
-                {% for value in values.contacts %}
-                    <a href="mailto:{{ value }}">{{ value }}</a>
-                {% endfor %} -
-                {% for role in values.roles %}
-                    {% trans role %}
-                {% endfor %}
-            </p>
-        {% endfor %}
-        <br />
-        <p>{% trans "Distributed under the" %}
-            <a href="http://www.gnu.org/licenses/gpl.html" >GNU GPLv3</a>
-            {% trans "license" %}</p>
-        <p><a href="https://bitbucket.org/neko259/neboard">
-            {% trans "Repository" %}</a></p>
+        {% trans 'Your IP address has been banned. Contact the administrator' %}
     </div>
 {% endblock %}
  No newline at end of file

boards/templates/boards/base.html

@@ -21,6 +21,8 b''
 <body>
 <script src="{{ STATIC_URL }}js/jquery-2.0.1.min.js"></script>
 <script src="{{ STATIC_URL }}js/jquery.fancybox.pack.js"></script>
+<script src="{% url 'django.views.i18n.javascript_catalog' %}"></script>
+<script src="{{ STATIC_URL }}js/refmaps.js"></script>
 <script src="{{ STATIC_URL }}js/main.js"></script>
 
 <div class="navigation_panel">
@@ -42,4 +44,4 b''
 </div>
 
 </body>
-</html>
  No newline at end of file
+</html>

boards/templates/boards/posting_general.html

@@ -23,24 +23,26 b''
         {% for thread in threads %}
             <div class="thread">
             {% if thread.can_bump %}
-                <div class="post">
+		<div class="post" id="{{thread.id}}">
             {% else %}
-                <div class="post dead_post">
+		<div class="post dead_post" id="{{ thread.id }}">
             {% endif %}
             {% if thread.image %}
                 <div class="image">
                     <a class="fancy"
                        href="{{ thread.image.url }}"><img
-                src="{{ thread.image.url_200x150 }}"
-                alt="{% trans 'Post image' %}" />
+                            src="{{ thread.image.url_200x150 }}"
+                            alt="{% trans 'Post image' %}"
+                            data-width="{{ thread.image_width }}"
+                            data-height="{{ thread.image_height }}" />
                     </a>
                 </div>
             {% endif %}
             <div class="message">
                 <div class="post-info">
                     <span class="title">{{ thread.title }}</span>
-                    <a class="post_id" href="{% url 'thread' thread.id %}">
-                        (#{{ thread.id }})</a>
+		    <a class="post_id" href="{% url 'thread' thread.id %}"
+			>(#{{ thread.id }})</a>
                     [{{ thread.pub_time }}]
                     [<a class="link" href="{% url 'thread' thread.id %}#form"
                         >{% trans "Reply" %}</a>]
@@ -75,16 +77,18 b''
                 <div class="last-replies">
                     {% for post in thread.get_last_replies %}
                         {% if thread.can_bump %}
-                            <div class="post">
+			    <div class="post" id="{{ post.id }}">
                         {% else %}
-                            <div class="post dead_post">
+			    <div class="post dead_post id="{{ post.id }}"">
                         {% endif %}
                             {% if post.image %}
                                 <div class="image">
                                     <a class="fancy"
                                        href="{{ post.image.url }}"><img
-                                src=" {{ post.image.url_200x150 }}"
-                                alt="{% trans 'Post image' %}" />
+                                            src=" {{ post.image.url_200x150 }}"
+                                            alt="{% trans 'Post image' %}"
+                                            data-width="{{ post.image_width }}"
+                                            data-height="{{ post.image_height }}"/>
                                     </a>
                                 </div>
                             {% endif %}

boards/templates/boards/thread.html

@@ -24,7 +24,9 b''
                             class="fancy"
                             href="{{ post.image.url }}"><img
                             src="{{ post.image.url_200x150 }}"
-                            alt="{% trans 'Post image' %}" />
+                            alt="{% trans 'Post image' %}"
+                            data-width="{{ post.image_width }}"
+                            data-height="{{ post.image_height }}"/>
                     </a>
                 </div>
             {% endif %}
@@ -34,11 +36,6 b''
                     <a class="post_id" href="#{{ post.id }}">
                         (#{{ post.id }})</a>
                     [{{ post.pub_time }}]
-                    {% if post.is_get %}
-                        <span class="get">
-                            {% trans "Get!" %}
-                        </span>
-                    {% endif %}
                 [<a href="#" onclick="javascript:addQuickReply('{{ post.id }}')
                     ; return false;">&gt;&gt;</a>]
 
@@ -121,4 +118,4 b''
         {% trans 'Last update: ' %}{{ posts.0.last_edit_time }}
     </span>
 
-{% endblock %}
  No newline at end of file
+{% endblock %}

boards/thumbs.py

@@ -155,6 +155,7 b' class ImageWithThumbsField(ImageField):'
     To do:
     ======
     Add method to regenerate thubmnails
+
     
     """
 
@@ -169,5 +170,4 b' class ImageWithThumbsField(ImageField):'
 
 
 from south.modelsinspector import add_introspection_rules
-
-add_introspection_rules([], ["^boards\.thumbs\.ImageWithThumbsField"])
  No newline at end of file
+add_introspection_rules([], ["^boards\.thumbs\.ImageWithThumbsField"])

boards/urls.py

@@ -2,6 +2,10 b' from django.conf.urls import patterns, u'
 from boards import views
 from boards.rss import AllThreadsFeed, TagThreadsFeed, ThreadPostsFeed
 
+js_info_dict = {
+    'packages': ('boards',),
+}
+
 urlpatterns = patterns('',
 
     # /boards/
@@ -27,6 +31,7 b" urlpatterns = patterns('',"
     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'^banned/$', views.you_are_banned, name='banned'),
 
     # RSS feeds
     url(r'^rss/$', AllThreadsFeed()),
@@ -34,4 +39,6 b" urlpatterns = patterns('',"
     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()),
-)
  No newline at end of file
+
+    url(r'^jsi18n/$', 'django.views.i18n.javascript_catalog', js_info_dict),
+)

boards/views.py

@@ -11,7 +11,7 b' from boards import utils'
 from boards.forms import ThreadForm, PostForm, SettingsForm, PlainErrorList, \
     ThreadCaptchaForm, PostCaptchaForm
 
-from boards.models import Post, Admin, Tag, User, RANK_USER, RANK_MODERATOR, NO_PARENT
+from boards.models import Post, Admin, Tag, Ban, User, RANK_USER, RANK_MODERATOR, NO_PARENT
 from boards import authors
 import neboard
 
@@ -48,6 +48,12 b' def index(request, page=0):'
 def _new_post(request, form, thread_id=boards.models.NO_PARENT):
     """Add a new post (in thread or as a reply)."""
 
+    ip = _get_client_ip(request)
+    is_banned = Ban.objects.filter(ip=ip).count() > 0
+
+    if is_banned:
+        return redirect(you_are_banned)
+
     data = form.cleaned_data
 
     title = data['title']
@@ -58,8 +64,6 b' def _new_post(request, form, thread_id=b'
     else:
         image = None
 
-    ip = _get_client_ip(request)
-
     tags = []
 
     new_thread = thread_id == boards.models.NO_PARENT
@@ -230,12 +234,21 b' def delete(request, post_id):'
 
     if user.is_moderator():
         Post.objects.delete_post(post)
-
+    
     if NO_PARENT == post.parent:
         return redirect(index)
     else:
         return redirect(thread, post_id=post.parent)
 
+def you_are_banned(request):
+    context = _init_default_context(request)
+    return render(request, 'boards/banned.html', context)
+
+
+def page_404(request):
+    context = _init_default_context(request)
+    return render(request, 'boards/404.html', context)
+
 
 def _get_theme(request):
     """Get user's CSS theme"""
@@ -289,4 +302,4 b' def _get_user(request):'
 
     user.last_access_time = timezone.now()
 
-    return user
  No newline at end of file
+    return user

neboard/urls.py

@@ -20,4 +20,4 b" urlpatterns = patterns('',"
     url(r'^', include('boards.urls')),
 ) + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
 
- 
+handler404 = 'boards.views.page_404'