display changes, mostly in book boxes

[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 583c9c7..542f1cd 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,29 @@ 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,
+        '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,
+        'related': book.related_info(),
         'request': context.get('request'),
     }
 
@@ -310,8 +313,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(),
     }
 
 
@@ -345,16 +348,9 @@ def related_books(book, limit=6):
         common_slug=book.common_slug).exclude(pk=book.pk)[:limit])
     limit -= len(related)
     if limit:
-        tagged = Book.tagged.with_any(book.tags).exclude(pk=book.pk)
-        book_tag = book.book_tag()
-        for rel_book in tagged:
-            if book_tag in rel_book.tags.all():
-                continue
-            related += [rel_book]
-            limit -= 1
-            if not limit:
-                break
-
+        related += Book.tagged.related_to(book,
+                Book.objects.exclude(common_slug=book.common_slug),
+                ignore_by_tag=book.book_tag())[:limit]
     return {
         'books': related,
     }