Remove ssify.

diff --git a/requirements/requirements.txt b/requirements/requirements.txt
index 2996527..9660e24 100644 (file)
--- a/requirements/requirements.txt
+++ b/requirements/requirements.txt
@@ -59,7 +59,6 @@ django-getpaid==1.8.0
 deprecated
 
 httplib2
 deprecated
 
 httplib2

-django-ssify==0.2.7

 
 raven
 
 
 raven
 

diff --git a/src/catalogue/api/views.py b/src/catalogue/api/views.py
index 68626e6..34971c4 100644 (file)
--- a/src/catalogue/api/views.py
+++ b/src/catalogue/api/views.py
@@ -159,7 +159,7 @@ class Preview(ListAPIView):
     def get_queryset(self):
         qs = Book.objects.filter(preview=True)
         # FIXME: temporary workaround for a problem with iOS app; see #3954.
     def get_queryset(self):
         qs = Book.objects.filter(preview=True)
         # FIXME: temporary workaround for a problem with iOS app; see #3954.

-        if 'Darwin' in self.request.META['HTTP_USER_AGENT'] and 'debug' not in self.request.GET:
+        if 'Darwin' in self.request.META.get('HTTP_USER_AGENT', '') and 'debug' not in self.request.GET:

             qs = qs.none()
         return qs
 
             qs = qs.none()
         return qs
 

diff --git a/src/catalogue/fields.py b/src/catalogue/fields.py
index 2b2d6a6..8f6bc7a 100644 (file)
--- a/src/catalogue/fields.py
+++ b/src/catalogue/fields.py
@@ -96,7 +96,7 @@ class BuildEbook(Task):
         """Just run `build` on FieldFile, can't pass it directly to Celery."""
         task_logger.info("%s -> %s" % (obj.slug, field_name))
         ret = self.build(getattr(obj, field_name))
         """Just run `build` on FieldFile, can't pass it directly to Celery."""
         task_logger.info("%s -> %s" % (obj.slug, field_name))
         ret = self.build(getattr(obj, field_name))

-        obj.flush_includes()
+        obj.clear_cache()

         return ret
 
     def set_file_permissions(self, fieldfile):
         return ret
 
     def set_file_permissions(self, fieldfile):

diff --git a/src/catalogue/models/book.py b/src/catalogue/models/book.py
index ecf6d96..d47cb15 100644 (file)
--- a/src/catalogue/models/book.py
+++ b/src/catalogue/models/book.py
@@ -16,7 +16,6 @@ from django.utils.translation import ugettext_lazy as _, get_language
 from django.utils.deconstruct import deconstructible
 import jsonfield
 from fnpdjango.storage import BofhFileSystemStorage
 from django.utils.deconstruct import deconstructible
 import jsonfield
 from fnpdjango.storage import BofhFileSystemStorage

-from ssify import flush_ssi_includes

 
 from librarian.cover import WLCover
 from librarian.html import transform_abstrakt
 
 from librarian.cover import WLCover
 from librarian.html import transform_abstrakt


@@ -592,23 +591,9 @@ class Book(models.Model):
                     b.ancestor.add(parent)
                     parent = parent.parent
 
                     b.ancestor.add(parent)
                     parent = parent.parent
 

-    def flush_includes(self, languages=True):
+    def clear_cache(self):

         clear_cached_renders(self.mini_box)
         clear_cached_renders(self.mini_box_nolink)
         clear_cached_renders(self.mini_box)
         clear_cached_renders(self.mini_box_nolink)

-        if not languages:
-            return
-        if languages is True:
-            languages = [lc for (lc, _ln) in settings.LANGUAGES]
-        flush_ssi_includes([
-            template % (self.pk, lang)
-            for template in [
-                '/katalog/b/%d/short.%s.html',
-                '/katalog/b/%d/wide.%s.html',
-                '/api/include/book/%d.%s.json',
-                '/api/include/book/%d.%s.xml',
-                ]
-            for lang in languages
-            ])

 
     def cover_info(self, inherit=True):
         """Returns a dictionary to serve as fallback for BookInfo.
 
     def cover_info(self, inherit=True):
         """Returns a dictionary to serve as fallback for BookInfo.

diff --git a/src/catalogue/models/collection.py b/src/catalogue/models/collection.py
index f059cb3..739ad78 100644 (file)
--- a/src/catalogue/models/collection.py
+++ b/src/catalogue/models/collection.py
@@ -5,8 +5,8 @@ from django.conf import settings
 from django.db import models
 from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
 from django.db import models
 from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _

-from ssify import flush_ssi_includes

 import re
 import re

+from wolnelektury.utils import cached_render, clear_cached_renders

 
 
 class Collection(models.Model):
 
 
 class Collection(models.Model):


@@ -46,11 +46,11 @@ class Collection(models.Model):
         from catalogue.models import Book
         return Book.objects.filter(self.get_query())
 
         from catalogue.models import Book
         return Book.objects.filter(self.get_query())
 

-    def flush_includes(self, languages=True):
-        if not languages:
-            return
-        if languages is True:
-            languages = [lc for (lc, _ln) in settings.LANGUAGES]
+    @cached_render('catalogue/collection_box.html')
+    def box(self):
+        return {
+            'collection': self
+        }

 
 

-        flush_ssi_includes([
-            '/katalog/%s.json' % lang for lang in languages])
+    def clear_cache(self):
+        clear_cached_renders(self.box)

diff --git a/src/catalogue/models/fragment.py b/src/catalogue/models/fragment.py
index ef15f85..ac0c539 100644 (file)
--- a/src/catalogue/models/fragment.py
+++ b/src/catalogue/models/fragment.py
@@ -8,7 +8,7 @@ from django.db import models
 from django.utils.translation import ugettext_lazy as _
 from newtagging import managers
 from catalogue.models import Tag
 from django.utils.translation import ugettext_lazy as _
 from newtagging import managers
 from catalogue.models import Tag

-from ssify import flush_ssi_includes
+from wolnelektury.utils import cached_render, clear_cached_renders

 
 
 class Fragment(models.Model):
 
 
 class Fragment(models.Model):


@@ -23,8 +23,6 @@ class Fragment(models.Model):
     tags = managers.TagDescriptor(Tag)
     tag_relations = GenericRelation(Tag.intermediary_table_model)
 
     tags = managers.TagDescriptor(Tag)
     tag_relations = GenericRelation(Tag.intermediary_table_model)
 

-    short_html_url_name = 'catalogue_fragment_short'
-

     class Meta:
         ordering = ('book', 'anchor',)
         verbose_name = _('fragment')
     class Meta:
         ordering = ('book', 'anchor',)
         verbose_name = _('fragment')


@@ -41,21 +39,18 @@ class Fragment(models.Model):
         """Returns short version of the fragment."""
         return self.short_text if self.short_text else self.text
 
         """Returns short version of the fragment."""
         return self.short_text if self.short_text else self.text
 

+    @cached_render('catalogue/fragment_short.html')
+    def midi_box(self):
+        return {'fragment': self}
+
+    @cached_render('catalogue/fragment_promo.html')
+    def promo_box(self):
+        return {'fragment': self}
+

     @property
     def themes(self):
         return self.tags.filter(category='theme')
 
     @property
     def themes(self):
         return self.tags.filter(category='theme')
 

-    def flush_includes(self, languages=True):
-        if not languages:
-            return
-        if languages is True:
-            languages = [lc for (lc, _ln) in settings.LANGUAGES]
-        flush_ssi_includes([
-            template % (self.pk, lang)
-            for template in [
-                '/katalog/f/%d/short.%s.html',
-                '/api/include/fragment/%d.%s.json',
-                '/api/include/fragment/%d.%s.xml',
-                ]
-            for lang in languages
-            ])
+    def clear_cache(self):
+        clear_cached_renders(self.midi_box)
+        clear_cached_renders(self.promo_box)

diff --git a/src/catalogue/models/source.py b/src/catalogue/models/source.py
index f36850d..c678cad 100644 (file)
--- a/src/catalogue/models/source.py
+++ b/src/catalogue/models/source.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-

 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #


@@ -40,5 +39,5 @@ class Source(models.Model):
             for book in Book.objects.all():
                 source = book.extra_info.get('source_url', '')
                 if self.netloc in source or (old_netloc != self.netloc and old_netloc in source):
             for book in Book.objects.all():
                 source = book.extra_info.get('source_url', '')
                 if self.netloc in source or (old_netloc != self.netloc and old_netloc in source):

-                    book.flush_includes()
+                    book.clear_cache()

         return ret
         return ret

diff --git a/src/catalogue/models/tag.py b/src/catalogue/models/tag.py
index dac96e2..db7267e 100644 (file)
--- a/src/catalogue/models/tag.py
+++ b/src/catalogue/models/tag.py
@@ -14,7 +14,6 @@ from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
 
 from newtagging.models import TagManager, TaggedItemManager
 from django.utils.translation import ugettext_lazy as _
 
 from newtagging.models import TagManager, TaggedItemManager

-from ssify import flush_ssi_includes

 
 
 # Those are hard-coded here so that makemessages sees them.
 
 
 # Those are hard-coded here so that makemessages sees them.


@@ -72,7 +71,7 @@ class Tag(models.Model):
     created_at = models.DateTimeField(_('creation date'), auto_now_add=True, db_index=True)
     changed_at = models.DateTimeField(_('creation date'), auto_now=True, db_index=True)
 
     created_at = models.DateTimeField(_('creation date'), auto_now_add=True, db_index=True)
     changed_at = models.DateTimeField(_('creation date'), auto_now=True, db_index=True)
 

-    after_change = Signal(providing_args=['instance', 'languages'])
+    after_change = Signal(providing_args=['instance'])

 
     intermediary_table_model = TagRelation
     objects = TagManager()
 
     intermediary_table_model = TagRelation
     objects = TagManager()


