Merged with default

boards/templates/boards/preview.html

@@ -0,0 +1,30 b''
+{% extends "boards/base.html" %}
+
+{% load i18n %}
+
+{% block head %}
+    <title>{% trans 'Preview' %} - {{ site_name }}</title>
+{% endblock %}
+
+{% block content %}
+
+    <div class="post-form-w">
+        <div class="post-form">
+            <form enctype="multipart/form-data" method="post">
+                <textarea name="query">{{ query }}</textarea>
+                <div class="form-submit">
+                    <input type="submit" value="{% trans "Post" %}"/>
+                </div>
+            </form>
+        </div>
+    </div>
+
+    {% if result %}
+        <div class="post">
+            {% autoescape off %}
+                {{ result }}
+            {% endautoescape %}
+        </div>
+    {% endif %}
+
+{% endblock %}

boards/views/preview.py

@@ -0,0 +1,35 b''
+from django.shortcuts import render
+from django.template import RequestContext
+from django.views.generic import View
+
+from boards.mdx_neboard import bbcode_extended
+
+FORM_QUERY = 'query'
+
+CONTEXT_RESULT = 'result'
+CONTEXT_QUERY = 'query'
+
+__author__ = 'neko259'
+
+TEMPLATE = 'boards/preview.html'
+
+
+class PostPreviewView(View):
+    def get(self, request):
+        context = RequestContext(request)
+
+        return render(request, TEMPLATE, context)
+
+    def post(self, request):
+        context = RequestContext(request)
+
+        if FORM_QUERY in request.POST:
+            raw_text = request.POST[FORM_QUERY]
+
+            if len(raw_text) >= 0:
+                rendered_text = bbcode_extended(raw_text)
+
+                context[CONTEXT_RESULT] = rendered_text
+                context[CONTEXT_QUERY] = raw_text
+
+        return render(request, TEMPLATE, context)

boards/forms.py

@@ -181,10 +181,6 b' class PostForm(NeboardForm):'
     def _validate_posting_speed(self):
         can_post = True
 
-        # TODO Remove this, it's only for test
-        if not 'user_id' in self.session:
-            return
-
         posting_delay = settings.POSTING_DELAY
 
         if board_settings.LIMIT_POSTING_SPEED and LAST_POST_TIME in \

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-20 20:11+0300\n"
+"POT-Creation-Date: 2014-08-19 15:51+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"
@@ -34,89 +34,85 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:23
+#: forms.py:22
 msgid "Type message here. Use formatting panel for more advanced usage."
 msgstr ""
 "Вводите сообщение сюда. Используйте панель для более сложного форматирования."
 
-#: forms.py:24
+#: forms.py:23
 msgid "tag1 several_words_tag"
 msgstr "тег1 тег_из_нескольких_слов"
 
-#: forms.py:26
+#: forms.py:25
 msgid "Such image was already posted"
 msgstr "Такое изображение уже было загружено"
 
-#: forms.py:28
+#: forms.py:27
 msgid "Title"
 msgstr "Заголовок"
 
-#: forms.py:29
+#: forms.py:28
 msgid "Text"
 msgstr "Текст"
 
-#: forms.py:30
+#: forms.py:29
 msgid "Tag"
 msgstr "Тег"
 
-#: forms.py:31 templates/boards/base.html:54 templates/search/search.html:9
+#: forms.py:30 templates/boards/base.html:36 templates/search/search.html:9
 #: templates/search/search.html.py:13
 msgid "Search"
 msgstr "Поиск"
 
-#: forms.py:108
+#: forms.py:107
 msgid "Image"
 msgstr "Изображение"
 
-#: forms.py:113
+#: forms.py:112
 msgid "e-mail"
 msgstr ""
 
-#: forms.py:124
+#: forms.py:123
 #, python-format
 msgid "Title must have less than %s characters"
 msgstr "Заголовок должен иметь меньше %s символов"
 
-#: forms.py:133
+#: forms.py:132
 #, python-format
 msgid "Text must have less than %s characters"
 msgstr "Текст должен быть короче %s символов"
 
