Added subscription to tags.

boards/locale/ru/LC_MESSAGES/django.po

@@ -1,218 +1,233 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: 2013-09-06 21:49+0300\n"
+"POT-Creation-Date: 2013-09-07 19:43+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"
 
 #: 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
 msgid "Authors"
 msgstr "Авторы"
 
 #: templates/boards/authors.html:24
 msgid "Distributed under the"
 msgstr "Распространяется под"
 
 #: templates/boards/authors.html:26
 msgid "license"
 msgstr "лицензией"
 
 #: templates/boards/authors.html:28
 msgid "Repository"
 msgstr "Репозиторий"
 
 #: templates/boards/banned.html:6
 msgid "Banned"
 msgstr "Заблокирован"
 
 #: templates/boards/banned.html:11
 msgid "Your IP address has been banned. Contact the administrator"
 msgstr "Ваш IP адрес был заблокирован. Свяжитесь с администратором"
 
 #: templates/boards/base.html:12
 msgid "Feed"
 msgstr "Лента"
 
 #: templates/boards/base.html:29
 msgid "All threads"
 msgstr "Все темы"
 
 #: templates/boards/base.html:35
 msgid "Settings"
 msgstr "Настройки"
 
 #: templates/boards/base.html:42 templates/boards/login.html:6
 #: templates/boards/login.html.py:21
 msgid "Login"
 msgstr "Вход"
 
 #: templates/boards/base.html:43
 msgid "Up"
 msgstr "Вверх"
 
 #: templates/boards/login.html:15
 msgid "User ID"
 msgstr "ID пользователя"
 
 #: templates/boards/login.html:24
 msgid "Insert your user id above"
 msgstr "Вставьте свой ID пользователя выше"
 
 #: templates/boards/posting_general.html:18
 msgid "Tag: "
 msgstr "Тег: "
 
 #: templates/boards/posting_general.html:35
 #: templates/boards/posting_general.html:89 templates/boards/thread.html:27
 #: templates/boards/rss/post.html:5
 msgid "Post image"
 msgstr "Изображение сообщения"
 
 #: templates/boards/posting_general.html:48
 msgid "Reply"
 msgstr "Ответ"
 
 #: templates/boards/posting_general.html:54 templates/boards/thread.html:46
 msgid "Delete"
 msgstr "Удалить"
 
 #: templates/boards/posting_general.html:63 templates/boards/thread.html:113
 msgid "replies"
 msgstr "ответов"
 
 #: templates/boards/posting_general.html:64 templates/boards/thread.html:114
 msgid "images"
 msgstr "изображений"
 
 #: templates/boards/posting_general.html:66
-#: templates/boards/posting_general.html:139 templates/boards/thread.html:56
-#: templates/boards/rss/post.html:10
+#: templates/boards/posting_general.html:139 templates/boards/tags.html:7
+#: templates/boards/thread.html:56 templates/boards/rss/post.html:10
 msgid "Tags"
 msgstr "Теги"
 
 #: templates/boards/posting_general.html:115
 msgid "No threads exist. Create the first one!"
 msgstr "Нет тем. Создайте первую!"
 
 #: templates/boards/posting_general.html:121
 msgid "Create new thread"
 msgstr "Создать новую тему"
 
 #: templates/boards/posting_general.html:124 templates/boards/thread.html:75
 msgid "Title"
 msgstr "Заголовок"
 
 #: templates/boards/posting_general.html:129 templates/boards/thread.html:80
 msgid "Text"
 msgstr "Текст"
 
 #: templates/boards/posting_general.html:134 templates/boards/thread.html:85
 msgid "Image"
 msgstr "Изображение"
 
 #: templates/boards/posting_general.html:149 templates/boards/thread.html:96
 msgid "Post"
 msgstr "Отправить"
 
 #: templates/boards/posting_general.html:151
 msgid "Tags must be delimited by spaces. Text or image is required."
 msgstr ""
 "Теги должны быть разделены пробелами. Текст или изображение обязательны."
 
 #: templates/boards/posting_general.html:154 templates/boards/thread.html:98
 msgid "Basic markdown syntax."
 msgstr "Базовый синтаксис markdown."
 
 #: templates/boards/posting_general.html:164
 msgid "Pages:"
 msgstr "Страницы: "
 
 #: 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:36
 msgid "Save"
 msgstr "Сохранить"
 
