Basic support for the generic forms. Still need to fix some things in the form

rendering, also need to implement a new widget for the text with formatting
panel.

boards/forms.py

@@ -1,253 +1,253 b''
 import re
 from captcha.fields import CaptchaField
 from django import forms
 from django.forms.util import ErrorList
 from django.utils.translation import ugettext_lazy as _
 import time
 from boards.models.post import TITLE_MAX_LENGTH
 from boards.models import User
 from neboard import settings
 from boards import utils
 import boards.settings as board_settings
 
 LAST_POST_TIME = "last_post_time"
 LAST_LOGIN_TIME = "last_login_time"
 
 
 class PlainErrorList(ErrorList):
     def __unicode__(self):
         return self.as_text()
 
     def as_text(self):
         return ''.join([u'(!) %s ' % e for e in self])
 
 
 class NeboardForm(forms.Form):
 
     def as_p(self):
         "Returns this form rendered as HTML <p>s."
         return self._html_output(
+            # TODO Do not show hidden rows in the list here
             normal_row='<div class="form-row">'
                        '<div class="form-label">'
                        '%(label)s'
                        '</div>'
                        '<div class="form-input">'
                        '%(field)s'
                        '</div>'
                        '%(help_text)s'
                        '</div>',
-            error_row='<div class="form-errors">%s</div>',
+            error_row='<div class="form-row"><div class="form-label"></div><div class="form-errors">%s</div></div>',
             row_ender='</p>',
             help_text_html=' <span class="helptext">%s</span>',
             errors_on_separate_row=True)
 