-#: forms.py:144
+#: forms.py:143
 #, python-format
 msgid "Image must be less than %s bytes"
 msgstr "Изображение должно быть менее %s байт"
 
-#: forms.py:179
+#: forms.py:178
 msgid "Either text or image must be entered."
 msgstr "Текст или картинка должны быть введены."
 
-#: forms.py:199
+#: forms.py:198
 #, python-format
 msgid "Wait %s seconds after last posting"
 msgstr "Подождите %s секунд после последнего постинга"
 
-#: forms.py:215 templates/boards/tags.html:7 templates/boards/rss/post.html:10
+#: forms.py:214 templates/boards/tags.html:7 templates/boards/rss/post.html:10
 msgid "Tags"
 msgstr "Теги"
 
-#: forms.py:222 forms.py:290
+#: forms.py:221 forms.py:247
 msgid "Inappropriate characters in tags."
 msgstr "Недопустимые символы в тегах."
 
-#: forms.py:250 forms.py:271
-msgid "Captcha validation failed"
-msgstr "Проверка капчи провалена"
-
-#: forms.py:277
+#: forms.py:234
 msgid "Theme"
 msgstr "Тема"
 
-#: forms.py:313
+#: forms.py:270
 msgid "Invalid master password"
 msgstr "Неверный мастер-пароль"
 
-#: forms.py:327
+#: forms.py:284
 #, python-format
 msgid "Wait %s minutes after last login"
 msgstr "Подождите %s минут после последнего входа"
@@ -157,28 +153,27 b' msgstr "\xd0\x92\xd1\x81\xd0\xb5 \xd1\x82\xd0\xb5\xd0\xbc\xd1\x8b"'
 msgid "Tag management"
 msgstr "Управление тегами"
 
-#: templates/boards/base.html:36 templates/boards/settings.html:7
+#: templates/boards/base.html:37 templates/boards/settings.html:7
 msgid "Settings"
 msgstr "Настройки"
 
 #: templates/boards/base.html:50
-msgid "Logout"
-msgstr "Выход"
+msgid "Admin"
+msgstr ""
 
-#: templates/boards/base.html:52 templates/boards/login.html:6
-#: templates/boards/login.html.py:16
-msgid "Login"
-msgstr "Вход"
-
-#: templates/boards/base.html:56
+#: templates/boards/base.html:52
 #, python-format
 msgid "Speed: %(ppd)s posts per day"
 msgstr "Скорость: %(ppd)s сообщений в день"
 
-#: templates/boards/base.html:58
+#: templates/boards/base.html:54
 msgid "Up"
 msgstr "Вверх"
 
+#: templates/boards/login.html:6 templates/boards/login.html.py:16
+msgid "Login"
+msgstr "Вход"
+
 #: templates/boards/login.html:19
 msgid "Insert your user id above"
 msgstr "Вставьте свой ID пользователя выше"
@@ -212,12 +207,12 b' msgid "Replies"'
 msgstr "Ответы"
 
 #: templates/boards/post.html:86 templates/boards/thread.html:88
-#: templates/boards/thread_gallery.html:61
+#: templates/boards/thread_gallery.html:59
 msgid "messages"
 msgstr "сообщений"
 
 #: templates/boards/post.html:87 templates/boards/thread.html:89
-#: templates/boards/thread_gallery.html:62
+#: templates/boards/thread_gallery.html:60
 msgid "images"
 msgstr "изображений"
 
@@ -258,7 +253,8 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:137 templates/boards/thread.html:58
+#: templates/boards/posting_general.html:137 templates/boards/preview.html:16
+#: templates/boards/thread.html:58
 msgid "Post"
 msgstr "Отправить"
 
@@ -275,6 +271,10 b' msgstr "\xd0\xa1\xd0\xb8\xd0\xbd\xd1\x82\xd0\xb0\xd0\xba\xd1\x81\xd0\xb8\xd1\x81 \xd1\x82\xd0\xb5\xd0\xba\xd1\x81\xd1\x82\xd0\xb0"'
 msgid "Pages:"
 msgstr "Страницы: "
 
