X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/69191eddb9e4221d964a7e5b044ff7c5dfe38315..fe3cc2a284f1aa7457b0ec9491203aae100681a6:/wolnelektury/templates/catalogue/book_short.html

diff --git a/wolnelektury/templates/catalogue/book_short.html b/wolnelektury/templates/catalogue/book_short.html
index a6d3028d1..424487bd4 100644
--- a/wolnelektury/templates/catalogue/book_short.html
+++ b/wolnelektury/templates/catalogue/book_short.html
@@ -1,11 +1,11 @@
 {% load i18n %}
-{% load social_tags %}
+{% load catalogue_tags social_tags %}
 {% load thumbnail %}
 <div class="{% block box-class %}book-box{% endblock %}">
 <div class="book-box-inner" style="position: relative;">
 
 
-    <a href="{{ book.get_absolute_url }}">
+    <a href="{{ main_link }}">
         {% if book.cover %}
             <img src="
                 {% thumbnail book.cover "139x193" as thumb %}
@@ -37,42 +37,42 @@
 
         <div class="book-box-head">
             <div class="mono author">
-                {% for name, url in related.tags.author %}
-                    <a href="{{ url }}">{{ name }}</a>{% if not forloop.last %},
+                {% for name, slug in related.tags.author %}
+                    <a href="{% tag_url 'author' slug %}">{{ name }}</a>{% if not forloop.last %},
                 {% endif %}{% endfor %}{% for title, slug in related.parents %},
-                    <a href="{% url book_detail slug %}">{{ title }}</a>
-                {% endfor %}
+                    <a href="{% url book_detail slug %}">{{ title }}</a>{% endfor %}
             </div>
-            <div class="title"><a href="{{ book.get_absolute_url }}">{{ book.title }}</a></div>
+            <div class="title"><a href="{{ main_link }}">{{ book.title }}</a></div>
         </div>
+
         <div class="tags">
-            {% spaceless %}
+        	{% spaceless %}
 
-            <span class="mono">{% trans "Epoch" %}:</span>&nbsp;<span class="book-box-tag">
-                {% for name, url in related.tags.epoch %}
-                    <a href="{{ url }}">{{ name }} </a>
+            <span class="mono"> {% trans "Epoch" %}:</span>&nbsp;<span class="book-box-tag">
+            	{% for name, slug in related.tags.epoch %}
+            		<a href="{% tag_url 'epoch' slug %}">{{ name }}</a>
+            		{% if not forloop.last %}<span>,&nbsp;</span>{% endif %}
                 {% endfor %}
             </span>
 
-            <span class="mono">{% trans "Kind" %}:</span>&nbsp;<span class="book-box-tag">
-                {% for name, url in related.tags.kind %}
-                    <a href="{{ url }}">{{ name }} </a>
+            <span class="mono"> {% trans "Kind" %}:</span>&nbsp;<span class="book-box-tag">
+            	{% for name, slug in related.tags.kind %}
+            		<a href="{% tag_url 'kind' slug %}">{{ name }}</a>
+            		{% if not forloop.last %}<span>,&nbsp;</span>{% endif %}
                 {% endfor %}
             </span>
 
-            <span class="mono">{% trans "Genre" %}:</span>&nbsp;<span class="book-box-tag">
-                {% for name, url in related.tags.genre %}
-                    <a href="{{ url }}">{{ name }} </a>
+            <span class="mono"> {% trans "Genre" %}:</span>&nbsp;<span class="book-box-tag">
+            	{% for name, slug in related.tags.genre %}
+            		<a href="{% tag_url 'genre' slug %}">{{ name }}</a>
+            		{% if not forloop.last %}<span>,&nbsp;</span>{% endif %}
                 {% endfor %}
             </span>
 
-            {% endspaceless %}
-
-            {% shelf_tags book %}
+           {% endspaceless %}
         </div>
     </div>
-
-    {% block book-box-extra-info %}{% endblock %}
+    {% shelf_tags book %}
 
     <ul class="book-box-tools">
         <li class="book-box-read">
@@ -103,6 +103,7 @@
         {% endif %}
         </li>
     </ul>
+    {% block book-box-extra-info %}{% endblock %}
     {% block box-append %}
     {% endblock %}
     <div class="clearboth"></div>