-
 class PostForm(NeboardForm):
 
     title = forms.CharField(max_length=TITLE_MAX_LENGTH, required=False,
                             label=_('Title'))
     text = forms.CharField(widget=forms.Textarea, required=False,
                            label=_('Text'))
     image = forms.ImageField(required=False, label=_('Image'))
 
     # This field is for spam prevention only
     email = forms.CharField(max_length=100, required=False, label=_('e-mail'),
                             widget=forms.TextInput(attrs={
                                 'class': 'form-email'}))
 
     session = None
     need_to_ban = False
 
     def clean_title(self):
         title = self.cleaned_data['title']
         if title:
             if len(title) > TITLE_MAX_LENGTH:
                 raise forms.ValidationError(_('Title must have less than %s '
                                               'characters') %
                                             str(TITLE_MAX_LENGTH))
         return title
 
     def clean_text(self):
         text = self.cleaned_data['text']
         if text:
             if len(text) > board_settings.MAX_TEXT_LENGTH:
                 raise forms.ValidationError(_('Text must have less than %s '
                                               'characters') %
                                             str(board_settings
                                             .MAX_TEXT_LENGTH))
         return text
 
     def clean_image(self):
         image = self.cleaned_data['image']
         if image:
             if image._size > board_settings.MAX_IMAGE_SIZE:
                 raise forms.ValidationError(
                     _('Image must be less than %s bytes')
                     % str(board_settings.MAX_IMAGE_SIZE))
         return image
 
     def clean(self):
         cleaned_data = super(PostForm, self).clean()
 
         if not self.session:
             raise forms.ValidationError('Humans have sessions')
 
         if cleaned_data['email']:
             self.need_to_ban = True
             raise forms.ValidationError('A human cannot enter a hidden field')
 
         if not self.errors:
             self._clean_text_image()
 
         if not self.errors and self.session:
             self._validate_posting_speed()
 
         return cleaned_data
 
     def _clean_text_image(self):
         text = self.cleaned_data.get('text')
         image = self.cleaned_data.get('image')
 
         if (not text) and (not image):
             error_message = _('Either text or image must be entered.')
             self._errors['text'] = self.error_class([error_message])
 
     def _validate_posting_speed(self):
         can_post = True
 
         if LAST_POST_TIME in self.session:
             now = time.time()
             last_post_time = self.session[LAST_POST_TIME]
 
             current_delay = int(now - last_post_time)
 
             if current_delay < settings.POSTING_DELAY:
                 error_message = _('Wait %s seconds after last posting') % str(
                     settings.POSTING_DELAY - current_delay)
                 self._errors['text'] = self.error_class([error_message])
 
                 can_post = False
 
         if can_post:
             self.session[LAST_POST_TIME] = time.time()
 
 
 class ThreadForm(PostForm):
 
     regex_tags = re.compile(ur'^[\w\s\d]+$', re.UNICODE)
 
     tags = forms.CharField(max_length=100, label=_('Tags'))
 
     def clean_tags(self):
         tags = self.cleaned_data['tags']
 
         if tags:
             if not self.regex_tags.match(tags):
                 raise forms.ValidationError(
                     _('Inappropriate characters in tags.'))
 
         return tags
 
     def clean(self):
         cleaned_data = super(ThreadForm, self).clean()
 
         return cleaned_data
 
 
 class PostCaptchaForm(PostForm):
     captcha = CaptchaField()
 
     def __init__(self, *args, **kwargs):
         self.request = kwargs['request']
         del kwargs['request']
 
         super(PostCaptchaForm, self).__init__(*args, **kwargs)
 
     def clean(self):
         cleaned_data = super(PostCaptchaForm, self).clean()
 
         success = self.is_valid()
         utils.update_captcha_access(self.request, success)
 
         if success:
             return cleaned_data
         else:
             raise forms.ValidationError(_("Captcha validation failed"))
 
 
 class ThreadCaptchaForm(ThreadForm):
     captcha = CaptchaField()
 
     def __init__(self, *args, **kwargs):
         self.request = kwargs['request']
         del kwargs['request']
 
         super(ThreadCaptchaForm, self).__init__(*args, **kwargs)
 
     def clean(self):
         cleaned_data = super(ThreadCaptchaForm, self).clean()
 
         success = self.is_valid()
         utils.update_captcha_access(self.request, success)
 
         if success:
             return cleaned_data
         else:
             raise forms.ValidationError(_("Captcha validation failed"))
 
 
 class SettingsForm(NeboardForm):
 
     theme = forms.ChoiceField(choices=settings.THEMES,
                               label=_('Theme'))
 
 
 class ModeratorSettingsForm(SettingsForm):
 
     moderate = forms.BooleanField(required=False, label=_('Enable moderation '
                                                           'panel'))
 
 
 class LoginForm(NeboardForm):
 
     user_id = forms.CharField()
 
     session = None
 
     def clean_user_id(self):
         user_id = self.cleaned_data['user_id']
         if user_id:
             users = User.objects.filter(user_id=user_id)
             if len(users) == 0:
                 raise forms.ValidationError(_('No such user found'))
 
         return user_id
 
     def _validate_login_speed(self):
         can_post = True
 
         if LAST_LOGIN_TIME in self.session:
             now = time.time()
             last_login_time = self.session[LAST_LOGIN_TIME]
 
             current_delay = int(now - last_login_time)
 
             if current_delay < board_settings.LOGIN_TIMEOUT:
                 error_message = _('Wait %s minutes after last login') % str(
                     (board_settings.LOGIN_TIMEOUT - current_delay) / 60)
                 self._errors['user_id'] = self.error_class([error_message])
 
                 can_post = False
 
         if can_post:
             self.session[LAST_LOGIN_TIME] = time.time()
 
     def clean(self):
         if not self.session:
             raise forms.ValidationError('Humans have sessions')
 
         self._validate_login_speed()
 
         cleaned_data = super(LoginForm, self).clean()
 
         return cleaned_data

boards/templates/boards/posting_general.html