@@ -101,59 +100,12 @@ class Tag(models.Model):
         app_label = 'catalogue'
 
     def save(self, *args, **kwargs):
         app_label = 'catalogue'
 
     def save(self, *args, **kwargs):

-        flush_cache = flush_all_includes = False
-        if self.pk and self.category != 'set':
-            # Flush the whole views cache.
-            # Seem a little harsh, but changed tag names, descriptions
-            # and links come up at any number of places.
-            flush_cache = True
-
-            # Find in which languages we need to flush related includes.
-            old_self = type(self).objects.get(pk=self.pk)
-            # Category shouldn't normally be changed, but just in case.
-            if self.category != old_self.category:
-                flush_all_includes = True
-            languages_changed = self.languages_changed(old_self)
-
+        existing = self.pk and self.category != 'set'

         ret = super(Tag, self).save(*args, **kwargs)
         ret = super(Tag, self).save(*args, **kwargs)

-
-        if flush_cache:
-            caches[settings.CACHE_MIDDLEWARE_ALIAS].clear()
-            if flush_all_includes:
-                flush_ssi_includes()
-            else:
-                self.flush_includes()
-            self.after_change.send(sender=type(self), instance=self, languages=languages_changed)
-
+        if existing:
+            self.after_change.send(sender=type(self), instance=self)

         return ret
 
         return ret
 

-    def languages_changed(self, old):
-        all_langs = [lc for (lc, _ln) in settings.LANGUAGES]
-        if (old.category, old.slug) != (self.category, self.slug):
-            return all_langs
-        languages = set()
-        for lang in all_langs:
-            name_field = 'name_%s' % lang
-            if getattr(old, name_field) != getattr(self, name_field):
-                languages.add(lang)
-        return languages
-
-    def flush_includes(self, languages=True):
-        if not languages:
-            return
-        if languages is True:
-            languages = [lc for (lc, _ln) in settings.LANGUAGES]
-        flush_ssi_includes([
-            template % (self.pk, lang)
-            for template in [
-                '/api/include/tag/%d.%s.json',
-                '/api/include/tag/%d.%s.xml',
-                ]
-            for lang in languages
-            ])
-        flush_ssi_includes([
-            '/katalog/%s.json' % lang for lang in languages])
-

     def __str__(self):
         return self.name
 
     def __str__(self):
         return self.name
 

diff --git a/src/catalogue/signals.py b/src/catalogue/signals.py
index d3d6ec3..72f8a89 100644 (file)
--- a/src/catalogue/signals.py
+++ b/src/catalogue/signals.py
@@ -6,7 +6,6 @@ from django.core.cache import caches
 from django.core.exceptions import ImproperlyConfigured
 from django.db.models.signals import post_save, post_delete
 from django.dispatch import receiver
 from django.core.exceptions import ImproperlyConfigured
 from django.db.models.signals import post_save, post_delete
 from django.dispatch import receiver

-from ssify import flush_ssi_includes

 from newtagging.models import tags_updated
 from picture.models import Picture, PictureArea
 from .models import BookMedia, Book, Collection, Fragment, Tag
 from newtagging.models import tags_updated
 from picture.models import Picture, PictureArea
 from .models import BookMedia, Book, Collection, Fragment, Tag


@@ -31,17 +30,8 @@ def bookmedia_save(sender, instance, **kwargs):
 @receiver(post_save, sender=Collection)
 def collection_save(sender, instance, **kwargs):
     caches[settings.CACHE_MIDDLEWARE_ALIAS].clear()
 @receiver(post_save, sender=Collection)
 def collection_save(sender, instance, **kwargs):
     caches[settings.CACHE_MIDDLEWARE_ALIAS].clear()

-    flush_ssi_includes([
-        '/katalog/%s.json' % lang
-        for lang in [lc for (lc, _ln) in settings.LANGUAGES]])

 
 
 
 

-@receiver(post_delete, sender=Collection)
-def collection_delete(sender, instance, **kwargs):
-    flush_ssi_includes([
-        '/katalog/%s.json' % lang
-        for lang in [lc for (lc, _ln) in settings.LANGUAGES]])
-

 ####
 # Book
 ####
 ####
 # Book
 ####


@@ -56,15 +46,12 @@ def book_save(sender, instance, **kwargs):
         caches['template_fragments'].clear()
     except ImproperlyConfigured:
         pass
         caches['template_fragments'].clear()
     except ImproperlyConfigured:
         pass

-    instance.flush_includes()
+    instance.clear_cache()

 
 
 @receiver(post_delete, sender=Book)
 def book_delete(sender, instance, **kwargs):
     caches[settings.CACHE_MIDDLEWARE_ALIAS].clear()
 
 
 @receiver(post_delete, sender=Book)
 def book_delete(sender, instance, **kwargs):
     caches[settings.CACHE_MIDDLEWARE_ALIAS].clear()

-    flush_ssi_includes([
-        '/katalog/%s.json' % lang
-        for lang in [lc for (lc, _ln) in settings.LANGUAGES]])

 
     if not settings.NO_SEARCH_INDEX:
         # remove the book from search index, when it is deleted.
 
     if not settings.NO_SEARCH_INDEX:
         # remove the book from search index, when it is deleted.


@@ -80,20 +67,17 @@ def book_delete(sender, instance, **kwargs):
 
 
 @receiver(Tag.after_change)
 
 
 @receiver(Tag.after_change)

-def tag_after_change(sender, instance, languages, **kwargs):
+def tag_after_change(sender, instance, **kwargs):

     caches[settings.CACHE_MIDDLEWARE_ALIAS].clear()
     caches[settings.CACHE_MIDDLEWARE_ALIAS].clear()

-    flush_ssi_includes([
-        '/katalog/%s.json' % lang
-        for lang in [lc for (lc, _ln) in settings.LANGUAGES]])

 
     for model in Book, Picture:
         for model_instance in model.tagged.with_all([instance]).only('pk'):
 
     for model in Book, Picture:
         for model_instance in model.tagged.with_all([instance]).only('pk'):

-            model_instance.flush_includes()
+            model_instance.clear_cache()

 
     if instance.category == 'author':
         for model in Fragment, PictureArea:
             for model_instance in model.tagged.with_all([instance]).only('pk'):
 
     if instance.category == 'author':
         for model in Fragment, PictureArea:
             for model_instance in model.tagged.with_all([instance]).only('pk'):

-                model_instance.flush_includes()
+                model_instance.clear_cache()

 
 
 @receiver(tags_updated)
 
 
 @receiver(tags_updated)


@@ -103,7 +87,4 @@ def receive_tags_updated(sender, instance, affected_tags, **kwargs):
         return
 
     caches[settings.CACHE_MIDDLEWARE_ALIAS].clear()
         return
 
     caches[settings.CACHE_MIDDLEWARE_ALIAS].clear()

-    instance.flush_includes()
-    flush_ssi_includes([
-        '/katalog/%s.json' % lang
-        for lang in [lc for (lc, _ln) in settings.LANGUAGES]])
+    instance.clear_cache()

diff --git a/src/catalogue/templates/catalogue/book_wide.html b/src/catalogue/templates/catalogue/book_wide.html
index b4faeab..ad0384c 100644 (file)
--- a/src/catalogue/templates/catalogue/book_wide.html
+++ b/src/catalogue/templates/catalogue/book_wide.html
@@ -2,7 +2,6 @@
 {% load i18n %}
 {% load choose_fragment license_icon from catalogue_tags %}
 {% load choose_cite from social_tags %}
 {% load i18n %}
 {% load choose_fragment license_icon from catalogue_tags %}
 {% load choose_cite from social_tags %}

-{% load ssi_include from ssify %}

 
 
 {% block box-class %}book-wide-box{% endblock %}
 
 
 {% block box-class %}book-wide-box{% endblock %}


@@ -18,14 +17,15 @@
 {% block right-column %}
   <div class="right-column">
     <div class="quote">
 {% block right-column %}
   <div class="right-column">
     <div class="quote">

-      {% choose_cite book.pk as cite_promo %}
-      {% choose_fragment book.pk unless=cite_promo as fragment_promo %}
-      {{ cite_promo.if }}
-        {% ssi_include 'social_cite' pk=cite_promo %}
-      {{ cite_promo.endif }}
-      {{ fragment_promo.if }}
-        {% ssi_include 'catalogue_fragment_promo' pk=fragment_promo %}
-      {{ fragment_promo.endif }}
+      {% choose_cite book as cite_promo %}
+      {% if cite_promo %}
+        {{ cite.promo_box }}
+      {% else %}
+        {% choose_fragment book as fragment_promo %}
+       {% if fragment_promo %}
+         {{ fragment_promo.promo_box }}
+       {% endif %}
+      {% endif %}

     </div>
     {% include 'catalogue/snippets/jplayer.html' %}
   </div>
     </div>
     {% include 'catalogue/snippets/jplayer.html' %}
   </div>

diff --git a/src/catalogue/templates/catalogue/collections.html b/src/catalogue/templates/catalogue/collections.html
index 2f8d121..1d7b0f7 100644 (file)
--- a/src/catalogue/templates/catalogue/collections.html
+++ b/src/catalogue/templates/catalogue/collections.html
@@ -1,7 +1,6 @@
 {% extends "base/base.html" %}
 {% load i18n %}
 {% load catalogue_tags %}
 {% extends "base/base.html" %}
 {% load i18n %}
 {% load catalogue_tags %}

-{% load ssi_include from ssify %}

 
 {% block titleextra %}{% trans "Collections" %}{% endblock %}
 
 
 {% block titleextra %}{% trans "Collections" %}{% endblock %}
 


@@ -11,7 +10,7 @@
   <h1>{% trans "Collections" %}</h1>
 
   {% for obj in best %}
   <h1>{% trans "Collections" %}</h1>
 
   {% for obj in best %}

