add contrib locale to make-locale-pack, various bugfixes

[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 2c81b2e..ee097ae 100644 (file)
--- a/wolnelektury/templates/catalogue/book_short.html
+++ b/wolnelektury/templates/catalogue/book_short.html
@@ -1,23 +1,21 @@
 {% 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 }}">
+    {% if main_link %}<a href="{{ main_link }}">{% endif %}
         {% if book.cover %}
             <img src="
-                {% thumbnail book.cover "216x288" as thumb %}
+                {% thumbnail book.cover "139x193" as thumb %}
                     {{ thumb.url }}
                 {% empty %}
                     {{ book.cover.url }}
                 {% endthumbnail %}
             " alt="Cover" />
         {% endif %}
-    </a>
-    {% block right-column %}
-    {% endblock %}
+    {% if main_link %}</a>{% endif %}
     <div class="book-box-body">
 
 
@@ -37,36 +35,47 @@
 
         <div class="book-box-head">
             <div class="mono author">
-                {% for name, url in related.tags.author %}
-                    {{ name }}{% if not forloop.last %}, {% endif %}
-                {% endfor %}
+                {% 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 %}
             </div>
-            <div class="title">{{ book.title }}</div>
+            <div class="title">
+                               {% if main_link %}<a href="{{ main_link }}">{% endif %}
+                                       {{ book.title }}
+                           {% if main_link %}</a>{% endif %}
+                       </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 %}
+           {% endspaceless %}
         </div>
     </div>
+    {% shelf_tags book %}
+
     <ul class="book-box-tools">
         <li class="book-box-read">
         {% if book.html_file %}
@@ -76,17 +85,17 @@
         <li class="book-box-download">
             <a class="mono downarrow">{% trans "Download" %}</a>
             <div class="book-box-formats mono">
-             {% if formats.pdf %}
-             <span><a href="{{formats.pdf.url}}">PDF</a> do wydruku</span>
+             {% if book.pdf_file %}
+             <span><a href="{{ book.pdf_file.url}}">PDF</a> {% trans "to print" %}</span>
              {% endif %}
-             {% if formats.epub %}
-             <span><a href="{{formats.epub.url}}">EPUB</a> na czytnik</span>
+             {% if  book.epub_file %}
+             <span><a href="{{ book.epub_file.url}}">EPUB</a> {% trans "for an e-book reader" %}</span>
              {% endif %}
-             {% if formats.mobi %}
-             <span><a href="{{formats.mobi.url}}">MOBI</a> na Kindle</span>
+             {% if  book.mobi_file %}
+             <span><a href="{{ book.mobi_file.url}}">MOBI</a> {% trans "for Kindle" %}</span>
              {% endif %}
-             {% if formats.txt %}
-             <span><a href="{{formats.txt.url}}">TXT</a> do zadań specjalnych</span>
+             {% if  book.txt_file %}
+             <span><a href="{{ book.txt_file.url}}">TXT</a> {% trans "for advanced usage" %}</span>
              {% endif %}
             </div>
         </li>
@@ -96,7 +105,11 @@
         {% endif %}
         </li>
     </ul>
+    {% block book-box-extra-info %}{% endblock %}
     {% block box-append %}
     {% endblock %}
+    {% block right-column %}
+    {% endblock %}
+    <div class="clearboth"></div>
 </div>
 </div>