X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/6f76645ab55509cc72ce4bb1e645d9287d620935..5411431fe8c247572635a206cc977816dded415c:/apps/catalogue/templatetags/catalogue_tags.py

diff --git a/apps/catalogue/templatetags/catalogue_tags.py b/apps/catalogue/templatetags/catalogue_tags.py
index 29b4f2b83..e433b8e32 100644
--- a/apps/catalogue/templatetags/catalogue_tags.py
+++ b/apps/catalogue/templatetags/catalogue_tags.py
@@ -14,6 +14,8 @@ from django.db.models import Q
 from django.conf import settings
 from django.utils.translation import ugettext as _
 
+from catalogue.forms import SearchForm
+
 
 register = template.Library()
 
@@ -140,8 +142,20 @@ def book_tree(book_list, books_by_parent):
 
 
 @register.simple_tag
-def person_name(person):
-    return ' '.join(p.strip() for p in person.split(',')[::-1])
+def all_editors(extra_info):
+    editors = []
+    if 'editors' in extra_info:
+        editors += extra_info['editors']
+    if 'technical_editors' in extra_info:
+        editors += extra_info['technical_editors']
+    # support for extra_info-s from librarian<1.2
+    if 'editor' in extra_info:
+        editors.append(extra_info['editor'])
+    if 'technical_editor' in extra_info:
+        editors.append(extra_info['technical_editor'])
+    return ', '.join(
+                     ' '.join(p.strip() for p in person.rsplit(',', 1)[::-1])
+                     for person in sorted(set(editors)))
 
 
 @register.simple_tag
@@ -154,9 +168,12 @@ 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):
-    from catalogue.forms import SearchForm
     context = {'tag_list': tags}
     try:
         max_tag_list = settings.MAX_TAG_LIST
@@ -248,7 +265,7 @@ def tag_list(tags, choices=None):
 
 
 @register.inclusion_tag('catalogue/folded_tag_list.html')
-def folded_tag_list(tags, choices=None):
+def folded_tag_list(tags, title='', choices=None):
     tags = [tag for tag in tags if tag.count]
     if choices is None:
         choices = []
@@ -263,3 +280,7 @@ def folded_tag_list(tags, choices=None):
             some_tags_hidden = True
     return locals()
 
+
+@register.inclusion_tag('catalogue/book_info.html')
+def book_info(book):
+    return locals()