Added attachment alias categories

boards/templates/boards/aliases.html

@@ -0,0 +1,17 b''
+{% extends "boards/base.html" %}
+
+{% load i18n %}
+{% load tz %}
+
+{% block head %}
+    <meta name="robots" content="noindex">
+    <title>{% trans 'Aliases' %} - {{ site_name }}</title>
+{% endblock %}
+
+{% block content %}
+    <div class="post">
+        {% for image in image_aliases %}
+        <div>{{ image.alias }}: {{ image.get_view|safe }}</div>
+        {% endfor %}
+    </div>
+{% endblock %}

boards/views/alias.py

@@ -0,0 +1,32 b''
+from django.db import transaction
+from django.shortcuts import render, redirect
+from django.utils import timezone
+from django.utils.decorators import method_decorator
+from django.views.decorators.csrf import csrf_protect
+
+from boards.abstracts.settingsmanager import get_settings_manager, \
+    SETTING_USERNAME, SETTING_LAST_NOTIFICATION_ID, SETTING_IMAGE_VIEWER
+from boards.middlewares import SESSION_TIMEZONE
+from boards.views.base import BaseBoardView, CONTEXT_FORM
+from boards.forms import SettingsForm, PlainErrorList
+from boards import settings
+from boards.models import Attachment
+
+CONTEXT_IMAGE_ALIASES = 'image_aliases'
+
+TEMPLATE = 'boards/aliases.html'
+
+
+class AliasesView(BaseBoardView):
+    @method_decorator(csrf_protect)
+    def get(self, request, category):
+        params = dict()
+        settings_manager = get_settings_manager(request)
+
+        selected_theme = settings_manager.get_theme()
+
+        params[CONTEXT_IMAGE_ALIASES] = Attachment.objects.exclude(alias='')\
+                .exclude(alias=None).filter(alias__startswith=(category + '/'))
+
+        return render(request, TEMPLATE, params)
+

boards/templates/boards/settings.html

@@ -1,44 +1,40 b''
 {% extends "boards/base.html" %}
 
 {% load i18n %}
 {% load tz %}
 
 {% block head %}
     <meta name="robots" content="noindex">
     <title>{% trans 'Settings' %} - {{ site_name }}</title>
 {% endblock %}
 
 {% block content %}
     <div class="post">
         <p>
             {% if moderator %}
                 {% trans 'You are moderator.' %}
             {% endif %}
         </p>
         {% if hidden_tags %}
             <p>{% trans 'Hidden tags:' %}
                 {% for tag in hidden_tags %}
                     {{ tag.get_view|safe }}
                 {% endfor %}
             </p>
         {% else %}
             <p>{% trans 'No hidden tags.' %}</p>
         {% endif %}
-
-        {% for image in image_aliases %}
-            <div>{{ image.alias }}: {{ image.get_view|safe }}</div>
-        {% endfor %}
     </div>
 
     <div class="post-form-w">
     <div class="post-form">
         <form method="post">{% csrf_token %}
             {{ form.as_div }}
             <div class="form-submit">
                 <input type="submit" value="{% trans "Save" %}" />
             </div>
         </form>
     </div>
     </div>
 
 {% endblock %}

boards/urls.py

@@ -1,96 +1,97 b''
 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