-#: templates/boards/tags.html:7
-msgid "tags"
-msgstr "тегов"
+#: templates/boards/tags.html:17
+msgid "threads"
+msgstr "тем"
+
+#: templates/boards/tags.html:20
+msgid "Remove"
+msgstr "Удалить"
+
+#: templates/boards/tags.html:23
+msgid "Add"
+msgstr "Добавить"
+
+#: templates/boards/tags.html:28
+msgid "No tags found."
+msgstr "Теги не найдены."
 
 #: templates/boards/thread.html:72
 msgid "Reply to thread"
 msgstr "Ответить в тему"
 
 #: templates/boards/thread.html:99
 msgid "Example: "
 msgstr "Пример: "
 
 #: templates/boards/thread.html:99
 msgid "italic"
 msgstr "курсив"
 
 #: templates/boards/thread.html:100
 msgid "bold"
 msgstr "полужирный"
 
 #: templates/boards/thread.html:101
 msgid "Quotes can be inserted with"
 msgstr "Цитаты могут быть вставлены при помощи"
 
 #: templates/boards/thread.html:102
 msgid "Links to answers can be inserted with"
 msgstr "Ссылки на ответы могут быть вставлены с помощью"
 
 #: templates/boards/thread.html:115
 msgid "Last update: "
 msgstr "Последнее обновление: "
 
+#~ msgid "tags"
+#~ msgstr "тегов"
+
 #~ msgid "Get!"
 #~ msgstr "Гет!"
 
 #~ msgid "View"
 #~ msgstr "Просмотр"
 
 #~ msgid "gets"
 #~ msgstr "гетов"
 
 #~ msgid "author"
 #~ msgstr "автор"
 
 #~ msgid "developer"
 #~ msgstr "разработчик"
 
 #~ msgid "javascript developer"
 #~ msgstr "разработчик javascript"
 
 #~ msgid "designer"
 #~ msgstr "дизайнер"

boards/templates/boards/base.html

@@ -1,47 +1,47 b''
 {% load staticfiles %}
 {% load i18n %}
 
 <!DOCTYPE html>
 <html>
 <head>
     <link rel="stylesheet" type="text/css"
           href="{{ STATIC_URL }}css/jquery.fancybox.css" media="all"/>
     <link rel="stylesheet" type="text/css"
           href="{{ STATIC_URL }}css/{{ theme }}/base_page.css" media="all"/>
     <link rel="alternate" type="application/rss+xml" href="rss/" title="
     {% trans 'Feed' %}"/>
 
     <link rel="icon" type="image/png"
           href="{{ STATIC_URL }}favicon.png">
 
     <meta name="viewport" content="width=device-width, initial-scale=1"/>
     <meta charset="utf-8"/>
     {% block head %}{% endblock %}
 </head>
 <body>
 <script src="{{ STATIC_URL }}js/jquery-2.0.1.min.js"></script>
 <script src="{{ STATIC_URL }}js/jquery.fancybox.pack.js"></script>
 <script src="{% url 'django.views.i18n.javascript_catalog' %}"></script>
 <script src="{{ STATIC_URL }}js/refmaps.js"></script>
 <script src="{{ STATIC_URL }}js/main.js"></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>({{ tag.get_post_count }})
