X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/90e4a87f6ebffca42088cb952281c40555d2c520..e7d557155e2cd195f975e4559c353be5f28d7d66:/src/catalogue/templatetags/catalogue_tags.py diff --git a/src/catalogue/templatetags/catalogue_tags.py b/src/catalogue/templatetags/catalogue_tags.py index 16d5de7a9..afb2e7ef5 100644 --- a/src/catalogue/templatetags/catalogue_tags.py +++ b/src/catalogue/templatetags/catalogue_tags.py @@ -10,11 +10,12 @@ from django.conf import settings from django import template from django.template import Node, Variable, Template, Context from django.core.urlresolvers import reverse -from django.contrib.auth.forms import UserCreationForm, AuthenticationForm from django.utils.cache import add_never_cache_headers from django.utils.translation import ugettext as _ from ssify import ssi_variable + +from catalogue.helpers import get_audiobook_tags from catalogue.models import Book, BookMedia, Fragment, Tag, Source from catalogue.constants import LICENSES from picture.models import Picture @@ -22,22 +23,6 @@ from picture.models import Picture register = template.Library() -class RegistrationForm(UserCreationForm): - def as_ul(self): - """Returns this form rendered as HTML
  • s -- excluding the .""" - return self._html_output( - u'
  • %(errors)s%(label)s %(field)s%(help_text)s
    • ', u'
  • %s
    • ', - '', u' %s', False) - - -class LoginForm(AuthenticationForm): - def as_ul(self): - """Returns this form rendered as HTML
  • s -- excluding the .""" - return self._html_output( - u'
  • %(errors)s%(label)s %(field)s%(help_text)s
    • ', u'
  • %s
    • ', - '', u' %s', False) - - def iterable(obj): try: iter(obj) @@ -226,53 +211,29 @@ def all_editors(extra_info): for person in sorted(set(editors))) -@register.simple_tag -def user_creation_form(): - return RegistrationForm(prefix='registration').as_ul() - - -@register.simple_tag -def authentication_form(): - return LoginForm(prefix='login').as_ul() - - @register.tag def catalogue_url(parser, token): bits = token.split_contents() tags_to_add = [] tags_to_remove = [] - for bit in bits[1:]: - if bit[0] == '-': - tags_to_remove.append(bit[1:]) - else: - tags_to_add.append(bit) - - return CatalogueURLNode(tags_to_add, tags_to_remove) - - -@register.tag -def catalogue_url_gallery(parser, token): - bits = token.split_contents() - - tags_to_add = [] - tags_to_remove = [] - for bit in bits[1:]: + for bit in bits[2:]: if bit[0] == '-': tags_to_remove.append(bit[1:]) else: tags_to_add.append(bit) - return CatalogueURLNode(tags_to_add, tags_to_remove, gallery=True) + return CatalogueURLNode(bits[1], tags_to_add, tags_to_remove) class CatalogueURLNode(Node): - def __init__(self, tags_to_add, tags_to_remove, gallery=False): + def __init__(self, list_type, tags_to_add, tags_to_remove): self.tags_to_add = [Variable(tag) for tag in tags_to_add] self.tags_to_remove = [Variable(tag) for tag in tags_to_remove] - self.gallery = gallery + self.list_type_var = Variable(list_type) def render(self, context): + list_type = self.list_type_var.resolve(context) tags_to_add = [] tags_to_remove = [] @@ -298,16 +259,23 @@ class CatalogueURLNode(Node): pass if len(tag_slugs) > 0: - if self.gallery: + if list_type == 'gallery': return reverse('tagged_object_list_gallery', kwargs={'tags': '/'.join(tag_slugs)}) + elif list_type == 'audiobooks': + return reverse('tagged_object_list_audiobooks', kwargs={'tags': '/'.join(tag_slugs)}) else: return reverse('tagged_object_list', kwargs={'tags': '/'.join(tag_slugs)}) else: - return reverse('book_list') + if list_type == 'gallery': + return reverse('gallery') + elif list_type == 'audiobooks': + return reverse('audiobook_list') + else: + return reverse('book_list') # @register.inclusion_tag('catalogue/tag_list.html') -def tag_list(tags, choices=None, category=None, gallery=False): +def tag_list(tags, choices=None, category=None, list_type='books'): # print(tags, choices, category) if choices is None: choices = [] @@ -326,22 +294,27 @@ def tag_list(tags, choices=None, category=None, gallery=False): other = Tag.objects.filter(category=category).exclude(pk__in=[t.pk for t in tags])\ .exclude(pk__in=[t.pk for t in category_choices]) # Filter out empty tags. - ct = ContentType.objects.get_for_model(Picture if gallery else Book) + ct = ContentType.objects.get_for_model(Picture if list_type == 'gallery' else Book) other = other.filter(items__content_type=ct).distinct() + if list_type == 'audiobooks': + other = other.filter(id__in=get_audiobook_tags()) + other = other.only('name', 'slug', 'category') else: other = [] return { 'one_tag': one_tag, 'choices': choices, + 'category_choices': category_choices, 'tags': tags, 'other': other, + 'list_type': list_type, } @register.inclusion_tag('catalogue/inline_tag_list.html') -def inline_tag_list(tags, choices=None, category=None, gallery=False): - return tag_list(tags, choices, category, gallery) +def inline_tag_list(tags, choices=None, category=None, list_type='books'): + return tag_list(tags, choices, category, list_type) @register.inclusion_tag('catalogue/collection_list.html') @@ -364,7 +337,7 @@ def work_list(context, object_list): @register.inclusion_tag('catalogue/plain_list.html', takes_context=True) -def plain_list(context, object_list, with_initials=True, by_author=False, choice=None, book=None, gallery=False, +def plain_list(context, object_list, with_initials=True, by_author=False, choice=None, book=None, list_type='books', paged=True, initial_blocks=False): names = [('', [])] last_initial = None @@ -379,14 +352,14 @@ def plain_list(context, object_list, with_initials=True, by_author=False, choice initial = obj.get_initial().upper() if initial != last_initial: last_initial = initial - names.append((obj.author_str() if by_author else initial, [])) + names.append((obj.author_unicode() if by_author else initial, [])) names[-1][1].append(obj) return { 'paged': paged, 'names': names, 'initial_blocks': initial_blocks, 'book': book, - 'gallery': gallery, + 'list_type': list_type, 'choice': choice, }