-    {% ssi_include 'catalogue_collection_box' pk=obj.pk %}
+    {{ obj.box }}

   {% endfor %}
 
   <h2>{% trans "All collections" %}</h2>
   {% endfor %}
 
   <h2>{% trans "All collections" %}</h2>

diff --git a/src/catalogue/templates/catalogue/related_books.html b/src/catalogue/templates/catalogue/related_books.html
index 62e45f2..cd2f358 100755 (executable)
--- a/src/catalogue/templates/catalogue/related_books.html
+++ b/src/catalogue/templates/catalogue/related_books.html
@@ -12,12 +12,13 @@
 
   {% if random %}
     {% catalogue_random_book random_excluded_books as random_book %}
 
   {% if random %}
     {% catalogue_random_book random_excluded_books as random_book %}

-    {% picture_random_picture random_excluded_pics unless=random_book as random_pic %}

     {% if random_book %}
       {{ random_book.mini_box }}
     {% if random_book %}
       {{ random_book.mini_box }}

-    {% endif %}
-    {% if random_pic %}
-      {{ random_pic.mini_box }}
+    {% else %}
+      {% picture_random_picture random_excluded_pics as random_pic %}
+      {% if random_pic %}
+        {{ random_pic.mini_box }}
+      {% endif %}

     {% endif %}
   {% endif %}
 {% endspaceless %}
     {% endif %}
   {% endif %}
 {% endspaceless %}

diff --git a/src/catalogue/templates/catalogue/search_multiple_hits.html b/src/catalogue/templates/catalogue/search_multiple_hits.html
index b14ab0c..6da02a8 100644 (file)
--- a/src/catalogue/templates/catalogue/search_multiple_hits.html
+++ b/src/catalogue/templates/catalogue/search_multiple_hits.html
@@ -3,7 +3,6 @@
 {% load pagination_tags %}
 {% load inline_tag_list from catalogue_tags %}
 {% load book_searched from search_tags %}
 {% load pagination_tags %}
 {% load inline_tag_list from catalogue_tags %}
 {% load book_searched from search_tags %}

-{% load ssi_include from ssify %}

 
 {% block titleextra %}{% trans "Search" %}{% endblock %}
 
 
 {% block titleextra %}{% trans "Search" %}{% endblock %}
 

diff --git a/src/catalogue/templates/catalogue/snippets/like_button.html b/src/catalogue/templates/catalogue/snippets/like_button.html
index 9b333c4..298f34e 100644 (file)
--- a/src/catalogue/templates/catalogue/snippets/like_button.html
+++ b/src/catalogue/templates/catalogue/snippets/like_button.html
@@ -1,6 +1,6 @@
 {% load likes_book from social_tags %}
 {% load likes_book from social_tags %}

-{% likes_book book.pk as likes %}
-<div class="star {{ likes.if }}{{ likes.else }}un{{ likes.endif }}like">
+{% likes_book book as likes %}
+<div class="star {% if not likes %}un{% endif %}like">

   <div class="if-like" >
     <a id="social-book-sets-{{ book.slug }}" data-callback='social-book-sets'
        class='ajaxable' href='{% url "social_book_sets" book.slug %}'>★</a>
   <div class="if-like" >
     <a id="social-book-sets-{{ book.slug }}" data-callback='social-book-sets'
        class='ajaxable' href='{% url "social_book_sets" book.slug %}'>★</a>

diff --git a/src/catalogue/templates/catalogue/work-list.html b/src/catalogue/templates/catalogue/work-list.html
index 5e3f3b9..58e28c7 100755 (executable)
--- a/src/catalogue/templates/catalogue/work-list.html
+++ b/src/catalogue/templates/catalogue/work-list.html
@@ -4,7 +4,6 @@
   {% load pagination_tags %}
   {% load class_name from catalogue_tags %}
   {% load status from catalogue_tags %}
   {% load pagination_tags %}
   {% load class_name from catalogue_tags %}
   {% load status from catalogue_tags %}

-  {% load ssi_include from ssify %}

 
   {% autopaginate object_list 10 %}
 
 
   {% autopaginate object_list 10 %}
 


@@ -14,7 +13,7 @@
         {% if item|class_name == 'Book' %}
           {% include "catalogue/book_short.html" with book=item %}
         {% else %}
         {% if item|class_name == 'Book' %}
           {% include "catalogue/book_short.html" with book=item %}
         {% else %}

-          {% ssi_include item.short_html_url_name pk=item.pk %}
+         {{ item.midi_box }}

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

diff --git a/src/catalogue/templatetags/catalogue_tags.py b/src/catalogue/templatetags/catalogue_tags.py
index b8e9d9d..39f044a 100644 (file)
--- a/src/catalogue/templatetags/catalogue_tags.py
+++ b/src/catalogue/templatetags/catalogue_tags.py
@@ -13,8 +13,6 @@ from django.utils.cache import add_never_cache_headers
 from django.utils.safestring import mark_safe
 from django.utils.translation import ugettext as _
 
 from django.utils.safestring import mark_safe
 from django.utils.translation import ugettext as _
 

-from ssify import ssi_variable
-

 from catalogue.helpers import get_audiobook_tags
 from catalogue.models import Book, BookMedia, Fragment, Tag, Source
 from catalogue.constants import LICENSES
 from catalogue.helpers import get_audiobook_tags
 from catalogue.models import Book, BookMedia, Fragment, Tag, Source
 from catalogue.constants import LICENSES


@@ -277,7 +275,6 @@ class CatalogueURLNode(Node):
 
 # @register.inclusion_tag('catalogue/tag_list.html')
 def tag_list(tags, choices=None, category=None, list_type='books'):
 
 # @register.inclusion_tag('catalogue/tag_list.html')
 def tag_list(tags, choices=None, category=None, list_type='books'):

-    # print(tags, choices, category)

     if choices is None:
         choices = []
 
     if choices is None:
         choices = []
 


@@ -460,7 +457,6 @@ def source_name(url):
 def catalogue_random_book(exclude_ids):
     from .. import app_settings
     if random() < app_settings.RELATED_RANDOM_PICTURE_CHANCE:
 def catalogue_random_book(exclude_ids):
     from .. import app_settings
     if random() < app_settings.RELATED_RANDOM_PICTURE_CHANCE:

-        print('yay, picture')

         return None
     queryset = Book.objects.exclude(pk__in=exclude_ids)
     count = queryset.count()
         return None
     queryset = Book.objects.exclude(pk__in=exclude_ids)
     count = queryset.count()


@@ -470,13 +466,10 @@ def catalogue_random_book(exclude_ids):
         return None
 
 
         return None
 
 

-@ssi_variable(register, patch_response=[add_never_cache_headers])
-def choose_fragment(request, book_id=None, tag_ids=None, unless=False):
-    if unless:
-        return None
-
-    if book_id is not None:
-        fragment = Book.objects.get(pk=book_id).choose_fragment()
+@register.simple_tag
+def choose_fragment(book=None, tag_ids=None):
+    if book is not None:
+        fragment = book.choose_fragment()

     else:
         if tag_ids is not None:
             tags = Tag.objects.filter(pk__in=tag_ids)
     else:
         if tag_ids is not None:
             tags = Tag.objects.filter(pk__in=tag_ids)


@@ -485,7 +478,7 @@ def choose_fragment(request, book_id=None, tag_ids=None, unless=False):
             fragments = Fragment.objects.all().order_by().only('id')
         fragment_count = fragments.count()
         fragment = fragments[randint(0, fragment_count - 1)] if fragment_count else None
             fragments = Fragment.objects.all().order_by().only('id')
         fragment_count = fragments.count()
         fragment = fragments[randint(0, fragment_count - 1)] if fragment_count else None

-    return fragment.pk if fragment is not None else None
+    return fragment

 
 
 @register.filter
 
 
 @register.filter

diff --git a/src/catalogue/test_utils.py b/src/catalogue/test_utils.py
index 7ed3536..dd5647a 100644 (file)
--- a/src/catalogue/test_utils.py
+++ b/src/catalogue/test_utils.py
@@ -21,7 +21,6 @@ from django.conf import settings
             'default': {'BACKEND': 'django.core.cache.backends.dummy.DummyCache'},
         },
     SOLR=settings.SOLR_TEST,
             'default': {'BACKEND': 'django.core.cache.backends.dummy.DummyCache'},
         },
     SOLR=settings.SOLR_TEST,

-    SSIFY_RENDER=False,

 )
 class WLTestCase(TestCase):
     """
 )
 class WLTestCase(TestCase):
     """

diff --git a/src/catalogue/tests/test_visit.py b/src/catalogue/tests/test_visit.py
index 6d31b5e..29011fa 100644 (file)
--- a/src/catalogue/tests/test_visit.py
+++ b/src/catalogue/tests/test_visit.py
@@ -47,10 +47,6 @@ class VisitTest(WLTestCase):
                 'daisy/',
                 # 'autor/jane-doe/gatunek/genre/',
                 # 'autor/jane-doe/gatunek/genre/motyw/sielanka/',
                 'daisy/',
                 # 'autor/jane-doe/gatunek/genre/',
                 # 'autor/jane-doe/gatunek/genre/motyw/sielanka/',

