Added admin actions (showing IP, post removal). Added user ranks. This refs #61, #12

boards/admin.py

@@ -1,6 +1,6 b''
 from django.contrib import admin
-from boards.models import Post, Tag, Admin
+from boards.models import Post, Tag, User
 
 admin.site.register(Post)
 admin.site.register(Tag)
-admin.site.register(Admin)
+admin.site.register(User)

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-08-04 14:04+0300\n"
+"POT-Creation-Date: 2013-08-21 20:49+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"
@@ -38,15 +38,15 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:31
+#: templates/boards/base.html:27
 msgid "All threads"
 msgstr "Все темы"
 
-#: templates/boards/base.html:37
+#: templates/boards/base.html:33
 msgid "Settings"
 msgstr "Настройки"
 
-#: templates/boards/base.html:45
+#: templates/boards/base.html:41
 msgid "Up"
 msgstr "Вверх"
 
@@ -55,7 +55,7 b' msgid "Tag: "'
 msgstr "Тег: "
 
 #: templates/boards/posting_general.html:35
-#: templates/boards/posting_general.html:79 templates/boards/thread.html:27
+#: templates/boards/posting_general.html:87 templates/boards/thread.html:27
 #: templates/boards/rss/post.html:5
 msgid "Post image"
 msgstr "Изображение сообщения"
@@ -64,58 +64,70 b' msgstr "\xd0\x98\xd0\xb7\xd0\xbe\xd0\xb1\xd1\x80\xd0\xb0\xd0\xb6\xd0\xb5\xd0\xbd\xd0\xb8\xd0\xb5 \xd1\x81\xd0\xbe\xd0\xbe\xd0\xb1\xd1\x89\xd0\xb5\xd0\xbd\xd0\xb8\xd1\x8f"'
 msgid "Reply"
 msgstr "Ответ"
 
-#: templates/boards/posting_general.html:53 templates/boards/thread.html:111
+#: templates/boards/posting_general.html:52 templates/boards/thread.html:49
+msgid "Delete"
+msgstr "Удалить"
+
+#: templates/boards/posting_general.html:61 templates/boards/thread.html:119
 msgid "replies"
 msgstr "ответов"
 
-#: templates/boards/posting_general.html:54 templates/boards/thread.html:112
+#: templates/boards/posting_general.html:62 templates/boards/thread.html:120
 msgid "images"
 msgstr "изображений"
 
-#: templates/boards/posting_general.html:56
-#: templates/boards/posting_general.html:127 templates/boards/thread.html:51
+#: templates/boards/posting_general.html:64
+#: templates/boards/posting_general.html:135 templates/boards/thread.html:59
 #: templates/boards/rss/post.html:10
 msgid "Tags"
 msgstr "Теги"
 
-#: templates/boards/posting_general.html:109
+#: templates/boards/posting_general.html:117
 msgid "Create new thread"
 msgstr "Создать новую тему"
 
-#: templates/boards/posting_general.html:112 templates/boards/thread.html:73
+#: templates/boards/posting_general.html:120 templates/boards/thread.html:81
 msgid "Title"
 msgstr "Заголовок"
 
-#: templates/boards/posting_general.html:117 templates/boards/thread.html:78
+#: templates/boards/posting_general.html:125 templates/boards/thread.html:86
 msgid "Text"
 msgstr "Текст"
 
-#: templates/boards/posting_general.html:122 templates/boards/thread.html:83
+#: templates/boards/posting_general.html:130 templates/boards/thread.html:91
 msgid "Image"
 msgstr "Изображение"
 
-#: templates/boards/posting_general.html:137 templates/boards/thread.html:94
+#: templates/boards/posting_general.html:145 templates/boards/thread.html:102
 msgid "Post"
 msgstr "Отправить"
 
-#: templates/boards/posting_general.html:139
+#: templates/boards/posting_general.html:147
 msgid "Tags must be delimited by spaces. Text or image is required."
 msgstr ""
 "Теги должны быть разделены пробелами. Текст или изображение обязательны."
 
-#: templates/boards/posting_general.html:142 templates/boards/thread.html:96
+#: templates/boards/posting_general.html:150 templates/boards/thread.html:104
 msgid "Basic markdown syntax."
 msgstr "Базовый синтаксис markdown."
 
-#: templates/boards/posting_general.html:152
+#: templates/boards/posting_general.html:160
 msgid "Pages:"
 msgstr "Страницы: "
 
-#: templates/boards/settings.html:13
+#: templates/boards/settings.html:12
+msgid "User:"
+msgstr "Пользователь:"
+
+#: templates/boards/settings.html:14
+msgid "You are moderator."
+msgstr "Вы модератор."
+
+#: templates/boards/settings.html:20
 msgid "Theme"
 msgstr "Тема"
 
