merge

[wolnelektury.git] / apps / catalogue / templatetags / catalogue_tags.py

diff --git a/apps/catalogue/templatetags/catalogue_tags.py b/apps/catalogue/templatetags/catalogue_tags.py
index f6347e9..961cc01 100644 (file)
--- a/apps/catalogue/templatetags/catalogue_tags.py
+++ b/apps/catalogue/templatetags/catalogue_tags.py
@@ -17,8 +17,9 @@ from django.conf import settings
 from django.template.defaultfilters import stringfilter
 from django.utils.translation import ugettext as _
 
+from catalogue import forms
 from catalogue.utils import split_tags
-from catalogue.models import Book, Fragment
+from catalogue.models import Book, Fragment, Tag
 
 register = template.Library()
 
@@ -282,27 +283,31 @@ def book_info(book):
 
 @register.inclusion_tag('catalogue/book_wide.html', takes_context=True)
 def book_wide(context, book):
-    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)
+    theme_counter = book.theme_counter
+    book_themes = Tag.objects.filter(pk__in=theme_counter.keys())
+    for tag in book_themes:
+        tag.count = theme_counter[tag.pk]
+    extra_info = book.get_extra_info_value()
+    hide_about = extra_info.get('about', '').startswith('http://wiki.wolnepodreczniki.pl')
 
     return {
-        'related': book.related_info(),
         'book': book,
-        'formats': formats,
+        'main_link': reverse('book_text', args=[book.slug]),
+        'related': book.related_info(),
         'extra_info': book.get_extra_info_value(),
+        'hide_about': hide_about,
+        'themes': book_themes,
+        'custom_pdf_form': forms.CustomPDFForm(),
         'request': context.get('request'),
-        'fragment': book.choose_fragment(),
     }
 
 
 @register.inclusion_tag('catalogue/book_short.html', takes_context=True)
 def book_short(context, book):
     return {
-        'related': book.related_info(),
         'book': book,
+        'main_link': book.get_absolute_url(),
+        'related': book.related_info(),
         'request': context.get('request'),
     }
 
@@ -310,8 +315,8 @@ def book_short(context, book):
 @register.inclusion_tag('catalogue/book_mini_box.html')
 def book_mini(book):
     return {
-        'related': book.related_info(),
         'book': book,
+        'related': book.related_info(),
     }
 
 
@@ -323,8 +328,8 @@ def work_list(context, object_list):
     return locals()
 
 
-@register.inclusion_tag('catalogue/chosen_fragment.html')
-def promo_fragment(arg=None):
+@register.inclusion_tag('catalogue/fragment_promo.html')
+def fragment_promo(arg=None):
     if arg is None:
         fragments = Fragment.objects.all().order_by('?')
         fragment = fragments[0] if fragments.exists() else None
@@ -339,16 +344,22 @@ def promo_fragment(arg=None):
     }
 
 
-@register.filter
-@stringfilter
-def removewholetags(value, tags):
-    """Removes a space separated list of [X]HTML tags from the output.
+@register.inclusion_tag('catalogue/related_books.html')
+def related_books(book, limit=6):
+    related = list(Book.objects.filter(
+        common_slug=book.common_slug).exclude(pk=book.pk)[:limit])
+    limit -= len(related)
+    if limit:
+        related += Book.tagged.related_to(book,
+                Book.objects.exclude(common_slug=book.common_slug),
+                ignore_by_tag=book.book_tag())[:limit]
+    return {
+        'books': related,
+    }
 
-    FIXME: It makes the assumption the removed tags aren't nested.
 
-    """
-    tags = [re.escape(tag) for tag in tags.split()]
-    tags_re = u'(%s)' % u'|'.join(tags)
-    tag_re = re.compile(ur'<%s[^>]*>.*?</\s*\1\s*>' % tags_re, re.U)
-    value = tag_re.sub(u'', value)
-    return value
+@register.simple_tag
+def tag_url(category, slug):
+    return reverse('catalogue.views.tagged_object_list', args=[
+        '/'.join((Tag.categories_dict[category], slug))
+    ])