-                'b/%d/short.pl.html' % self.book.pk,
-                'b/%d/wide.pl.html' % self.book.pk,
-                'f/%d/promo.pl.html' % self.book.fragments.all()[0].pk,
-                'f/%d/short.pl.html' % self.book.fragments.all()[0].pk,

                 ],
             404: [
                 'lektury/nonexistent/',  # Nonexistent Collection.
                 ],
             404: [
                 'lektury/nonexistent/',  # Nonexistent Collection.


@@ -61,10 +57,6 @@ class VisitTest(WLTestCase):
                 'autor/nonexistent/',  # Nonexistent author.
                 'motyw/nonexistent/',  # Nonexistent theme.
                 'zh.json',  # Nonexistent language.
                 'autor/nonexistent/',  # Nonexistent author.
                 'motyw/nonexistent/',  # Nonexistent theme.
                 'zh.json',  # Nonexistent language.

-                'b/%d/short.pl.html' % (self.book.pk + 100),  # Nonexistent book.
-                'b/%d/wide.pl.html' % (self.book.pk + 100),  # Nonexistent book.
-                'f/%d/promo.pl.html' % (self.book.fragments.all()[0].pk + 100),  # Nonexistent fragment.
-                'f/%d/short.pl.html' % (self.book.fragments.all()[0].pk + 100),  # Nonexistent fragment.

                 ]
             }
         prefix = '/katalog/'
                 ]
             }
         prefix = '/katalog/'

diff --git a/src/catalogue/urls.py b/src/catalogue/urls.py
index 16c4567..0fc51a6 100644 (file)
--- a/src/catalogue/urls.py
+++ b/src/catalogue/urls.py
@@ -20,9 +20,6 @@ urlpatterns = [
     url(r'^obraz/(?P<slug>%s).html$' % SLUG, picture.views.picture_viewer, name='picture_viewer'),
     url(r'^obraz/(?P<slug>%s)/$' % SLUG, picture.views.picture_detail, name='picture_detail'),
 
     url(r'^obraz/(?P<slug>%s).html$' % SLUG, picture.views.picture_viewer, name='picture_viewer'),
     url(r'^obraz/(?P<slug>%s)/$' % SLUG, picture.views.picture_detail, name='picture_detail'),
 

-    url(r'^p/(?P<pk>\d+)/short\.(?P<lang>.+)\.html', picture.views.picture_short, name='picture_short'),
-    url(r'^pa/(?P<pk>\d+)/short\.(?P<lang>.+)\.html', picture.views.picturearea_short, name='picture_area_short'),
-

     # old search page - redirected
     url(r'^szukaj/$', RedirectView.as_view(
             url='/szukaj/', query_string=True, permanent=True)),
     # old search page - redirected
     url(r'^szukaj/$', RedirectView.as_view(
             url='/szukaj/', query_string=True, permanent=True)),


@@ -75,14 +72,6 @@ urlpatterns = [
     url(r'^okladka-ridero/(?P<slug>%s).png$' % SLUG, views.ridero_cover),
     url(r'^isbn/(?P<book_format>(pdf|epub|mobi|txt|html))/(?P<slug>%s)/' % SLUG, views.get_isbn),
 
     url(r'^okladka-ridero/(?P<slug>%s).png$' % SLUG, views.ridero_cover),
     url(r'^isbn/(?P<book_format>(pdf|epub|mobi|txt|html))/(?P<slug>%s)/' % SLUG, views.get_isbn),
 

-    # Includes.
-    url(r'^b/(?P<pk>\d+)/short\.(?P<lang>.+)\.html', views.book_short, name='catalogue_book_short'),
-    url(r'^b/(?P<pk>\d+)/wide\.(?P<lang>.+)\.html', views.book_wide, name='catalogue_book_wide'),
-    url(r'^f/(?P<pk>\d+)/promo\.(?P<lang>.+)\.html', views.fragment_promo, name='catalogue_fragment_promo'),
-    url(r'^f/(?P<pk>\d+)/short\.(?P<lang>.+)\.html', views.fragment_short, name='catalogue_fragment_short'),
-    url(r'^t/(?P<pk>\d+)/box\.(?P<lang>.+)\.html', views.tag_box, name='catalogue_tag_box'),
-    url(r'^c/(?P<pk>.+)/box\.(?P<lang>.+)\.html', views.collection_box, name='catalogue_collection_box'),
-

     # This should be the last pattern.
     url(r'^galeria/(?P<tags>[a-zA-Z0-9-/]*)/$', views.tagged_object_list, {'list_type': 'gallery'},
         name='tagged_object_list_gallery'),
     # This should be the last pattern.
     url(r'^galeria/(?P<tags>[a-zA-Z0-9-/]*)/$', views.tagged_object_list, {'list_type': 'gallery'},
         name='tagged_object_list_gallery'),

diff --git a/src/catalogue/views.py b/src/catalogue/views.py
index fca48b9..ccd51ff 100644 (file)
--- a/src/catalogue/views.py
+++ b/src/catalogue/views.py
@@ -21,7 +21,6 @@ from ajaxable.utils import AjaxableFormView
 from club.models import Membership
 from pdcounter import views as pdcounter_views
 from picture.models import Picture, PictureArea
 from club.models import Membership
 from pdcounter import views as pdcounter_views
 from picture.models import Picture, PictureArea

-from ssify import ssi_included, ssi_expect, SsiVariable as Var

 from catalogue import constants
 from catalogue import forms
 from catalogue.helpers import get_top_level_related_tags
 from catalogue import constants
 from catalogue import forms
 from catalogue.helpers import get_top_level_related_tags


@@ -410,70 +409,6 @@ class CustomPDFFormView(AjaxableFormView):
         return obj.pretty_title()
 
 
         return obj.pretty_title()
 
 

-####
-# Includes
-####
-
-
-@ssi_included(get_ssi_vars=lambda pk: (lambda ipk: (
-        ('ssify.get_csrf_token',),
-        ('social_tags.likes_book', (ipk,)),
-        ('social_tags.book_shelf_tags', (ipk,)),
-    ))(ssi_expect(pk, int)))
-def book_short(request, pk):
-    book = get_object_or_404(Book, pk=pk)
-
-    return render(request, 'catalogue/book_short.html', {
-        'book': book,
-    })
-
-
-@ssi_included(
-    get_ssi_vars=lambda pk: book_short.get_ssi_vars(pk) +
-    (lambda ipk: (
-        ('social_tags.choose_cite', [ipk]),
-        ('catalogue_tags.choose_fragment', [ipk], {
-            'unless': Var('social_tags.choose_cite', [ipk])}),
-    ))(ssi_expect(pk, int)))
-def book_wide(request, pk):
-    book = get_object_or_404(Book, pk=pk)
-
-    return render(request, 'catalogue/book_wide.html', {
-        'book': book,
-    })
-
-
-@ssi_included
-def fragment_short(request, pk):
-    fragment = get_object_or_404(Fragment, pk=pk)
-    return render(request, 'catalogue/fragment_short.html', {'fragment': fragment})
-
-
-@ssi_included
-def fragment_promo(request, pk):
-    fragment = get_object_or_404(Fragment, pk=pk)
-    return render(request, 'catalogue/fragment_promo.html', {'fragment': fragment})
-
-
-@ssi_included
-def tag_box(request, pk):
-    tag = get_object_or_404(Tag, pk=pk)
-    assert tag.category != 'set'
-
-    return render(request, 'catalogue/tag_box.html', {
-        'tag': tag,
-    })
-
-
-@ssi_included
-def collection_box(request, pk):
-    collection = get_object_or_404(Collection, pk=pk)
-
-    return render(request, 'catalogue/collection_box.html', {
-        'collection': collection,
-    })
-
-

 def tag_catalogue(request, category):
     if category == 'theme':
         tags = Tag.objects.usage_for_model(
 def tag_catalogue(request, category):
     if category == 'theme':
         tags = Tag.objects.usage_for_model(

diff --git a/src/funding/management/commands/funding_notify.py b/src/funding/management/commands/funding_notify.py
index f622374..792c171 100755 (executable)
--- a/src/funding/management/commands/funding_notify.py
+++ b/src/funding/management/commands/funding_notify.py
@@ -27,7 +27,7 @@ class Command(BaseCommand):
                 print('Notify end:', offer)
             # The 'WL fund' list needs to be updated.
             caches[settings.CACHE_MIDDLEWARE_ALIAS].clear()
                 print('Notify end:', offer)
             # The 'WL fund' list needs to be updated.
             caches[settings.CACHE_MIDDLEWARE_ALIAS].clear()

-            offer.flush_includes()
+            offer.clear_cache()

             offer.notify_end()
 
         current = Offer.current()
             offer.notify_end()
 
         current = Offer.current()

diff --git a/src/funding/models.py b/src/funding/models.py
index 2b4372f..3e20efc 100644 (file)
--- a/src/funding/models.py
+++ b/src/funding/models.py
@@ -13,10 +13,10 @@ from django.urls import reverse
 from django.utils.timezone import utc
 from django.utils.translation import ugettext_lazy as _, override
 import getpaid
 from django.utils.timezone import utc
 from django.utils.translation import ugettext_lazy as _, override
 import getpaid

-from ssify import flush_ssi_includes

 from catalogue.models import Book
 from catalogue.utils import get_random_hash
 from polls.models import Poll
 from catalogue.models import Book
 from catalogue.utils import get_random_hash
 from polls.models import Poll

+from wolnelektury.utils import cached_render, clear_cached_renders

 from . import app_settings
 
 
 from . import app_settings
 
 


@@ -58,26 +58,17 @@ class Offer(models.Model):
             self.book_id is not None and self.pk is not None and
             type(self).objects.values('book').get(pk=self.pk)['book'] != self.book_id)
         retval = super(Offer, self).save(*args, **kw)
             self.book_id is not None and self.pk is not None and
             type(self).objects.values('book').get(pk=self.pk)['book'] != self.book_id)
         retval = super(Offer, self).save(*args, **kw)

-        self.flush_includes()
+        self.clear_cache()

         if published_now:
             self.notify_published()
         return retval
 
         if published_now:
             self.notify_published()
         return retval
 

-    def flush_includes(self):
-        flush_ssi_includes([
-            template % (self.pk, lang)
-            for template in [
-                '/wesprzyj/o/%d/top-bar.%s.html',
-                '/wesprzyj/o/%d/detail-bar.%s.html',
-                '/wesprzyj/o/%d/list-bar.%s.html',
-                '/wesprzyj/o/%d/status.%s.html',
-                '/wesprzyj/o/%d/status-more.%s.html',
-                ] + [
-                    '/wesprzyj/o/%%d/fundings/%d.%%s.html' % page
-                    for page in range(1, len(self.funding_payed()) // 10 + 2)
-                ]
-            for lang in [lc for (lc, _ln) in settings.LANGUAGES]
-            ])
+    def clear_cache(self):
+        clear_cached_renders(self.top_bar)
+        clear_cached_renders(self.list_bar)
+        clear_cached_renders(self.detail_bar)
+        clear_cached_renders(self.status)
+        clear_cached_renders(self.status_more)

 
     def is_current(self):
         return self.start <= date.today() <= self.end and self == self.current()
 
     def is_current(self):
         return self.start <= date.today() <= self.end and self == self.current()


@@ -199,6 +190,55 @@ class Offer(models.Model):
                 'current': self.current(),
             })
 
                 'current': self.current(),
             })
 

