X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/57a20265fc4e83cdaa26d8c05af2e4d9a77afea0..145bf215dceaee2808be13e45e8c5c09907ecd36:/apps/catalogue/templatetags/catalogue_tags.py

diff --git a/apps/catalogue/templatetags/catalogue_tags.py b/apps/catalogue/templatetags/catalogue_tags.py
index ad60962c5..6a30a9c26 100644
--- a/apps/catalogue/templatetags/catalogue_tags.py
+++ b/apps/catalogue/templatetags/catalogue_tags.py
@@ -4,6 +4,7 @@
 #
 import datetime
 import feedparser
+from random import randint
 
 from django.conf import settings
 from django import template
@@ -310,6 +311,11 @@ def inline_tag_list(tags, choices=None):
     return tag_list(tags, choices)
 
 
+@register.inclusion_tag('catalogue/collection_list.html')
+def collection_list(collections):
+    return locals()
+
+
 @register.inclusion_tag('catalogue/book_info.html')
 def book_info(book):
     return locals()
@@ -344,9 +350,11 @@ def book_short(context, book):
 
 @register.inclusion_tag('catalogue/book_mini_box.html')
 def book_mini(book):
+    author_str = ", ".join(name
+        for name, url in book.related_info()['tags']['author'])
     return {
         'book': book,
-        'related': book.related_info(),
+        'author_str': author_str,
     }
 
 
@@ -388,9 +396,14 @@ def related_books(book, limit=6, random=1):
                     ignore_by_tag=book.book_tag())[:limit-random]
         cache.set(cache_key, related, 1800)
     if random:
-        related += list(Book.objects.exclude(
-                        pk__in=[b.pk for b in related] + [book.pk]
-                    ).order_by('?')[:random])
+        random_books = Book.objects.exclude(
+                        pk__in=[b.pk for b in related] + [book.pk])
+        if random == 1:
+            count = random_books.count()
+            if count:
+                related.append(random_books[randint(0, count - 1)])
+        else:
+            related += list(random_books.order_by('?')[:random])
     return {
         'books': related,
     }
@@ -398,18 +411,18 @@ def related_books(book, limit=6, random=1):
 
 @register.inclusion_tag('catalogue/menu.html')
 def catalogue_menu():
-    tags = Tag.objects.filter(
-            category__in=('author', 'epoch', 'genre', 'kind', 'theme')
-        ).exclude(book_count=0)
-    return split_tags(tags)
-    
+    return {'categories': [
+                ('author', _('Authors'), 'autorzy'),
+                ('genre', _('Genres'), 'gatunki'),
+                ('kind', _('Kinds'), 'rodzaje'),
+                ('epoch', _('Epochs'), 'epoki'),
+                ('theme', _('Themes'), 'autorzy'),
+        ]}
 
 
 @register.simple_tag
 def tag_url(category, slug):
-    return reverse('catalogue.views.tagged_object_list', args=[
-        '/'.join((Tag.categories_dict[category], slug))
-    ])
+    return Tag.create_url(category, slug)
 
 
 @register.simple_tag