Added login and logout for moderators

boards/views/login.py

@@ -0,0 +1,33 b''
+from django.shortcuts import render, redirect
+
+from boards.abstracts.settingsmanager import SettingsManager, \
+    PERMISSION_MODERATE
+from boards.forms import LoginForm, PlainErrorList
+from boards.views.base import BaseBoardView, CONTEXT_FORM
+
+
+__author__ = 'neko259'
+
+
+class LoginView(BaseBoardView):
+
+    def get(self, request, form=None):
+        context = self.get_context_data(request=request)
+
+        if not form:
+            form = LoginForm()
+        context[CONTEXT_FORM] = form
+
+        return render(request, 'boards/login.html', context)
+
+    def post(self, request):
+        form = LoginForm(request.POST, request.FILES,
+                         error_class=PlainErrorList)
+        form.session = request.session
+
+        if form.is_valid():
+            settings_manager = SettingsManager(request.session)
+            settings_manager.add_permission(PERMISSION_MODERATE)
+            return redirect('index')
+        else:
+            return self.get(request, form)

boards/views/logout.py

@@ -0,0 +1,24 b''
+from django.shortcuts import render
+
+from boards.abstracts.settingsmanager import SettingsManager, \
+    PERMISSION_MODERATE
+from boards.forms import LoginForm
+from boards.views.base import BaseBoardView, CONTEXT_FORM
+
+
+__author__ = 'neko259'
+
+
+class LogoutView(BaseBoardView):
+
+    def get(self, request, form=None):
+        settings_manager = SettingsManager(request.session)
+        settings_manager.del_permission(PERMISSION_MODERATE)
+
+        context = self.get_context_data(request=request)
+
+        if not form:
+            form = LoginForm()
+        context[CONTEXT_FORM] = form
+
+        return render(request, 'boards/login.html', context)
  No newline at end of file

boards/abstracts/settingsmanager.py

@@ -1,106 +1,114 b''
 from django.shortcuts import get_object_or_404
 from boards.models import Tag
 
 __author__ = 'neko259'
 
 SESSION_SETTING = 'setting'
 
 PERMISSION_MODERATE = 'moderator'
 
 SETTING_THEME = 'theme'
 SETTING_FAVORITE_TAGS = 'favorite_tags'
 SETTING_HIDDEN_TAGS = 'hidden_tags'
 SETTING_PERMISSIONS = 'permissions'
 
 DEFAULT_THEME = 'md'
 
 
 class SettingsManager:
 
     def __init__(self, session):
         self.session = session
 
     def get_theme(self):
         theme = self.get_setting(SETTING_THEME)
         if not theme:
             theme = DEFAULT_THEME
             self.set_setting(SETTING_THEME, theme)
 
         return theme
 
     def set_theme(self, theme):
         self.set_setting(SETTING_THEME, theme)
 
     def has_permission(self, permission):
         permissions = self.get_setting(SETTING_PERMISSIONS)
         if permissions:
             return permission in permissions
         else:
             return False
 
     def get_setting(self, setting):
         if setting in self.session:
             return self.session[setting]
         else:
             return None
 
     def set_setting(self, setting, value):
         self.session[setting] = value
 
     def add_permission(self, permission):
         permissions = self.get_setting(SETTING_PERMISSIONS)
         if not permissions:
             permissions = [permission]
         else:
