Removed linked tags. Added changelog for 2.0. Fixed reply connection.

boards/admin.py

@@ -11,9 +11,7 b' class PostAdmin(admin.ModelAdmin):'
 
 class TagAdmin(admin.ModelAdmin):
 
-    list_display = ('name', 'linked')
-    list_filter = ('linked',)
-
+    list_display = ('name',)
 
 class ThreadAdmin(admin.ModelAdmin):
 

boards/forms.py

@@ -20,8 +20,7 b" ATTRIBUTE_PLACEHOLDER = 'placeholder'"
 
 LAST_POST_TIME = 'last_post_time'
 LAST_LOGIN_TIME = 'last_login_time'
-TEXT_PLACEHOLDER = _('''Type message here. You can reply to message >>123 like
- this. 2 new lines are required to start new paragraph.''')
+TEXT_PLACEHOLDER = _('''Type message here. Use formatting panel for more advanced usage.''')
 TAGS_PLACEHOLDER = _('tag1 several_words_tag')
 
 ERROR_IMAGE_DUPLICATE = _('Such image was already posted')

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: 2014-07-05 20:42+0300\n"
+"POT-Creation-Date: 2014-07-08 18:07+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,91 +35,87 b' msgid "designer"'
 msgstr "дизайнер"
 
 #: forms.py:23
-msgid ""
-"Type message here. You can reply to message >>123 like\n"
-" this. 2 new lines are required to start new paragraph."
-msgstr ""
-"Введите сообщение здесь. Вы можете ответить на сообщение >>123 вот так. 2 "
-"переноса строки обязательны для создания нового абзаца."
+msgid "Type message here. Use formatting panel for more advanced usage."
+msgstr "Вводите сообщение сюда. Используйте панель для более сложного форматирования."
 
-#: forms.py:25
+#: forms.py:24
 msgid "tag1 several_words_tag"
 msgstr "тег1 тег_из_нескольких_слов"
 
-#: forms.py:27
+#: forms.py:26
 msgid "Such image was already posted"
 msgstr "Такое изображение уже было загружено"
 
-#: forms.py:29
+#: forms.py:28
 msgid "Title"
 msgstr "Заголовок"
 
-#: forms.py:30
+#: forms.py:29
 msgid "Text"
 msgstr "Текст"
 
-#: forms.py:31
+#: forms.py:30
 msgid "Tag"
 msgstr "Тег"
 
-#: forms.py:32 templates/boards/base.html:54 templates/search/search.html:9
+#: forms.py:31 templates/boards/base.html:54 templates/search/search.html:9
 #: templates/search/search.html.py:13
 msgid "Search"
 msgstr "Поиск"
 
-#: forms.py:109
+#: forms.py:108
 msgid "Image"
 msgstr "Изображение"
 
-#: forms.py:114
+#: forms.py:113
 msgid "e-mail"
 msgstr ""
 
-#: forms.py:125
+#: forms.py:124
 #, python-format
 msgid "Title must have less than %s characters"
 msgstr "Заголовок должен иметь меньше %s символов"
 
-#: forms.py:134
+#: forms.py:133
 #, python-format
 msgid "Text must have less than %s characters"
 msgstr "Текст должен быть короче %s символов"
 
-#: forms.py:145
+#: forms.py:144
 #, python-format
 msgid "Image must be less than %s bytes"
 msgstr "Изображение должно быть менее %s байт"
 
-#: forms.py:180
+#: forms.py:179
 msgid "Either text or image must be entered."
 msgstr "Текст или картинка должны быть введены."
 
-#: forms.py:200
+#: forms.py:199
 #, python-format
 msgid "Wait %s seconds after last posting"
 msgstr "Подождите %s секунд после последнего постинга"
 
-#: forms.py:216 templates/boards/tags.html:7 templates/boards/rss/post.html:10
+#: forms.py:215 templates/boards/tags.html:7 templates/boards/rss/post.html:10
 msgid "Tags"
 msgstr "Теги"
 
-#: forms.py:223 forms.py:291
+#: forms.py:222 forms.py:290
 msgid "Inappropriate characters in tags."
 msgstr "Недопустимые символы в тегах."
 
-#: forms.py:251 forms.py:272
+#: forms.py:250 forms.py:271
 msgid "Captcha validation failed"
 msgstr "Проверка капчи провалена"
 
