From f7bf1b53894f95a4c27d3063c70ce798f39a6d3b Mon Sep 17 00:00:00 2001
From: =?utf8?q?Marek=20St=C4=99pniowski?= <marek@stepniowski.com>
Date: Thu, 4 Sep 2008 00:49:28 +0200
Subject: [PATCH] Added inclusion tag for book.

---
 catalogue/templatetags/catalogue_tags.py | 17 +++++++++++++++++
 templates/catalogue/_book.html           | 21 ++-------------------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/catalogue/templatetags/catalogue_tags.py b/catalogue/templatetags/catalogue_tags.py
index 3c75801a7..d3a25ad93 100644
--- a/catalogue/templatetags/catalogue_tags.py
+++ b/catalogue/templatetags/catalogue_tags.py
@@ -4,6 +4,7 @@ from django.template import Node, Variable
 from django.utils.encoding import smart_str
 from django.core.urlresolvers import reverse
 from django.contrib.auth.forms import UserCreationForm, AuthenticationForm
+from django.db.models import Q
 
 
 register = template.Library()
@@ -116,6 +117,22 @@ def breadcrumbs(tags, search_form=True):
     return context
 
 
+@register.inclusion_tag('catalogue/_book.html')
+def book(book):
+    tags = book.tags.filter(~Q(category__in=('set', 'theme')))
+    tags = [u'<a href="%s">%s</a>' % (tag.get_absolute_url(), tag.name) for tag in tags]
+    
+    formats = []
+    if book.html_file:
+        formats.append(u'<a href="%s">Czytaj online</a>' % book.html_file.url)
+    if book.pdf_file:
+        formats.append(u'<a href="%s">Plik PDF</a>' % book.pdf_file.url)
+    if book.odt_file:
+        formats.append(u'<a href="%s">Plik ODT</a>' % book.odt_file.url)
+        
+    return {'book': book, 'tags': tags, 'formats': formats}
+
+
 @register.tag
 def catalogue_url(parser, token):
     bits = token.split_contents()
diff --git a/templates/catalogue/_book.html b/templates/catalogue/_book.html
index 7666b61fe..08cb12c5e 100644
--- a/templates/catalogue/_book.html
+++ b/templates/catalogue/_book.html
@@ -7,24 +7,7 @@
     <div class="book-thumbnail"></div>
     <div class="book-description">
         <h2><a href="{{ book.get_absolute_url }}">{{ book.title }}</a></h2>
-        <p style="margin: 0">Formaty: 
-            <a href="#">Czytaj online</a>
-            {% if book.pdf_file %}
-                <a href="{{ book.pdf_file.url }}">Pobierz plik PDF</a>
-            {% endif %}
-            {% if book.odt_file %}
-                <a href="{{ book.odt_file.url }}">ODT</a>
-            {% endif %}
-            {% if book.html_file %}
-                <a href="{{ book.html_file.url }}">Pobierz plik HTML</a>
-            {% endif %}
-        </p>
-        <p style="margin: 0">Utwór w kategoriach:
-        {% for tag in book.tags %}
-            {% ifnotequal tag.category "set" %}
-                <a href="{{ tag.get_absolute_url }}">{{ tag }}</a>{% if not forloop.last %},{% endif %}
-            {% endifnotequal %}
-        {% endfor %}
-        </p>
+        <p style="margin: 0">Formaty: {{ formats|join:", "|safe }}</p>
+        <p style="margin: 0">Utwór w kategoriach: {{ tags|join:", "|safe }}</p>
     </div>
 </div>
\ No newline at end of file
-- 
2.20.1