Progress bar on payment form page.

[wolnelektury.git] / src / social / templatetags / social_tags.py

diff --git a/src/social/templatetags/social_tags.py b/src/social/templatetags/social_tags.py
index a444d66..596c36d 100644 (file)
--- a/src/social/templatetags/social_tags.py
+++ b/src/social/templatetags/social_tags.py
@@ -6,35 +6,28 @@ 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 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()
 
 
-@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):
-    if not request.user.is_authenticated():
+@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)
     lks = likes(request.user, book, request)
@@ -57,10 +50,10 @@ def carousel(context, slug):
         carousel = Carousel.objects.get(slug=slug)
     except Carousel.DoesNotExist:
         # TODO: add sanity check for install.
-        carousel = None
+        carousel = Carousel.objects.create(slug=slug)
     banners = [
             item.get_banner()
-            for item in carousel.carouselitem_set.all()
+            for item in carousel.carouselitem_set.all().select_related('banner')
             ]
 
     request = context['request']