Added strikethrough text to the text parser

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-24 16:06+0300\n"
+"POT-Creation-Date: 2013-10-30 17:38+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -34,23 +34,23 b' msgstr "\xd1\x80\xd0\xb0\xd0\xb7\xd1\x80\xd0\xb0\xd0\xb1\xd0\xbe\xd1\x82\xd1\x87\xd0\xb8\xd0\xba javascript"'
 msgid "designer"
 msgstr "дизайнер"
 
-#: forms.py:51 templates/boards/posting_general.html:135
-#: templates/boards/thread.html:100
+#: forms.py:51 templates/boards/posting_general.html:157
+#: templates/boards/thread.html:101
 msgid "Title"
 msgstr "Заголовок"
 
-#: forms.py:53 templates/boards/posting_general.html:150
-#: templates/boards/thread.html:115
+#: forms.py:53 templates/boards/posting_general.html:172
+#: templates/boards/thread.html:116
 msgid "Text"
 msgstr "Текст"
 
-#: forms.py:54 templates/boards/posting_general.html:155
-#: templates/boards/thread.html:120
+#: forms.py:54 templates/boards/posting_general.html:177
+#: templates/boards/thread.html:121
 msgid "Image"
 msgstr "Изображение"
 
-#: forms.py:57 templates/boards/posting_general.html:165
-#: templates/boards/thread.html:125
+#: forms.py:57 templates/boards/posting_general.html:187
+#: templates/boards/thread.html:126
 msgid "e-mail"
 msgstr ""
 
@@ -79,9 +79,8 b' msgid "Wait %s seconds after last postin'
 msgstr "Подождите %s секунд после последнего постинга"
 
 #: 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:80 templates/boards/rss/post.html:10
+#: templates/boards/posting_general.html:182 templates/boards/tags.html:7
+#: templates/boards/rss/post.html:10
 msgid "Tags"
 msgstr "Теги"
 
@@ -138,24 +137,24 b' msgstr "\xd0\xa0\xd0\xb5\xd0\xbf\xd0\xbe\xd0\xb7\xd0\xb8\xd1\x82\xd0\xbe\xd1\x80\xd0\xb8\xd0\xb9"'
 msgid "Feed"
 msgstr "Лента"
 
-#: templates/boards/base.html:35
+#: templates/boards/base.html:34
 msgid "All threads"
 msgstr "Все темы"
 
-#: templates/boards/base.html:40
+#: templates/boards/base.html:39
 msgid "Tag management"
 msgstr "Управление тегами"
 
-#: templates/boards/base.html:42
+#: templates/boards/base.html:41
 msgid "Settings"
 msgstr "Настройки"
 
-#: templates/boards/base.html:49 templates/boards/login.html:6
+#: templates/boards/base.html:48 templates/boards/login.html:6
 #: templates/boards/login.html.py:21
 msgid "Login"
 msgstr "Вход"
 
-#: templates/boards/base.html:50
+#: templates/boards/base.html:49
 msgid "Up"
 msgstr "Вверх"
 
@@ -171,102 +170,103 b' msgstr "\xd0\x92\xd1\x81\xd1\x82\xd0\xb0\xd0\xb2\xd1\x8c\xd1\x82\xd0\xb5 \xd1\x81\xd0\xb2\xd0\xbe\xd0\xb9 ID \xd0\xbf\xd0\xbe\xd0\xbb\xd1\x8c\xd0\xb7\xd0\xbe\xd0\xb2\xd0\xb0\xd1\x82\xd0\xb5\xd0\xbb\xd1\x8f \xd0\xb2\xd1\x8b\xd1\x88\xd0\xb5"'
 msgid "Post image"
 msgstr "Изображение сообщения"
 
-#: templates/boards/post.html:26 templates/boards/posting_general.html:62
-#: templates/boards/thread.html:59
+#: templates/boards/post.html:26 templates/boards/posting_general.html:67
+#: templates/boards/thread.html:60
 msgid "Delete"
 msgstr "Удалить"
 
