X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/6c9c6aa32a1b986128d7e5c2547d22d7a9f8d943..4db71d02697f83eac393bdf34fbe1aff54757df4:/src/catalogue/templates/catalogue/book_short.html

diff --git a/src/catalogue/templates/catalogue/book_short.html b/src/catalogue/templates/catalogue/book_short.html
index fff3fc0ff..25c130908 100644
--- a/src/catalogue/templates/catalogue/book_short.html
+++ b/src/catalogue/templates/catalogue/book_short.html
@@ -1,5 +1,6 @@
 {% spaceless %}
   {% load i18n %}
+  {% load cache %}
   {% load catalogue_tags %}
   {% load book_shelf_tags from social_tags %}
   {% load static %}
@@ -21,13 +22,15 @@
 
         <div class="cover-area">
           {% if book.cover_thumb %}
-            <a href="{{ book.get_absolute_url }}">
+            <a href="{% block cover-link %}{{ book.get_absolute_url }}{% endblock %}">
               <img src="{{ book.cover_thumb.url }}" alt="Cover" class="cover" />
             </a>
           {% endif %}
           {% block cover-area-extra %}{% endblock %}
         </div>
 
+        {% get_current_language as LANGUAGE_CODE %}
+        {% cache 86400 book_box_head_tags book.pk LANGUAGE_CODE %}
         <div class="book-box-head">
           <div class="author">
             {% for tag in tags.author %}
@@ -70,12 +73,14 @@
             {% endfor %}
           </span></span>
 
-          {% if book.extra_info.location %}
-            <span class="category">
-            <span class="mono"> {% trans "Region" %}:</span>&nbsp;<span class="book-box-tag">
-                {{ book.extra_info.location }}
-            </span></span>
-          {% endif %}
+	  {% with extra_info=book.get_extra_info_json %}
+            {% if extra_info.location %}
+              <span class="category">
+              <span class="mono"> {% trans "Region" %}:</span>&nbsp;<span class="book-box-tag">
+                  {{ extra_info.location }}
+              </span></span>
+            {% endif %}
+	  {% endwith %}
 
           {% if book.is_foreign %}
             <span class="category">
@@ -94,13 +99,16 @@
           {% endif %}
           {% endwith %}
         </div>
+        {% endcache %}
       </div>
       {% book_shelf_tags book.pk %}
 
+      {% cache 86400 book_box_tools book.pk book|status:request.user LANGUAGE_CODE %}
       {% if book|status:request.user != 'closed' %}
         <ul class="book-box-tools">
           <li class="book-box-read">
             {% if book.html_file %}
+	    <div>{% content_warning book %}</div>
               <a href="{% url 'book_text' book.slug %}" class="downarrow">{% trans "Read online" %}</a>
             {% endif %}
             {% if book.print_on_demand %}
@@ -109,50 +117,56 @@
             {% endif %}
           </li>
           <li class="book-box-download">
-            <a class="downarrow">{% trans "Download" %}:</a>
             <div class="book-box-formats">
+              {% trans "Download an ebook" %}:<br>
               {% if book.pdf_file %}
-                <span><a href="{{ book.pdf_url}}">PDF</a></span>
+                <a href="{{ book.pdf_url}}">PDF</a>
               {% endif %}
               {% if book.epub_file %}
-                <span><a href="{{ book.epub_url}}">EPUB</a></span>
+                <a href="{{ book.epub_url}}">EPUB</a>
               {% endif %}
               {% if book.mobi_file %}
-                <span><a href="{{ book.mobi_url}}">MOBI</a></span>
+                <a href="{{ book.mobi_url}}">MOBI</a>
               {% endif %}
-              {% if book.has_audio %}
-                <span><a href="{% url 'download_zip_mp3' book.slug %}">MP3</a></span>
+              {% if  book.fb2_file %}
+                <a href="{{ book.fb2_url}}">FB2</a>
               {% endif %}
-              <a class="read-more-show hide" href="#">{% trans "more" %}</a>
-              <span class="read-more-content">
-                {% if  book.fb2_file %}
-                  <span><a href="{{ book.fb2_url}}">FB2</a></span>
-                {% endif %}
-                {% if  book.txt_file %}
-                  <span><a href="{{ book.txt_url}}">TXT</a></span>
-                {% endif %}
-                {% download_audio book mp3=False %}
-                <br>
+              {% if  book.txt_file %}
+                <a href="{{ book.txt_url}}">TXT</a>
+              {% endif %}
+            </div>
+            {% if book.has_mp3_file %}
+              <div class="book-box-formats">
+                {% trans "Download audiobook" %}:<br>
+                {% download_audio book %}
+              </div>
+            {% endif %}
+            <div class="book-box-formats">
                 {% custom_pdf_link_li book %}
-                <a class="read-more-hide hide" href="#">{% trans "less" %}</a>
-              </span>
             </div>
           </li>
         </ul>
       {% else %}
-        <p class="book-box-tools">{% trans "For now this work is only available for our subscribers." %}</p>
+        {% block preview-info %}
+          <p class="book-box-tools book-box-tools-warn">
+            {% trans "For now this work is only available for our subscribers." %}
+	    <a href="/towarzystwo/">Dołącz do Towarzystwa Przyjaciół Wolnych Lektur</a>
+	  </p>
+          <div>{% content_warning book %}</div>
+        {% endblock %}
       {% endif %}
+      {% endcache %}
       {% block book-box-extra-info %}{% endblock %}
       {% block box-append %}{% endblock %}
     </div>
     {% endwith %}
 
     {% block right-column %}
-      {% if audiobooks %}
+      {% if audiobooks %}{% if book|status:request.user != 'closed' %}
         <div class="book-right-column">
           {% include 'catalogue/snippets/jplayer.html' %}
         </div>
-      {% endif %}
+      {% endif %}{% endif %}
     {% endblock %}
     {% if book.abstract %}
       <div class="abstract more-expand">