diff --git a/boards/locale/ru/LC_MESSAGES/django.po b/boards/locale/ru/LC_MESSAGES/django.po --- a/boards/locale/ru/LC_MESSAGES/django.po +++ b/boards/locale/ru/LC_MESSAGES/django.po @@ -424,18 +424,6 @@ msgstr "Цитата" msgid "You can try pasting the text and previewing the result here:" msgstr "Вы можете попробовать вставить текст и проверить результат здесь:" -#: templates/boards/tags.html:17 -msgid "Sections:" -msgstr "Разделы:" - -#: templates/boards/tags.html:30 -msgid "Other tags:" -msgstr "Другие метки:" - -#: templates/boards/tags.html:43 -msgid "All tags..." -msgstr "Все метки..." - #: templates/boards/thread.html:14 msgid "Normal" msgstr "Нормальный" diff --git a/boards/locale/uk/LC_MESSAGES/django.po b/boards/locale/uk/LC_MESSAGES/django.po --- a/boards/locale/uk/LC_MESSAGES/django.po +++ b/boards/locale/uk/LC_MESSAGES/django.po @@ -424,18 +424,6 @@ msgstr "Цитата" msgid "You can try pasting the text and previewing the result here:" msgstr "Можете спробувати вставити текст і перевірити результат тут:" -#: templates/boards/tags.html:17 -msgid "Sections:" -msgstr "Розділи:" - -#: templates/boards/tags.html:30 -msgid "Other tags:" -msgstr "Інші мітки:" - -#: templates/boards/tags.html:43 -msgid "All tags..." -msgstr "Усі мітки..." - #: templates/boards/thread.html:14 msgid "Normal" msgstr "Звичайний" diff --git a/boards/templates/boards/tags.html b/boards/templates/boards/tags.html deleted file mode 100644 --- a/boards/templates/boards/tags.html +++ /dev/null @@ -1,27 +0,0 @@ -{% extends "boards/base.html" %} - -{% load i18n %} - -{% block head %} - {{ site_name }} - {% trans "Tags" %} -{% endblock %} - -{% block content %} - -{% regroup all_tags by get_first_letter as other_tag_list %} - -
- {% if all_tags %} -
- {% for letter in other_tag_list %} - ({{ letter.grouper|upper }}) - {% for tag in letter.list %} - {{ tag.get_view|safe }}{% if not forloop.last %},{% endif %} - {% endfor %} - {% if not forloop.last %}
{% endif %} - {% endfor %} -
- {% endif %} -
- -{% endblock %} diff --git a/boards/urls.py b/boards/urls.py --- a/boards/urls.py +++ b/boards/urls.py @@ -1,24 +1,20 @@ from django.conf.urls import url -import neboard - from boards import views from boards.rss import AllThreadsFeed, TagThreadsFeed, ThreadPostsFeed -from boards.views import api, tag_threads, all_threads, \ - settings, all_tags, feed, stickers +from boards.views import api, tag_threads, all_threads, settings, feed, stickers from boards.views.authors import AuthorsView +from boards.views.landing import LandingView from boards.views.notifications import NotificationView +from boards.views.preview import PostPreviewView +from boards.views.random import RandomImageView +from boards.views.search import BoardSearchView from boards.views.static import StaticPageView -from boards.views.preview import PostPreviewView from boards.views.sync import get_post_sync_data, response_get, response_list -from boards.views.random import RandomImageView from boards.views.tag_gallery import TagGalleryView from boards.views.translation import cached_javascript_catalog -from boards.views.search import BoardSearchView -from boards.views.landing import LandingView from boards.views.utils import UtilsView - js_info_dict = { 'packages': ('boards',), } @@ -44,7 +40,6 @@ urlpatterns = [ url(r'^settings/$', settings.SettingsView.as_view(), name='settings'), url(r'^stickers/$', stickers.AliasesView.as_view(), name='stickers'), url(r'^stickers/(?P\w+)/$', stickers.AliasesView.as_view(), name='stickers'), - url(r'^tags/$', all_tags.AllTagsView.as_view(), name='tags'), url(r'^authors/$', AuthorsView.as_view(), name='authors'), url(r'^banned/$', views.banned.BannedView.as_view(), name='banned'), diff --git a/boards/views/all_tags.py b/boards/views/all_tags.py deleted file mode 100644 --- a/boards/views/all_tags.py +++ /dev/null @@ -1,19 +0,0 @@ -from django.shortcuts import render - -from boards.views.base import BaseBoardView -from boards.models.tag import Tag - - -PARAM_TAGS = 'all_tags' - - -# TODO This view is deprecated and should be removed in the future cause the tag -# list is quite large and slow -class AllTagsView(BaseBoardView): - - def get(self, request): - params = dict() - - params[PARAM_TAGS] = Tag.objects.get_not_empty_tags() - - return render(request, 'boards/tags.html', params)