+    def basic_info(self):
+        offer_sum = self.sum()
+        return {
+            'offer': self,
+            'sum': offset_sum,
+            'is_current': self.is_current(),
+            'is_win': offer_sum >= self.target,
+            'missing': self.target - offer_sum,
+            'percentage': 100 * offer_sum / self.target,
+
+            'show_title': True,
+            'show_title_calling': True,
+        }
+
+    @cached_render('funding/includes/funding.html')
+    def top_bar(self):
+        ctx = self.basic_info()
+        ctx.update({
+            'link': True,
+            'closeable': True,
+            'add_class': 'funding-top-header',
+        })
+        return ctx
+
+    @cached_render('funding/includes/funding.html')
+    def list_bar(self):
+        ctx = self.basic_info()
+        ctx.update({
+            'link': True,
+            'show_title_calling': False,
+        })
+        return ctx
+
+    @cached_render('funding/includes/funding.html')
+    def detail_bar(self):
+        ctx = self.basic_info()
+        ctx.update({
+            'show_title': False,
+        })
+        return ctx
+
+    @cached_render('funding/includes/offer_status.html')
+    def status(self):
+        return {'offer': self}
+
+    @cached_render('funding/includes/offer_status_more.html')
+    def status_more(self):
+        return {'offer': self}
+

 
 class Perk(models.Model):
     """ A perk offer.
 
 class Perk(models.Model):
     """ A perk offer.


@@ -268,7 +308,7 @@ class Funding(models.Model):
         if self.email and not self.notify_key:
             self.notify_key = get_random_hash(self.email)
         ret = super(Funding, self).save(*args, **kwargs)
         if self.email and not self.notify_key:
             self.notify_key = get_random_hash(self.email)
         ret = super(Funding, self).save(*args, **kwargs)

-        self.offer.flush_includes()
+        self.offer.clear_cache()

         return ret
 
     @classmethod
         return ret
 
     @classmethod

diff --git a/src/funding/templates/funding/offer_detail.html b/src/funding/templates/funding/offer_detail.html
index 96a65d6..02ad536 100644 (file)
--- a/src/funding/templates/funding/offer_detail.html
+++ b/src/funding/templates/funding/offer_detail.html
@@ -4,7 +4,7 @@
 {% load fnp_share %}
 {% load thumbnail %}
 {% load build_absolute_uri from fnp_common %}
 {% load fnp_share %}
 {% load thumbnail %}
 {% load build_absolute_uri from fnp_common %}

-{% load ssi_include from ssify %}
+{% load fundings from funding_tags %}

 
 
 {% block titleextra %}{{ object }}{% endblock %}
 
 
 {% block titleextra %}{{ object }}{% endblock %}


@@ -17,7 +17,7 @@
 {% block body %}
   <h1>{{ object }}</h1>
 
 {% block body %}
   <h1>{{ object }}</h1>
 

-  {% ssi_include 'funding_detail_bar' pk=object.pk %}
+  {{ object.detail_bar }}

   <div class="white-box">
     <div class="funding-details-intro">
       {% if object.cover %}
   <div class="white-box">
     <div class="funding-details-intro">
       {% if object.cover %}


@@ -27,9 +27,9 @@
       <div class="normal-text">
         <h3>{% trans "Help free the book!" %}</h3>
         {{ object.description|safe }}
       <div class="normal-text">
         <h3>{% trans "Help free the book!" %}</h3>
         {{ object.description|safe }}

-        {% ssi_include 'funding_status' pk=object.pk %}
+       {{ object.status }}

         <a href='//nowoczesnapolska.org.pl/pomoz-nam/wesprzyj-nas/' target="_blank" style='float:right;border:1px solid #ddd;padding: 1em;margin:0 0 1em 1em;background:#eee;'><img src='//nowoczesnapolska.org.pl/wp-content/themes/koed/annoy/procent.png' alt='1%' style='float:left;margin-right: 1em;margin-top:.2em;'>Możesz też przekazać<br/>1% podatku na rozwój biblioteki. &rarr;</a>
         <a href='//nowoczesnapolska.org.pl/pomoz-nam/wesprzyj-nas/' target="_blank" style='float:right;border:1px solid #ddd;padding: 1em;margin:0 0 1em 1em;background:#eee;'><img src='//nowoczesnapolska.org.pl/wp-content/themes/koed/annoy/procent.png' alt='1%' style='float:left;margin-right: 1em;margin-top:.2em;'>Możesz też przekazać<br/>1% podatku na rozwój biblioteki. &rarr;</a>

-        {% ssi_include 'funding_status_more' pk=object.pk %}
+       {{ object.status_more }}

         <p><a href="{% url 'infopage' 'wesprzyj' %}">{% trans "Learn more" %}</a>.</p>
       </div>
 
         <p><a href="{% url 'infopage' 'wesprzyj' %}">{% trans "Learn more" %}</a>.</p>
       </div>
 


@@ -84,6 +84,6 @@
   <h2>{% trans "Supporters" %}:</h2>
 
   <div class="white-box normal-text">
   <h2>{% trans "Supporters" %}:</h2>
 
   <div class="white-box normal-text">

-    {% ssi_include 'funding_fundings' pk=object.pk page=page %}
+    {% fundings object %}

   </div>
 {% endblock %}
   </div>
 {% endblock %}

diff --git a/src/funding/templates/funding/offer_list.html b/src/funding/templates/funding/offer_list.html
index 055e1ce..3e04747 100644 (file)
--- a/src/funding/templates/funding/offer_list.html
+++ b/src/funding/templates/funding/offer_list.html
@@ -1,6 +1,5 @@
 {% extends "base/base.html" %}
 {% load i18n %}
 {% extends "base/base.html" %}
 {% load i18n %}

-{% load ssi_include from ssify %}

 {% load pagination_tags %}
 
 {% block titleextra %}{% trans "All fundraisers" %}{% endblock %}
 {% load pagination_tags %}
 
 {% block titleextra %}{% trans "All fundraisers" %}{% endblock %}


@@ -22,15 +21,15 @@
         <h2>{% trans "Previous fundraisers:" %}</h2>
       {% endif %}
 
         <h2>{% trans "Previous fundraisers:" %}</h2>
       {% endif %}
 

-      {% ssi_include 'funding_list_bar' pk=offer.pk %}
+      {{ offer.list_bar }}

 
       <div class="white-box normal-text">
         {% if is_current %}
           <h3>{% trans "Help free the book!" %}</h3>
           {{ offer.description|safe }}
         {% endif %}
 
       <div class="white-box normal-text">
         {% if is_current %}
           <h3>{% trans "Help free the book!" %}</h3>
           {{ offer.description|safe }}
         {% endif %}

-        {% ssi_include 'funding_status' pk=offer.pk %}
-        {% ssi_include 'funding_status_more' pk=offer.pk %}
+       {{ offer.status }}
+       {{ offer.status_more }}

       </div>
 
       {% if is_current and not forloop.last %}
       </div>
 
       {% if is_current and not forloop.last %}

diff --git a/src/funding/templatetags/funding_tags.py b/src/funding/templatetags/funding_tags.py
index 851e0ce..ece7ba2 100755 (executable)
--- a/src/funding/templatetags/funding_tags.py
+++ b/src/funding/templatetags/funding_tags.py
@@ -1,27 +1,38 @@
-# -*- coding: utf-8 -*-

 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 from django import template
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 from django import template

-from ssify import ssi_variable
-from ssify.utils import ssi_cache_control
+from django.template.loader import render_to_string
+from django.core.paginator import Paginator, InvalidPage

 
 from ..models import Offer
 from ..utils import sanitize_payment_title
 
 from ..models import Offer
 from ..utils import sanitize_payment_title

-from ..views import offer_bar
+

 
 register = template.Library()
 
 
 
 register = template.Library()
 
 

-@ssi_variable(register, patch_response=[ssi_cache_control(must_revalidate=True, max_age=0)])
-def current_offer(request=None):
+@register.simple_tag
+def funding_top_bar():

     offer = Offer.current()
     offer = Offer.current()

-    return offer.pk if offer is not None else None
+    return offer.top_bar() if offer is not None else ''

 
 
 
 

-@register.inclusion_tag('funding/includes/funding.html')
-def funding_top_bar():
-    return offer_bar(Offer.current(), link=True, closeable=True, add_class="funding-top-header")
+register.filter(sanitize_payment_title)

 
 
 
 

-register.filter(sanitize_payment_title)
+@register.simple_tag(takes_context=True)
+def fundings(context, offer):
+    fundings = offer.funding_payed()
+    page = context['request'].GET.get('page', 1)
+    paginator = Paginator(fundings, 10, 2)
+    try:
+        page_obj = paginator.page(int(page))
+    except InvalidPage:
+        return ''
+    else:
+        return render_to_string("funding/includes/fundings.html", {
+            "paginator": paginator,
+            "page_obj": page_obj,
+            "fundings": page_obj.object_list,
+        })