@@ -1,283 +1,241 b''
 {% extends "boards/base.html" %}
 
 {% load i18n %}
 {% load cache %}
 {% load board %}
 
 {% block head %}
     {% if tag %}
         <title>Neboard - {{ tag.name }}</title>
     {% else %}
         <title>Neboard</title>
     {% endif %}
 
     {% if prev_page %}
         <link rel="next" href="
             {% if tag %}
                 {% url "tag" tag_name=tag page=prev_page %}
             {% else %}
                 {% url "index" page=prev_page %}
             {% endif %}
         " />
     {% endif %}
     {% if next_page %}
         <link rel="next" href="
             {% if tag %}
                 {% url "tag" tag_name=tag page=next_page %}
             {% else %}
                 {% url "index" page=next_page %}
             {% endif %}
         " />
     {% endif %}
 
 {% endblock %}
 
 {% block content %}
 
     {% get_current_language as LANGUAGE_CODE %}
 
 {% if tag %}
     <div class="tag_info">
         <h2>
             {% if tag in user.fav_tags.all %}
                 <a href="{% url 'tag_unsubscribe' tag.name %}?next={{ request.path }}"
                    class="fav">★</a>
             {% else %}
                 <a href="{% url 'tag_subscribe' tag.name %}?next={{ request.path }}"
                    class="not_fav">★</a>
             {% endif %}
             #{{ tag.name }}
         </h2>
     </div>
 {% endif %}
 
     {% if threads %}
         {% if prev_page %}
             <div class="page_link">
                 <a href="
             {% if tag %}
                 {% url "tag" tag_name=tag page=prev_page %}
             {% else %}
                 {% url "index" page=prev_page %}
             {% endif %}
                 ">{% trans "Previous page" %}</a>
             </div>
         {% endif %}
 
         {% for thread in threads %}
             {% cache 600 thread_short thread.id thread.thread.last_edit_time moderator LANGUAGE_CODE %}
             <div class="thread">
             {% if thread.bumpable %}
 		        <div class="post" id="{{ thread.op.id }}">
             {% else %}
 		        <div class="post dead_post" id="{{ thread.op.id }}">
             {% endif %}
             {% if thread.op.image %}
                 <div class="image">
                     <a class="thumb"
                        href="{{ thread.op.image.url }}"><img
                             src="{{ thread.op.image.url_200x150 }}"
                             alt="{{ thread.op.id }}"
                             data-width="{{ thread.op.image_width }}"
                             data-height="{{ thread.op.image_height }}"/>
                     </a>
                 </div>
             {% endif %}
             <div class="message">
                 <div class="post-info">
                     <span class="title">{{ thread.op.title }}</span>
                     <a class="post_id" href="{% url 'thread' thread.op.id %}"
                     >({{ thread.op.id }})</a>
                     [{{ thread.op.pub_time }}]
                     [<a class="link" href="
                     {% url 'thread' thread.op.id %}#form"
                         >{% trans "Reply" %}</a>]
 
                     {% if moderator %}
                         <span class="moderator_info">
                             [<a href="
                             {% url 'delete' post_id=thread.op.id %}?next={{ request.path }}"
                                 >{% trans 'Delete' %}</a>]
                             ({{ thread.thread.poster_ip }})
                             [<a href="
                             {% url 'ban' post_id=thread.op.id %}?next={{ request.path }}"
                                 >{% trans 'Ban IP' %}</a>]
                         </span>
                     {% endif %}
                 </div>
                 {% autoescape off %}
                     {{ thread.op.text.rendered|truncatewords_html:50 }}
                 {% endautoescape %}
 		{% if thread.op.is_referenced %}
 		    <div class="refmap">
 			{% trans "Replies" %}:
 			{% for ref_post in thread.op.get_sorted_referenced_posts %}
 			<a href="{% post_url ref_post.id %}">&gt;&gt;{{ ref_post.id }}</a
                     >{% if not forloop.last %},{% endif %}
 			{% endfor %}
 		    </div>
 		{% endif %}
             </div>
             <div class="metadata">
                 {{ thread.thread.get_images_count }} {% trans 'images' %}.
                 {% if thread.thread.tags %}
                     <span class="tags">
                         {% for tag in thread.thread.get_tags %}
                             <a class="tag" href="
                                     {% url 'tag' tag_name=tag.name %}">
                                 #{{ tag.name }}</a
                                     >{% if not forloop.last %},{% endif %}
                         {% endfor %}
                     </span>
                 {% endif %}
             </div>
             </div>
             {% if thread.last_replies.exists %}
                 {% if thread.skipped_replies %}
                     <div class="skipped_replies">
                         <a href="{% url 'thread' thread.op.id %}">
                         {% blocktrans with count=thread.skipped_replies %}Skipped {{ count }} replies. Open thread to see all replies.{% endblocktrans %}
                         </a>
                     </div>
                 {% endif %}
                 <div class="last-replies">
                     {% for post in thread.last_replies %}
                         {% if thread.bumpable %}
                             <div class="post" id="{{ post.id }}">
                         {% else %}
                             <div class="post dead_post" id="{{ post.id }}">
                         {% endif %}
                             {% if post.image %}
                                 <div class="image">
                                     <a class="thumb"
                                        href="{{ post.image.url }}"><img
                                             src=" {{ post.image.url_200x150 }}"
                                             alt="{{ post.id }}"
                                             data-width="{{ post.image_width }}"
                                             data-height="{{ post.image_height }}"/>
                                     </a>
                                 </div>
                             {% endif %}
                             <div class="message">
                                 <div class="post-info">
                                     <span class="title">{{ post.title }}</span>
                                     <a class="post_id" href="
                                 {% url 'thread' thread.op.id %}#{{ post.id }}">
                                         ({{ post.id }})</a>
                                     [{{ post.pub_time }}]
                                 </div>
                                 {% autoescape off %}
                                     {{ post.text.rendered|truncatewords_html:50 }}
                                 {% endautoescape %}
                         </div>
 			    {% if post.is_referenced %}
 				<div class="refmap">
 				    {% trans "Replies" %}:
 				    {% for ref_post in post.get_sorted_referenced_posts %}
 				    <a href="{% post_url ref_post.id %}">&gt;&gt;{{ ref_post.id }}</a
                             >{% if not forloop.last %},{% endif %}
 				    {% endfor %}
 				</div>
 			    {% endif %}
                         </div>
                     {% endfor %}
                 </div>
             {% endif %}
         </div>
         {% endcache %}
         {% endfor %}
 
         {% if next_page %}
             <div class="page_link">
                 <a href="
             {% if tag %}
                 {% url "tag" tag_name=tag page=next_page %}
             {% else %}
                 {% url "index" page=next_page %}
             {% endif %}
                 ">{% trans "Next page" %}</a>
             </div>
         {% endif %}
     {% else %}
         <div class="post">
             {% trans 'No threads exist. Create the first one!' %}</div>
