Change menu; fixes #4009.

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

diff --git a/src/catalogue/templates/catalogue/book_text.html b/src/catalogue/templates/catalogue/book_text.html
index e958d70..c0fe955 100644 (file)
--- a/src/catalogue/templates/catalogue/book_text.html
+++ b/src/catalogue/templates/catalogue/book_text.html
@@ -1,8 +1,9 @@
 {% extends "catalogue/viewer_base.html" %}
 {% load i18n %}
-{% load catalogue_tags ssify %}
+{% load catalogue_tags %}
+{% load chunks %}
 {% load thumbnail %}
-{% load cache %}
+{% load annoy_banners from annoy %}
 
 
 {% block title %}{{ book.pretty_title }}{% endblock %}
@@ -59,8 +60,9 @@
 
 
 {% block big-pane %}
+
   <article id="main-text">
-    <!--#include file='{{ book.html_url }}'-->
+    {{ book_text|safe }}
   </article>
 
   <article id="other-text">
@@ -87,10 +89,7 @@
               <a class="display-other"
                  data-other="{{ other_version.html_url }}"
                  href="{% url 'book_text' other_version.slug %}">
-                {% cache 86400 book_mini_box other_version.pk %}
-                  {% include 'catalogue/book_mini_box.html' with book=other_version no_link=True %}
-                {% endcache %}
-                {#% ssi_include 'catalogue_book_mini_nolink' pk=other_version.pk %#}
+                {{ other_version.mini_box_nolink }}
               </a>
             </li>
           {% endfor %}
@@ -112,4 +111,12 @@
   <div class="box" id="book-short">
     {% include 'catalogue/book_short.html' %}
   </div>
+
+  <div id="annoy-stubs">
+    {% annoy_banners 'book-text-intermission' %}
+
+    {% for insert in inserts %}
+      {% include 'annoy/dynamic_insert.html' %}
+    {% endfor %}
+  </div>
 {% endblock footer %}