diff --git a/src/funding/urls.py b/src/funding/urls.py
index f8afc66..986c4f0 100644 (file)
--- a/src/funding/urls.py
+++ b/src/funding/urls.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-

 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #


@@ -20,12 +19,4 @@ urlpatterns = [
     url(r'^wylacz_email/$', views.DisableNotifications.as_view(), name='funding_disable_notifications'),
 
     url(r'^getpaid/', include('getpaid.urls')),
     url(r'^wylacz_email/$', views.DisableNotifications.as_view(), name='funding_disable_notifications'),
 
     url(r'^getpaid/', include('getpaid.urls')),

-
-    # Includes
-    url(r'^o/(?P<pk>\d+)/top-bar\.(?P<lang>.+)\.html$', views.top_bar, name='funding_top_bar'),
-    url(r'^o/(?P<pk>\d+)/detail-bar\.(?P<lang>.+)\.html$', views.detail_bar, name='funding_detail_bar'),
-    url(r'^o/(?P<pk>\d+)/list-bar\.(?P<lang>.+)\.html$', views.list_bar, name='funding_list_bar'),
-    url(r'^o/(?P<pk>\d+)/status\.(?P<lang>.+)\.html$', views.offer_status, name='funding_status'),
-    url(r'^o/(?P<pk>\d+)/status-more\.(?P<lang>.+)\.html$', views.offer_status_more, name='funding_status_more'),
-    url(r'^o/(?P<pk>\d+)/fundings/(?P<page>\d+)\.(?P<lang>.+)\.html$', views.offer_fundings, name='funding_fundings'),

 ]
 ]

diff --git a/src/funding/views.py b/src/funding/views.py
index d6d6570..91dafc1 100644 (file)
--- a/src/funding/views.py
+++ b/src/funding/views.py
@@ -1,15 +1,12 @@
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #

-from django.core.paginator import Paginator, InvalidPage

 from django.http import Http404
 from django.shortcuts import get_object_or_404, redirect, render
 from django.urls import reverse
 from django.views.decorators.csrf import csrf_exempt
 from django.views.generic import TemplateView, FormView, ListView
 from getpaid.models import Payment
 from django.http import Http404
 from django.shortcuts import get_object_or_404, redirect, render
 from django.urls import reverse
 from django.views.decorators.csrf import csrf_exempt
 from django.views.generic import TemplateView, FormView, ListView
 from getpaid.models import Payment

-from ssify import ssi_included
-from ssify.utils import ssi_cache_control

 from . import app_settings
 from .forms import FundingForm
 from .models import Offer, Spent, Funding
 from . import app_settings
 from .forms import FundingForm
 from .models import Offer, Spent, Funding


@@ -98,7 +95,6 @@ class OfferDetailView(FormView):
     def get_context_data(self, **kwargs):
         ctx = super(OfferDetailView, self).get_context_data(**kwargs)
         ctx['object'] = self.object
     def get_context_data(self, **kwargs):
         ctx = super(OfferDetailView, self).get_context_data(**kwargs)
         ctx['object'] = self.object

-        ctx['page'] = self.request.GET.get('page', 1)

         if self.object.is_current():
             ctx['funding_no_show_current'] = True
         return ctx
         if self.object.is_current():
             ctx['funding_no_show_current'] = True
         return ctx


@@ -157,72 +153,3 @@ class DisableNotifications(TemplateView):
     def post(self, *args, **kwargs):
         self.object.disable_notifications()
         return redirect(self.request.get_full_path())
     def post(self, *args, **kwargs):
         self.object.disable_notifications()
         return redirect(self.request.get_full_path())

-
-
-def offer_bar(offer, link=False, closeable=False, show_title=True, show_title_calling=True, add_class=""):
-    if offer:
-        offer_sum = offer.sum()
-    else:
-        return {}
-    return {
-        'offer': offer,
-        'sum': offer_sum,
-        'is_current': offer.is_current(),
-        'is_win': offer_sum >= offer.target,
-        'missing': offer.target - offer_sum,
-        'percentage': 100 * offer_sum / offer.target,
-        'link': link,
-        'closeable': closeable,
-        'show_title': show_title,
-        'show_title_calling': show_title_calling,
-        'add_class': add_class,
-    }
-
-
-def render_offer_bar(request, pk, link=False, closeable=False, show_title=True, show_title_calling=True, add_class=""):
-    offer = get_object_or_404(Offer, pk=pk)
-    return render(request, "funding/includes/funding.html",
-                  offer_bar(offer, link, closeable, show_title, show_title_calling, add_class))
-
-
-@ssi_included(patch_response=[ssi_cache_control(must_revalidate=True)])
-def top_bar(request, pk):
-    return render_offer_bar(request, pk, link=True, closeable=True, add_class="funding-top-header")
-
-
-@ssi_included(patch_response=[ssi_cache_control(must_revalidate=True)])
-def list_bar(request, pk):
-    return render_offer_bar(request, pk, link=True, show_title_calling=False)
-
-
-@ssi_included(patch_response=[ssi_cache_control(must_revalidate=True)])
-def detail_bar(request, pk):
-    return render_offer_bar(request, pk, show_title=False)
-
-
-@ssi_included(patch_response=[ssi_cache_control(must_revalidate=True)])
-def offer_status(request, pk):
-    offer = get_object_or_404(Offer, pk=pk)
-    return render(request, "funding/includes/offer_status.html", {'offer': offer})
-
-
-@ssi_included(patch_response=[ssi_cache_control(must_revalidate=True)])
-def offer_status_more(request, pk):
-    offer = get_object_or_404(Offer, pk=pk)
-    return render(request, "funding/includes/offer_status_more.html", {'offer': offer})
-
-
-@ssi_included(patch_response=[ssi_cache_control(must_revalidate=True)])
-def offer_fundings(request, pk, page):
-    offer = get_object_or_404(Offer, pk=pk)
-    fundings = offer.funding_payed()
-    paginator = Paginator(fundings, 10, 2)
-    try:
-        page_obj = paginator.page(int(page))
-    except InvalidPage:
-        raise Http404
-    return render(request, "funding/includes/fundings.html", {
-        "paginator": paginator,
-        "page_obj": page_obj,
-        "fundings": page_obj.object_list,
-    })

diff --git a/src/picture/models.py b/src/picture/models.py
index 416c846..75d84e2 100644 (file)
--- a/src/picture/models.py
+++ b/src/picture/models.py
@@ -9,7 +9,6 @@ from django.contrib.contenttypes.fields import GenericRelation
 from django.core.files.storage import FileSystemStorage
 from django.urls import reverse
 from slugify import slugify
 from django.core.files.storage import FileSystemStorage
 from django.urls import reverse
 from slugify import slugify

-from ssify import flush_ssi_includes

 
 from catalogue.models.tag import prefetched_relations
 from catalogue.utils import split_tags
 
 from catalogue.models.tag import prefetched_relations
 from catalogue.utils import split_tags


@@ -55,18 +54,18 @@ class PictureArea(models.Model):
         pa.area = coords
         return pa
 
         pa.area = coords
         return pa
 

-    def flush_includes(self, languages=True):
-        if not languages:
-            return
-        if languages is True:
-            languages = [lc for (lc, _ln) in settings.LANGUAGES]
-        flush_ssi_includes([
-            template % (self.pk, lang)
-            for template in [
-                '/katalog/pa/%d/short.%s.html',
-                ]
-            for lang in languages
-            ])
+    @cached_render('picture/picturearea_short.html')
+    def midi_box(self):
+        themes = self.tags.filter(category='theme')
+        things = self.tags.filter(category='thing')
+        return {
+            'area': self,
+            'theme': themes[0] if themes else None,
+            'thing': things[0] if things else None,
+        }
+
+    def clear_cache(self):
+        clear_cached_renders(self.midi_box)

 
 
 class Picture(models.Model):
 
 
 class Picture(models.Model):


@@ -349,24 +348,19 @@ class Picture(models.Model):
             'picture': self,
         }
 
             'picture': self,
         }
 

+    @cached_render('picture/picture_short.html')
+    def midi_box(self):
+        return {
+            'picture': self,
+        }
+

     def related_themes(self):
         return catalogue.models.Tag.objects.usage_for_queryset(
             self.areas.all(), counts=True).filter(category__in=('theme', 'thing'))
 
     def related_themes(self):
         return catalogue.models.Tag.objects.usage_for_queryset(
             self.areas.all(), counts=True).filter(category__in=('theme', 'thing'))
 

-    def flush_includes(self, languages=True):
+    def clear_cache(self):

         clear_cached_renders(self.mini_box)
         clear_cached_renders(self.mini_box)

-        if not languages:
-            return
-        if languages is True:
-            languages = [lc for (lc, _ln) in settings.LANGUAGES]
-        flush_ssi_includes([
-            template % (self.pk, lang)
-            for template in [
-                '/katalog/p/%d/short.%s.html',
-                '/katalog/p/%d/mini.%s.html',
-                ]
-            for lang in languages
-            ])
+        clear_cached_renders(self.midi_box)

 
     def search_index(self, picture_info=None, index=None, index_tags=True, commit=True):
         if index is None:
 
     def search_index(self, picture_info=None, index=None, index_tags=True, commit=True):
         if index is None:

diff --git a/src/picture/templates/picture/picture_viewer.html b/src/picture/templates/picture/picture_viewer.html
index d23148f..6c35fe0 100644 (file)
--- a/src/picture/templates/picture/picture_viewer.html
+++ b/src/picture/templates/picture/picture_viewer.html
@@ -3,7 +3,6 @@
 {% load static from staticfiles %}
 {% load catalogue_tags %}
 {% load thumbnail %}
 {% load static from staticfiles %}
 {% load catalogue_tags %}
 {% load thumbnail %}