-#: templates/boards/settings.html:29
+#: templates/boards/settings.html:36
 msgid "Save"
 msgstr "Сохранить"
 
@@ -127,31 +139,31 b' msgstr "\xd1\x82\xd0\xb5\xd0\xb3\xd0\xbe\xd0\xb2"'
 msgid "Get!"
 msgstr "Гет!"
 
-#: templates/boards/thread.html:70
+#: templates/boards/thread.html:78
 msgid "Reply to thread"
 msgstr "Ответить в тему"
 
-#: templates/boards/thread.html:97
+#: templates/boards/thread.html:105
 msgid "Example: "
 msgstr "Пример: "
 
-#: templates/boards/thread.html:97
+#: templates/boards/thread.html:105
 msgid "italic"
 msgstr "курсив"
 
-#: templates/boards/thread.html:98
+#: templates/boards/thread.html:106
 msgid "bold"
 msgstr "полужирный"
 
-#: templates/boards/thread.html:99
+#: templates/boards/thread.html:107
 msgid "Quotes can be inserted with"
 msgstr "Цитаты могут быть вставлены при помощи"
 
-#: templates/boards/thread.html:100
+#: templates/boards/thread.html:108
 msgid "Links to answers can be inserted with"
 msgstr "Ссылки на ответы могут быть вставлены с помощью"
 
-#: templates/boards/thread.html:113
+#: templates/boards/thread.html:121
 msgid "Last update: "
 msgstr "Последнее обновление: "
 
@@ -161,8 +173,8 b' msgstr "\xd0\x9f\xd0\xbe\xd1\x81\xd0\xbb\xd0\xb5\xd0\xb4\xd0\xbd\xd0\xb5\xd0\xb5 \xd0\xbe\xd0\xb1\xd0\xbd\xd0\xbe\xd0\xb2\xd0\xbb\xd0\xb5\xd0\xbd\xd0\xb8\xd0\xb5: "'
 #~ msgid "gets"
 #~ msgstr "гетов"
 
-msgid "author"
-msgstr "автор"
+#~ msgid "author"
+#~ msgstr "автор"
 
-msgid "developer"
-msgstr "разработчик"
  No newline at end of file
+#~ msgid "developer"
+#~ msgstr "разработчик"

boards/models.py

@@ -30,6 +30,10 b" FILE_EXTENSION_DELIMITER = '.'"
 REGEX_PRETTY = re.compile(r'^\d(0)+$')
 REGEX_SAME = re.compile(r'^(.)\1+$')
 
+RANK_ADMIN = 0
+RANK_MODERATOR = 10
+RANK_USER = 100
+
 
 class PostManager(models.Manager):
     def create_post(self, title, text, image=None, parent_id=NO_PARENT,
@@ -289,26 +293,20 b' class Admin(models.Model):'
         return self.name + '/' + '*' * len(self.password)
 
 
-class Setting(models.Model):
-
-    name = models.CharField(max_length=50)
-    value = models.CharField(max_length=50)
-
-
 class User(models.Model):
 
-    user_id = models.CharField(max_length=20)
-    settings = models.ManyToManyField(Setting)
+    user_id = models.CharField(max_length=50)
+    rank = models.IntegerField()
 
     def save_setting(self, name, value):
-        setting, created = self.settings.get_or_create(name=name)
+        setting, created = Setting.objects.get_or_create(name=name, user=self)
         setting.value = value
         setting.save()
 
         return setting
 
     def get_setting(self, name):
-        settings = self.settings.filter(name=name)
+        settings = Setting.objects.filter(name=name, user=self)
         if len(settings) > 0:
             setting = settings[0]
         else:
@@ -320,3 +318,16 b' class User(models.Model):'
             setting_value = None
 
         return setting_value
+
+    def is_moderator(self):
+        return RANK_MODERATOR >= self.rank
+
+    def __unicode__(self):
+        return self.user_id
+
+
+class Setting(models.Model):
+
+    name = models.CharField(max_length=50)
+    value = models.CharField(max_length=50)
+    user = models.ForeignKey(User)

boards/static/css/md/base_page.css

@@ -273,3 +273,8 b' li {'
 .post-info {
     color: #ddd;
 }
+
+.moderator_info {
+    color: #e99d41;
+    float: right;
+}
  No newline at end of file

boards/static/css/sw/base_page.css

@@ -261,4 +261,9 b' li {'
 
 .form-errors {
     margin-left: 1ex;
+}
+
+.moderator_info {
+    font-weight: bold;
+    float: right;
 }
  No newline at end of file

boards/templates/boards/base.html

@@ -22,18 +22,11 b''
 <script src="{{ STATIC_URL }}js/jquery-2.0.1.min.js"></script>
 <script src="{{ STATIC_URL }}js/jquery.fancybox.pack.js"></script>
 <script src="{{ STATIC_URL }}js/main.js"></script>
-<div id="admin_panel">
-
-    {% if request.session.admin == True %}
-        Admin panel TODO: Need to implement <BR />
-    {% endif %}
-
-</div>
 
 <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 %}">
