X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/357027375ff8867f42ca34bcbfb5a78b5b185fc3..2e37735013cf9e1f806851ac82a1f517a597298e:/src/catalogue/templatetags/catalogue_tags.py diff --git a/src/catalogue/templatetags/catalogue_tags.py b/src/catalogue/templatetags/catalogue_tags.py index 6e81caec2..117abba0c 100644 --- a/src/catalogue/templatetags/catalogue_tags.py +++ b/src/catalogue/templatetags/catalogue_tags.py @@ -4,6 +4,7 @@ # from random import randint, random from urlparse import urlparse +from django.contrib.contenttypes.models import ContentType from django.conf import settings from django import template @@ -23,14 +24,18 @@ 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) + """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) + """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): @@ -107,8 +112,8 @@ def title_from_tags(tags): # Specjalny przypadek "Dramat w twórczości Sofoklesa", wtedy gdy podane # są tylko rodzaj literacki i autor if 'kind' in self and 'author' in self and len(self) == 2: - text = u'%s w twórczości %s' % (unicode(self['kind']), - flection.get_case(unicode(self['author']), u'dopełniacz')) + text = u'%s w twórczości %s' % ( + unicode(self['kind']), flection.get_case(unicode(self['author']), u'dopełniacz')) return capfirst(text) # Przypadki ogólniejsze @@ -149,17 +154,20 @@ def book_tree(book_list, books_by_parent): else: return '' + @register.simple_tag def audiobook_tree(book_list, books_by_parent): text = "".join("
  • %s%s
  • " % ( - reverse("book_player", args=[book.slug]), book.title, audiobook_tree(books_by_parent.get(book, ()), books_by_parent) - ) for book in book_list) + reverse("book_player", args=[book.slug]), book.title, + audiobook_tree(books_by_parent.get(book, ()), books_by_parent) + ) for book in book_list) if text: return "
      %s
    " % text else: return '' + @register.simple_tag def book_tree_texml(book_list, books_by_parent, depth=1): return "".join(""" @@ -200,6 +208,7 @@ def book_tree_csv(author, book_list, books_by_parent, depth=1, max_depth=3, deli "children": book_tree_csv(author, books_by_parent.get(book.id, ()), books_by_parent, depth + 1) } for book in book_list) + @register.simple_tag def all_editors(extra_info): editors = [] @@ -242,10 +251,26 @@ def catalogue_url(parser, token): 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:]: + 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) + + class CatalogueURLNode(Node): - def __init__(self, tags_to_add, tags_to_remove): + def __init__(self, tags_to_add, tags_to_remove, gallery=False): 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 def render(self, context): tags_to_add = [] @@ -273,23 +298,41 @@ class CatalogueURLNode(Node): pass if len(tag_slugs) > 0: - return reverse('tagged_object_list', kwargs={'tags': '/'.join(tag_slugs)}) + if self.gallery: + return reverse('tagged_object_list_gallery', kwargs={'tags': '/'.join(tag_slugs)}) + else: + return reverse('tagged_object_list', kwargs={'tags': '/'.join(tag_slugs)}) else: - return reverse('main_page') + return reverse('book_list') @register.inclusion_tag('catalogue/tag_list.html') -def tag_list(tags, choices=None): +def tag_list(tags, choices=None, category=None, gallery=False): + print(tags, choices, category) if choices is None: choices = [] - if len(tags) == 1 and tags[0].category not in [t.category for t in choices]: + + if category is None and tags: + category = tags[0].category + + category_choices = [tag for tag in choices if tag.category == category] + + if len(tags) == 1 and category not in [t.category for t in choices]: one_tag = tags[0] + + if category is not None: + 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) + other = other.filter(items__content_type=ct).distinct() + return locals() @register.inclusion_tag('catalogue/inline_tag_list.html') -def inline_tag_list(tags, choices=None): - return tag_list(tags, choices) +def inline_tag_list(tags, choices=None, category=None, gallery=False): + return tag_list(tags, choices, category, gallery) @register.inclusion_tag('catalogue/collection_list.html') @@ -311,10 +354,28 @@ def work_list(context, object_list): return locals() +@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, + paged=True): + names = [('', [])] + last_initial = None + for obj in object_list: + if with_initials: + if by_author: + initial = obj.sort_key_author + else: + initial = obj.get_initial().upper() + if initial != last_initial: + last_initial = initial + names.append((obj.author_str() if by_author else initial, [])) + names[-1][1].append(obj) + return locals() + + # TODO: These are no longer just books. @register.inclusion_tag('catalogue/related_books.html', takes_context=True) def related_books(context, instance, limit=6, random=1, taken=0): - limit = limit - taken + limit -= taken max_books = limit - random is_picture = isinstance(instance, Picture) @@ -347,33 +408,19 @@ def related_books(context, instance, limit=6, random=1, taken=0): } -@register.inclusion_tag('catalogue/menu.html') -def catalogue_menu(): - return {'categories': [ - ('author', _('Authors'), 'autorzy'), - ('genre', _('Genres'), 'gatunki'), - ('kind', _('Kinds'), 'rodzaje'), - ('epoch', _('Epochs'), 'epoki'), - ('theme', _('Themes'), 'motywy'), - ]} - - @register.simple_tag def download_audio(book, daisy=True): links = [] if book.has_media('mp3'): - links.append("%s" % - (reverse('download_zip_mp3', args=[book.slug]), - BookMedia.formats['mp3'].name)) + links.append("%s" % ( + reverse('download_zip_mp3', args=[book.slug]), BookMedia.formats['mp3'].name)) if book.has_media('ogg'): - links.append("%s" % - (reverse('download_zip_ogg', args=[book.slug]), - BookMedia.formats['ogg'].name)) + links.append("%s" % ( + reverse('download_zip_ogg', args=[book.slug]), BookMedia.formats['ogg'].name)) if daisy and book.has_media('daisy'): for dsy in book.get_media('daisy'): - links.append("%s" % - (dsy.file.url, BookMedia.formats['daisy'].name)) - return ", ".join(links) + links.append("%s" % (dsy.file.url, BookMedia.formats['daisy'].name)) + return "".join(links) @register.inclusion_tag("catalogue/snippets/custom_pdf_link_li.html")