-            permissions += permission
+            permissions.append(permission)
+        self.set_setting(SETTING_PERMISSIONS, permissions)
+
+    def del_permission(self, permission):
+        permissions = self.get_setting(SETTING_PERMISSIONS)
+        if not permissions:
+            permissions = []
+        else:
+            permissions.remove(permission)
         self.set_setting(SETTING_PERMISSIONS, permissions)
 
     def get_fav_tags(self):
         tag_names = self.get_setting(SETTING_FAVORITE_TAGS)
         tags = []
         if tag_names:
             for tag_name in tag_names:
                 tag = get_object_or_404(Tag, name=tag_name)
                 tags.append(tag)
 
         return tags
 
     def add_fav_tag(self, tag):
         tags = self.get_setting(SETTING_FAVORITE_TAGS)
         if not tags:
             tags = [tag.name]
         else:
             if not tag.name in tags:
                 tags.append(tag.name)
         self.set_setting(SETTING_FAVORITE_TAGS, tags)
 
     def del_fav_tag(self, tag):
         tags = self.get_setting(SETTING_FAVORITE_TAGS)
         if tag.name in tags:
             tags.remove(tag.name)
             self.set_setting(SETTING_FAVORITE_TAGS, tags)
 
     def get_hidden_tags(self):
         tag_names = self.get_setting(SETTING_HIDDEN_TAGS)
         tags = []
         if tag_names:
             for tag_name in tag_names:
                 tag = get_object_or_404(Tag, name=tag_name)
                 tags.append(tag)
 
         return tags
 
     def add_hidden_tag(self, tag):
         tags = self.get_setting(SETTING_HIDDEN_TAGS)
         if not tags:
             tags = [tag.name]
         else:
             if not tag.name in tags:
                 tags.append(tag.name)
         self.set_setting(SETTING_HIDDEN_TAGS, tags)
 
     def del_hidden_tag(self, tag):
         tags = self.get_setting(SETTING_HIDDEN_TAGS)
         if tag.name in tags:
             tags.remove(tag.name)
             self.set_setting(SETTING_HIDDEN_TAGS, tags)

boards/forms.py

