Merged with BB

boards/migrations/0012_auto.py

@@ -0,0 +1,78 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 M2M table for field referenced_posts on 'Post'
+        m2m_table_name = db.shorten_name(u'boards_post_referenced_posts')
+        db.create_table(m2m_table_name, (
+            ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)),
+            ('from_post', models.ForeignKey(orm[u'boards.post'], null=False)),
+            ('to_post', models.ForeignKey(orm[u'boards.post'], null=False))
+        ))
+        db.create_unique(m2m_table_name, ['from_post_id', 'to_post_id'])
+
+
+    def backwards(self, orm):
+        # Removing M2M table for field referenced_posts on 'Post'
+        db.delete_table(db.shorten_name(u'boards_post_referenced_posts'))
+
+
+    models = {
+        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', [], {}),
+            'bump_time': ('django.db.models.fields.DateTimeField', [], {}),
+            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_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': u"orm['boards.Post']"}),
+            'replies': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'re+'", 'null': 'True', 'symmetrical': 'False', 'to': u"orm['boards.Post']"}),
+            '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'}),
+            'thread': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': u"orm['boards.Post']", 'null': 'True'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '50'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': u"orm['boards.User']", 'null': 'True'})
+        },
+        u'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': u"orm['boards.User']"}),
+            'value': ('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'}),
+            'linked': ('django.db.models.fields.related.ForeignKey', [], {'to': u"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': u"orm['boards.Post']"})
+        },
+        u'boards.user': {
+            'Meta': {'object_name': 'User'},
+            'fav_tags': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': u"orm['boards.Tag']", 'null': 'True', 'blank': 'True'}),
+            'fav_threads': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'symmetrical': 'False', 'to': u"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

maintenance.py

@@ -0,0 +1,15 b''
+"""
+Maintenance script for neboard imageboard. Use this to update data after
+migrations etc.
+"""
+
+from boards.models import Post
+from boards import views
+
+def update_posts():
+    for post in Post.objects.all():
+	print 'Updating post #' + str(post.id)
+
+	post.save()
+
+	Post.objects.connect_replies(post)

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-10-21 21:13+0300\n"
+"POT-Creation-Date: 2013-10-24 16:06+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"
@@ -35,22 +35,22 b' msgid "designer"'
 msgstr "дизайнер"
 
 #: forms.py:51 templates/boards/posting_general.html:135
-#: templates/boards/thread.html:90
+#: templates/boards/thread.html:100
 msgid "Title"
 msgstr "Заголовок"
 
 #: forms.py:53 templates/boards/posting_general.html:150
-#: templates/boards/thread.html:105
+#: templates/boards/thread.html:115
 msgid "Text"
 msgstr "Текст"
 
 #: forms.py:54 templates/boards/posting_general.html:155
-#: templates/boards/thread.html:110
+#: templates/boards/thread.html:120
 msgid "Image"
 msgstr "Изображение"
 
 #: forms.py:57 templates/boards/posting_general.html:165
-#: templates/boards/thread.html:115
+#: templates/boards/thread.html:125
 msgid "e-mail"
 msgstr ""
 
@@ -81,7 +81,7 b' msgstr "\xd0\x9f\xd0\xbe\xd0\xb4\xd0\xbe\xd0\xb6\xd0\xb4\xd0\xb8\xd1\x82\xd0\xb5 %s \xd1\x81\xd0\xb5\xd0\xba\xd1\x83\xd0\xbd\xd0\xb4 \xd0\xbf\xd0\xbe\xd1\x81\xd0\xbb\xd0\xb5 \xd0\xbf\xd0\xbe\xd1\x81\xd0\xbb\xd0\xb5\xd0\xb4\xd0\xbd\xd0\xb5\xd0\xb3\xd0\xbe \xd0\xbf\xd0\xbe\xd1\x81\xd1\x82\xd0\xb8\xd0\xbd\xd0\xb3\xd0\xb0"'
 #: forms.py:140 templates/boards/post.html:39
 #: templates/boards/posting_general.html:77
 #: templates/boards/posting_general.html:160 templates/boards/tags.html:7
-#: templates/boards/thread.html:70 templates/boards/rss/post.html:10
+#: templates/boards/thread.html:80 templates/boards/rss/post.html:10
 msgid "Tags"
 msgstr "Теги"
 
@@ -118,19 +118,19 b' msgstr "\xd0\x9d\xd0\xb5 \xd0\xbd\xd0\xb0\xd0\xb9\xd0\xb4\xd0\xb5\xd0\xbd\xd0\xbe"'
 msgid "This page does not exist"
 msgstr "Этой страницы не существует"
 
-#: templates/boards/authors.html:6
+#: templates/boards/authors.html:6 templates/boards/authors.html.py:12
 msgid "Authors"
 msgstr "Авторы"
 
-#: templates/boards/authors.html:24
+#: templates/boards/authors.html:25
 msgid "Distributed under the"
 msgstr "Распространяется под"
 
-#: templates/boards/authors.html:26
+#: templates/boards/authors.html:27
 msgid "license"
 msgstr "лицензией"
 
-#: templates/boards/authors.html:28
+#: templates/boards/authors.html:29
 msgid "Repository"
 msgstr "Репозиторий"
 
@@ -172,12 +172,12 b' msgid "Post image"'
 msgstr "Изображение сообщения"
 
 #: templates/boards/post.html:26 templates/boards/posting_general.html:62
-#: templates/boards/thread.html:57
+#: templates/boards/thread.html:59
 msgid "Delete"
 msgstr "Удалить"
 
 #: templates/boards/post.html:29 templates/boards/posting_general.html:65
-#: templates/boards/thread.html:60
+#: templates/boards/thread.html:62
 msgid "Ban IP"
 msgstr "Заблокировать IP"
 
@@ -189,11 +189,11 b' msgstr "\xd0\xa2\xd0\xb5\xd0\xb3: "'
 msgid "Reply"
 msgstr "Ответ"
 
-#: templates/boards/posting_general.html:74 templates/boards/thread.html:143
+#: templates/boards/posting_general.html:74 templates/boards/thread.html:153
 msgid "replies"
 msgstr "ответов"
 
-#: templates/boards/posting_general.html:75 templates/boards/thread.html:144
+#: templates/boards/posting_general.html:75 templates/boards/thread.html:154
 msgid "images"
 msgstr "изображений"
 
@@ -205,31 +205,31 b' msgstr "\xd0\x9d\xd0\xb5\xd1\x82 \xd1\x82\xd0\xb5\xd0\xbc. \xd0\xa1\xd0\xbe\xd0\xb7\xd0\xb4\xd0\xb0\xd0\xb9\xd1\x82\xd0\xb5 \xd0\xbf\xd0\xb5\xd1\x80\xd0\xb2\xd1\x83\xd1\x8e!"'
 msgid "Create new thread"
 msgstr "Создать новую тему"
 
-#: templates/boards/posting_general.html:140 templates/boards/thread.html:95
+#: templates/boards/posting_general.html:140 templates/boards/thread.html:105
 msgid "Formatting"
 msgstr "Форматирование"
 
-#: templates/boards/posting_general.html:142 templates/boards/thread.html:97
+#: templates/boards/posting_general.html:142 templates/boards/thread.html:107
 msgid "quote"
 msgstr "цитата"
 
-#: templates/boards/posting_general.html:143 templates/boards/thread.html:98
+#: templates/boards/posting_general.html:143 templates/boards/thread.html:108
 msgid "italic"
 msgstr "курсив"
 
-#: templates/boards/posting_general.html:144 templates/boards/thread.html:99
+#: templates/boards/posting_general.html:144 templates/boards/thread.html:109
 msgid "bold"
 msgstr "полужирный"
 
-#: templates/boards/posting_general.html:145 templates/boards/thread.html:100
+#: templates/boards/posting_general.html:145 templates/boards/thread.html:110
 msgid "spoiler"
 msgstr "спойлер"
 
-#: templates/boards/posting_general.html:146 templates/boards/thread.html:101
+#: templates/boards/posting_general.html:146 templates/boards/thread.html:111
 msgid "comment"
 msgstr "комментарий"
 
-#: templates/boards/posting_general.html:178 templates/boards/thread.html:129
+#: templates/boards/posting_general.html:178 templates/boards/thread.html:139
 msgid "Post"
 msgstr "Отправить"
 
@@ -238,7 +238,7 b' msgid "Tags must be delimited by spaces.'
 msgstr ""
 "Теги должны быть разделены пробелами. Текст или изображение обязательны."
 
-#: templates/boards/posting_general.html:183 templates/boards/thread.html:131
+#: templates/boards/posting_general.html:183 templates/boards/thread.html:141
 msgid "Text syntax"
 msgstr "Синтаксис текста"
 
@@ -270,7 +270,7 b' msgstr "\xd0\x9f\xd0\xbe\xd1\x81\xd0\xbb\xd0\xb5\xd0\xb4\xd0\xbd\xd0\xb8\xd0\xb9 \xd0\xb4\xd0\xbe\xd1\x81\xd1\x82\xd1\x83\xd0\xbf: "'
 msgid "Save"
 msgstr "Сохранить"
 
-#: templates/boards/tags.html:17
+#: templates/boards/tags.html:24
 msgid "threads"
 msgstr "тем"
 
@@ -278,15 +278,19 b' msgstr "\xd1\x82\xd0\xb5\xd0\xbc"'
 msgid "No tags found."
 msgstr "Теги не найдены."
 
-#: templates/boards/thread.html:22
+#: templates/boards/thread.html:24
 msgid "posts to bumplimit"
 msgstr "сообщений до бамплимита"
 
-#: templates/boards/thread.html:87
+#: templates/boards/thread.html:71
+msgid "Replies"
+msgstr "Ответы"
+
+#: templates/boards/thread.html:97
 msgid "Reply to thread"
 msgstr "Ответить в тему"
 
-#: templates/boards/thread.html:145
+#: templates/boards/thread.html:155
 msgid "Last update: "
 msgstr "Последнее обновление: "
 

boards/models.py

@@ -12,6 +12,8 b' from markupfield.fields import MarkupFie'
 from neboard import settings
 import thumbs
 
+import re
+
 IMAGE_THUMB_SIZE = (200, 150)
 
 TITLE_MAX_LENGTH = 50
@@ -28,10 +30,12 b" FILE_EXTENSION_DELIMITER = '.'"
 
 RANK_ADMIN = 0
 RANK_MODERATOR = 10
-RANK_USER = 100   \
+RANK_USER = 100
 
 SETTING_MODERATE = "moderate"
 
+REGEX_REPLY = re.compile('>>(\d+)')
+
 
 class PostManager(models.Manager):
 
@@ -61,6 +65,8 b' class PostManager(models.Manager):'
         else:
             self._delete_old_threads()
 
+	self.connect_replies(post)
+
         return post
 
     def delete_post(self, post):
@@ -147,6 +153,15 b' class PostManager(models.Manager):'
 
             map(self.delete_post, old_threads)
 
+    def connect_replies(self, post):
+	"""Connect replies to a post to show them as a refmap"""
+
+	for reply_number in re.finditer(REGEX_REPLY, post.text.raw):
+	    id = reply_number.group(1)
+	    ref_post = self.filter(id=id)
+	    if ref_post.count() > 0:
+		ref_post[0].referenced_posts.add(post)
+
 
 class TagManager(models.Manager):
 
@@ -248,6 +263,8 b' class Post(models.Model):'
 
     replies = models.ManyToManyField('Post', symmetrical=False, null=True,
                                      blank=True, related_name='re+')
+    referenced_posts = models.ManyToManyField('Post', symmetrical=False, null=True,
+                                     blank=True, related_name='rfp+')
 
     def __unicode__(self):
         return '#' + str(self.id) + ' ' + self.title + ' (' + \

boards/static/js/main.js

@@ -5,9 +5,9 b''
     });
 
     addImgPreview();
