more fixes

[wolnelektury.git] / wolnelektury / templates / catalogue / book_short.html

diff --git a/wolnelektury/templates/catalogue/book_short.html b/wolnelektury/templates/catalogue/book_short.html
index 9eae96f..424487b 100644 (file)
--- a/wolnelektury/templates/catalogue/book_short.html
+++ b/wolnelektury/templates/catalogue/book_short.html
@@ -40,39 +40,39 @@
                 {% 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="{{ 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, slug in related.tags.epoch %}
-                    <a href="{% tag_url 'epoch' slug %}">{{ 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, slug in related.tags.kind %}
-                    <a href="{% tag_url 'kind' slug %}">{{ 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, slug in related.tags.genre %}
-                    <a href="{% tag_url 'genre' slug %}">{{ 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>