+            {{ tag.name }}</a>
     {% endfor %}
     <a class="tag" href="{% url 'tags' %}">[...]</a>
     <a class="link" href="{% url 'settings' %}">{% trans 'Settings' %}</a>
 </div>
 
 {% block content %}{% endblock %}
 
 <div class="navigation_panel">
     {% block metapanel %}{% endblock %}
     [<a href="{% url "login" %}">{% trans 'Login' %}</a>]
     <a class="link" href="#top">{% trans 'Up' %}</a>
 </div>
 
 </body>
 </html>

boards/templates/boards/tags.html

@@ -1,24 +1,32 b''
 {% extends "boards/base.html" %}
 
 {% load i18n %}
 {% load markup %}
 
 {% block head %}
-    <title>Neboard - {% trans "tags" %}</title>
+    <title>Neboard - {% trans "Tags" %}</title>
 {% endblock %}
 
 {% block content %}
 
     <div class="post">
-	{% if tags %}
+	{% if all_tags %}
 		{% for tag in all_tags %}
             <a class="tag" href="{% url 'tag' tag.name %}">
-                {{ tag.name }}</a><br />
+                {{ tag.name }}</a>
+            ({{ tag.get_post_count }} {% trans 'threads' %})
+            {% if tag in user.fav_tags.all %}
+                [<a href="{% url 'tag_unsubscribe' tag.name %}"
+                    >{% trans 'Remove' %}</a>]
+            {% else %}
+                [<a href="{% url 'tag_subscribe' tag.name %}"
+                    >{% trans 'Add' %}</a>]
+            {% endif %}
+            <br />
 		{% endfor %}
 	{% else %}
-		No tags found.
-        <hr />
+		{% trans 'No tags found.' %}
 	{% endif %}
     </div>
 
 {% endblock %}
  No newline at end of file

boards/urls.py

@@ -1,42 +1,50 b''
 from django.conf.urls import patterns, url, include
 from boards import views
 from boards.rss import AllThreadsFeed, TagThreadsFeed, ThreadPostsFeed
 
 js_info_dict = {
     'packages': ('boards',),
 }
 
 urlpatterns = patterns('',
 
     # /boards/
     url(r'^$', views.index, name='index'),
     # /boards/page/
     url(r'^page/(?P<page>\w+)/$', views.index, name='index'),
 
     # login page
     url(r'^login/$', views.login, name='login'),
 
     # /boards/tag/tag_name/
     url(r'^tag/(?P<tag_name>\w+)/$', views.tag, name='tag'),
     # /boards/tag/tag_id/page/
     url(r'^tag/(?P<tag_name>\w+)/page/(?P<page>\w+)/$', views.tag, name='tag'),
+
+    # /boards/tag/tag_name/unsubscribe/
+    url(r'^tag/(?P<tag_name>\w+)/subscribe/$', views.tag_subscribe,
+        name='tag_subscribe'),
+    # /boards/tag/tag_name/unsubscribe/
+    url(r'^tag/(?P<tag_name>\w+)/unsubscribe/$', views.tag_unsubscribe,
+        name='tag_unsubscribe'),
+
     # /boards/thread/
     url(r'^thread/(?P<post_id>\w+)/$', views.thread, name='thread'),
     # /boards/theme/theme_name/
     url(r'^settings/$', views.settings, name='settings'),
     url(r'^tags/$', views.all_tags, name='tags'),
     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'),
     url(r'^banned/$', views.you_are_banned, name='banned'),
 
     # 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()),
 
     url(r'^jsi18n/$', 'django.views.i18n.javascript_catalog', js_info_dict),
 )

boards/views.py

