add section numbers in search + 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 dfe9ac5..6173d7c 100644 (file)
--- a/wolnelektury/templates/catalogue/book_short.html
+++ b/wolnelektury/templates/catalogue/book_short.html
@@ -45,34 +45,31 @@
             <div class="title"><a href="{{ main_link }}">{{ book.title }}</a></div>
         </div>
         <div class="tags">
-            {% 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 %}
         </div>
     </div>
 
-    {% block book-box-extra-info %}{% endblock %}
-
     <ul class="book-box-tools">
         <li class="book-box-read">
         {% if book.html_file %}
@@ -102,6 +99,7 @@
         {% endif %}
         </li>
     </ul>
+    {% block book-box-extra-info %}{% endblock %}
     {% block box-append %}
     {% endblock %}
     <div class="clearboth"></div>