+    settings, all_tags, feed, alias
 from boards.views.authors import AuthorsView
 from boards.views.notifications import NotificationView
 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
 
 
 js_info_dict = {
     'packages': ('boards',),
 }
 
 urlpatterns = [
     # /boards/
     url(r'^$', all_threads.AllThreadsView.as_view(), name='index'),
 
     # /boards/tag/tag_name/
     url(r'^tag/(?P<tag_name>\w+)/$', tag_threads.TagView.as_view(),
         name='tag'),
 
     # /boards/thread/
     url(r'^thread/(?P<post_id>\d+)/$', views.thread.NormalThreadView.as_view(),
         name='thread'),
     url(r'^thread/(?P<post_id>\d+)/mode/gallery/$', views.thread.GalleryThreadView.as_view(),
         name='thread_gallery'),
     url(r'^thread/(?P<post_id>\d+)/mode/tree/$', views.thread.TreeThreadView.as_view(),
         name='thread_tree'),
     # /feed/
     url(r'^feed/$', views.feed.FeedView.as_view(), name='feed'),
 
     url(r'^settings/$', settings.SettingsView.as_view(), name='settings'),
+    url(r'^aliases/(?P<category>\w+)/$', alias.AliasesView.as_view(), name='aliases'),
     url(r'^tags/(?P<query>\w+)?/?$', 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'),
     url(r'^staticpage/(?P<name>\w+)/$', StaticPageView.as_view(),
         name='staticpage'),
 
     url(r'^random/$', RandomImageView.as_view(), name='random'),
     url(r'^tag/(?P<tag_name>\w+)/gallery/$', TagGalleryView.as_view(), name='tag_gallery'),
 
     # RSS feeds
     url(r'^rss/$', AllThreadsFeed()),
     url(r'^page/(?P<page>\d+)/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>\d+)/rss/$', ThreadPostsFeed()),
 
     # i18n
     url(r'^jsi18n/$', cached_javascript_catalog, js_info_dict,
         name='js_info_dict'),
 
     # API
     url(r'^api/post/(?P<post_id>\d+)/$', api.get_post, name="get_post"),
     url(r'^api/diff_thread/$', 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'),
     url(r'^api/notifications/(?P<username>\w+)/$', api.api_get_notifications,
             name='api_notifications'),
     url(r'^api/preview/$', api.api_get_preview, name='preview'),
     url(r'^api/new_posts/$', api.api_get_new_posts, name='new_posts'),
 
     # Sync protocol API
     url(r'^api/sync/list/$', response_list, name='api_sync_list'),
     url(r'^api/sync/get/$', response_get, name='api_sync_get'),
 
     # Notifications
     url(r'^notifications/(?P<username>\w+)/$', NotificationView.as_view(), name='notifications'),
     url(r'^notifications/$', NotificationView.as_view(), name='notifications'),
 
     # Post preview
     url(r'^preview/$', PostPreviewView.as_view(), name='preview'),
     url(r'^post_xml/(?P<post_id>\d+)$', get_post_sync_data,
         name='post_sync_data'),
 ]
 
 # Search
 if 'haystack' in neboard.settings.INSTALLED_APPS:
     from boards.views.search import BoardSearchView
     urlpatterns.append(url(r'^search/$', BoardSearchView.as_view(), name='search'))
 

boards/views/settings.py

@@ -1,82 +1,80 b''
 from django.db import transaction
 from django.shortcuts import render, redirect
 from django.utils import timezone
 from django.utils.decorators import method_decorator
 from django.views.decorators.csrf import csrf_protect
 
 from boards.abstracts.settingsmanager import get_settings_manager, \
     SETTING_USERNAME, SETTING_LAST_NOTIFICATION_ID, SETTING_IMAGE_VIEWER
 from boards.middlewares import SESSION_TIMEZONE
 from boards.views.base import BaseBoardView, CONTEXT_FORM
 from boards.forms import SettingsForm, PlainErrorList
 from boards import settings
 from boards.models import Attachment
 
 FORM_THEME = 'theme'
 FORM_USERNAME = 'username'
 FORM_TIMEZONE = 'timezone'
 FORM_IMAGE_VIEWER = 'image_viewer'
 
 CONTEXT_HIDDEN_TAGS = 'hidden_tags'
-CONTEXT_IMAGE_ALIASES = 'image_aliases'
 
 TEMPLATE = 'boards/settings.html'
 
 
 class SettingsView(BaseBoardView):
     @method_decorator(csrf_protect)
     def get(self, request):
         params = dict()
         settings_manager = get_settings_manager(request)
 
         selected_theme = settings_manager.get_theme()
 
         form = SettingsForm(
             initial={
                 FORM_THEME: selected_theme,
                 FORM_IMAGE_VIEWER: settings_manager.get_setting(
                     SETTING_IMAGE_VIEWER,
                     default=settings.get('View', 'DefaultImageViewer')),
                 FORM_USERNAME: settings_manager.get_setting(SETTING_USERNAME),
                 FORM_TIMEZONE: request.session.get(
                     SESSION_TIMEZONE, timezone.get_current_timezone()),
             },
             error_class=PlainErrorList)
 
         params[CONTEXT_FORM] = form
         params[CONTEXT_HIDDEN_TAGS] = settings_manager.get_hidden_tags()
-        params[CONTEXT_IMAGE_ALIASES] = Attachment.objects.exclude(alias='').exclude(alias=None)
 
         return render(request, TEMPLATE, params)
 
     @method_decorator(csrf_protect)
     def post(self, request):
         settings_manager = get_settings_manager(request)
 
         with transaction.atomic():
             form = SettingsForm(request.POST, error_class=PlainErrorList)
 
             if form.is_valid():
                 selected_theme = form.cleaned_data[FORM_THEME]
                 username = form.cleaned_data[FORM_USERNAME].lower()
 
                 settings_manager.set_theme(selected_theme)
                 settings_manager.set_setting(SETTING_IMAGE_VIEWER,
                                              form.cleaned_data[FORM_IMAGE_VIEWER])
 
                 old_username = settings_manager.get_setting(SETTING_USERNAME)
                 if username != old_username:
                     settings_manager.set_setting(SETTING_USERNAME, username)
                     settings_manager.set_setting(SETTING_LAST_NOTIFICATION_ID, None)
 
                 request.session[SESSION_TIMEZONE] = form.cleaned_data[FORM_TIMEZONE]
 
                 return redirect('settings')
             else:
                 params = dict()
 
                 params[CONTEXT_FORM] = form
                 params[CONTEXT_HIDDEN_TAGS] = settings_manager.get_hidden_tags()
 
                 return render(request, TEMPLATE, params)