-	{% endif %}
+    {% endif %}
 
-    <form enctype="multipart/form-data" method="post">{% csrf_token %}
     <div class="post-form-w">
-
-        <div class="form-title">{% trans "Create new thread" %}</div>
         <div class="post-form">
-            <div class="form-row">
-                <div class="form-label">{% trans 'Title' %}</div>
-                <div class="form-input">{{ form.title }}</div>
-                <div class="form-errors">{{ form.title.errors }}</div>
-            </div>
-            <div class="form-row">
-                <div class="form-label">{% trans 'Formatting' %}</div>
-                <div class="form-input" id="mark_panel">
-                    <span class="mark_btn" id="quote"><span class="quote">&gt;{% trans 'quote' %}</span></span>
-                    <span class="mark_btn" id="italic"><i>{% trans 'italic' %}</i></span>
-                    <span class="mark_btn" id="bold"><b>{% trans 'bold' %}</b></span>
-                    <span class="mark_btn" id="spoiler"><span class="spoiler">{% trans 'spoiler' %}</span></span>
-                    <span class="mark_btn" id="comment"><span class="comment">// {% trans 'comment' %}</span></span>
-                </div>
-            </div>
-            <div class="form-row">
-                <div class="form-label">{% trans 'Text' %}</div>
-                <div class="form-input">{{ form.text }}</div>
-                <div class="form-errors">{{ form.text.errors }}</div>
+            <div class="form-title">{% trans "Create new thread" %}</div>
+            <form enctype="multipart/form-data" method="post">{% csrf_token %}
+                {{ form.as_p }}
+                <div class="form-submit">
+                    <input type="submit" value="{% trans "Post" %}"/></div>
+                <div>
+            </form>
+                {% trans 'Tags must be delimited by spaces. Text or image is required.' %}
             </div>
-            <div class="form-row">
-                <div class="form-label">{% trans 'Image' %}</div>
-                <div class="form-input">{{ form.image }}</div>
-                <div class="form-errors">{{ form.image.errors }}</div>
-            </div>
-            <div class="form-row">
-                <div class="form-label">{% trans 'Tags' %}</div>
-                <div class="form-input">{{ form.tags }}</div>
-                <div class="form-errors">{{ form.tags.errors }}</div>
-            </div>
-            <div class="form-row form-email">
-                <div class="form-label">{% trans 'e-mail' %}</div>
-                <div class="form-input">{{ form.email }}</div>
-                <div class="form-errors">{{ form.email.errors }}</div>
-            </div>
-            <div class="form-row">
-                {{ form.captcha }}
-                <div class="form-errors">{{ form.captcha.errors }}</div>
-            </div>
-            <div class="form-row">
-                <div class="form-errors">{{ form.other.errors }}</div>
-            </div>
+            <div><a href="{% url "staticpage" name="help" %}">
+                {% trans 'Text syntax' %}</a></div>
         </div>
