X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/83f999c77fa2a262df304953c38339351fc719b1..6cc6ca1a2aaf47a116807c53c6a69e6e580bc599:/src/picture/templates/picture/picture_short.html

diff --git a/src/picture/templates/picture/picture_short.html b/src/picture/templates/picture/picture_short.html
index 05a0398ad..a065d4b5a 100644
--- a/src/picture/templates/picture/picture_short.html
+++ b/src/picture/templates/picture/picture_short.html
@@ -6,63 +6,67 @@
 <div class="{% block box-class %}book-box{% endblock %} picture">
   <div class="book-box-inner">
     <div class="book-box-body">
-      <div class="book-box-head">
-          <div class="author">
-              {% for tag in tags.author %}
-                  <a href="{{ tag.get_absolute_gallery_url }}">{{ tag }}</a>{% if not forloop.last %},
-              {% endif %}{% endfor %}
-          </div>
-          <div class="title">
-              {% if main_link %}<a href="{{ main_link }}">{% endif %}
-                  {{ picture.title }}
-              {% if main_link %}</a>{% endif %}
-          </div>
-      </div>
+      {% with picture.get_absolute_url as main_link %}
+      {% with picture.tags_by_category as tags %}
+        <div class="book-box-head">
+            <div class="author">
+                {% for tag in tags.author %}
+                    <a href="{{ tag.get_absolute_gallery_url }}">{{ tag }}</a>{% if not forloop.last %},
+                {% endif %}{% endfor %}
+            </div>
+            <div class="title">
+                {% if main_link %}<a href="{{ main_link }}">{% endif %}
+                    {{ picture.title }}
+                {% if main_link %}</a>{% endif %}
+            </div>
+        </div>
 
-      <div class="cover-area">
-        {% block picture-view %}
-        {% if main_link %}<a href="{{ main_link }}">{% endif %}
-          {% thumbnail picture.image_file "216x288" crop="center" as thumb %}
-          <img class="cover" src="{{thumb.url}}"/>
-          {% endthumbnail %}
-        {% if main_link %}</a>{% endif %}
-        {% endblock %}
-         {# what about licensing icons here #}
-      </div>
+        <div class="cover-area">
+          {% block picture-view %}
+          {% if main_link %}<a href="{{ main_link }}">{% endif %}
+            {% thumbnail picture.image_file "216x288" crop="center" as thumb %}
+            <img class="cover" src="{{thumb.url}}"/>
+            {% endthumbnail %}
+          {% if main_link %}</a>{% endif %}
+          {% endblock %}
+           {# what about licensing icons here #}
+        </div>
 
-      <div class="tags">
-        {% spaceless %}
-          <span class="category">
-            <span class="mono"> {% trans "Epoch" %}:</span>&nbsp;<span class="book-box-tag">
-              {% for tag in tags.epoch %}
-                <a href="{{ tag.get_absolute_gallery_url }}">{{ tag }}</a>
-                {% if not forloop.last %}<span>, </span>{% endif %}
-              {% endfor %}
+        <div class="tags">
+          {% spaceless %}
+            <span class="category">
+              <span class="mono"> {% trans "Epoch" %}:</span>&nbsp;<span class="book-box-tag">
+                {% for tag in tags.epoch %}
+                  <a href="{{ tag.get_absolute_gallery_url }}">{{ tag }}</a>
+                  {% if not forloop.last %}<span>, </span>{% endif %}
+                {% endfor %}
+              </span>
             </span>
-          </span>
 
-          <span class="category">
-            <span class="mono"> {% trans "Kind" %}:</span>&nbsp;<span class="book-box-tag">
-              {% for tag in tags.kind %}
-                <a href="{{ tag.get_absolute_gallery_url }}">{{ tag }}</a>
-                {% if not forloop.last %}<span>, </span>{% endif %}
-              {% endfor %}
+            <span class="category">
+              <span class="mono"> {% trans "Kind" %}:</span>&nbsp;<span class="book-box-tag">
+                {% for tag in tags.kind %}
+                  <a href="{{ tag.get_absolute_gallery_url }}">{{ tag }}</a>
+                  {% if not forloop.last %}<span>, </span>{% endif %}
+                {% endfor %}
+              </span>
             </span>
-          </span>
 
-          <span class="category">
-            <span class="mono"> {% trans "Genre" %}:</span>&nbsp;<span class="book-box-tag">
-              {% for tag in tags.genre %}
-                <a href="{{ tag.get_absolute_gallery_url }}">{{ tag }}</a>
-                {% if not forloop.last %}<span>, </span>{% endif %}
-              {% endfor %}
+            <span class="category">
+              <span class="mono"> {% trans "Genre" %}:</span>&nbsp;<span class="book-box-tag">
+                {% for tag in tags.genre %}
+                  <a href="{{ tag.get_absolute_gallery_url }}">{{ tag }}</a>
+                  {% if not forloop.last %}<span>, </span>{% endif %}
+                {% endfor %}
+              </span>
             </span>
-          </span>
 
-          {% block extra_categories %}
-          {% endblock %}
-        {% endspaceless %}
-      </div>
+            {% block extra_categories %}
+            {% endblock %}
+          {% endspaceless %}
+        </div>
+      {% endwith %}
+      {% endwith %}
     </div>
     <ul class="book-box-tools">
       <li class="book-box-read">