X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/af77776a9ff93ac89cfe941c8a97e3e4cac1bd2e..eb59143b0d1b21cfcbe1b7067f027d768fa88fcc:/apps/catalogue/templatetags/catalogue_tags.py

diff --git a/apps/catalogue/templatetags/catalogue_tags.py b/apps/catalogue/templatetags/catalogue_tags.py
index ba70f7b57..df938a624 100644
--- a/apps/catalogue/templatetags/catalogue_tags.py
+++ b/apps/catalogue/templatetags/catalogue_tags.py
@@ -15,6 +15,7 @@ from django.conf import settings
 from django.utils.translation import ugettext as _
 
 from catalogue.forms import SearchForm
+from catalogue.utils import split_tags
 
 
 register = template.Library()
@@ -141,15 +142,17 @@ def book_tree(book_list, books_by_parent):
         return ''
 
 @register.simple_tag
-def book_tree_texml(book_list, books_by_parent, depth=0):
+def book_tree_texml(book_list, books_by_parent, depth=1):
     return "".join("""
             <cmd name='hspace'><parm>%(depth)dem</parm></cmd>%(title)s
-            <spec cat='align' />%(audiobook)s
+            <spec cat='align' /><cmd name="note"><parm>%(audiences)s</parm></cmd>
+            <spec cat='align' /><cmd name="note"><parm>%(audiobook)s</parm></cmd>
             <ctrl ch='\\' />
             %(children)s
             """ % {
                 "depth": depth,
                 "title": book.title, 
+                "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)
@@ -182,22 +185,6 @@ def authentication_form():
     return LoginForm(prefix='login').as_ul()
 
 
-@register.inclusion_tag('catalogue/search_form.html')
-def search_form():
-    return {"form": SearchForm()}
-
-@register.inclusion_tag('catalogue/breadcrumbs.html')
-def breadcrumbs(tags, search_form=True):
-    context = {'tag_list': tags}
-    try:
-        max_tag_list = settings.MAX_TAG_LIST
-    except AttributeError:
-        max_tag_list = -1
-    if search_form and (max_tag_list == -1 or len(tags) < max_tag_list):
-        context['search_form'] = SearchForm(tags=tags)
-    return context
-
-
 @register.tag
 def catalogue_url(parser, token):
     bits = token.split_contents()
@@ -277,24 +264,35 @@ def tag_list(tags, choices=None):
         one_tag = tags[0]
     return locals()
 
-
-@register.inclusion_tag('catalogue/folded_tag_list.html')
-def folded_tag_list(tags, title='', choices=None):
-    tags = [tag for tag in tags if tag.count]
+@register.inclusion_tag('catalogue/inline_tag_list.html')
+def inline_tag_list(tags, choices=None):
     if choices is None:
         choices = []
-    some_tags_hidden = False
-    tag_count = len(tags)
-
-    if tag_count == 1:
+    if len(tags) == 1:
         one_tag = tags[0]
-    else:
-        shown_tags = [tag for tag in tags if tag.main_page]
-        if tag_count > len(shown_tags):
-            some_tags_hidden = True
     return locals()
 
 
 @register.inclusion_tag('catalogue/book_info.html')
 def book_info(book):
     return locals()
+
+
+@register.inclusion_tag('catalogue/book_wide.html')
+def book_wide(book):
+    tags = book.tags.filter(category__in=('author', 'kind', 'genre', 'epoch'))
+    tags = split_tags(tags)
+
+    formats = {}
+    # files generated during publication
+    for ebook_format in book.ebook_formats:
+        if book.has_media(ebook_format):
+            formats[ebook_format] = book.get_media(ebook_format)
+
+    extra_info = book.get_extra_info_value()
+
+    has_media = {}
+    for media_format in ['mp3', 'ogg']:
+        has_media[media_format] = book.has_media(media_format)
+
+    return locals()