+        <a class="tag" href="{% url 'tag' tag_name=tag.name %}">
             {{ tag.name }}</a>({{ tag.get_post_count }})
     {% endfor %}
     <a class="tag" href="{% url 'tags' %}">[...]</a>

boards/templates/boards/posting_general.html

@@ -44,6 +44,14 b''
                     [{{ thread.pub_time }}]
                     [<a class="link" href="{% url 'thread' thread.id %}#form"
                         >{% trans "Reply" %}</a>]
+
+                    {% if user.is_moderator %}
+                        <span class="moderator_info">
+                            ({{ thread.poster_ip }})
+                            [<a href="{% url 'delete' post_id=thread.id %}"
+                                >{% trans 'Delete' %}</a>]
+                        </span>
+                    {% endif %}
                 </div>
                 {% autoescape off %}
                     {{ thread.text.rendered|truncatewords_html:50 }}

boards/templates/boards/settings.html

@@ -9,7 +9,10 b''
 {% block content %}
 
     <div class="post">
-        {% trans 'User:' %} <b>{{ request.session.user.user_id }}</b>
+        {% trans 'User:' %} <b>{{ user.user_id }}</b>.
+        {% if user.is_moderator %}
+            {% trans 'You are moderator.' %}
+        {% endif %}
     </div>
 
     <div class="post-form-w">

boards/templates/boards/thread.html

@@ -41,6 +41,14 b''
                     {% endif %}
                 [<a href="#" onclick="javascript:addQuickReply('{{ post.id }}')
                     ; return false;">&gt;&gt;</a>]
+
+                    {% if user.is_moderator %}
+                        <span class="moderator_info">
+                            ({{ post.poster_ip }})
+                            [<a href="{% url 'delete' post_id=post.id %}"
+                                >{% trans 'Delete' %}</a>]
+                        </span>
+                    {% endif %}
                 </div>
                 {% autoescape off %}
                 {{ post.text.rendered }}

boards/urls.py

@@ -26,6 +26,7 b" urlpatterns = patterns('',"
     url(r'^captcha/', include('captcha.urls')),
     url(r'^jump/(?P<post_id>\w+)/$', views.jump_to_post, name='jumper'),
     url(r'^authors/$', views.authors, name='authors'),
+    url(r'^delete/(?P<post_id>\w+)/$', views.delete, name='delete'),
 
     # RSS feeds
     url(r'^rss/$', AllThreadsFeed()),

boards/views.py

@@ -10,7 +10,7 b' from boards import utils'
 from boards.forms import ThreadForm, PostForm, SettingsForm, PlainErrorList, \
     ThreadCaptchaForm, PostCaptchaForm
 
-from boards.models import Post, Admin, Tag, User
+from boards.models import Post, Admin, Tag, User, RANK_USER, RANK_MODERATOR, NO_PARENT
 from boards import authors
 import neboard
 
@@ -190,7 +190,6 b' def settings(request):'
         selected_theme = _get_theme(request)
         form = SettingsForm(initial={'theme': selected_theme})
         context['form'] = form
-        _get_user(request)
 
         return render(request, 'boards/settings.html', context)
 
@@ -224,6 +223,19 b' def authors(request):'
     return render(request, 'boards/authors.html', context)
 
 
+def delete(request, post_id):
+    user = _get_user(request)
+    post = get_object_or_404(Post, id=post_id)
+
+    if user.is_moderator():
+        Post.objects.delete_post(post)
+
+    if NO_PARENT == post.parent:
+        return redirect(index)
+    else:
+        return redirect(thread, post_id=post.parent)
+
+
 def _get_theme(request):
     """Get user's CSS theme"""
 
@@ -250,6 +262,7 b' def _init_default_context(request):'
     context = RequestContext(request)
     context['tags'] = Tag.objects.get_popular_tags()
     context['theme'] = _get_theme(request)
+    context['user'] = _get_user(request)
 
     return context
 
@@ -258,17 +271,17 b' def _get_user(request):'
     """Get current user from the session"""
 
     session = request.session
-    if not 'user' in session:
+    if not 'user_id' in session:
         request.session.save()
 
         md5 = hashlib.md5()
         md5.update(session.session_key)
         new_id = md5.hexdigest()
 
-        user = User.objects.create(user_id=new_id)
+        user = User.objects.create(user_id=new_id, rank=RANK_USER)
 
-        session['user'] = user
+        session['user_id'] = user.id
     else:
-        user = session['user']
+        user = User.objects.get(id=session['user_id'])
 
     return user
  No newline at end of file