-{% load ssi_include from ssify %}

 
 
 {% block title %}{{ picture.pretty_title }}{% endblock %}
 
 
 {% block title %}{{ picture.pretty_title }}{% endblock %}

diff --git a/src/picture/templatetags/picture_tags.py b/src/picture/templatetags/picture_tags.py
index 0542fa3..70d58e0 100644 (file)
--- a/src/picture/templatetags/picture_tags.py
+++ b/src/picture/templatetags/picture_tags.py
@@ -65,9 +65,7 @@ def area_thumbnail_url(area, geometry):
 
 
 @register.simple_tag
 
 
 @register.simple_tag

-def picture_random_picture(exclude_ids, unless=None):
-    if unless:
-        return None
+def picture_random_picture(exclude_ids):

     queryset = Picture.objects.exclude(pk__in=exclude_ids).exclude(image_file='')
     count = queryset.count()
     if count:
     queryset = Picture.objects.exclude(pk__in=exclude_ids).exclude(image_file='')
     count = queryset.count()
     if count:

diff --git a/src/picture/views.py b/src/picture/views.py
index 98485af..6345f20 100644 (file)
--- a/src/picture/views.py
+++ b/src/picture/views.py
@@ -4,9 +4,8 @@
 from django.conf import settings
 from django.contrib.auth.decorators import permission_required
 from django.shortcuts import render, get_object_or_404, render
 from django.conf import settings
 from django.contrib.auth.decorators import permission_required
 from django.shortcuts import render, get_object_or_404, render

-from picture.models import Picture, PictureArea
+from picture.models import Picture

 from catalogue.utils import split_tags
 from catalogue.utils import split_tags

-from ssify import ssi_included

 from sponsors.models import Sponsor
 from wolnelektury.utils import ajax
 
 from sponsors.models import Sponsor
 from wolnelektury.utils import ajax
 


@@ -100,24 +99,3 @@ def import_picture(request):
         return HttpResponse(_("Picture imported successfully"))
     else:
         return HttpResponse(_("Error importing file: %r") % import_form.errors)
         return HttpResponse(_("Picture imported successfully"))
     else:
         return HttpResponse(_("Error importing file: %r") % import_form.errors)

-
-
-@ssi_included
-def picture_short(request, pk):
-    picture = get_object_or_404(Picture, pk=pk)
-
-    return render(request, 'picture/picture_short.html', {
-        'picture': picture,
-    })
-
-
-@ssi_included
-def picturearea_short(request, pk):
-    area = get_object_or_404(PictureArea, pk=pk)
-    themes = area.tags.filter(category='theme')
-    things = area.tags.filter(category='thing')
-    return render(request, 'picture/picturearea_short.html', {
-        'area': area,
-        'theme': themes[0] if themes else None,
-        'thing': things[0] if things else None,
-    })

diff --git a/src/social/models.py b/src/social/models.py
index c9334d8..b8f50ab 100644 (file)
--- a/src/social/models.py
+++ b/src/social/models.py
@@ -7,8 +7,8 @@ from django.conf import settings
 from django.core.exceptions import ValidationError
 from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _, string_concat
 from django.core.exceptions import ValidationError
 from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _, string_concat

-from ssify import flush_ssi_includes

 from catalogue.models import Book
 from catalogue.models import Book

+from wolnelektury.utils import cached_render, clear_cached_renders

 
 
 class BannerGroup(models.Model):
 
 
 class BannerGroup(models.Model):


@@ -116,18 +116,18 @@ class Cite(models.Model):
 
     def save(self, *args, **kwargs):
         ret = super(Cite, self).save(*args, **kwargs)
 
     def save(self, *args, **kwargs):
         ret = super(Cite, self).save(*args, **kwargs)

-        self.flush_includes()
+        self.clear_cache()

         return ret
 
         return ret
 

-    def flush_includes(self):
-        flush_ssi_includes([
-            template % (self.pk, lang)
-            for template in [
-                '/ludzie/cite/%s.%s.html',
-                '/ludzie/cite_main/%s.%s.html',
-            ]
-            for lang in [lc for (lc, _ln) in settings.LANGUAGES]] +
-            ['/ludzie/cite_info/%s.html' % self.pk])
+    @cached_render('social/cite_promo.html')
+    def main_box(self):
+        return {
+            'cite': self,
+            'main': True,
+        }
+
+    def clear_cache(self):
+        clear_cached_renders(self.main_box)

 
 
 class Carousel(models.Model):
 
 
 class Carousel(models.Model):

diff --git a/src/social/templates/social/carousel.html b/src/social/templates/social/carousel.html
index 64380bc..c86d94d 100644 (file)
--- a/src/social/templates/social/carousel.html
+++ b/src/social/templates/social/carousel.html
@@ -13,7 +13,7 @@
 
   {% for banner in banners %}
     {% if banner %}
 
   {% for banner in banners %}
     {% if banner %}

-      {% include 'social/cite_promo.html' with cite=banner main=True %}
+      {{ banner.main_box }}

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

diff --git a/src/social/templatetags/social_tags.py b/src/social/templatetags/social_tags.py
index 0af1da2..298782c 100644 (file)
--- a/src/social/templatetags/social_tags.py
+++ b/src/social/templatetags/social_tags.py
@@ -6,34 +6,27 @@ from django import template
 from django.utils.functional import lazy
 from django.utils.cache import add_never_cache_headers
 from catalogue.models import Book
 from django.utils.functional import lazy
 from django.utils.cache import add_never_cache_headers
 from catalogue.models import Book

-from ssify import ssi_variable
-from ssify.utils import ssi_vary_on_cookie

 from social.utils import likes, get_or_choose_cite
 from ..models import Carousel, Cite
 
 register = template.Library()
 
 
 from social.utils import likes, get_or_choose_cite
 from ..models import Carousel, Cite
 
 register = template.Library()
 
 

-@ssi_variable(register, patch_response=[ssi_vary_on_cookie])
-def likes_book(request, book_id):
-    return likes(request.user, Book.objects.get(pk=book_id), request)
-
-
-@ssi_variable(register, name='choose_cite', patch_response=[add_never_cache_headers])
-def choose_cite_tag(request, book_id=None, tag_ids=None):
-    cite = get_or_choose_cite(request, book_id, tag_ids)
-    return cite.pk if cite is not None else None
+@register.simple_tag(takes_context=True)
+def likes_book(context, book):
+    request = context['request']
+    return likes(request.user, book, request)

 
 
 
 

-@register.inclusion_tag('social/cite_promo.html')
-def render_cite(cite):
-    return {
-        'cite': cite,
-    }
+@register.simple_tag(takes_context=True)
+def choose_cite(context, book_id=None, tag_ids=None):
+    request = context['request']
+    return get_or_choose_cite(request, book_id, tag_ids)

 
 
 
 

-@ssi_variable(register, patch_response=[ssi_vary_on_cookie])
-def book_shelf_tags(request, book_id):
+@register.simple_tag(takes_context=True)
+def book_shelf_tags(context, book_id):
+    request = context['request']

     if not request.user.is_authenticated():
         return ''
     book = Book.objects.get(pk=book_id)
     if not request.user.is_authenticated():
         return ''
     book = Book.objects.get(pk=book_id)

diff --git a/src/social/urls.py b/src/social/urls.py
index 395e54a..6b78950 100644 (file)
--- a/src/social/urls.py
+++ b/src/social/urls.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-

 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #


@@ -12,9 +11,4 @@ urlpatterns = [
     url(r'^lektura/(?P<slug>[a-z0-9-]+)/nie_lubie/$', views.unlike_book, name='social_unlike_book'),
     url(r'^lektura/(?P<slug>[a-z0-9-]+)/polki/$', never_cache(views.ObjectSetsFormView()), name='social_book_sets'),
     url(r'^polka/$', views.my_shelf, name='social_my_shelf'),
     url(r'^lektura/(?P<slug>[a-z0-9-]+)/nie_lubie/$', views.unlike_book, name='social_unlike_book'),
     url(r'^lektura/(?P<slug>[a-z0-9-]+)/polki/$', never_cache(views.ObjectSetsFormView()), name='social_book_sets'),
     url(r'^polka/$', views.my_shelf, name='social_my_shelf'),

-
-    # Includes
-    url(r'^cite/(?P<pk>\d+)\.(?P<lang>.+)\.html$', views.cite, name='social_cite'),
-    url(r'^cite_main/(?P<pk>\d+)\.(?P<lang>.+)\.html$', views.cite, {'main': True}, name='social_cite_main'),
-    url(r'^cite_info/(?P<pk>\d+).html$', views.cite_info, name='social_cite_info'),

 ]
 ]

diff --git a/src/social/views.py b/src/social/views.py
index 757b5a2..2d95cfe 100644 (file)
--- a/src/social/views.py
+++ b/src/social/views.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-

 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #


@@ -10,9 +9,7 @@ from django.views.decorators.http import require_POST
 from ajaxable.utils import AjaxableFormView
 
 from catalogue.models import Book
 from ajaxable.utils import AjaxableFormView
 
 from catalogue.models import Book

-from ssify import ssi_included

 from social import forms
 from social import forms

-from .models import Cite

 
 
 # ====================
 
 
 # ====================


@@ -70,20 +67,3 @@ class ObjectSetsFormView(AjaxableFormView):
 
     def form_args(self, request, obj):
         return (obj, request.user), {}
 
     def form_args(self, request, obj):
         return (obj, request.user), {}

-
-
-@ssi_included
-def cite(request, pk, main=False):
-    cite = get_object_or_404(Cite, pk=pk)
-    return render(request, 'social/cite_promo.html', {
-        'main': main,
-        'cite': cite,
-    })
-
-
-@ssi_included(use_lang=False)
-def cite_info(request, pk):
-    cite = get_object_or_404(Cite, pk=pk)
-    return render(request, 'social/cite_info.html', {
-        'cite': cite,
-    })

