Merge branch 'master' into rwd

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

diff --git a/apps/catalogue/templates/catalogue/book_short.html b/apps/catalogue/templates/catalogue/book_short.html
index c8fb952..4acefe2 100644 (file)
--- a/apps/catalogue/templates/catalogue/book_short.html
+++ b/apps/catalogue/templates/catalogue/book_short.html
@@ -28,8 +28,8 @@
 
         <div class="book-box-head">
             <div class="author">
-                {% for name, slug in related.tags.author %}
-                    <a href="{% tag_url 'author' slug %}">{{ name }}</a>{% if not forloop.last %},
+                {% for tag in related.tags.author %}
+                    <a href="{% tag_url 'author' tag.slug %}">{% related_tag_name tag %}</a>{% if not forloop.last %},
                 {% endif %}{% endfor %}{% for title, slug in related.parents %},
                     <a href="{% url 'book_detail' slug %}">{{ title }}</a>{% endfor %}
             </div>
@@ -59,24 +59,24 @@
 
             <span class="category">
             <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>
+               {% for tag in related.tags.epoch %}
+                       <a href="{% tag_url 'epoch' tag.slug %}">{% related_tag_name tag %}</a>
                        {% if not forloop.last %}<span>, </span>{% endif %}
                 {% endfor %}
             </span></span>
 
             <span class="category">
             <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>
+               {% for tag in related.tags.kind %}
+                       <a href="{% tag_url 'kind' tag.slug %}">{% related_tag_name tag %}</a>
                        {% if not forloop.last %}<span>, </span>{% endif %}
                 {% endfor %}
             </span></span>
 
             <span class="category">
             <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>
+               {% for tag in related.tags.genre %}
+                       <a href="{% tag_url 'genre' tag.slug %}">{% related_tag_name tag %}</a>
                        {% if not forloop.last %}<span>, </span>{% endif %}
                 {% endfor %}
             </span></span>