+#: templates/boards/preview.html:6 templates/boards/staticpages/help.html:19
+msgid "Preview"
+msgstr "Предпросмотр"
+
 #: templates/boards/settings.html:15
 msgid "You are moderator."
 msgstr "Вы модератор."
@@ -295,11 +295,11 b' msgstr "\xd0\xa1\xd0\xbe\xd1\x85\xd1\x80\xd0\xb0\xd0\xbd\xd0\xb8\xd1\x82\xd1\x8c"'
 msgid "No tags found."
 msgstr "Теги не найдены."
 
-#: templates/boards/thread.html:20 templates/boards/thread_gallery.html:21
+#: templates/boards/thread.html:20 templates/boards/thread_gallery.html:19
 msgid "Normal mode"
 msgstr "Нормальный режим"
 
-#: templates/boards/thread.html:21 templates/boards/thread_gallery.html:22
+#: templates/boards/thread.html:21 templates/boards/thread_gallery.html:20
 msgid "Gallery mode"
 msgstr "Режим галереи"
 
@@ -315,7 +315,7 b' msgstr "\xd0\x9e\xd1\x82\xd0\xb2\xd0\xb5\xd1\x82\xd0\xb8\xd1\x82\xd1\x8c \xd0\xb2 \xd1\x82\xd0\xb5\xd0\xbc\xd1\x83"'
 msgid "Switch mode"
 msgstr "Переключить режим"
 
-#: templates/boards/thread.html:90 templates/boards/thread_gallery.html:63
+#: templates/boards/thread.html:90 templates/boards/thread_gallery.html:61
 msgid "Last update: "
 msgstr "Последнее обновление: "
 
@@ -359,3 +359,7 b' msgstr "\xd0\x97\xd0\xb0\xd1\x87\xd0\xb5\xd1\x80\xd0\xba\xd0\xbd\xd1\x83\xd1\x82\xd1\x8b\xd0\xb9 \xd1\x82\xd0\xb5\xd0\xba\xd1\x81\xd1\x82"'
 #: templates/boards/staticpages/help.html:16
 msgid "Comment"
 msgstr "Комментарий"
+
+#: templates/boards/staticpages/help.html:19
+msgid "You can try pasting the text and previewing the result here:"
+msgstr "Вы можете попробовать вставить текст и проверить результат здесь:"

boards/mdx_neboard.py

@@ -116,7 +116,7 b' class CodePattern(TextFormatter):'
 
 def render_reflink(tag_name, value, options, parent, context):
     if not REFLINK_PATTERN.match(value):
-        return u'>>%s' % value
+        return '>>%s' % value
 
     post_id = int(value)
 
@@ -124,21 +124,21 b' def render_reflink(tag_name, value, opti'
     if posts.exists():
         post = posts[0]
 
-        return u'<a href="%s">&gt;&gt;%s</a>' % (post.get_url(), post_id)
+        return '<a href="%s">&gt;&gt;%s</a>' % (post.get_url(), post_id)
     else:
-        return u'>>%s' % value
+        return '>>%s' % value
 
 
 def render_quote(tag_name, value, options, parent, context):
-    source = u''
+    source = ''
     if 'source' in options:
         source = options['source']
 
-    result = u''
+    result = ''
     if source:
-        result = u'<div class="multiquote"><div class="quote-header">%s</div><div class="quote-text">%s</div></div>' % (source, value)
+        result = '<div class="multiquote"><div class="quote-header">%s</div><div class="quote-text">%s</div></div>' % (source, value)
     else:
-        result = u'<div class="multiquote"><div class="quote-text">%s</div></div>' % value
+        result = '<div class="multiquote"><div class="quote-text">%s</div></div>' % value
 
     return result
 
@@ -152,7 +152,9 b' def preparse_text(text):'
 
 
 def bbcode_extended(markup):