diff --git a/src/wolnelektury/settings/apps.py b/src/wolnelektury/settings/apps.py
index 76a9218..ba313f5 100644 (file)
--- a/src/wolnelektury/settings/apps.py
+++ b/src/wolnelektury/settings/apps.py
@@ -58,7 +58,6 @@ INSTALLED_APPS_CONTRIB = [
     'fnpdjango',
     'getpaid',
     'getpaid.backends.payu',
     'fnpdjango',
     'getpaid',
     'getpaid.backends.payu',

-    'ssify',

     'django_extensions',
     'raven.contrib.django.raven_compat',
     'club.apps.ClubConfig',
     'django_extensions',
     'raven.contrib.django.raven_compat',
     'club.apps.ClubConfig',

diff --git a/src/wolnelektury/settings/basic.py b/src/wolnelektury/settings/basic.py
index e6511ab..006e9e0 100644 (file)
--- a/src/wolnelektury/settings/basic.py
+++ b/src/wolnelektury/settings/basic.py
@@ -69,15 +69,13 @@ TEMPLATES = [{
 MIDDLEWARE_CLASSES = [
     'debug_toolbar.middleware.DebugToolbarMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
 MIDDLEWARE_CLASSES = [
     'debug_toolbar.middleware.DebugToolbarMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',

-    'ssify.middleware.SsiMiddleware',

     'django.middleware.cache.UpdateCacheMiddleware',
     'django.middleware.cache.UpdateCacheMiddleware',

-    'ssify.middleware.PrepareForCacheMiddleware',

     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.admindocs.middleware.XViewMiddleware',
     'fnp_django_pagination.middleware.PaginationMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.admindocs.middleware.XViewMiddleware',
     'fnp_django_pagination.middleware.PaginationMiddleware',

-    'ssify.middleware.LocaleMiddleware',
+    'django.middleware.locale.LocaleMiddleware',

     'maintenancemode.middleware.MaintenanceModeMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'maintenancemode.middleware.MaintenanceModeMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',

diff --git a/src/wolnelektury/settings/cache.py b/src/wolnelektury/settings/cache.py
index fab8325..ce873cb 100644 (file)
--- a/src/wolnelektury/settings/cache.py
+++ b/src/wolnelektury/settings/cache.py
@@ -8,14 +8,6 @@ CACHES = {
             '127.0.0.1:11211',
         ]
     },
             '127.0.0.1:11211',
         ]
     },

-    'ssify': {
-        'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
-        'TIMEOUT': None,
-        'KEY_PREFIX': 'ssify',
-        'LOCATION': [
-            '127.0.0.1:11211',
-        ],
-    },

     'template_fragments': {
         'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
         'TIMEOUT': 86400,
     'template_fragments': {
         'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
         'TIMEOUT': 86400,

diff --git a/src/wolnelektury/signals.py b/src/wolnelektury/signals.py
index 5eb7e88..d15b960 100644 (file)
--- a/src/wolnelektury/signals.py
+++ b/src/wolnelektury/signals.py
@@ -21,7 +21,7 @@ def flush_views_after_manual_change(sender, **kwargs):
     to just flush the cache on those instances.
 
     If changes become too often, relevant bits should be separated
     to just flush the cache on those instances.
 
     If changes become too often, relevant bits should be separated

-    as ssi_included views and flushed individually when needed.
+    and cached and flushed individually when needed.

 
     """
     if sender in (Catalog, Library, InfoPage, Author, BookStub, Spent):
 
     """
     if sender in (Catalog, Library, InfoPage, Author, BookStub, Spent):

diff --git a/src/wolnelektury/templates/main_page.html b/src/wolnelektury/templates/main_page.html
index d68c2cc..49892ec 100644 (file)
--- a/src/wolnelektury/templates/main_page.html
+++ b/src/wolnelektury/templates/main_page.html
@@ -1,8 +1,8 @@
 {% extends "base/base.html" %}
 {% extends "base/base.html" %}

+{% load latest_blog_posts from blog %}

 {% load carousel from social_tags %}
 {% load static from staticfiles %}
 {% load i18n catalogue_tags infopages_tags %}
 {% load carousel from social_tags %}
 {% load static from staticfiles %}
 {% load i18n catalogue_tags infopages_tags %}

-{% load ssi_include from ssify %}

 {% load cache %}
 {% load funding_tags %}
 {% get_current_language as LANGUAGE_CODE %}
 {% load cache %}
 {% load funding_tags %}
 {% get_current_language as LANGUAGE_CODE %}


@@ -56,9 +56,7 @@
     {% if collection %}
       <section>
         <h1>{% trans "Collections" %}</h1>
     {% if collection %}
       <section>
         <h1>{% trans "Collections" %}</h1>

-        {% cache 3600 collection_box collection.pk LANGUAGE_CODE %}
-          {% include 'catalogue/collection_box.html' %}
-        {% endcache %}
+       {{ collection.box }}

         <a class="more" href="{% url 'catalogue_collections' %}">{% trans "See collections catalog" %}</a>
       </section>
     {% endif %}
         <a class="more" href="{% url 'catalogue_collections' %}">{% trans "See collections catalog" %}</a>
       </section>
     {% endif %}


@@ -75,7 +73,9 @@
 
     <section class="infopages-box">
       <h1>{% trans "News" %}</h1>
 
     <section class="infopages-box">
       <h1>{% trans "News" %}</h1>

-      {% ssi_include 'latest_blog_posts' %}
+      {% cache 1800 latest_blog_posts %}
+        {% latest_blog_posts %}
+      {% endcache %}

     </section>
 
     <section class="infopages-box">
     </section>
 
     <section class="infopages-box">

diff --git a/src/wolnelektury/templatetags/blog.py b/src/wolnelektury/templatetags/blog.py
new file mode 100644 (file)
index 0000000..ca97e25
--- /dev/null
+++ b/src/wolnelektury/templatetags/blog.py
@@ -0,0 +1,30 @@
+from datetime import date
+from django.conf import settings
+from django.template import Library
+import feedparser
+
+
+register = Library()
+
+
+@register.inclusion_tag('latest_blog_posts.html')
+def latest_blog_posts(feed_url=None, posts_to_show=5):
+    if feed_url is None:
+        feed_url = settings.LATEST_BLOG_POSTS
+    posts = []
+    try:
+        feed = feedparser.parse(str(feed_url))
+        for i in range(posts_to_show):
+            pub_date = feed['entries'][i].published_parsed
+            published = date(pub_date[0], pub_date[1], pub_date[2])
+            posts.append({
+                'title': feed['entries'][i].title,
+                'summary': feed['entries'][i].summary,
+                'link': feed['entries'][i].link,
+                'date': published,
+                })
+    except:
+        pass
+    return {
+        'posts': posts
+    }

diff --git a/src/wolnelektury/urls.py b/src/wolnelektury/urls.py
index 2622461..6af8093 100644 (file)
--- a/src/wolnelektury/urls.py
+++ b/src/wolnelektury/urls.py
@@ -26,9 +26,6 @@ urlpatterns = [
     url(r'^uzytkownik/logout/$', views.logout_then_redirect, name='logout'),
     url(r'^uzytkownik/zaloguj-utworz/$', views.LoginRegisterFormView(), name='login_register'),
     url(r'^uzytkownik/social/signup/$', views.SocialSignupView.as_view(), name='socialaccount_signup'),
     url(r'^uzytkownik/logout/$', views.logout_then_redirect, name='logout'),
     url(r'^uzytkownik/zaloguj-utworz/$', views.LoginRegisterFormView(), name='login_register'),
     url(r'^uzytkownik/social/signup/$', views.SocialSignupView.as_view(), name='socialaccount_signup'),

-
-    # Includes.
-    url(r'^latests_blog_posts.html$', views.latest_blog_posts, name='latest_blog_posts'),

 ]
 
 urlpatterns += [
 ]
 
 urlpatterns += [

diff --git a/src/wolnelektury/views.py b/src/wolnelektury/views.py
index 4b20a55..e770455 100644 (file)
--- a/src/wolnelektury/views.py
+++ b/src/wolnelektury/views.py
@@ -19,7 +19,6 @@ from django.views.decorators.cache import never_cache
 from ajaxable.utils import AjaxableFormView
 from ajaxable.utils import placeholdized
 from catalogue.models import Book, Collection, Tag, Fragment
 from ajaxable.utils import AjaxableFormView
 from ajaxable.utils import placeholdized
 from catalogue.models import Book, Collection, Tag, Fragment

-from ssify import ssi_included

 
 from social.utils import get_or_choose_cite
 from wolnelektury.forms import RegistrationForm, SocialSignupForm
 
 from social.utils import get_or_choose_cite
 from wolnelektury.forms import RegistrationForm, SocialSignupForm


@@ -154,28 +153,6 @@ def user_settings(request):
     return render(request, "user.html")
 
 
     return render(request, "user.html")
 
 

-@ssi_included(use_lang=False, timeout=1800)
-def latest_blog_posts(request, feed_url=None, posts_to_show=5):
-    if feed_url is None:
-        feed_url = settings.LATEST_BLOG_POSTS
-    try:
-        feed = feedparser.parse(str(feed_url))
-        posts = []
-        for i in range(posts_to_show):
-            pub_date = feed['entries'][i].published_parsed
-            published = date(pub_date[0], pub_date[1], pub_date[2])
-            posts.append({
-                'title': feed['entries'][i].title,
-                'summary': feed['entries'][i].summary,
-                'link': feed['entries'][i].link,
-                'date': published,
-                })
-    except:
-        posts = []
-    return render(request, 'latest_blog_posts.html', {'posts': posts})
-
-
-@ssi_included(use_lang=False)

 def widget(request):
     return render(request, 'widget.html')
 
 def widget(request):
     return render(request, 'widget.html')