-#: forms.py:278
+#: forms.py:277
 msgid "Theme"
 msgstr "Тема"
 
-#: forms.py:314
+#: forms.py:313
 msgid "Invalid master password"
 msgstr "Неверный мастер-пароль"
 
-#: forms.py:328
+#: forms.py:327
 #, python-format
 msgid "Wait %s minutes after last login"
 msgstr "Подождите %s минут после последнего входа"
@@ -186,7 +182,7 b' msgstr "\xd0\x92\xd0\xb2\xd0\xb5\xd1\x80\xd1\x85"'
 msgid "Insert your user id above"
 msgstr "Вставьте свой ID пользователя выше"
 
-#: templates/boards/post.html:21 templates/boards/staticpages/help.html:19
+#: templates/boards/post.html:21 templates/boards/staticpages/help.html:17
 msgid "Quote"
 msgstr "Цитата"
 
@@ -340,33 +336,25 b' 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
+#: templates/boards/staticpages/help.html:12
 msgid "Bold text"
 msgstr "Полужирный текст"
 
-#: templates/boards/staticpages/help.html:14
+#: templates/boards/staticpages/help.html:13
 msgid "Spoiler"
 msgstr "Спойлер"
 
-#: templates/boards/staticpages/help.html:15
+#: templates/boards/staticpages/help.html:14
 msgid "Link to a post"
 msgstr "Ссылка на сообщение"
 
-#: templates/boards/staticpages/help.html:16
+#: templates/boards/staticpages/help.html:15
 msgid "Strikethrough text"
 msgstr "Зачеркнутый текст"
 
-#: templates/boards/staticpages/help.html:17
-msgid "You need to new line before:"
-msgstr "Перед этими тегами нужна новая строка:"
-
-#: templates/boards/staticpages/help.html:18
+#: templates/boards/staticpages/help.html:16
 msgid "Comment"
 msgstr "Комментарий"

boards/models/post.py

@@ -38,13 +38,12 b" UNKNOWN_UA = ''"
 
 SETTING_MODERATE = "moderate"
 
-REGEX_REPLY = re.compile('>>(\d+)')
+REGEX_REPLY = re.compile(r'>>(\d+)')
 
 logger = logging.getLogger(__name__)
 
 
 class PostManager(models.Manager):
-
     def create_post(self, title, text, image=None, thread=None, ip=NO_IP,
                     tags=None):
         """
@@ -79,13 +78,6 b' class PostManager(models.Manager):'
 
         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)
 
         if new_thread:
@@ -128,7 +120,7 b' class PostManager(models.Manager):'
         Connects replies to a post to show them as a reflink map
         """
 
-        for reply_number in re.finditer(REGEX_REPLY, post.text.raw):
+        for reply_number in re.finditer(REGEX_REPLY, post.text.rendered):
             post_id = reply_number.group(1)
             ref_post = self.filter(id=post_id)
             if ref_post.count() > 0:
@@ -218,13 +210,18 b' class Post(models.Model, Viewable):'
         return title
 
     def build_refmap(self):
+        """
+        Builds a replies map string from replies list. This is a cache to stop
+        the server from recalculating the map on every post show.
+        """
         map_string = ''
 
         first = True
         for refpost in self.referenced_posts.all():
             if not first:
                 map_string += ', '
-            map_string += '<a href="%s">&gt;&gt;%s</a>' % (refpost.get_url(), refpost.id)
+            map_string += '<a href="%s">&gt;&gt;%s</a>' % (refpost.get_url(),
+                                                           refpost.id)
             first = False
 
         self.refmap = map_string
@@ -249,10 +246,10 b' class Post(models.Model, Viewable):'
         thread = self.get_thread()
         thread.add_tag(tag)
         self.last_edit_time = edit_time
-        self.save()
+        self.save(update_fields=['last_edit_time'])
 
         thread.last_edit_time = edit_time
-        thread.save()
+        thread.save(update_fields=['last_edit_time'])
 
     @transaction.atomic
     def remove_tag(self, tag):
@@ -261,10 +258,10 b' class Post(models.Model, Viewable):'
         thread = self.get_thread()
         thread.remove_tag(tag)
         self.last_edit_time = edit_time
-        self.save()
+        self.save(update_fields=['last_edit_time'])
 
         thread.last_edit_time = edit_time
