fix

[wolnelektury.git] / 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 05a0398..43f54ac 100644 (file)
--- a/src/picture/templates/picture/picture_short.html
+++ b/src/picture/templates/picture/picture_short.html
@@ -5,73 +5,79 @@
 
 <div class="{% block box-class %}book-box{% endblock %} picture">
   <div class="book-box-inner">
 
 <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 class="picture-left-column">
+      <div class="book-box-body">
+        {% 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>

-          <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 %}
-            </span>
-          </span>
+          <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 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 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 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 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>

 
 

-          {% block extra_categories %}
-          {% endblock %}
-        {% endspaceless %}
+              {% block extra_categories %}
+              {% endblock %}
+            {% endspaceless %}
+          </div>
+        {% endwith %}
+        {% endwith %}

       </div>
       </div>

+      <ul class="book-box-tools">
+        <li class="book-box-read">
+          <a href="{% url 'picture_viewer' picture.slug %}" class="downarrow">{% trans "View online" %}</a>
+        </li>
+        <li class="book-box-download">
+          <a href="{{picture.image_file.url}}" class="downarrow">{% trans "download original" %}</a>
+        </li>
+      </ul>

     </div>
     </div>

-    <ul class="book-box-tools">
-      <li class="book-box-read">
-        <a href="{% url 'picture_viewer' picture.slug %}" class="downarrow">{% trans "View online" %}</a>
-      </li>
-      <li class="book-box-download">
-        <a href="{{picture.image_file.url}}" class="downarrow">{% trans "download original" %}</a>
-      </li>
-    </ul>

     {% block book-box-extra-info %}{% endblock %}
     {% block box-append %}{% endblock %}
     {% block right-column %}{% endblock %}
     {% block book-box-extra-info %}{% endblock %}
     {% block box-append %}{% endblock %}
     {% block right-column %}{% endblock %}