fnp
/
wolnelektury.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixes.
[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
93e755f
..
a1c0b23
100644
(file)
--- a/
src/catalogue/templates/catalogue/book_text.html
+++ b/
src/catalogue/templates/catalogue/book_text.html
@@
-1,8
+1,7
@@
{% extends "catalogue/viewer_base.html" %}
{% load i18n %}
{% extends "catalogue/viewer_base.html" %}
{% load i18n %}
-{% load catalogue_tags
ssify
%}
+{% load catalogue_tags %}
{% load thumbnail %}
{% load thumbnail %}
-{% load cache %}
{% block title %}{{ book.pretty_title }}{% endblock %}
{% block title %}{{ book.pretty_title }}{% endblock %}
@@
-59,8
+58,9
@@
{% block big-pane %}
{% block big-pane %}
+
<article id="main-text">
<article id="main-text">
- <!--#include file='{{ book.html_file.url }}'-->
+ {{ book_text|safe }}
</article>
<article id="other-text">
</article>
<article id="other-text">
@@
-85,12
+85,9
@@
{% for other_version in book.other_versions %}
<li>
<a class="display-other"
{% for other_version in book.other_versions %}
<li>
<a class="display-other"
- data-other="{{ other_version.html_
file.
url }}"
+ data-other="{{ other_version.html_url }}"
href="{% url 'book_text' other_version.slug %}">
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 %}
</a>
</li>
{% endfor %}
@@
-110,8
+107,6
@@
</div>
<div class="box" id="book-short">
</div>
<div class="box" id="book-short">
- {% cache 86400 catalogue_book_short book.pk %}
- {% include 'catalogue/book_short.html' %}
- {% endcache %}
+ {% include 'catalogue/book_short.html' %}
</div>
{% endblock footer %}
</div>
{% endblock footer %}