-#: templates/boards/post.html:29 templates/boards/posting_general.html:65
-#: templates/boards/thread.html:62
+#: templates/boards/post.html:29 templates/boards/posting_general.html:70
+#: templates/boards/thread.html:63
 msgid "Ban IP"
 msgstr "Заблокировать IP"
 
-#: templates/boards/posting_general.html:19
-msgid "Tag: "
-msgstr "Тег: "
-
-#: templates/boards/posting_general.html:57
+#: templates/boards/posting_general.html:62
 msgid "Reply"
 msgstr "Ответ"
 
-#: templates/boards/posting_general.html:74 templates/boards/thread.html:153
+#: templates/boards/posting_general.html:79
+#: templates/boards/posting_general.html:133 templates/boards/thread.html:72
+msgid "Replies"
+msgstr "Ответы"
+
+#: templates/boards/posting_general.html:87 templates/boards/thread.html:154
 msgid "replies"
 msgstr "ответов"
 
-#: templates/boards/posting_general.html:75 templates/boards/thread.html:154
+#: templates/boards/posting_general.html:88 templates/boards/thread.html:155
 msgid "images"
 msgstr "изображений"
 
-#: templates/boards/posting_general.html:126
+#: templates/boards/posting_general.html:148
 msgid "No threads exist. Create the first one!"
 msgstr "Нет тем. Создайте первую!"
 
-#: templates/boards/posting_general.html:132
+#: templates/boards/posting_general.html:154
 msgid "Create new thread"
 msgstr "Создать новую тему"
 
-#: templates/boards/posting_general.html:140 templates/boards/thread.html:105
+#: templates/boards/posting_general.html:162 templates/boards/thread.html:106
 msgid "Formatting"
 msgstr "Форматирование"
 
-#: templates/boards/posting_general.html:142 templates/boards/thread.html:107
+#: templates/boards/posting_general.html:164 templates/boards/thread.html:108
 msgid "quote"
 msgstr "цитата"
 
-#: templates/boards/posting_general.html:143 templates/boards/thread.html:108
+#: templates/boards/posting_general.html:165 templates/boards/thread.html:109
 msgid "italic"
 msgstr "курсив"
 
-#: templates/boards/posting_general.html:144 templates/boards/thread.html:109
+#: templates/boards/posting_general.html:166 templates/boards/thread.html:110
 msgid "bold"
 msgstr "полужирный"
 
-#: templates/boards/posting_general.html:145 templates/boards/thread.html:110
+#: templates/boards/posting_general.html:167 templates/boards/thread.html:111
 msgid "spoiler"
 msgstr "спойлер"
 
-#: templates/boards/posting_general.html:146 templates/boards/thread.html:111
+#: templates/boards/posting_general.html:168 templates/boards/thread.html:112
 msgid "comment"
 msgstr "комментарий"
 
-#: templates/boards/posting_general.html:178 templates/boards/thread.html:139
+#: templates/boards/posting_general.html:200 templates/boards/thread.html:140
 msgid "Post"
 msgstr "Отправить"
 
-#: templates/boards/posting_general.html:180
+#: templates/boards/posting_general.html:202
 msgid "Tags must be delimited by spaces. Text or image is required."
 msgstr ""
 "Теги должны быть разделены пробелами. Текст или изображение обязательны."
 
-#: templates/boards/posting_general.html:183 templates/boards/thread.html:141
+#: templates/boards/posting_general.html:205 templates/boards/thread.html:142
 msgid "Text syntax"
 msgstr "Синтаксис текста"
 
-#: templates/boards/posting_general.html:193
+#: templates/boards/posting_general.html:215
 msgid "Pages:"
 msgstr "Страницы: "
 
-#: templates/boards/settings.html:13
+#: templates/boards/settings.html:14
 msgid "User:"
 msgstr "Пользователь:"
 
-#: templates/boards/settings.html:15
+#: templates/boards/settings.html:16
 msgid "You are moderator."
 msgstr "Вы модератор."
 
-#: templates/boards/settings.html:18
+#: templates/boards/settings.html:19
 msgid "Posts:"
 msgstr "Сообщений:"
 
-#: templates/boards/settings.html:19
+#: templates/boards/settings.html:20
 msgid "First access:"
 msgstr "Первый доступ:"
 
