Added ability to disable moderator panel. Refactored forms code. Translating forms.

boards/forms.py

@@ -2,9 +2,8 b' import re'
 from captcha.fields import CaptchaField
 from django import forms
 from django.forms.util import ErrorList
-from django.utils import timezone
+from django.utils.translation import ugettext_lazy as _
 import time
-import math
 from boards.models import TITLE_MAX_LENGTH, User
 from neboard import settings
 from boards import utils
@@ -20,7 +19,27 b' class PlainErrorList(ErrorList):'
         return ''.join([u'(!) %s ' % e for e in self])
 
 
-class PostForm(forms.Form):
+class NeboardForm(forms.Form):
+
+    def as_p(self):
+        "Returns this form rendered as HTML <p>s."
+        return self._html_output(
+            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>',
+            row_ender='</p>',
+            help_text_html=' <span class="helptext">%s</span>',
+            errors_on_separate_row=True)
+
+
+class PostForm(NeboardForm):
 
     MAX_TEXT_LENGTH = 30000
     MAX_IMAGE_SIZE = 8 * 1024 * 1024
@@ -74,7 +93,7 b' class PostForm(forms.Form):'
         image = self.cleaned_data.get('image')
 
         if (not text) and (not image):
-            error_message = 'Either text or image must be entered.'
+            error_message = _('Either text or image must be entered.')
             self._errors['text'] = self.error_class([error_message])
 
     def _validate_posting_speed(self):
@@ -108,7 +127,7 b' class ThreadForm(PostForm):'
         if tags:
             if not self.regex_tags.match(tags):
                 raise forms.ValidationError(
-                    'Inappropriate characters in tags.')
+                    _('Inappropriate characters in tags.'))
 
         return tags
 
@@ -136,7 +155,7 b' class PostCaptchaForm(PostForm):'
         if success:
             return cleaned_data
         else:
-            raise forms.ValidationError("captcha validation failed")
+            raise forms.ValidationError(_("Captcha validation failed"))
 
 
 class ThreadCaptchaForm(ThreadForm):
@@ -157,14 +176,22 b' class ThreadCaptchaForm(ThreadForm):'
         if success:
             return cleaned_data
         else:
-            raise forms.ValidationError("captcha validation failed")
+            raise forms.ValidationError(_("Captcha validation failed"))
 
 
-class SettingsForm(forms.Form):
-    theme = forms.ChoiceField(choices=settings.THEMES, widget=forms.RadioSelect)
+class SettingsForm(NeboardForm):
+
+    theme = forms.ChoiceField(choices=settings.THEMES,
+                              label=_('Theme'))
 
 
-class LoginForm(forms.Form):
+class ModeratorSettingsForm(SettingsForm):
+
+    moderate = forms.BooleanField(required=False, label=_('Enable moderation '
+                                                          'panel'))
+
+
+class LoginForm(NeboardForm):
     user_id = forms.CharField()
 
     def clean_user_id(self):
@@ -172,7 +199,7 b' class LoginForm(forms.Form):'
         if user_id:
             users = User.objects.filter(user_id=user_id)
             if len(users) == 0:
-                raise forms.ValidationError('No such user found')
+                raise forms.ValidationError(_('No such user found'))
 
         return user_id
 

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-09-16 20:18+0300\n"
+"POT-Creation-Date: 2013-09-17 21:58+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"
@@ -18,6 +18,31 b' msgstr ""'
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
+#: forms.py:96
+msgid "Either text or image must be entered."
+msgstr "Текст или картинка должны быть введены."
+
+#: forms.py:130
+msgid "Inappropriate characters in tags."
+msgstr "Недопустимые символы в тегах."
+
+#: forms.py:158 forms.py:179
+msgid "Captcha validation failed"
+msgstr "Проверка капчи провалена"
+
+#: forms.py:185
+msgid "Theme"
+msgstr "Тема"
+
+#: forms.py:190
+msgid "Enable moderation panel"
+msgstr "Включить панель модерации"
+
+#: forms.py:202
+#, fuzzy
+msgid "No such user found"
+msgstr "Теги не найдены."
+
 #: templates/boards/404.html:6
 msgid "Not found"
 msgstr "Не найдено"
