no ssi for book wide

diff --git a/src/catalogue/templates/catalogue/book_detail.html b/src/catalogue/templates/catalogue/book_detail.html
index e3f4d73..22c230b 100644 (file)
--- a/src/catalogue/templates/catalogue/book_detail.html
+++ b/src/catalogue/templates/catalogue/book_detail.html
@@ -13,7 +13,9 @@
 {% block bodyid %}book-detail{% endblock %}
 
 {% block body %}
 {% block bodyid %}book-detail{% endblock %}
 
 {% block body %}

-  {% ssi_include 'catalogue_book_wide' pk=book.pk %}
+  {% cache 86400 book_wide book.pk book|status:user %}
+    {% include 'catalogue/book_wide.html' %}
+  {% endcache %}

 
   {% work_list book_children %}
 
 
   {% work_list book_children %}
 

diff --git a/src/catalogue/templates/catalogue/book_wide.html b/src/catalogue/templates/catalogue/book_wide.html
index 88cc0be..b4faeab 100644 (file)
--- a/src/catalogue/templates/catalogue/book_wide.html
+++ b/src/catalogue/templates/catalogue/book_wide.html
@@ -9,8 +9,8 @@
 
 
 {% block cover-area-extra %}
 
 
 {% block cover-area-extra %}

-  {% if extra_info.license %}
-    {% license_icon extra_info.license %}
+  {% if book.extra_info.license %}
+    {% license_icon book.extra_info.license %}

   {% endif %}
 {% endblock %}
 
   {% endif %}
 {% endblock %}
 

diff --git a/src/catalogue/views.py b/src/catalogue/views.py
index 5273ab4..0a5ab58 100644 (file)
--- a/src/catalogue/views.py
+++ b/src/catalogue/views.py
@@ -426,17 +426,9 @@ def book_short(request, pk):
     ))(ssi_expect(pk, int)))
 def book_wide(request, pk):
     book = get_object_or_404(Book, pk=pk)
     ))(ssi_expect(pk, int)))
 def book_wide(request, pk):
     book = get_object_or_404(Book, pk=pk)

-    extra_info = book.extra_info

 
     return render(request, 'catalogue/book_wide.html', {
         'book': book,
 
     return render(request, 'catalogue/book_wide.html', {
         'book': book,

-        'parents': book.parents(),
-        'tags': split_tags(book.tags.exclude(category__in=('set', 'theme'))),
-        'show_lang': book.language_code() != settings.LANGUAGE_CODE,
-
-        'main_link': reverse('book_text', args=[book.slug]) if book.html_file else None,
-        'extra_info': extra_info,
-        'hide_about': extra_info.get('about', '').startswith('http://wiki.wolnepodreczniki.pl'),

     })
 
 
     })