-#: templates/boards/settings.html:21
+#: templates/boards/settings.html:22
 msgid "Last access:"
 msgstr "Последний доступ: "
 
-#: templates/boards/settings.html:30
+#: templates/boards/settings.html:31
 msgid "Save"
 msgstr "Сохранить"
 
@@ -278,19 +278,15 b' msgstr "\xd1\x82\xd0\xb5\xd0\xbc"'
 msgid "No tags found."
 msgstr "Теги не найдены."
 
-#: templates/boards/thread.html:24
+#: templates/boards/thread.html:25
 msgid "posts to bumplimit"
 msgstr "сообщений до бамплимита"
 
-#: templates/boards/thread.html:71
-msgid "Replies"
-msgstr "Ответы"
-
-#: templates/boards/thread.html:97
+#: templates/boards/thread.html:98
 msgid "Reply to thread"
 msgstr "Ответить в тему"
 
-#: templates/boards/thread.html:155
+#: templates/boards/thread.html:156
 msgid "Last update: "
 msgstr "Последнее обновление: "
 
@@ -335,6 +331,13 b' msgstr "\xd0\xa6\xd0\xb8\xd1\x82\xd0\xb0\xd1\x82\xd0\xb0"'
 msgid "Link to a post"
 msgstr "Ссылка на сообщение"
 
+#: templates/boards/staticpages/help.html:18
+msgid "Strikethrough text"
+msgstr "Зачеркнутый текст"
+
+#~ msgid "Tag: "
+#~ msgstr "Тег: "
+
 #~ msgid "Remove"
 #~ msgstr "Удалить"
 

boards/mdx_neboard.py

@@ -12,6 +12,7 b" QUOTE_PATTERN = r'^(?<!>)(>[^>].+)$'"
 REFLINK_PATTERN = r'((>>)(\d+))'
 SPOILER_PATTERN = r'%%(.+)%%'
 COMMENT_PATTERN = r'^(//(.+))'
+STRIKETHROUGH_PATTERN = r'~(.+)~'
 
 class AutolinkPattern(Pattern):
     def handleMatch(self, m):
@@ -71,6 +72,15 b' class CommentPattern(Pattern):'
         return quote_element
 
 
+class StrikeThroughPattern(Pattern):
+    def handleMatch(self, m):
+        quote_element = etree.Element('span')
+        quote_element.set('class', 'strikethrough')
+        quote_element.text = m.group(2)
+
+        return quote_element
+
+
 class NeboardMarkdown(markdown.Extension):
     def extendMarkdown(self, md, md_globals):
         self._add_neboard_patterns(md)
@@ -88,9 +98,11 b' class NeboardMarkdown(markdown.Extension'
         reflink = ReflinkPattern(REFLINK_PATTERN, md)
         spoiler = SpoilerPattern(SPOILER_PATTERN, md)
         comment = CommentPattern(COMMENT_PATTERN, md)
+	strikethrough = StrikeThroughPattern(STRIKETHROUGH_PATTERN, md)
 
         md.inlinePatterns[u'autolink_ext'] = autolink
         md.inlinePatterns[u'spoiler'] = spoiler
+	md.inlinePatterns[u'strikethrough'] = strikethrough
         md.inlinePatterns[u'comment'] = comment
         md.inlinePatterns[u'reflink'] = reflink
         md.inlinePatterns[u'quote'] = quote

boards/static/css/base.css

@@ -17,4 +17,8 b''
     background-color: #CCC;
     border: 1px solid #000;
     cursor: pointer;
-}
  No newline at end of file
+}
+
+.strikethrough {
+    text-decoration: line-through;
+}

boards/templates/boards/staticpages/help.html

@@ -15,4 +15,5 b''
     <p><span class="comment">//{% trans 'Comment' %}</span></p>
     <p><span class="quote">> {% trans 'Quote' %}</span></p>
     <p><a>>>123</a> -- {% trans 'Link to a post' %}</p>
-{% endblock %}
  No newline at end of file
+    <p>~<span class="strikethrough">{% trans 'Strikethrough text' %}</span>~</p>
+{% endblock %}