X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/b95b09260db87f6665bfcef3fb4f7c19f8acb666..05cca019b7dba62e457feb47df10e7a41dd939ef:/src/picture/views.py

diff --git a/src/picture/views.py b/src/picture/views.py
index 6f02007e0..43601a180 100644
--- a/src/picture/views.py
+++ b/src/picture/views.py
@@ -1,14 +1,11 @@
-# -*- 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 picture.models import Picture, PictureArea
+from django.shortcuts import render, get_object_or_404, render
+from picture.models import Picture
 from catalogue.utils import split_tags
-from ssify import ssi_included
 from sponsors.models import Sponsor
 from wolnelektury.utils import ajax
 
@@ -20,7 +17,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):
@@ -28,25 +25,25 @@ def picture_detail(request, slug):
 
     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',
-    }, context_instance=RequestContext(request))
+    })
 
 
 def picture_viewer(request, slug):
     picture = get_object_or_404(Picture, slug=slug)
     sponsors = []
-    for sponsor in picture.extra_info.get('sponsors', []):
+    for sponsor in picture.get_extra_info_json().get('sponsors', []):
         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')
@@ -63,7 +60,7 @@ def picture_page(request, key=None):
             'epoch': picture.tag_unicode('epoch'),
             'kind': picture.tag_unicode('kind'),
             'genre': picture.tag_unicode('genre'),
-            'style': picture.extra_info['style'],
+            'style': picture.get_extra_info_json()['style'],
             'image_url': picture.image_file.url,
             'width': picture.width,
             'height': picture.height,
@@ -102,34 +99,3 @@ def import_picture(request):
         return HttpResponse(_("Picture imported successfully"))
     else:
         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)
-
-    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,
-    })