-    addRefLinkMap();
 
     // TODO Rewrite popups module and reenable it
     //addPopups();
+    
     addMarkPanel();
 });

boards/static/js/thread.js

@@ -52,5 +52,4 b' function addQuickReply(postId) {'
 
 $(document).ready(function(){
     addGalleryPanel();
-    addRefLinkMap();
 });

boards/templates/boards/base.html

@@ -25,7 +25,6 b''
 <script src="{% static 'js/jquery-ui-1.10.3.custom.min.js' %}"></script>
 <script src="{% static 'js/jquery.mousewheel.js' %}"></script>
 <script src="{% url 'django.views.i18n.javascript_catalog' %}"></script>
-<script src="{% static 'js/refmaps.js' %}"></script>
 <script src="{% static 'js/panel.js' %}"></script>
 <script src="{% static 'js/popup.js' %}"></script>
 <script src="{% static 'js/image.js' %}"></script>

boards/templates/boards/posting_general.html

@@ -83,6 +83,14 b''
                     </span>
                 {% endif %}
             </div>
+		{% if thread.thread.referenced_posts.all %}
+		    <div class="refmap">
+			{% trans "Replies" %}:
+			{% for ref_post in thread.thread.referenced_posts.all %}
+			<a href="{% url 'jumper' ref_post.id %}">&gt;&gt;{{ ref_post.id }}</a>
+			{% endfor %}
+		    </div>
+		{% endif %}
             </div>
             {% if thread.thread.get_last_replies.exists %}
                 <div class="last-replies">
@@ -115,6 +123,14 b''
                                     {{ post.text.rendered|truncatewords_html:50 }}
                                 {% endautoescape %}
                         </div>
+			    {% if post.referenced_posts.all %}
+				<div class="refmap">
+				    {% trans "Replies" %}:
+				    {% for ref_post in post.referenced_posts.all %}
+				    <a href="{% url 'jumper' ref_post.id %}">&gt;&gt;{{ ref_post.id }}</a>
+				    {% endfor %}
+				</div>
+			    {% endif %}
                         </div>
                     {% endfor %}
                 </div>

boards/templates/boards/thread.html

@@ -66,6 +66,14 b''
                 {% autoescape off %}
                 {{ post.text.rendered }}
                 {% endautoescape %}
+		{% if post.referenced_posts.all %}
+		    <div class="refmap">
+			{% trans "Replies" %}:
+			{% for ref_post in post.referenced_posts.all %}
+			<a href="{% url 'jumper' ref_post.id %}">&gt;&gt;{{ ref_post.id }}</a>
+			{% endfor %}
+		    </div>
+		{% endif %}
             </div>
             {% if post.id == posts.0.id %}
                 <div class="metadata">