X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/ae60b2a3949e96357477cc04f90fd0873cee8a92..b74fa4eb15c62d11fe0fa2b1015571c90681dd86:/src/catalogue/templatetags/catalogue_tags.py
diff --git a/src/catalogue/templatetags/catalogue_tags.py b/src/catalogue/templatetags/catalogue_tags.py
index 23eeedacc..263f12cfa 100644
--- a/src/catalogue/templatetags/catalogue_tags.py
+++ b/src/catalogue/templatetags/catalogue_tags.py
@@ -10,34 +10,21 @@ 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.safestring import mark_safe
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 paypal.rest import user_is_subscribed
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)
@@ -71,7 +58,7 @@ def simple_title(tags):
@register.simple_tag
def book_title(book, html_links=False):
- return book.pretty_title(html_links)
+ return mark_safe(book.pretty_title(html_links))
@register.simple_tag
@@ -150,7 +137,7 @@ def book_tree(book_list, books_by_parent):
) for book in book_list)
if text:
- return "%s
" % text
+ return mark_safe("%s
" % text)
else:
return ''
@@ -163,14 +150,14 @@ def audiobook_tree(book_list, books_by_parent):
) for book in book_list)
if text:
- return "%s
" % text
+ return mark_safe("%s
" % text)
else:
return ''
@register.simple_tag
def book_tree_texml(book_list, books_by_parent, depth=1):
- return "".join("""
+ return mark_safe("".join("""
%(depth)dem%(title)s
%(audiences)s
%(audiobook)s
@@ -182,7 +169,7 @@ def book_tree_texml(book_list, books_by_parent, depth=1):
"audiences": ", ".join(book.audiences_pl()),
"audiobook": "audiobook" if book.has_media('mp3') else "",
"children": book_tree_texml(books_by_parent.get(book.id, ()), books_by_parent, depth + 1)
- } for book in book_list)
+ } for book in book_list))
@register.simple_tag
@@ -195,7 +182,7 @@ def book_tree_csv(author, book_list, books_by_parent, depth=1, max_depth=3, deli
except ValueError:
return s
- return "".join("""%(author)s%(d)s%(preindent)s%(title)s%(d)s%(postindent)s%(audiences)s%(d)s%(audiobook)s
+ return mark_safe("".join("""%(author)s%(d)s%(preindent)s%(title)s%(d)s%(postindent)s%(audiences)s%(d)s%(audiobook)s
%(children)s""" % {
"d": delimeter,
"preindent": delimeter * (depth - 1),
@@ -206,7 +193,7 @@ def book_tree_csv(author, book_list, books_by_parent, depth=1, max_depth=3, deli
"audiences": ", ".join(book.audiences_pl()),
"audiobook": "audiobook" if book.has_media('mp3') else "",
"children": book_tree_csv(author, books_by_parent.get(book.id, ()), books_by_parent, depth + 1)
- } for book in book_list)
+ } for book in book_list))
@register.simple_tag
@@ -226,53 +213,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:]:
+ 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)
-
-
-@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)
+ 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,17 +261,24 @@ 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):
- print(tags, choices, category)
+# @register.inclusion_tag('catalogue/tag_list.html')
+def tag_list(tags, choices=None, category=None, list_type='books'):
+ # print(tags, choices, category)
if choices is None:
choices = []
@@ -319,25 +289,39 @@ def tag_list(tags, choices=None, category=None, gallery=False):
if len(tags) == 1 and category not in [t.category for t in choices]:
one_tag = tags[0]
+ else:
+ one_tag = None
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)
+ 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 locals()
+ 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')
def collection_list(collections):
- return locals()
+ return {'collections': collections}
@register.inclusion_tag('catalogue/book_info.html')
@@ -351,11 +335,11 @@ def book_info(book):
@register.inclusion_tag('catalogue/work-list.html', takes_context=True)
def work_list(context, object_list):
request = context.get('request')
- return locals()
+ return {'object_list': object_list, 'request': request}
@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
@@ -370,9 +354,18 @@ 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 locals()
+ if names[0] == ('', []):
+ del names[0]
+ return {
+ 'paged': paged,
+ 'names': names,
+ 'initial_blocks': initial_blocks,
+ 'book': book,
+ 'list_type': list_type,
+ 'choice': choice,
+ }
# TODO: These are no longer just books.
@@ -412,9 +405,9 @@ def related_books(context, instance, limit=6, random=1, taken=0):
@register.simple_tag
-def download_audio(book, daisy=True):
+def download_audio(book, daisy=True, mp3=True):
links = []
- if book.has_media('mp3'):
+ if mp3 and book.has_media('mp3'):
links.append("%s" % (
reverse('download_zip_mp3', args=[book.slug]), BookMedia.formats['mp3'].name))
if book.has_media('ogg'):
@@ -423,7 +416,7 @@ def download_audio(book, daisy=True):
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)
+ return mark_safe("".join(links))
@register.inclusion_tag("catalogue/snippets/custom_pdf_link_li.html")
@@ -500,3 +493,13 @@ def strip_tag(html, tag_name):
# docelowo może byÄ warto zainstalowaÄ BeautifulSoup do takich rzeczy
import re
return re.sub(r"<.?%s\b[^>]*>" % tag_name, "", html)
+
+
+@register.filter
+def status(book, user):
+ if not book.preview:
+ return 'open'
+ elif user_is_subscribed(user):
+ return 'preview'
+ else:
+ return 'closed'