@@ -1,308 +1,342 b''
 import re
 import time
 import hashlib
 
 from captcha.fields import CaptchaField
 from django import forms
 from django.forms.util import ErrorList
 from django.utils.translation import ugettext_lazy as _
 
 from boards.mdx_neboard import formatters
 from boards.models.post import TITLE_MAX_LENGTH
 from boards.models import PostImage
 from neboard import settings
 from boards import utils
 import boards.settings as board_settings
 
 VETERAN_POSTING_DELAY = 5
 
 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.''')
 TAGS_PLACEHOLDER = _('tag1 several_words_tag')
 
 ERROR_IMAGE_DUPLICATE = _('Such image was already posted')
 
 LABEL_TITLE = _('Title')
 LABEL_TEXT = _('Text')
 LABEL_TAG = _('Tag')
 LABEL_SEARCH = _('Search')
 
 TAG_MAX_LENGTH = 20
 
 REGEX_TAG = ur'^[\w\d]+$'
 
 
 class FormatPanel(forms.Textarea):
     def render(self, name, value, attrs=None):
         output = '<div id="mark-panel">'
         for formatter in formatters:
             output += u'<span class="mark_btn"' + \
                       u' onClick="addMarkToMsg(\'' + formatter.format_left + \
                       '\', \'' + formatter.format_right + '\')">' + \
                       formatter.preview_left + formatter.name + \
                       formatter.preview_right + u'</span>'
 
         output += '</div>'
         output += super(FormatPanel, self).render(name, value, attrs=None)
 
         return output
 
 
 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_div(self):
         """
         Returns this form rendered as HTML <as_div>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>'
                        '<div class="form-row"><div class="form-input">'
                        '%(field)s'
                        '</div></div>'
                        '<div class="form-row">'
                        '%(help_text)s'
                        '</div>',
             error_row='<div class="form-row">'
                       '<div class="form-label"></div>'
                       '<div class="form-errors">%s</div>'
                       '</div>',
             row_ender='</div>',
             help_text_html='%s',
             errors_on_separate_row=True)
 
     def as_json_errors(self):
         errors = []
 
         for name, field in self.fields.items():
             if self[name].errors:
                 errors.append({
                     'field': name,
                     'errors': self[name].errors.as_text(),
                 })
 
         return errors
 
 
 class PostForm(NeboardForm):
 
     title = forms.CharField(max_length=TITLE_MAX_LENGTH, required=False,
                             label=LABEL_TITLE)
     text = forms.CharField(
         widget=FormatPanel(attrs={ATTRIBUTE_PLACEHOLDER: TEXT_PLACEHOLDER}),
         required=False, label=LABEL_TEXT)
     image = forms.ImageField(required=False, label=_('Image'),
                              widget=forms.ClearableFileInput(
                                  attrs={'accept': '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'].strip()
         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))
 
             md5 = hashlib.md5()
             for chunk in image.chunks():
                 md5.update(chunk)
             image_hash = md5.hexdigest()
             if PostImage.objects.filter(hash=image_hash).exists():
                 raise forms.ValidationError(ERROR_IMAGE_DUPLICATE)
 
         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
 
         # 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 \
                 self.session:
             now = time.time()
             last_post_time = self.session[LAST_POST_TIME]
 
             current_delay = int(now - last_post_time)
 
             if current_delay < posting_delay:
                 error_message = _('Wait %s seconds after last posting') % str(
                     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(
         widget=forms.TextInput(attrs={ATTRIBUTE_PLACEHOLDER: TAGS_PLACEHOLDER}),
         max_length=100, label=_('Tags'), required=True)
 
     def clean_tags(self):
         tags = self.cleaned_data['tags'].strip()
 
         if not tags or 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 AddTagForm(NeboardForm):
 
     tag = forms.CharField(max_length=TAG_MAX_LENGTH, label=LABEL_TAG)
     method = forms.CharField(widget=forms.HiddenInput(), initial='add_tag')
 
     def clean_tag(self):
         tag = self.cleaned_data['tag']
 
         regex_tag = re.compile(REGEX_TAG, re.UNICODE)
         if not regex_tag.match(tag):
             raise forms.ValidationError(_('Inappropriate characters in tags.'))
 
         return tag
 
     def clean(self):
         cleaned_data = super(AddTagForm, self).clean()
 
         return cleaned_data
 
 
 class SearchForm(NeboardForm):
-    query = forms.CharField(max_length=500, label=LABEL_SEARCH, required=False)
  No newline at end of file
+    query = forms.CharField(max_length=500, label=LABEL_SEARCH, required=False)
+
+
+class LoginForm(NeboardForm):
+
+    password = forms.CharField()
+
+    session = None
+
+    def clean_password(self):
+        password = self.cleaned_data['password']
+        if board_settings.MASTER_PASSWORD != password:
+            raise forms.ValidationError(_('Invalid master password'))
+
+        return password
+
+    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['password'] = self.error_class([error_message])
+
+                can_post = False
+
+        if can_post:
+            self.session[LAST_LOGIN_TIME] = time.time()
+
+    def clean(self):
+        self._validate_login_speed()
+
+        cleaned_data = super(LoginForm, self).clean()
+
+        return cleaned_data

boards/locale/ru/LC_MESSAGES/django.po

@@ -1,392 +1,368 b''
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-29 13:46+0300\n"
+"POT-Creation-Date: 2014-07-05 18:10+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"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "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"
 
-#: authors.py:5
+#: authors.py:9
 msgid "author"
 msgstr "автор"
 
-#: authors.py:6
+#: authors.py:10
 msgid "developer"
 msgstr "разработчик"
 
-#: authors.py:7
+#: authors.py:11
 msgid "javascript developer"
 msgstr "разработчик javascript"
 
-#: authors.py:8
+#: authors.py:12
 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 "
 "переноса строки обязательны для создания нового абзаца."
 
 #: forms.py:25
 msgid "tag1 several_words_tag"
 msgstr "тег1 тег_из_нескольких_слов"
 
 #: forms.py:27
 msgid "Such image was already posted"
 msgstr "Такое изображение уже было загружено"
 
 #: forms.py:29
 msgid "Title"
 msgstr "Заголовок"
 
 #: forms.py:30
 msgid "Text"
 msgstr "Текст"
 
 #: forms.py:31
 msgid "Tag"
 msgstr "Тег"
 
-#: forms.py:32 templates/boards/base.html:50 templates/search/search.html:9
+#: forms.py:32 templates/boards/base.html:54 templates/search/search.html:9
 #: templates/search/search.html.py:13
 msgid "Search"
 msgstr "Поиск"
 
 #: forms.py:109
 msgid "Image"
 msgstr "Изображение"
 
-#: forms.py:113
+#: forms.py:114
 msgid "e-mail"
 msgstr ""
 
-#: forms.py:124
+#: forms.py:125
 #, python-format
 msgid "Title must have less than %s characters"
 msgstr "Заголовок должен иметь меньше %s символов"
 
-#: forms.py:133
+#: forms.py:134
 #, python-format
 msgid "Text must have less than %s characters"
 msgstr "Текст должен быть короче %s символов"
 
-#: forms.py:144
+#: forms.py:145
 #, python-format
 msgid "Image must be less than %s bytes"
 msgstr "Изображение должно быть менее %s байт"
 
-#: forms.py:179
+#: forms.py:180
 msgid "Either text or image must be entered."
 msgstr "Текст или картинка должны быть введены."
 
-#: forms.py:202
+#: forms.py:200
 #, python-format
 msgid "Wait %s seconds after last posting"
 msgstr "Подождите %s секунд после последнего постинга"
 
-#: forms.py:218 templates/boards/tags.html:7 templates/boards/rss/post.html:10
+#: forms.py:216 templates/boards/tags.html:7 templates/boards/rss/post.html:10
 msgid "Tags"
 msgstr "Теги"
 
-#: forms.py:225 forms.py:344
+#: forms.py:223 forms.py:291
 msgid "Inappropriate characters in tags."
 msgstr "Недопустимые символы в тегах."
 
-#: forms.py:253 forms.py:274
+#: forms.py:251 forms.py:272
 msgid "Captcha validation failed"
 msgstr "Проверка капчи провалена"
 
-#: forms.py:280
+#: forms.py:278
 msgid "Theme"
 msgstr "Тема"
 
-#: forms.py:285
-msgid "Enable moderation panel"
-msgstr "Включить панель модерации"
+#: forms.py:314
+msgid "Invalid master password"
+msgstr "Неверный мастер-пароль"
 
-#: forms.py:300
-msgid "No such user found"
-msgstr "Данный пользователь не найден"
-
-#: forms.py:314
+#: forms.py:328
 #, python-format
 msgid "Wait %s minutes after last login"
 msgstr "Подождите %s минут после последнего входа"
 
 #: templates/boards/404.html:6
 msgid "Not found"
 msgstr "Не найдено"
 
 #: templates/boards/404.html:12
 msgid "This page does not exist"
 msgstr "Этой страницы не существует"
 
 #: templates/boards/authors.html:6 templates/boards/authors.html.py:12
 msgid "Authors"
 msgstr "Авторы"
 
 #: templates/boards/authors.html:26
 msgid "Distributed under the"
 msgstr "Распространяется под"
 
 #: templates/boards/authors.html:28
 msgid "license"
 msgstr "лицензией"
 
 #: templates/boards/authors.html:30
 msgid "Repository"
 msgstr "Репозиторий"
 
 #: templates/boards/base.html:12
 msgid "Feed"
 msgstr "Лента"
 
 #: templates/boards/base.html:29
 msgid "All threads"
 msgstr "Все темы"
 
 #: templates/boards/base.html:34
 msgid "Tag management"
 msgstr "Управление тегами"
 
 #: templates/boards/base.html:36 templates/boards/settings.html:7
 msgid "Settings"
 msgstr "Настройки"
 
-#: templates/boards/base.html:49 templates/boards/login.html:6
+#: templates/boards/base.html:50
+msgid "Logout"
+msgstr "Выход"
+
+#: templates/boards/base.html:52 templates/boards/login.html:6
 #: templates/boards/login.html.py:16
 msgid "Login"
 msgstr "Вход"
 
-#: templates/boards/base.html:52
+#: templates/boards/base.html:56
 #, python-format
 msgid "Speed: %(ppd)s posts per day"
 msgstr "Скорость: %(ppd)s сообщений в день"
 
-#: templates/boards/base.html:54
+#: templates/boards/base.html:58
 msgid "Up"
 msgstr "Вверх"
 
 #: templates/boards/login.html:19
 msgid "Insert your user id above"
 msgstr "Вставьте свой ID пользователя выше"
 
 #: templates/boards/post.html:21 templates/boards/staticpages/help.html:19
 msgid "Quote"
 msgstr "Цитата"
 
 #: templates/boards/post.html:31
 msgid "Open"
 msgstr "Открыть"
 
 #: templates/boards/post.html:33
 msgid "Reply"
 msgstr "Ответ"
 
 #: templates/boards/post.html:40
 msgid "Edit"
 msgstr "Изменить"
 
 #: templates/boards/post.html:42
 msgid "Delete"
 msgstr "Удалить"
 
 #: templates/boards/post.html:45
 msgid "Ban IP"
 msgstr "Заблокировать IP"
 
 #: templates/boards/post.html:76
 msgid "Replies"
 msgstr "Ответы"
 
 #: templates/boards/post.html:86 templates/boards/thread.html:88
 #: templates/boards/thread_gallery.html:61
 msgid "replies"
 msgstr "ответов"
 
 #: templates/boards/post.html:87 templates/boards/thread.html:89
 #: templates/boards/thread_gallery.html:62
 msgid "images"
 msgstr "изображений"
 
 #: templates/boards/post_admin.html:19
 msgid "Tags:"
 msgstr "Теги:"
 
 #: templates/boards/post_admin.html:30
 msgid "Add tag"
 msgstr "Добавить тег"
 
 #: templates/boards/posting_general.html:56
 msgid "Show tag"
 msgstr "Показывать тег"
 
 #: templates/boards/posting_general.html:60
 msgid "Hide tag"
 msgstr "Скрывать тег"
 
 #: templates/boards/posting_general.html:79 templates/search/search.html:22
 msgid "Previous page"
 msgstr "Предыдущая страница"
 
 #: templates/boards/posting_general.html:94
 #, python-format
 msgid "Skipped %(count)s replies. Open thread to see all replies."
 msgstr "Пропущено %(count)s ответов. Откройте тред, чтобы увидеть все ответы."
 
-#: templates/boards/posting_general.html:121 templates/search/search.html:35
+#: templates/boards/posting_general.html:121 templates/search/search.html:33
 msgid "Next page"
 msgstr "Следующая страница"
 
 #: templates/boards/posting_general.html:126
 msgid "No threads exist. Create the first one!"
 msgstr "Нет тем. Создайте первую!"
 
 #: templates/boards/posting_general.html:132
 msgid "Create new thread"
 msgstr "Создать новую тему"
 
 #: templates/boards/posting_general.html:137 templates/boards/thread.html:58
 msgid "Post"
 msgstr "Отправить"
 
 #: templates/boards/posting_general.html:142
 msgid "Tags must be delimited by spaces. Text or image is required."
 msgstr ""
 "Теги должны быть разделены пробелами. Текст или изображение обязательны."
 
 #: templates/boards/posting_general.html:145 templates/boards/thread.html:66
 msgid "Text syntax"
 msgstr "Синтаксис текста"
 
 #: templates/boards/posting_general.html:157
 msgid "Pages:"
 msgstr "Страницы: "
 
-#: templates/boards/settings.html:14
-msgid "User:"
-msgstr "Пользователь:"
-
-#: templates/boards/settings.html:16
+#: templates/boards/settings.html:15
 msgid "You are moderator."
 msgstr "Вы модератор."
 
-#: templates/boards/settings.html:19
-msgid "You are veteran."
-msgstr "Вы ветеран."
-
-#: templates/boards/settings.html:22
-msgid "Posts:"
-msgstr "Сообщений:"
-
-#: templates/boards/settings.html:23
-msgid "First access:"
-msgstr "Первый доступ:"
-
-#: templates/boards/settings.html:25
-msgid "Last access:"
-msgstr "Последний доступ: "
-
-#: templates/boards/settings.html:29
+#: templates/boards/settings.html:20
 msgid "Hidden tags:"
 msgstr "Скрытые теги:"
 
-#: templates/boards/settings.html:44
+#: templates/boards/settings.html:35
 msgid "Save"
 msgstr "Сохранить"
 
 #: templates/boards/tags.html:22
 msgid "No tags found."
 msgstr "Теги не найдены."
 
 #: templates/boards/thread.html:20 templates/boards/thread_gallery.html:21
 msgid "Normal mode"
 msgstr "Нормальный режим"
 
 #: templates/boards/thread.html:21 templates/boards/thread_gallery.html:22
 msgid "Gallery mode"
 msgstr "Режим галереи"
 
 #: templates/boards/thread.html:29
 msgid "posts to bumplimit"
 msgstr "сообщений до бамплимита"
 
 #: templates/boards/thread.html:50
 msgid "Reply to thread"
 msgstr "Ответить в тему"
 
 #: templates/boards/thread.html:63
 msgid "Switch mode"
 msgstr "Переключить режим"
 
 #: templates/boards/thread.html:90 templates/boards/thread_gallery.html:63
 msgid "Last update: "
 msgstr "Последнее обновление: "
 
 #: templates/boards/rss/post.html:5
 msgid "Post image"
 msgstr "Изображение сообщения"
 
 #: templates/boards/staticpages/banned.html:6
 msgid "Banned"
 msgstr "Заблокирован"
 
 #: templates/boards/staticpages/banned.html:11
 msgid "Your IP address has been banned. Contact the administrator"
 msgstr "Ваш IP адрес был заблокирован. Свяжитесь с администратором"
 
 #: templates/boards/staticpages/help.html:6
 #: templates/boards/staticpages/help.html:10
 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
 msgid "Bold text"
 msgstr "Полужирный текст"
 
 #: templates/boards/staticpages/help.html:14
 msgid "Spoiler"
 msgstr "Спойлер"
 
 #: templates/boards/staticpages/help.html:15
 msgid "Link to a post"
 msgstr "Ссылка на сообщение"
 
 #: templates/boards/staticpages/help.html:16
 msgid "Strikethrough text"
 msgstr "Зачеркнутый текст"
 
 #: templates/boards/staticpages/help.html:17
 msgid "You need to new line before:"
 msgstr "Перед этими тегами нужна новая строка:"
 
 #: templates/boards/staticpages/help.html:18
 msgid "Comment"
-msgstr "Комментарий"
-
-#: templates/search/search.html:30
-msgid "No results found."
-msgstr "Результаты не найдены."
+msgstr "Комментарий"
  No newline at end of file

boards/settings.py

@@ -1,20 +1,23 b''
 VERSION = '1.8.1 Kara'
 SITE_NAME = 'Neboard'
 
 CACHE_TIMEOUT = 600  # Timeout for caching, if cache is used
 LOGIN_TIMEOUT = 3600  # Timeout between login tries
 MAX_TEXT_LENGTH = 30000  # Max post length in characters
 MAX_IMAGE_SIZE = 8 * 1024 * 1024  # Max image size
 
 # Thread bumplimit
 MAX_POSTS_PER_THREAD = 10
 # Old posts will be archived or deleted if this value is reached
 MAX_THREAD_COUNT = 5
 THREADS_PER_PAGE = 3
 DEFAULT_THEME = 'md'
 LAST_REPLIES_COUNT = 3
 
 # Enable archiving threads instead of deletion when the thread limit is reached
 ARCHIVE_THREADS = True
 # Limit posting speed
-LIMIT_POSTING_SPEED = False
  No newline at end of file
+LIMIT_POSTING_SPEED = False
+
+# This password is used to add admin permissions to the user
+MASTER_PASSWORD = u'password'
  No newline at end of file

boards/templates/boards/base.html

@@ -1,61 +1,66 b''
 {% load staticfiles %}
 {% load i18n %}
 {% load l10n %}
 {% load static from staticfiles %}
 
 <!DOCTYPE html>
 <html>
 <head>
     <link rel="stylesheet" type="text/css" href="{% static 'css/base.css' %}" media="all"/>
     <link rel="stylesheet" type="text/css" href="{% static 'css/3party/highlight.css' %}" media="all"/>
     <link rel="stylesheet" type="text/css" href="{% static theme_css %}" media="all"/>
     <link rel="alternate" type="application/rss+xml" href="rss/" title="{% trans 'Feed' %}"/>
 
     <link rel="icon" type="image/png"
         href="{% static 'favicon.png' %}">
 
     <meta name="viewport" content="width=device-width, initial-scale=1"/>
     <meta charset="utf-8"/>
 
     {% block head %}{% endblock %}
 </head>
 <body>
 <script src="{% static 'js/jquery-2.0.1.min.js' %}"></script>
 <script src="{% static 'js/jquery-ui-1.10.3.custom.min.js' %}"></script>
 <script src="{% static 'js/jquery.mousewheel.js' %}"></script>
 <script src="{% url 'js_info_dict' %}"></script>
 
 <div class="navigation_panel">
     <a class="link" href="{% url 'index' %}">{% trans "All threads" %}</a>
     {% for tag in tags %}
         <a class="tag" href="{% url 'tag' tag_name=tag.name %}"
                 >#{{ tag.name }}</a>,
     {% endfor %}
     <a href="{% url 'tags' %}" title="{% trans 'Tag management' %}"
             >[...]</a>
     <a class="link" href="{% url 'settings' %}">{% trans 'Settings' %}</a>
 </div>
 
 {% block content %}{% endblock %}
 
 <script src="{% static 'js/popup.js' %}"></script>
 <script src="{% static 'js/image.js' %}"></script>
 <script src="{% static 'js/3party/highlight.min.js' %}"></script>
 <script src="{% static 'js/refpopup.js' %}"></script>
 <script src="{% static 'js/main.js' %}"></script>
 
 <div class="navigation_panel">
     {% block metapanel %}{% endblock %}
+    {% if moderator %}
+        [<a href="{% url "logout" %}">{% trans 'Logout' %}</a>]
+    {% else %}
+        [<a href="{% url "login" %}">{% trans 'Login' %}</a>]
+    {% endif %}
     [<a href="{% url "search" %}">{% trans 'Search' %}</a>]
     {% with ppd=posts_per_day|floatformat:2 %}
         {% blocktrans %}Speed: {{ ppd }} posts per day{% endblocktrans %}
     {% endwith %}
     <a class="link" href="#top">{% trans 'Up' %}</a>
 </div>
 
 <div class="footer">
     <!-- Put your banners here -->
 </div>
 
 </body>
 </html>

boards/urls.py

@@ -1,80 +1,84 b''
 from django.conf.urls import patterns, url, include
 from boards import views
 from boards.rss import AllThreadsFeed, TagThreadsFeed, ThreadPostsFeed
 from boards.views import api, tag_threads, all_threads, \
-        settings, all_tags
+    login, settings, all_tags, logout
 from boards.views.authors import AuthorsView
 from boards.views.delete_post import DeletePostView
 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
 
 js_info_dict = {
     'packages': ('boards',),
 }
 
 urlpatterns = patterns('',
 
     # /boards/
     url(r'^$', all_threads.AllThreadsView.as_view(), name='index'),
     # /boards/page/
     url(r'^page/(?P<page>\w+)/$', all_threads.AllThreadsView.as_view(),
         name='index'),
 
+    # login page
+    url(r'^login/$', login.LoginView.as_view(), name='login'),
+    url(r'^logout/$', logout.LogoutView.as_view(), name='logout'),
+
     # /boards/tag/tag_name/
     url(r'^tag/(?P<tag_name>\w+)/$', tag_threads.TagView.as_view(),
         name='tag'),
     # /boards/tag/tag_id/page/
     url(r'^tag/(?P<tag_name>\w+)/page/(?P<page>\w+)/$',
         tag_threads.TagView.as_view(), name='tag'),
 
     # /boards/thread/
     url(r'^thread/(?P<post_id>\w+)/$', views.thread.ThreadView.as_view(),
         name='thread'),
     url(r'^thread/(?P<post_id>\w+)/mode/(?P<mode>\w+)/$', views.thread.ThreadView
         .as_view(), name='thread_mode'),
 
     # /boards/post_admin/
     url(r'^post_admin/(?P<post_id>\w+)/$', PostAdminView.as_view(),
             name='post_admin'),
 
     url(r'^settings/$', settings.SettingsView.as_view(), name='settings'),
     url(r'^tags/$', all_tags.AllTagsView.as_view(), name='tags'),
     url(r'^captcha/', include('captcha.urls')),
     url(r'^authors/$', AuthorsView.as_view(), name='authors'),
     url(r'^delete/(?P<post_id>\w+)/$', DeletePostView.as_view(),
             name='delete'),
     url(r'^ban/(?P<post_id>\w+)/$', BanUserView.as_view(), name='ban'),
 
     url(r'^banned/$', views.banned.BannedView.as_view(), name='banned'),
     url(r'^staticpage/(?P<name>\w+)/$', StaticPageView.as_view(),
         name='staticpage'),
 
     # RSS feeds
     url(r'^rss/$', AllThreadsFeed()),
     url(r'^page/(?P<page>\w+)/rss/$', AllThreadsFeed()),
     url(r'^tag/(?P<tag_name>\w+)/rss/$', TagThreadsFeed()),
     url(r'^tag/(?P<tag_name>\w+)/page/(?P<page>\w+)/rss/$', TagThreadsFeed()),
     url(r'^thread/(?P<post_id>\w+)/rss/$', ThreadPostsFeed()),
 
     # i18n
     url(r'^jsi18n/$', 'boards.views.cached_js_catalog', js_info_dict,
         name='js_info_dict'),
 
     # API
     url(r'^api/post/(?P<post_id>\w+)/$', api.get_post, name="get_post"),
     url(r'^api/diff_thread/(?P<thread_id>\w+)/(?P<last_update_time>\w+)/$',
         api.api_get_threaddiff, name="get_thread_diff"),
     url(r'^api/threads/(?P<count>\w+)/$', api.api_get_threads,
             name='get_threads'),
     url(r'^api/tags/$', api.api_get_tags, name='get_tags'),
     url(r'^api/thread/(?P<opening_post_id>\w+)/$', api.api_get_thread_posts,
             name='get_thread'),
     url(r'^api/add_post/(?P<opening_post_id>\w+)/$', api.api_add_post,
             name='add_post'),
 
     # Search
     url(r'^search/$', BoardSearchView.as_view(), name='search'),
 
 )

boards/views/settings.py

@@ -1,55 +1,35 b''
 from django.db import transaction
 from django.shortcuts import render, redirect
-from boards import utils
-from boards.abstracts.settingsmanager import SettingsManager, \
-    PERMISSION_MODERATE
+from boards.abstracts.settingsmanager import SettingsManager
 
 from boards.views.base import BaseBoardView, CONTEXT_FORM
-from boards.forms import SettingsForm, ModeratorSettingsForm, PlainErrorList
-from boards.models.post import SETTING_MODERATE
+from boards.forms import SettingsForm, PlainErrorList
 
 
 class SettingsView(BaseBoardView):
 
     def get(self, request):
         context = self.get_context_data(request=request)
         settings_manager = SettingsManager(request.session)
-        is_moderator = settings_manager.has_permission(PERMISSION_MODERATE)
 
         selected_theme = settings_manager.get_theme()
 
-        if is_moderator:
-            form = ModeratorSettingsForm(initial={
-                'theme': selected_theme,
-                'moderate': settings_manager.has_permission(PERMISSION_MODERATE)
-            }, error_class=PlainErrorList)
-        else:
-            form = SettingsForm(initial={'theme': selected_theme},
-                                error_class=PlainErrorList)
+        form = SettingsForm(initial={'theme': selected_theme},
+                            error_class=PlainErrorList)
 
         context[CONTEXT_FORM] = form
 
         return render(request, 'boards/settings.html', context)
 
     def post(self, request):
         settings_manager = SettingsManager(request.session)
-        is_moderator = settings_manager.has_permission(PERMISSION_MODERATE)
 
         with transaction.atomic():
-            if is_moderator:
-                form = ModeratorSettingsForm(request.POST,
-                                             error_class=PlainErrorList)
-            else:
-                form = SettingsForm(request.POST, error_class=PlainErrorList)
+            form = SettingsForm(request.POST, error_class=PlainErrorList)
 
             if form.is_valid():
                 selected_theme = form.cleaned_data['theme']
 
                 settings_manager.set_theme(selected_theme)
 
-                if is_moderator:
-                    moderate = form.cleaned_data['moderate']
-                    if moderate == 'True':
-                        settings_manager.add_permission(PERMISSION_MODERATE)
-
             return redirect('settings')