@@ -1,299 +1,320 b''
 import hashlib
 from django.core.urlresolvers import reverse
 from django.template import RequestContext
 from django.shortcuts import render, redirect, get_object_or_404
 from django.http import HttpResponseRedirect
 from django.utils import timezone
 
 from boards import forms
 import boards
 from boards import utils
 from boards.forms import ThreadForm, PostForm, SettingsForm, PlainErrorList, \
     ThreadCaptchaForm, PostCaptchaForm, LoginForm
 
 from boards.models import Post, Tag, Ban, User, RANK_USER, RANK_MODERATOR, NO_PARENT
 from boards import authors
 import neboard
 
 
 def index(request, page=0):
     context = _init_default_context(request)
 
     if utils.need_include_captcha(request):
         threadFormClass = ThreadCaptchaForm
         kwargs = {'request': request}
     else:
         threadFormClass = ThreadForm
         kwargs = {}
 
     if request.method == 'POST':
         form = threadFormClass(request.POST, request.FILES,
                                error_class=PlainErrorList, **kwargs)
 
         if form.is_valid():
             return _new_post(request, form)
     else:
         form = threadFormClass(error_class=PlainErrorList, **kwargs)
 
     threads = Post.objects.get_threads(page=int(page))
 
     context['threads'] = None if len(threads) == 0 else threads
     context['form'] = form
     context['pages'] = range(Post.objects.get_thread_page_count())
 
     return render(request, 'boards/posting_general.html',
                   context)
 
 
 def _new_post(request, form, thread_id=boards.models.NO_PARENT):
     """Add a new post (in thread or as a reply)."""
 
     ip = _get_client_ip(request)
     is_banned = Ban.objects.filter(ip=ip).count() > 0
 
     if is_banned:
         return redirect(you_are_banned)
 
     data = form.cleaned_data
 
     title = data['title']
     text = data['text']
 
     if 'image' in data.keys():
         image = data['image']
     else:
         image = None
 
     tags = []
 
     new_thread = thread_id == boards.models.NO_PARENT
     if new_thread:
         tag_strings = data['tags']
 
         if tag_strings:
             tag_strings = tag_strings.split(' ')
             for tag_name in tag_strings:
                 tag_name = tag_name.strip()
                 if len(tag_name) > 0:
                     tag, created = Tag.objects.get_or_create(name=tag_name)
                     tags.append(tag)
 
     # TODO Add a possibility to define a link image instead of an image file.
     # If a link is given, download the image automatically.
 
     post = Post.objects.create_post(title=title, text=text, ip=ip,
                                     parent_id=thread_id, image=image,
                                     tags=tags)
 
     thread_to_show = (post.id if new_thread else thread_id)
 
     if new_thread:
         return redirect(thread, post_id=thread_to_show)
     else:
         return redirect(reverse(thread,
                                 kwargs={'post_id': thread_to_show}) + '#'
                         + str(post.id))
 
 
 def tag(request, tag_name, page=0):
     """Get all tag threads (posts without a parent)."""
 
     tag = get_object_or_404(Tag, name=tag_name)
     threads = Post.objects.get_threads(tag=tag, page=int(page))
 
     if request.method == 'POST':
         form = ThreadForm(request.POST, request.FILES,
                           error_class=PlainErrorList)
         if form.is_valid():
             return _new_post(request, form)
     else:
         form = forms.ThreadForm(initial={'tags': tag_name},
                                 error_class=PlainErrorList)
 
     context = _init_default_context(request)
     context['threads'] = None if len(threads) == 0 else threads
     context['tag'] = tag_name
     context['pages'] = range(Post.objects.get_thread_page_count(tag=tag))
 
     context['form'] = form
 
     return render(request, 'boards/posting_general.html',
                   context)
 
 
 def thread(request, post_id):
     """Get all thread posts"""
 
     if utils.need_include_captcha(request):
         postFormClass = PostCaptchaForm
         kwargs = {'request': request}
     else:
         postFormClass = PostForm
         kwargs = {}
 
     if request.method == 'POST':
         form = postFormClass(request.POST, request.FILES,
                              error_class=PlainErrorList, **kwargs)
         if form.is_valid():
             return _new_post(request, form, post_id)
     else:
         form = postFormClass(error_class=PlainErrorList, **kwargs)
 
     posts = Post.objects.get_thread(post_id)
 
     context = _init_default_context(request)
 
     context['posts'] = posts
     context['form'] = form
 
     return render(request, 'boards/thread.html', context)
 
 
 def login(request):
     """Log in with user id"""
 
     context = _init_default_context(request)
 
     if request.method == 'POST':
         form = LoginForm(request.POST, request.FILES, error_class=PlainErrorList)
         if form.is_valid():
             user = User.objects.get(user_id=form.cleaned_data['user_id'])
             request.session['user_id'] = user.id
             return redirect(index)
 
     else:
         form = LoginForm()
 
     context['form'] = form
 
     return render(request, 'boards/login.html', context)
 
 
 def settings(request):
     """User's settings"""
 
     context = _init_default_context(request)
 
     if request.method == 'POST':
         form = SettingsForm(request.POST)
         if form.is_valid():
             selected_theme = form.cleaned_data['theme']
 
             user = _get_user(request)
             user.save_setting('theme', selected_theme)
 
         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)
 
 
 def all_tags(request):
     """All tags list"""
 
     context = _init_default_context(request)
     context['all_tags'] = Tag.objects.get_not_empty_tags()
 
     return render(request, 'boards/tags.html', context)
 
 
 def jump_to_post(request, post_id):
     """Determine thread in which the requested post is and open it's page"""
 
     post = get_object_or_404(Post, id=post_id)
 
     if boards.models.NO_PARENT == post.parent:
         return redirect(thread, post_id=post.id)
     else:
         parent_thread = get_object_or_404(Post, id=post.parent)
         return redirect(reverse(thread, kwargs={'post_id': parent_thread.id})
                         + '#' + str(post.id))
 
 
 def authors(request):
     context = _init_default_context(request)
     context['authors'] = boards.authors.authors
 
     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 you_are_banned(request):
     context = _init_default_context(request)
     return render(request, 'boards/banned.html', context)
 
 
 def page_404(request):
     context = _init_default_context(request)
     return render(request, 'boards/404.html', context)
 
 
