Carousel fixes.

[wolnelektury.git] / src / picture / views.py

diff --git a/src/picture/views.py b/src/picture/views.py
index 6ace134..ecd5d66 100644 (file)
--- a/src/picture/views.py
+++ b/src/picture/views.py
@@ -1,32 +1,13 @@
-# -*- 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.conf import settings
 from django.contrib.auth.decorators import permission_required
-from django.shortcuts import render_to_response, get_object_or_404, render
-from django.template import RequestContext
+from django.shortcuts import render, get_object_or_404, render
 from picture.models import Picture, PictureArea
 from catalogue.utils import split_tags
 from ssify import ssi_included
 from sponsors.models import Sponsor
-
-
-# WTF/unused
-# # was picture/picture_list.html list (without thumbs)
-# def picture_list(request, filter=None, get_filter=None, template_name='catalogue/picture_list.html',
-#                  cache_key=None, context=None):
-#     """ generates a listing of all books, optionally filtered with a test function """
-#
-#     if get_filter:
-#         filt = get_filter()
-#     pictures_by_author, orphans = Picture.picture_list(filt)
-#     books_nav = OrderedDict()
-#     for tag in pictures_by_author:
-#         if pictures_by_author[tag]:
-#             books_nav.setdefault(tag.sort_key[0], []).append(tag)
-#
-#     return render_to_response(template_name, locals(), context_instance=RequestContext(request))
 from wolnelektury.utils import ajax
 
 
@@ -37,7 +18,7 @@ def picture_list_thumb(request, filter=None, get_filter=None, template_name='pic
         pictures = pictures.filter(filter)
     if get_filter:
         pictures = pictures.filter(get_filter())
-    return render_to_response(template_name, {'book_list': list(pictures)}, context_instance=RequestContext(request))
+    return render(request, template_name, {'book_list': list(pictures)})
 
 
 def picture_detail(request, slug):
@@ -45,16 +26,12 @@ def picture_detail(request, slug):
 
     theme_things = split_tags(picture.related_themes())
 
-    # categories = SortedDict()
-    # for tag in picture.tags.iterator():
-    #     categories.setdefault(tag.category, []).append(tag)
-
-    return render_to_response("picture/picture_detail.html", {
+    return render(request, "picture/picture_detail.html", {
         'picture': picture,
         'themes': theme_things.get('theme', []),
         'things': theme_things.get('thing', []),
         'active_menu_item': 'gallery',
-    }, context_instance=RequestContext(request))
+    })
 
 
 def picture_viewer(request, slug):
@@ -64,10 +41,10 @@ def picture_viewer(request, slug):
         have_sponsors = Sponsor.objects.filter(name=sponsor)
         if have_sponsors.exists():
             sponsors.append(have_sponsors[0])
-    return render_to_response("picture/picture_viewer.html", {
+    return render(request, "picture/picture_viewer.html", {
         'picture': picture,
         'sponsors': sponsors,
-    }, context_instance=RequestContext(request))
+    })
 
 
 @ajax(method='get')