@@ -168,11 +193,7 b' msgstr "\xd0\x9f\xd0\xb5\xd1\x80\xd0\xb2\xd1\x8b\xd0\xb9 \xd0\xb4\xd0\xbe\xd1\x81\xd1\x82\xd1\x83\xd0\xbf:"'
 msgid "Last access:"
 msgstr "Последний доступ: "
 
-#: templates/boards/settings.html:27
-msgid "Theme"
-msgstr "Тема"
-
-#: templates/boards/settings.html:43
+#: templates/boards/settings.html:30
 msgid "Save"
 msgstr "Сохранить"
 

boards/models.py

@@ -28,7 +28,9 b" FILE_EXTENSION_DELIMITER = '.'"
 
 RANK_ADMIN = 0
 RANK_MODERATOR = 10
-RANK_USER = 100
+RANK_USER = 100   \
+
+SETTING_MODERATE = "moderate"
 
 
 class PostManager(models.Manager):
@@ -279,7 +281,7 b' class User(models.Model):'
 
     def save_setting(self, name, value):
         setting, created = Setting.objects.get_or_create(name=name, user=self)
-        setting.value = value
+        setting.value = str(value)
         setting.save()
 
         return setting

boards/templates/boards/settings.html

@@ -24,22 +24,9 b''
 
     <div class="post-form-w">
     <div class="post-form">
-        <span class="form-title">{% trans "Theme" %}</span>
         <form method="post">{% csrf_token %}
-            {% for choice in form.fields.theme.choices %}
-                <div class="settings_item">
-                    <label for="{{ choice.0 }}">
-                    <input type="radio" name="theme"
-                           id="{{ choice.0 }}"
-                           value="{{ choice.0 }}"
-                           {% ifequal form.initial.theme choice.0 %}
-                            checked
-                           {% endifequal %}
-                            />
-                        {{ choice.1 }}
-                    </label>
-                </div>
-            {% endfor %}
+            {{ form.as_p }}
+        <hr />
         <input type="submit" value="{% trans "Save" %}" />
         </form>
     </div>

boards/views.py

@@ -10,9 +10,9 b' from boards import forms'
 import boards
 from boards import utils
 from boards.forms import ThreadForm, PostForm, SettingsForm, PlainErrorList, \
-    ThreadCaptchaForm, PostCaptchaForm, LoginForm
+    ThreadCaptchaForm, PostCaptchaForm, LoginForm, ModeratorSettingsForm
 
-from boards.models import Post, Tag, Ban, User, RANK_USER
+from boards.models import Post, Tag, Ban, User, RANK_USER, SETTING_MODERATE
 from boards import authors
 import neboard
 
@@ -183,22 +183,40 b' def settings(request):'
     """User's settings"""
 
     context = _init_default_context(request)
+    user = _get_user(request)
+    is_moderator = user.is_moderator()
 
     if request.method == 'POST':
-        form = SettingsForm(request.POST)
+        if is_moderator:
+            form = ModeratorSettingsForm(request.POST,
+                                          error_class=PlainErrorList)
+        else:
+            form = SettingsForm(request.POST, error_class=PlainErrorList)
+
         if form.is_valid():
             selected_theme = form.cleaned_data['theme']
 
-            user = _get_user(request)
             user.save_setting('theme', selected_theme)
 
-        return redirect(settings)
+            if is_moderator:
+                moderate = form.cleaned_data['moderate']
+                user.save_setting(SETTING_MODERATE, moderate)
+
+            return redirect(settings)
     else:
         selected_theme = _get_theme(request)
-        form = SettingsForm(initial={'theme': selected_theme})
-        context['form'] = form
 
-        return render(request, 'boards/settings.html', context)
+        if is_moderator:
+            form = ModeratorSettingsForm(initial={'theme': selected_theme,
+                                         'moderate': context['moderator']},
+                                error_class=PlainErrorList)
+        else:
+            form = SettingsForm(initial={'theme': selected_theme},
+                                error_class=PlainErrorList)
+
+    context['form'] = form
+
+    return render(request, 'boards/settings.html', context)
 
 
 def all_tags(request):
@@ -319,7 +337,12 b' def _init_default_context(request):'
     context['user'] = user
     context['tags'] = user.get_sorted_fav_tags()
     context['theme'] = _get_theme(request, user)
-    context['moderator'] = user.is_moderator()
+
+    moderate = user.get_setting(SETTING_MODERATE)
+    if moderate == 'True':
+        context['moderator'] = user.is_moderator()
+    else:
+        context['moderator'] = False
 
     return context