+def tag_subscribe(request, tag_name):
+    user = _get_user(request)
+    tag = get_object_or_404(Tag, name=tag_name)
+
+    if not tag in user.fav_tags.all():
+        user.fav_tags.add(tag)
+
+    return redirect(all_tags)
+
+
+def tag_unsubscribe(request, tag_name):
+    user = _get_user(request)
+    tag = get_object_or_404(Tag, name=tag_name)
+
+    if tag in user.fav_tags.all():
+        user.fav_tags.remove(tag)
+
+    return redirect(all_tags)
+
+
 def _get_theme(request):
     """Get user's CSS theme"""
 
     user = _get_user(request)
     theme = user.get_setting('theme')
     if not theme:
         theme = neboard.settings.DEFAULT_THEME
 
     return theme
 
 
 def _get_client_ip(request):
     x_forwarded_for = request.META.get('HTTP_X_FORWARDED_FOR')
     if x_forwarded_for:
         ip = x_forwarded_for.split(',')[-1].strip()
     else:
         ip = request.META.get('REMOTE_ADDR')
     return ip
 
 
 def _init_default_context(request):
     """Create context with default values that are used in most views"""
 
     context = RequestContext(request)
-    context['tags'] = Tag.objects.get_popular_tags()
+    context['user'] = _get_user(request)
+    context['tags'] = _get_user(request).fav_tags.all()
     context['theme'] = _get_theme(request)
-    context['user'] = _get_user(request)
 
     return context
 
 
 def _get_user(request):
     """Get current user from the session"""
 
     session = request.session
     if not 'user_id' in session:
         request.session.save()
 
         md5 = hashlib.md5()
         md5.update(session.session_key)
         new_id = md5.hexdigest()
 
         time_now = timezone.now()
         user = User.objects.create(user_id=new_id, rank=RANK_USER,
                                    registration_time=time_now,
                                    last_access_time=time_now)
 
         session['user_id'] = user.id
     else:
         user = User.objects.get(id=session['user_id'])
         user.save()
 
     user.last_access_time = timezone.now()
 
     return user