X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/68dbe44bdbc497a82064c6a47eeaecbb34463f64..82c3054bcdeb000aa9782da80d644070797b5cbe:/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 4acefe285..b069cb585 100644
--- a/apps/catalogue/templates/catalogue/book_short.html
+++ b/apps/catalogue/templates/catalogue/book_short.html
@@ -1,6 +1,7 @@
+{% spaceless %}
 {% load i18n %}
-{% load catalogue_tags social_tags %}
-{% load thumbnail %}
+{% load catalogue_tags ssify %}
+{% load likes_book book_shelf_tags from social_tags %}
 <div class="{% block box-class %}book-box{% endblock %}">
 <div class="book-box-inner">
 <div class="book-left-column">
@@ -11,15 +12,14 @@
 <div class="book-box-body">
 
 
-<div class="star {% if not request.user|likes:book %}un{% endif %}like">
+{% likes_book book.pk as likes %}
+<div class="star {{ likes.if }}{{ likes.else }}un{{ likes.endif }}like">
     <div class="if-like" >
-        <a id="social-book-sets-{{ book.slug }}" data-callback='social-book-sets' class='ajaxable' href='{% url "social_book_sets" book.slug %}'>
-            ★
-        </a>
+        <a id="social-book-sets-{{ book.slug }}" data-callback='social-book-sets' class='ajaxable' href='{% url "social_book_sets" book.slug %}'>★</a>
     </div>
     <div class="if-unlike">
         <form id="social-like-book-{{ book.slug }}" data-callback='social-like-book' method='post' class='ajax-form' action='{% url "social_like_book" book.slug %}'>
-            {% csrf_token %}
+            {% ssi_csrf_token %}
             <button type='submit'>☆</button>
         </form>
     </div>
@@ -28,63 +28,68 @@
 
         <div class="book-box-head">
             <div class="author">
-                {% 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 %}
+                {% for tag in tags.author %}
+                    <a href="{{ tag.get_absolute_url }}">{{ tag.name }}</a>{% if not forloop.last %},
+                {% endif %}{% endfor %}{% for parent in parents %},
+                    <a href="{{ parent.get_absolute_url }}">{{ parent.title }}</a>{% endfor %}
             </div>
             <div class="title">
-				{% if main_link %}<a href="{{ main_link }}">{% endif %}
-					{{ book.title }}
-			    {% if main_link %}</a>{% endif %}
-			</div>
+                {% if main_link %}<a href="{{ main_link }}">{% endif %}{{ book.title }}{% if main_link %}</a>{% endif %}
+            </div>
         </div>
 
 <div class="cover-area">
-    {% if book.cover %}
+    {% if book.cover_thumb %}
         {% if main_link %}<a href="{{ main_link }}">{% endif %}
-            <img src="
-                {% thumbnail book.cover "139x193" as thumb %}
-                    {{ thumb.url }}
-                {% empty %}
-                    {{ book.cover.url }}
-                {% endthumbnail %}
-            " alt="Cover" class="cover" />
+            <img src="{{ book.cover_thumb.url }}" alt="Cover" class="cover" />
         {% if main_link %}</a>{% endif %}
     {% endif %}
     {% block cover-area-extra %}{% endblock %}
 </div>
         <div class="tags">
-        	{% spaceless %}
+            {% spaceless %}
 
             <span class="category">
             <span class="mono"> {% trans "Epoch" %}:</span>&nbsp;<span class="book-box-tag">
-            	{% 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 %}
+                {% for tag in tags.epoch %}
+                    <a href="{{ tag.get_absolute_url }}">{{ tag.name }}</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 related.tags.kind %}
-            		<a href="{% tag_url 'kind' tag.slug %}">{% related_tag_name tag %}</a>
-            		{% if not forloop.last %}<span>, </span>{% endif %}
+                {% for tag in tags.kind %}
+                    <a href="{{ tag.get_absolute_url }}">{{ tag.name }}</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 related.tags.genre %}
-            		<a href="{% tag_url 'genre' tag.slug %}">{% related_tag_name tag %}</a>
-            		{% if not forloop.last %}<span>, </span>{% endif %}
+                {% for tag in tags.genre %}
+                    <a href="{{ tag.get_absolute_url }}">{{ tag.name }}</a>
+                    {% if not forloop.last %}<span>, </span>{% endif %}
                 {% endfor %}
             </span></span>
 
+            {% if show_lang %}
+            <span class="category">
+            <span class="mono"> {% trans "Language" %}:</span>&nbsp;<span class="book-box-tag">
+                <a>{{ book.language_name }}</a>
+            </span></span>
+            {% endif %}
+
+            {% if stage_note %}
+            <br><span class="category">
+                <a{% if stage_note_url %} href="{{ stage_note_url }}"{% endif %}>{{ stage_note }}</a>
+            </span>
+            {% endif %}
+
            {% endspaceless %}
         </div>
     </div>
-    {% shelf_tags book %}
+    {% book_shelf_tags book.pk %}
 
     <ul class="book-box-tools">
         <li class="book-box-read">
@@ -95,25 +100,25 @@
         <li class="book-box-download hoverget">
             <a class="downarrow hoverclick">{% trans "Download" %}</a>
             <div class="book-box-formats">
-	      {% if book.pdf_file %}
-	      <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> {% trans "for an e-book reader" %}</span>
-	      {% endif %}
-	      {% if  book.mobi_file %}
-	      <span><a href="{{ book.mobi_file.url}}">MOBI</a> {% trans "for Kindle" %}</span>
-	      {% endif %}
-	      {% if  book.fb2_file %}
-	      <span><a href="{{ book.fb2_file.url}}">FB2</a> {% trans "FictionBook" %}</span>
-	      {% endif %}
-	      {% if  book.txt_file %}
-	      <span><a href="{{ book.txt_file.url}}">TXT</a> {% trans "for advanced usage" %}</span>
-	      {% endif %}
+             {% if book.pdf_file %}
+             <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> {% trans "for an e-book reader" %}</span>
+             {% endif %}
+             {% if  book.mobi_file %}
+             <span><a href="{{ book.mobi_file.url}}">MOBI</a> {% trans "for Kindle" %}</span>
+             {% endif %}
+             {% if  book.fb2_file %}
+             <span><a href="{{ book.fb2_file.url}}">FB2</a> {% trans "FictionBook" %}</span>
+             {% endif %}
+             {% if  book.txt_file %}
+             <span><a href="{{ book.txt_file.url}}">TXT</a> {% trans "for advanced usage" %}</span>
+             {% endif %}
             </div>
         </li>
         <li class="book-box-audiobook">
-        {% if related.media.mp3 or related.media.ogg %}
+        {% if has_audio %}
             <a href="{% url 'book_player' book.slug %}" class="open-player downarrow">{% trans "Listen" %}</a>
         {% endif %}
         </li>
@@ -127,3 +132,4 @@
     <div class="clearboth"></div>
 </div>
 </div>
+{% endspaceless %}
\ No newline at end of file