Update librarian

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

diff --git a/src/picture/views.py b/src/picture/views.py
index 6f02007..98485af 100644 (file)
--- a/src/picture/views.py
+++ b/src/picture/views.py
@@ -1,11 +1,9 @@
-# -*- 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
 # 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 picture.models import Picture, PictureArea
 from catalogue.utils import split_tags
 from ssify import ssi_included


@@ -20,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())
         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):
 
 
 def picture_detail(request, slug):


@@ -28,12 +26,12 @@ def picture_detail(request, slug):
 
     theme_things = split_tags(picture.related_themes())
 
 
     theme_things = split_tags(picture.related_themes())
 

-    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',
         '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):
 
 
 def picture_viewer(request, slug):


@@ -43,10 +41,10 @@ def picture_viewer(request, slug):
         have_sponsors = Sponsor.objects.filter(name=sponsor)
         if have_sponsors.exists():
             sponsors.append(have_sponsors[0])
         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,
         'picture': picture,
         'sponsors': sponsors,

-    }, context_instance=RequestContext(request))
+    })

 
 
 @ajax(method='get')
 
 
 @ajax(method='get')


@@ -104,16 +102,6 @@ def import_picture(request):
         return HttpResponse(_("Error importing file: %r") % import_form.errors)
 
 
         return HttpResponse(_("Error importing file: %r") % import_form.errors)
 
 

-@ssi_included
-def picture_mini(request, pk, with_link=True):
-    picture = get_object_or_404(Picture, pk=pk)
-    return render(request, 'picture/picture_mini_box.html', {
-        'picture': picture,
-        'author': picture.author_unicode(),
-        'with_link': with_link,
-    })
-
-

 @ssi_included
 def picture_short(request, pk):
     picture = get_object_or_404(Picture, pk=pk)
 @ssi_included
 def picture_short(request, pk):
     picture = get_object_or_404(Picture, pk=pk)