Merge branch 'pretty' of https://github.com/fnp/wolnelektury into pretty

[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..3541d0f 100644 (file)
--- a/wolnelektury/templates/catalogue/book_short.html
+++ b/wolnelektury/templates/catalogue/book_short.html
@@ -16,8 +16,6 @@
             " alt="Cover" />
         {% endif %}
     </a>
-    {% block right-column %}
-    {% endblock %}
     <div class="book-box-body">
 
 
@@ -44,34 +42,35 @@
             </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">
@@ -83,16 +82,16 @@
             <a class="mono downarrow">{% trans "Download" %}</a>
             <div class="book-box-formats mono">
              {% if book.pdf_file %}
-             <span><a href="{{ book.pdf_file.url}}">PDF</a> do wydruku</span>
+             <span><a href="{{ book.pdf_file.url}}">PDF</a> {% trans "to print" %}</span>
              {% endif %}
              {% if  book.epub_file %}
-             <span><a href="{{ book.epub_file.url}}">EPUB</a> na czytnik</span>
+             <span><a href="{{ book.epub_file.url}}">EPUB</a> {% trans "for an e-book reader" %}</span>
              {% endif %}
              {% if  book.mobi_file %}
-             <span><a href="{{ book.mobi_file.url}}">MOBI</a> na Kindle</span>
+             <span><a href="{{ book.mobi_file.url}}">MOBI</a> {% trans "for Kindle" %}</span>
              {% endif %}
              {% if  book.txt_file %}
-             <span><a href="{{ book.txt_file.url}}">TXT</a> do zadań specjalnych</span>
+             <span><a href="{{ book.txt_file.url}}">TXT</a> {% trans "for advanced usage" %}</span>
              {% endif %}
             </div>
         </li>
@@ -102,8 +101,11 @@
         {% endif %}
         </li>
     </ul>
+    {% block book-box-extra-info %}{% endblock %}
     {% block box-append %}
     {% endblock %}
+    {% block right-column %}
+    {% endblock %}
     <div class="clearboth"></div>
 </div>
 </div>