Uncrazy the caching, part 1.

diff --git a/src/ajaxable/templates/ajaxable/form.html b/src/ajaxable/templates/ajaxable/form.html
index 0af34f4..0c97b65 100755 (executable)
--- a/src/ajaxable/templates/ajaxable/form.html
+++ b/src/ajaxable/templates/ajaxable/form.html
@@ -1,11 +1,10 @@
 {% load i18n %}
 {% load i18n %}

-{% load ssi_csrf_token from ssify %}

 
 <h1>{{ title }}</h1>
 
 <form action="{% if action_url %}{% url action_url %}{% else %}{{ action }}{% endif %}{% if action_query %}?{{ action_query }}{% endif %}" method="post" accept-charset="utf-8"
       class="cuteform{% if placeholdize %} hidelabels{% endif %}">
 
 <h1>{{ title }}</h1>
 
 <form action="{% if action_url %}{% url action_url %}{% else %}{{ action }}{% endif %}{% if action_query %}?{{ action_query }}{% endif %}" method="post" accept-charset="utf-8"
       class="cuteform{% if placeholdize %} hidelabels{% endif %}">

-  {% ssi_csrf_token %}
+  {% csrf_token %}

   {% if honeypot %}
     {% load honeypot %}
     {% render_honeypot_field %}
   {% if honeypot %}
     {% load honeypot %}
     {% render_honeypot_field %}

diff --git a/src/catalogue/templates/catalogue/book_detail.html b/src/catalogue/templates/catalogue/book_detail.html
index ecae89e..a5be89b 100644 (file)
--- a/src/catalogue/templates/catalogue/book_detail.html
+++ b/src/catalogue/templates/catalogue/book_detail.html
@@ -1,7 +1,6 @@
 {% extends "base/base.html" %}
 {% load i18n %}
 {% load common_tags catalogue_tags %}
 {% extends "base/base.html" %}
 {% load i18n %}
 {% load common_tags catalogue_tags %}

-{% load ssify %}

 {% load build_absolute_uri from fnp_common %}
 {% load cache %}
 
 {% load build_absolute_uri from fnp_common %}
 {% load cache %}
 