-        thread.save()
+        thread.save(update_fields=['last_edit_time'])
 
     def get_url(self, thread=None):
         """
@@ -341,7 +338,7 b' class Post(models.Model, Viewable):'
 
     def delete(self, using=None):
         """
-        Delete all post images and the post itself.
+        Deletes all post images and the post itself.
         """
 
         self.images.all().delete()

boards/models/tag.py

@@ -38,7 +38,6 b' class Tag(models.Model, Viewable):'
     name = models.CharField(max_length=100, db_index=True)
     threads = models.ManyToManyField(Thread, null=True,
                                      blank=True, related_name='tag+')
-    linked = models.ForeignKey('Tag', null=True, blank=True)
 
     def __unicode__(self):
         return self.name
@@ -53,31 +52,6 b' class Tag(models.Model, Viewable):'
     def get_thread_count(self):
         return self.threads.count()
 
-    def get_linked_tags(self):
-        """
-        Gets tags linked to the current one.
-        """
-
-        tag_list = []
-        self.get_linked_tags_list(tag_list)
-
-        return tag_list
-
-    def get_linked_tags_list(self, tag_list=None):
-        """
-        Returns the list of tags linked to current. The list can be got
-        through returned value or tag_list parameter
-        """
-        if not tag_list:
-            tag_list = []
-
-        linked_tag = self.linked
-
-        if linked_tag and not (linked_tag in tag_list):
-            tag_list.append(linked_tag)
-
-            linked_tag.get_linked_tags_list(tag_list)
-
     def get_post_count(self, archived=False):
         """
         Gets posts count for the tag's threads.

boards/static/css/md/base_page.css

@@ -226,11 +226,13 b' blockquote {'
 }
 
 .multiquote {
-    color: #92cf38;
-    font-style: italic;
-    border-left: solid 3px #00aa00;
-    padding-left: 3px;
+    border-left: solid 4px #ccc;
+    padding: 3px;
     display: inline-block;
+    background: #222;
+    border-right: solid 1px #ccc;
+    border-top: solid 1px #ccc;
+    border-bottom: solid 1px #ccc;
 }
 
 .spoiler {

boards/tests.py

@@ -13,6 +13,8 b' from boards import urls'
 from boards import settings
 import neboard
 
+TEST_TAG = 'test_tag'
+
 PAGE_404 = 'boards/404.html'
 
 TEST_TEXT = 'test text'
@@ -31,14 +33,18 b' logger = logging.getLogger(__name__)'
 class PostTests(TestCase):
 
     def _create_post(self):
-        return Post.objects.create_post(title='title', text='text')
+        tag = Tag.objects.create(name=TEST_TAG)
+        return Post.objects.create_post(title='title', text='text',
+                                        tags=[tag])
 
     def test_post_add(self):
         """Test adding post"""
 
         post = self._create_post()
 
-        self.assertIsNotNone(post, 'No post was created')
+        self.assertIsNotNone(post, 'No post was created.')
+        self.assertEqual(TEST_TAG, post.get_thread().tags.all()[0].name,
+                         'No tags were added to the post.')
 
     def test_delete_post(self):
         """Test post deletion"""
@@ -131,17 +137,6 b' class PostTests(TestCase):'
         self.assertEqual(all_threads[settings.THREADS_PER_PAGE].id,
                          first_post.id)
 
-    def test_linked_tag(self):
-        """Test adding a linked tag"""
-
-        linked_tag = Tag.objects.create(name=u'tag1')
-        tag = Tag.objects.create(name=u'tag2', linked=linked_tag)
-
-        post = Post.objects.create_post("", "", tags=[tag])
-
-        self.assertTrue(linked_tag in post.get_thread().tags.all(),
-                        'Linked tag was not added')
-
 
 class PagesTest(TestCase):
 
@@ -272,4 +267,4 b' class AbstractTest(TestCase):'
 
 class MockRequest:
     def __init__(self):
-        self.session = dict()
  No newline at end of file
+        self.session = dict()

changelog.markdown

@@ -35,3 +35,8 b' elements instead of swapping them'
 images to a post
 * Added search over posts and tags
 * [ADMIN] Command to remove empty users
+
+# 2.0 D'Anna
+* Removed users. Now settings are stored in sessions
+* Changed markdown to bbcode
+* Removed linked tags