Added subscription to tags.

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-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"
@@ -106,8 +106,8 b' 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 "Теги"
 
@@ -164,9 +164,21 b' msgstr "\xd0\xa2\xd0\xb5\xd0\xbc\xd0\xb0"'
 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"
@@ -196,6 +208,9 b' msgstr "\xd0\xa1\xd1\x81\xd1\x8b\xd0\xbb\xd0\xba\xd0\xb8 \xd0\xbd\xd0\xb0 \xd0\xbe\xd1\x82\xd0\xb2\xd0\xb5\xd1\x82\xd1\x8b \xd0\xbc\xd0\xbe\xd0\xb3\xd1\x83\xd1\x82 \xd0\xb1\xd1\x8b\xd1\x82\xd1\x8c \xd0\xb2\xd1\x81\xd1\x82\xd0\xb0\xd0\xb2\xd0\xbb\xd0\xb5\xd0\xbd\xd1\x8b \xd1\x81 \xd0\xbf\xd0\xbe\xd0\xbc\xd0\xbe\xd1\x89\xd1\x8c\xd1\x8e"'
 msgid "Last update: "
 msgstr "Последнее обновление: "
 
+#~ msgid "tags"
+#~ msgstr "тегов"
+
 #~ msgid "Get!"
 #~ msgstr "Гет!"
 

boards/templates/boards/base.html

@@ -29,7 +29,7 b''
     <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>

boards/templates/boards/tags.html

@@ -4,20 +4,28 b''
 {% 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>
 

boards/urls.py

@@ -20,6 +20,14 b" urlpatterns = patterns('',"
     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/

boards/views.py

@@ -232,6 +232,7 b' def delete(request, post_id):'
     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)
@@ -242,6 +243,26 b' def page_404(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"""
 
@@ -266,9 +287,9 b' 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