@@ -33,7 +32,6 @@
           {% cache 86400 book_mini_box rel.pk %}
             {% include 'catalogue/book_mini_box.html' with book=rel %}
           {% endcache %}
           {% 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 %#}

         {% endfor %}
       </section>
     {% endif %}
         {% endfor %}
       </section>
     {% endif %}


@@ -56,7 +54,9 @@
   {% for author in book.authors %}
     <div class="white-box">
       <a style="display:block" href="{{ author.get_absolute_url }}">
   {% for author in book.authors %}
     <div class="white-box">
       <a style="display:block" href="{{ author.get_absolute_url }}">

-        {% ssi_include 'catalogue_tag_box' pk=author.pk %}
+       {% cache 86400 catalogue_tag_box rel.pk %}
+          {% include 'catalogue/tag_box.html' with tag=author %}
+       {% endcache %}

       </a>
     </div>
   {% endfor %}
       </a>
     </div>
   {% endfor %}

diff --git a/src/catalogue/templates/catalogue/book_text.html b/src/catalogue/templates/catalogue/book_text.html
index 42eb1fa..27eadb0 100644 (file)
--- a/src/catalogue/templates/catalogue/book_text.html
+++ b/src/catalogue/templates/catalogue/book_text.html
@@ -91,7 +91,6 @@
                 {% cache 86400 book_mini_box other_version.pk %}
                   {% include 'catalogue/book_mini_box.html' with book=other_version no_link=True %}
                 {% endcache %}
                 {% 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 %#}

               </a>
             </li>
           {% endfor %}
               </a>
             </li>
           {% endfor %}

diff --git a/src/catalogue/templates/catalogue/custom_pdf_form.html b/src/catalogue/templates/catalogue/custom_pdf_form.html
index 3abc22d..ef865bc 100644 (file)
--- a/src/catalogue/templates/catalogue/custom_pdf_form.html
+++ b/src/catalogue/templates/catalogue/custom_pdf_form.html
@@ -1,12 +1,11 @@
 {% load i18n %}
 {% load honeypot %}
 {% load i18n %}
 {% load honeypot %}

-{% load ssi_csrf_token from ssify %}

 {% load ajaxable_tags %}
 
 <h1>{% trans "Download custom PDF" %}</h1>
 
 <form id='custom-pdf-form' action="" method="post" accept-charset="utf-8" class="cuteform">
 {% load ajaxable_tags %}
 
 <h1>{% trans "Download custom PDF" %}</h1>
 
 <form id='custom-pdf-form' action="" method="post" accept-charset="utf-8" class="cuteform">

-  {% ssi_csrf_token %}
+  {% csrf_token %}

   {% render_honeypot_field %}
   <ol>
     {{ form.nofootnotes|pretty_checkbox }}
   {% render_honeypot_field %}
   <ol>
     {{ form.nofootnotes|pretty_checkbox }}

diff --git a/src/catalogue/templates/catalogue/related_books.html b/src/catalogue/templates/catalogue/related_books.html
index 74e680f..db0fd35 100755 (executable)
--- a/src/catalogue/templates/catalogue/related_books.html
+++ b/src/catalogue/templates/catalogue/related_books.html
@@ -12,7 +12,6 @@
     {% cache 86400 book_mini_box book.pk %}
       {% include 'catalogue/book_mini_box.html' %}
     {% endcache %}
     {% cache 86400 book_mini_box book.pk %}
       {% include 'catalogue/book_mini_box.html' %}
     {% endcache %}

-    {#% ssi_include 'catalogue_book_mini' pk=book.pk %#}

   {% endfor %}
 
   {% if random %}
   {% endfor %}
 
   {% if random %}


@@ -25,4 +24,4 @@
       {% ssi_include 'picture_mini' pk=random_pic_pk %}
     {{ random_pic_pk.endif }}
   {% endif %}
       {% ssi_include 'picture_mini' pk=random_pic_pk %}
     {{ random_pic_pk.endif }}
   {% endif %}

-{% endspaceless %}
\ No newline at end of file
+{% endspaceless %}

diff --git a/src/catalogue/templates/catalogue/snippets/like_button.html b/src/catalogue/templates/catalogue/snippets/like_button.html
index 6f0902e..9b333c4 100644 (file)
--- a/src/catalogue/templates/catalogue/snippets/like_button.html
+++ b/src/catalogue/templates/catalogue/snippets/like_button.html
@@ -1,4 +1,3 @@
-{% load ssify %}

 {% load likes_book from social_tags %}
 {% likes_book book.pk as likes %}
 <div class="star {{ likes.if }}{{ likes.else }}un{{ likes.endif }}like">
 {% load likes_book from social_tags %}
 {% likes_book book.pk as likes %}
 <div class="star {{ likes.if }}{{ likes.else }}un{{ likes.endif }}like">


@@ -10,7 +9,7 @@
     <form id="social-like-book-{{ book.slug }}"
           data-callback='social-like-book' method='post'
           class='ajax-form' action='{% url "social_like_book" book.slug %}'>
     <form id="social-like-book-{{ book.slug }}"
           data-callback='social-like-book' method='post'
           class='ajax-form' action='{% url "social_like_book" book.slug %}'>

-      {% ssi_csrf_token %}
+      {% csrf_token %}

       <button type='submit'>☆</button>
     </form>
   </div>
       <button type='submit'>☆</button>
     </form>
   </div>

diff --git a/src/catalogue/templates/catalogue/tag_catalogue.html b/src/catalogue/templates/catalogue/tag_catalogue.html
index 5f7e61b..73a5b14 100644 (file)
--- a/src/catalogue/templates/catalogue/tag_catalogue.html
+++ b/src/catalogue/templates/catalogue/tag_catalogue.html
@@ -1,7 +1,7 @@
 {% extends "base/base.html" %}
 {% load i18n %}
 {% extends "base/base.html" %}
 {% load i18n %}

+{% load cache %}

 {% load plain_list from catalogue_tags %}
 {% load plain_list from catalogue_tags %}

-{% load ssi_include from ssify %}

 
 {% block titleextra %}{{ title }}{% endblock %}
 
 
 {% block titleextra %}{{ title }}{% endblock %}
 


@@ -12,7 +12,9 @@
 
   {% for tag in best %}
     <a class="tag-box" href="{{ tag.get_absolute_url }}">
 
   {% for tag in best %}
     <a class="tag-box" href="{{ tag.get_absolute_url }}">

-      {% ssi_include "catalogue_tag_box" pk=tag.pk %}
+      {% cache 86400 catalogue_tag_box rel.pk %}
+        {% include 'catalogue/tag_box.html' %}
+      {% endcache %}

     </a>
   {% endfor %}
 
     </a>
   {% endfor %}
 

diff --git a/src/contact/templates/contact/form.html b/src/contact/templates/contact/form.html
index fc1427f..346de58 100644 (file)
--- a/src/contact/templates/contact/form.html
+++ b/src/contact/templates/contact/form.html
@@ -1,7 +1,6 @@
 {% extends form.base_template|default:"base/base.html" %}
 {% load chunks %}
 {% load honeypot %}
 {% extends form.base_template|default:"base/base.html" %}
 {% load chunks %}
 {% load honeypot %}

-{% load ssi_csrf_token from ssify %}

 
 {% block title %}{{ form.form_title }}{% endblock %}
 
 
 {% block title %}{{ form.form_title }}{% endblock %}
 


@@ -16,7 +15,7 @@
     </div>
 
     <form method="POST" action="." enctype="multipart/form-data" class="submit-form">
     </div>
 
     <form method="POST" action="." enctype="multipart/form-data" class="submit-form">

-    {% ssi_csrf_token %}
+    {% csrf_token %}

     {% render_honeypot_field %}
     {% block form %}
         <table>
     {% render_honeypot_field %}
     {% block form %}
         <table>

diff --git a/src/newsletter/templates/newsletter/subscribe_form.html b/src/newsletter/templates/newsletter/subscribe_form.html
index c0379f0..53d7901 100644 (file)
--- a/src/newsletter/templates/newsletter/subscribe_form.html
+++ b/src/newsletter/templates/newsletter/subscribe_form.html
@@ -1,13 +1,12 @@
 {% extends "base/base.html" %}
 {% load i18n %}
 {% extends "base/base.html" %}
 {% load i18n %}

-{% load ssify %}

 {% load honeypot %}
 {% load ajaxable_tags %}
 
 {% block body %}
   <h1>{{ page_title }}</h1>
   <form id="subscribe-form" action="" method="post" accept-charset="utf-8" class="cuteform">
 {% load honeypot %}
 {% load ajaxable_tags %}
 
 {% block body %}
   <h1>{{ page_title }}</h1>
   <form id="subscribe-form" action="" method="post" accept-charset="utf-8" class="cuteform">

-    {% ssi_csrf_token %}
+    {% csrf_token %}

     {% render_honeypot_field %}
     <ol>
       <li>{{ form.email|pretty_field }}</li>
     {% render_honeypot_field %}
     <ol>
       <li>{{ form.email|pretty_field }}</li>


@@ -16,4 +15,4 @@
       <li><input type="submit" value="{% trans "Subscribe" %}"/></li>
     </ol>
   </form>
       <li><input type="submit" value="{% trans "Subscribe" %}"/></li>
     </ol>
   </form>

-{% endblock %}
\ No newline at end of file
+{% endblock %}

diff --git a/src/newsletter/templates/newsletter/unsubscribe_form.html b/src/newsletter/templates/newsletter/unsubscribe_form.html
index 3372d2f..d7a6f70 100644 (file)
--- a/src/newsletter/templates/newsletter/unsubscribe_form.html
+++ b/src/newsletter/templates/newsletter/unsubscribe_form.html
@@ -1,16 +1,15 @@
 {% extends "base/base.html" %}
 {% load i18n %}
 {% extends "base/base.html" %}
 {% load i18n %}

-{% load ssify %}

 {% load honeypot %}
 
 {% block body %}
   <h1>{{ page_title }}</h1>
   <form id="unsubscribe-form" action="" method="post" accept-charset="utf-8" class="cuteform">
 {% load honeypot %}
 
 {% block body %}
   <h1>{{ page_title }}</h1>
   <form id="unsubscribe-form" action="" method="post" accept-charset="utf-8" class="cuteform">

-    {% ssi_csrf_token %}
+    {% csrf_token %}

     {% render_honeypot_field %}
     <ol>
       {{ form.as_ul }}
       <li><input type="submit" value="{% trans "Unsubscribe" %}"/></li>
     </ol>
   </form>
     {% render_honeypot_field %}
     <ol>
       {{ form.as_ul }}
       <li><input type="submit" value="{% trans "Unsubscribe" %}"/></li>
     </ol>
   </form>

-{% endblock %}
\ No newline at end of file
+{% endblock %}

diff --git a/src/polls/templates/polls/tags/poll.html b/src/polls/templates/polls/tags/poll.html
index 4c4d2b5..b4a4e7f 100644 (file)
--- a/src/polls/templates/polls/tags/poll.html
+++ b/src/polls/templates/polls/tags/poll.html
@@ -1,5 +1,4 @@
 {% load i18n %}
 {% load i18n %}

-{% load ssi_csrf_token from ssify %}

 
 {% if poll %}
     {% if voted_already %}
 
 {% if poll %}
     {% if voted_already %}


@@ -19,10 +18,10 @@
     {% else %}
         <div class="poll">
             <p>{{poll.question}}</p>
     {% else %}
         <div class="poll">
             <p>{{poll.question}}</p>

-            <form action="{{poll.get_absolute_url}}" method="post">{% ssi_csrf_token %}
+            <form action="{{poll.get_absolute_url}}" method="post">{% csrf_token %}

             {{ form.vote }}
             <input type="submit" value="{% trans "Submit" %}" />
             </form>
         </div>
     {% endif %}
             {{ form.vote }}
             <input type="submit" value="{% trans "Submit" %}" />
             </form>
         </div>
     {% endif %}

-{% endif %}
\ No newline at end of file
+{% endif %}

diff --git a/src/social/templates/social/sets_form.html b/src/social/templates/social/sets_form.html
index 05f8e43..a003f67 100644 (file)
--- a/src/social/templates/social/sets_form.html
+++ b/src/social/templates/social/sets_form.html
@@ -1,16 +1,15 @@
 {% load i18n %}
 {% load i18n %}

-{% load ssi_csrf_token from ssify %}

 <h1>{{ title }}</h1>
 
 <form action="{% url 'social_unlike_book' view_kwargs.slug %}" method="post" accept-charset="utf-8"
       class="cuteform{% if placeholdize %} hidelabels{% endif %}">
 <h1>{{ title }}</h1>
 
 <form action="{% url 'social_unlike_book' view_kwargs.slug %}" method="post" accept-charset="utf-8"
       class="cuteform{% if placeholdize %} hidelabels{% endif %}">

-  {% ssi_csrf_token %}
+  {% csrf_token %}

   <input type="submit" value="{% trans "Remove from my shelf" %}"/>
 </form>
 
 <form action="{{ request.get_full_path }}" method="post" accept-charset="utf-8"
       class="cuteform{% if placeholdize %} hidelabels{% endif %}">
   <input type="submit" value="{% trans "Remove from my shelf" %}"/>
 </form>
 
 <form action="{{ request.get_full_path }}" method="post" accept-charset="utf-8"
       class="cuteform{% if placeholdize %} hidelabels{% endif %}">

-  {% ssi_csrf_token %}
+  {% csrf_token %}

   <ol>
     <div id="id___all__"></div>
     {{ form.as_ul }}
   <ol>
     <div id="id___all__"></div>
     {{ form.as_ul }}

diff --git a/src/wolnelektury/templates/auth/login.html b/src/wolnelektury/templates/auth/login.html
index 2965713..c32df0f 100644 (file)
--- a/src/wolnelektury/templates/auth/login.html
+++ b/src/wolnelektury/templates/auth/login.html
@@ -1,11 +1,10 @@
 {% load i18n %}
 {% load i18n %}

-{% load ssi_csrf_token from ssify %}

 
 <h1>{{ title }}</h1>
 
 <form action="{{ request.get_full_path }}" method="post" accept-charset="utf-8"
       class="cuteform{% if placeholdize %} hidelabels{% endif %}">
 
 <h1>{{ title }}</h1>
 
 <form action="{{ request.get_full_path }}" method="post" accept-charset="utf-8"
       class="cuteform{% if placeholdize %} hidelabels{% endif %}">

-  {% ssi_csrf_token %}
+  {% csrf_token %}

   <ol>
     <div id="id_{% if form_prefix %}{{ form_prefix }}-{% endif %}__all__"></div>
     {{ form.as_ul }}
   <ol>
     <div id="id_{% if form_prefix %}{{ form_prefix }}-{% endif %}__all__"></div>
     {{ form.as_ul }}

diff --git a/src/wolnelektury/templates/auth/login_register.html b/src/wolnelektury/templates/auth/login_register.html
index 6be2054..50e2ea0 100644 (file)
--- a/src/wolnelektury/templates/auth/login_register.html
+++ b/src/wolnelektury/templates/auth/login_register.html
@@ -1,7 +1,6 @@
 {% extends "auth/login.html" %}
 {% load i18n %}
 {% load honeypot %}
 {% extends "auth/login.html" %}
 {% load i18n %}
 {% load honeypot %}

-{% load ssi_csrf_token from ssify %}

 
 {% block extra %}
   {{ block.super }}
 
 {% block extra %}
   {{ block.super }}

diff --git a/src/wolnelektury/templates/base/app.html b/src/wolnelektury/templates/base/app.html
index e0a729b..c10cc4c 100644 (file)
--- a/src/wolnelektury/templates/base/app.html
+++ b/src/wolnelektury/templates/base/app.html
@@ -5,7 +5,7 @@
     {% load static from staticfiles %}
     {% load catalogue_tags funding_tags reporting_stats %}
     {% load piwik_tags %}
     {% load static from staticfiles %}
     {% load catalogue_tags funding_tags reporting_stats %}
     {% load piwik_tags %}

-    {% load ssi_include ssi_csrf_token from ssify %}
+    {% load ssi_include from ssify %}

     {% load user_username user_is_staff from common_tags %}
     {% load cache %}
     {% get_current_language as LANGUAGE_CODE %}
     {% load user_username user_is_staff from common_tags %}
     {% load cache %}
     {% get_current_language as LANGUAGE_CODE %}


@@ -49,7 +49,7 @@
                 <div id="lang-menu-items">
                   {% for lang in LANGUAGES %}
                     <form action="{% url 'set_language' %}" method="post">
                 <div id="lang-menu-items">
                   {% for lang in LANGUAGES %}
                     <form action="{% url 'set_language' %}" method="post">

-                      {% ssi_csrf_token %}
+                      {% csrf_token %}

                       <input type="hidden" name="language" value="{{ lang.0 }}"/>
                       <button type="submit" lang="{{ lang.0 }}"
                               class="{% ifequal lang.0 LANGUAGE_CODE %}active{% endifequal %}">{{ lang.1 }}</button>
                       <input type="hidden" name="language" value="{{ lang.0 }}"/>
                       <button type="submit" lang="{{ lang.0 }}"
                               class="{% ifequal lang.0 LANGUAGE_CODE %}active{% endifequal %}">{{ lang.1 }}</button>

diff --git a/src/wolnelektury/templates/base/superbase.html b/src/wolnelektury/templates/base/superbase.html
index a34006b..b03392f 100644 (file)
--- a/src/wolnelektury/templates/base/superbase.html
+++ b/src/wolnelektury/templates/base/superbase.html
@@ -5,7 +5,7 @@
     {% load static from staticfiles %}
     {% load catalogue_tags funding_tags reporting_stats %}
     {% load piwik_tags %}
     {% load static from staticfiles %}
     {% load catalogue_tags funding_tags reporting_stats %}
     {% load piwik_tags %}

-    {% load ssi_include ssi_csrf_token from ssify %}
+    {% load ssi_include from ssify %}

     {% load user_username user_is_staff from common_tags %}
     {% load cache %}
     {% get_current_language as LANGUAGE_CODE %}
     {% load user_username user_is_staff from common_tags %}
     {% load cache %}
     {% get_current_language as LANGUAGE_CODE %}


@@ -69,7 +69,7 @@
                 <div id="lang-menu-items">
                   {% for lang in LANGUAGES %}
                     <form action="{% url 'set_language' %}" method="post">
                 <div id="lang-menu-items">
                   {% for lang in LANGUAGES %}
                     <form action="{% url 'set_language' %}" method="post">

-                      {% ssi_csrf_token %}
+                      {% csrf_token %}

                       <input type="hidden" name="language" value="{{ lang.0 }}"/>
                       <button type="submit" lang="{{ lang.0 }}"
                               class="{% ifequal lang.0 LANGUAGE_CODE %}active{% endifequal %}">{{ lang.1 }}</button>
                       <input type="hidden" name="language" value="{{ lang.0 }}"/>
                       <button type="submit" lang="{{ lang.0 }}"
                               class="{% ifequal lang.0 LANGUAGE_CODE %}active{% endifequal %}">{{ lang.1 }}</button>

diff --git a/src/wolnelektury/templates/main_page.html b/src/wolnelektury/templates/main_page.html
index c306412..c1e6a9c 100644 (file)
--- a/src/wolnelektury/templates/main_page.html
+++ b/src/wolnelektury/templates/main_page.html
@@ -57,40 +57,6 @@
       <a class="more" href="{% url 'theme_catalogue' %}">{% trans "See motifs catalog" %}</a>
     </section>
 
       <a class="more" href="{% url 'theme_catalogue' %}">{% trans "See motifs catalog" %}</a>
     </section>
 

-    {% comment %}
-    <section class="tag-box-section">
-      <h1>Autorzy</h1>
-      <a class="tag-box" href="{{ author.get_absolute_url }}">
-        {% ssi_include "catalogue_tag_box" pk=author.pk %}
-      </a>
-      <a class="more" href="{% url 'author_catalogue' %}">Zobacz katalog autorów</a>
-    </section>
-
-    <section class="tag-box-section">
-      <h1>Gatunki</h1>
-      <a class="tag-box" href="{{ genre.get_absolute_url }}">
-        {% ssi_include "catalogue_tag_box" pk=genre.pk %}
-      </a>
-      <a class="more" href="{% url 'genre_catalogue' %}">Zobacz katalog gatunków</a>
-    </section>
-
-    <section class="tag-box-section">
-      <h1>Rodzaje</h1>
-      <a class="tag-box" href="{{ kind.get_absolute_url }}">
-        {% ssi_include "catalogue_tag_box" pk=kind.pk %}
-      </a>
-      <a class="more" href="{% url 'kind_catalogue' %}">Zobacz katalog rodzajów</a>
-    </section>
-
-    <section class="tag-box-section">
-      <h1>Epoki</h1>
-      <a class="tag-box" href="{{ epoch.get_absolute_url }}">
-        {% ssi_include "catalogue_tag_box" pk=epoch.pk %}
-      </a>
-      <a class="more" href="{% url 'epoch_catalogue' %}">Zobacz katalog epok</a>
-    </section>
-    {% endcomment %}
-

     {% if collection %}
       <section>
         <h1>{% trans "Collections" %}</h1>
     {% if collection %}
       <section>
         <h1>{% trans "Collections" %}</h1>