fixes

[wolnelektury.git] / src / catalogue / templates / catalogue / book_detail.html

diff --git a/src/catalogue/templates/catalogue/book_detail.html b/src/catalogue/templates/catalogue/book_detail.html
index 22c230b..d2bfda7 100644 (file)
--- a/src/catalogue/templates/catalogue/book_detail.html
+++ b/src/catalogue/templates/catalogue/book_detail.html
@@ -1,8 +1,8 @@
 {% extends "base/base.html" %}
 {% load i18n %}
-{% load common_tags catalogue_tags %}
-{% load ssify %}
+{% load catalogue_tags %}
 {% load build_absolute_uri from fnp_common %}
+{% load annoy_banner from annoy %}
 {% load cache %}
 
 {% block titleextra %}{{ book.pretty_title }}{% endblock %}
@@ -12,10 +12,9 @@
 
 {% block bodyid %}book-detail{% endblock %}
 
+
 {% block body %}
-  {% cache 86400 book_wide book.pk book|status:user %}
-    {% include 'catalogue/book_wide.html' %}
-  {% endcache %}
+  {% include 'catalogue/book_wide.html' %}
 
   {% work_list book_children %}
 
@@ -24,14 +23,13 @@
       <section class="see-also">
         <h1>{% trans "Other versions" %}:</h1>
         {% for rel in book.other_versions %}
-          {% cache 86400 book_mini_box rel.pk %}
-            {% include 'catalogue/book_mini_box.html' with book=rel %}
-          {% endcache %}
-          {#% ssi_include 'catalogue_book_mini' pk=rel.pk %#}
+         {{ rel.mini_box }}
         {% endfor %}
       </section>
     {% endif %}
 
+    {% annoy_banner 'book-page' %}
+
     <section class="see-also">
       <h2>{% trans "See also" %}:</h2>
       {% related_books book taken=book.other_versions|length %}
@@ -47,22 +45,34 @@
 
 
   <h2>{% trans "Information about the work" %}</h2>
-  {% for tag in tags %}
+  {% for author in book.authors %}
     <div class="white-box">
-      <a style="display:block" href="{{ tag.get_absolute_url }}">
-        {% ssi_include 'catalogue_tag_box' pk=tag.pk %}
+      <a style="display:block" href="{{ author.get_absolute_url }}">
+       {% cache 86400 catalogue_tag_box author.pk %}
+          {% include 'catalogue/tag_box.html' with tag=author %}
+       {% endcache %}
       </a>
     </div>
   {% endfor %}
 
 
-  {% if extra_info.source_url %}
-    <div class="white-box">
-      <a href="{{ extra_info.source_url }}">{% trans "Source" %}</a> {% trans "of the book" %}
-      {% trans "in" %} {% source_name extra_info.source_url %}
-    </div>
+  {% with extra_info=book.get_extra_info_json %}
+    {% for source_url in extra_info.source_urls %}
+      <div class="white-box">
+        <a href="{{ source_url }}">{% trans "Source" %}</a> {% trans "of the book" %}
+        {% trans "in" %} {% source_name source_url %}
+      </div>
+    {% empty %}
+      {% if extra_info.source_url %}
+        <div class="white-box">
+          <a href="{{ extra_info.source_url }}">{% trans "Source" %}</a> {% trans "of the book" %}
+          {% trans "in" %} {% source_name extra_info.source_url %}
+        </div>
+      {% endif %}
+    {% endfor %}
+  {% if book|status:user != 'closed' %}
+    <div class="white-box"><a href="{{ book.xml_url }}">{% trans "Source XML file" %}</a></div>
   {% endif %}
-  <div class="white-box"><a href="{{ book.xml_file.url }}">{% trans "Source XML file" %}</a></div>
   {% if extra_info.about and not hide_about %}
     <div class="white-box">
       {% trans "Book on" %} <a href="{{ extra_info.about }}">{% trans "Editor's Platform" %}</a>
@@ -76,5 +86,6 @@
   <div class="white-box">
     <a href="{% url 'poem_from_book' book.slug %}">{% trans "Mix this book" %}</a>
   </div>
+{% endwith %}
 
 {% endblock %}