-        <div class="form-submit">
-            <input type="submit" value="{% trans "Post" %}"/></div>
-        <div>
-            {% trans 'Tags must be delimited by spaces. Text or image is required.' %}
-        </div>
-        <div><a href="{% url "staticpage" name="help" %}">
-            {% trans 'Text syntax' %}</a></div>
     </div>
-    </form>
 
 {% endblock %}
 
 {% block metapanel %}
 
     <span class="metapanel">
         <b><a href="{% url "authors" %}">Neboard</a> 1.4</b>
         {% trans "Pages:" %}
         {% for page in pages %}
             [<a href="
             {% if tag %}
                 {% url "tag" tag_name=tag page=page %}
             {% else %}
                 {% url "index" page=page %}
             {% endif %}
             ">{{ page }}</a>]
         {% endfor %}
         [<a href="rss/">RSS</a>]
     </span>
 
 {% endblock %}

boards/templates/boards/thread.html

@@ -1,163 +1,127 b''
 {% extends "boards/base.html" %}
 
 {% load i18n %}
 {% load cache %}
 {% load static from staticfiles %}
 {% load board %}
 
 {% block head %}
     <title>Neboard - {{ thread.get_replies.0.get_title }}</title>
 {% endblock %}
 
 {% block content %}
     {% spaceless %}
     {% get_current_language as LANGUAGE_CODE %}
 
     <script src="{% static 'js/thread_update.js' %}"></script>
     <script src="{% static 'js/thread.js' %}"></script>
 
     {% cache 600 thread_view thread.id thread.last_edit_time moderator LANGUAGE_CODE %}
         {% if bumpable %}
             <div class="bar-bg">
                 <div class="bar-value" style="width:{{ bumplimit_progress }}%" id="bumplimit_progress">
                 </div>
                 <div class="bar-text">
                     <span id="left_to_limit">{{ posts_left }}</span> {% trans 'posts to bumplimit' %}
                 </div>
             </div>
         {% endif %}
     <div class="thread">
     {% for post in thread.get_replies %}
         {% if bumpable %}
             <div class="post" id="{{ post.id }}">
         {% else %}
             <div class="post dead_post" id="{{ post.id }}">
         {% endif %}
         {% if post.image %}
             <div class="image">
                 <a
                         class="thumb"
                         href="{{ post.image.url }}"><img
                         src="{{ post.image.url_200x150 }}"
                         alt="{{ post.id }}"
                         data-width="{{ post.image_width }}"
                         data-height="{{ post.image_height }}"/>
                 </a>
             </div>
         {% endif %}
         <div class="message">
             <div class="post-info">
                 <span class="title">{{ post.title }}</span>
                 <a class="post_id" href="#{{ post.id }}">
                     ({{ post.id }})</a>
                 [{{ post.pub_time }}]
             [<a href="#" onclick="javascript:addQuickReply('{{ post.id }}')
                 ; return false;">&gt;&gt;</a>]
 
                 {% if moderator %}
                     <span class="moderator_info">
                         [<a href="{% url 'delete' post_id=post.id %}"
                             >{% trans 'Delete' %}</a>]
                         ({{ post.poster_ip }})
                         [<a href="{% url 'ban' post_id=post.id %}?next={{ request.path }}"
                             >{% trans 'Ban IP' %}</a>]
                     </span>
                 {% endif %}
             </div>
             {% autoescape off %}
             {{ post.text.rendered }}
             {% endautoescape %}
     {% if post.is_referenced %}
         <div class="refmap">
         {% trans "Replies" %}:
         {% for ref_post in post.get_sorted_referenced_posts %}
         <a href="{% post_url ref_post.id %}">&gt;&gt;{{ ref_post.id }}</a
                 >{% if not forloop.last %},{% endif %}
         {% endfor %}
         </div>
     {% endif %}
         </div>
         {% if forloop.first %}
             <div class="metadata">
                 <span class="tags">
                     {% for tag in thread.get_tags %}
                         <a class="tag" href="{% url 'tag' tag.name %}">
                             #{{ tag.name }}</a
                                 >{% if not forloop.last %},{% endif %}
                     {% endfor %}
                 </span>
             </div>
         {% endif %}
         </div>
     {% endfor %}
     </div>
     {% endcache %}
 
-    <form id="form" enctype="multipart/form-data" method="post"
-            >{% csrf_token %}
-        <div class="post-form-w">
-        <div class="form-title">{% trans "Reply to thread" %} #{{ thread.get_opening_post.id }}</div>
-            <div class="post-form">
-                <div class="form-row">
-                    <div class="form-label">{% trans 'Title' %}</div>
-                    <div class="form-input">{{ form.title }}</div>
-                    <div class="form-errors">{{ form.title.errors }}</div>
-                </div>
-                <div class="form-row">
-                    <div class="form-label">{% trans 'Formatting' %}</div>
-                    <div class="form-input" id="mark_panel">
-                        <span class="mark_btn" id="quote"><span class="quote">&gt;{% trans 'quote' %}</span></span>
-                        <span class="mark_btn" id="italic"><i>{% trans 'italic' %}</i></span>
-                        <span class="mark_btn" id="bold"><b>{% trans 'bold' %}</b></span>
-                        <span class="mark_btn" id="spoiler"><span class="spoiler">{% trans 'spoiler' %}</span></span>
-                        <span class="mark_btn" id="comment"><span class="comment">// {% trans 'comment' %}</span></span>
-                    </div>
-                </div>
-                <div class="form-row">
-                    <div class="form-label">{% trans 'Text' %}</div>
-                    <div class="form-input">{{ form.text }}</div>
-                    <div class="form-errors">{{ form.text.errors }}</div>
-                </div>
-                <div class="form-row">
-                    <div class="form-label">{% trans 'Image' %}</div>
-                    <div class="form-input">{{ form.image }}</div>
-                    <div class="form-errors">{{ form.image.errors }}</div>
-                </div>
-                <div class="form-row form-email">
-                    <div class="form-label">{% trans 'e-mail' %}</div>
-                    <div class="form-input">{{ form.email }}</div>
-                    <div class="form-errors">{{ form.email.errors }}</div>
-                </div>
-                <div class="form-row">
-                    {{ form.captcha }}
-                    <div class="form-errors">{{ form.captcha.errors }}</div>
-                </div>
-                <div class="form-row">
-                    <div class="form-errors">{{ form.other.errors }}</div>
-                </div>
+    <div class="post-form-w">
+    <div class="form-title">{% trans "Reply to thread" %} #{{ thread.get_opening_post.id }}</div>
+        <div class="post-form">
+        <form id="form" enctype="multipart/form-data" method="post"
+                     >{% csrf_token %}
+            {{ form.as_p }}
+            <div class="form-submit">
+                <input type="submit" value="{% trans "Post" %}"/>
             </div>
-
-            <div class="form-submit"><input type="submit"
-                                            value="{% trans "Post" %}"/></div>
-            <div><a href="{% url "staticpage" name="help" %}">
-                {% trans 'Text syntax' %}</a></div>
+        </form>
+        <div><a href="{% url "staticpage" name="help" %}">
+            {% trans 'Text syntax' %}</a></div>
         </div>
-    </form>
+    </div>
 
     {% endspaceless %}
 {% endblock %}
 
 {% block metapanel %}
 
     {% get_current_language as LANGUAGE_CODE %}
 
     <span class="metapanel" data-last-update="{{ last_update }}">
         {% cache 600 thread_meta thread.last_edit_time moderator LANGUAGE_CODE %}
             <span id="reply-count">{{ thread.get_reply_count }}</span> {% trans 'replies' %},
             <span id="image-count">{{ thread.get_images_count }}</span> {% trans 'images' %}.
             {% trans 'Last update: ' %}{{ thread.last_edit_time }}
             [<a href="rss/">RSS</a>]
         {% endcache %}
     </span>
 
 {% endblock %}