-    parser = bbcode.Parser()
+    # The newline hack is added because br's margin does not work in all
+    # browsers except firefox, when the div's does.
+    parser = bbcode.Parser(newline='<div class="br"></div>')
     parser.add_formatter('post', render_reflink, strip=True)
     parser.add_formatter('quote', render_quote, strip=True)
     parser.add_simple_formatter('comment',

boards/settings.py

@@ -18,6 +18,3 b' LAST_REPLIES_COUNT = 3'
 ARCHIVE_THREADS = True
 # Limit posting speed
 LIMIT_POSTING_SPEED = False
-
-# This password is used to add admin permissions to the user
-MASTER_PASSWORD = u'password'

boards/static/css/md/base_page.css

@@ -101,15 +101,11 b' body {'
     visibility: hidden;
 }
 
-p {
+p, .br {
     margin-top: .5em;
     margin-bottom: .5em;
 }
 
-br {
-    margin-bottom: .5em;
-}
-
 .post-form-w {
     background: #333344;
     border-top: solid 1px #888;
@@ -254,6 +250,10 b' a:hover {'
     border-right: solid 1px #777;
 }
 
+.last-replies > .post:first-child {
+    border-top: none;
+}
+
 .thread {
     margin-bottom: 3ex;
     margin-top: 1ex;
@@ -381,6 +381,7 b' li {'
     margin-right: 3ex;
     border-left: solid 1px #888;
     border-right: solid 1px #888;
+    border-bottom: solid 1px #888;
     background: #000;
 }
 

boards/static/css/pg/base_page.css

@@ -133,7 +133,7 b' p {'
     vertical-align: middle;
 }
 
-.post-form input, .post-form textarea {
+.post-form input:not([name="image"]), .post-form textarea {
     background: #fff;
     color: #000;
     border: solid 1px;
@@ -352,3 +352,13 b' input[type="submit"]:hover {'
     margin: 0.3ex;
     padding: 0.2ex;
 }
+
+.multiquote {
+    padding: 3px;
+    display: inline-block;
+    background: #ddd;
+    border-style: solid;
+    border-width: 1px 1px 1px 4px;
+    border-color: #222;
+    font-size: 0.9em;
+}

boards/templates/boards/base.html

@@ -32,7 +32,8 b''
                 >#{{ tag.name }}</a>,
     {% endfor %}
     <a href="{% url 'tags' %}" title="{% trans 'Tag management' %}"
-            >[...]</a>
+            >[...]</a>,
+        <a href="{% url 'search' %}" title="{% trans 'Search' %}">[S]</a>
     <a class="link" href="{% url 'settings' %}">{% trans 'Settings' %}</a>
 </div>
 
@@ -47,7 +48,6 b''
 <div class="navigation_panel">
     {% block metapanel %}{% endblock %}
     [<a href="{% url 'admin:index' %}">{% trans 'Admin' %}</a>]
-    [<a href="{% url 'search' %}">{% trans 'Search' %}</a>]
     {% with ppd=posts_per_day|floatformat:2 %}
         {% blocktrans %}Speed: {{ ppd }} posts per day{% endblocktrans %}
     {% endwith %}

boards/templates/boards/staticpages/help.html

@@ -15,4 +15,6 b''
     <p>[s]<span class="strikethrough">{% trans 'Strikethrough text' %}</span>[/s]</p>
     <p>[comment]<span class="comment">{% trans 'Comment' %}</span>[/comment]</p>
     <p>[quote]<span class="multiquote">{% trans 'Quote' %}</span>[/quote]</p>
+    <br/>
+    <p>{% trans 'You can try pasting the text and previewing the result here:' %} <a href="{% url 'preview' %}">{% trans 'Preview' %}</a></p>
 {% endblock %}

boards/urls.py

@@ -10,6 +10,7 b' from boards.views.ban import BanUserView'
 from boards.views.search import BoardSearchView
 from boards.views.static import StaticPageView
 from boards.views.post_admin import PostAdminView
+from boards.views.preview import PostPreviewView
 
 js_info_dict = {
     'packages': ('boards',),
@@ -76,4 +77,7 b" urlpatterns = patterns('',"
     # Search
     url(r'^search/$', BoardSearchView.as_view(), name='search'),
 
+    # Post preview
+    url(r'^preview/$', PostPreviewView.as_view(), name='preview')
+
 )