X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/f3e8dfa015744bd72796fdd8eff0d81f863cdc46..ba83b8311a93602de7f733c9a9e183e3ebbb006c:/src/picture/views.py

diff --git a/src/picture/views.py b/src/picture/views.py
index 98485afec..27f9050fe 100644
--- 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 picture.models import Picture, PictureArea
+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
 
@@ -18,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(request, template_name, {'book_list': list(pictures)})
+    return render(request, template_name, {'picture_list': list(pictures)})
 
 
 def picture_detail(request, slug):
@@ -37,7 +36,7 @@ def picture_detail(request, slug):
 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])
@@ -61,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,
@@ -82,7 +81,7 @@ def import_picture(request):
     """docstring for import_book"""
     from django.http import HttpResponse
     from picture.forms import PictureImportForm
-    from django.utils.translation import ugettext as _
+    from django.utils.translation import gettext as _
 
     import_form = PictureImportForm(request.POST, request.FILES)
     if import_form.is_valid():
@@ -96,28 +95,7 @@ def import_picture(request):
             exception = pprint.pformat(info[1])
             tb = '\n'.join(traceback.format_tb(info[2]))
             return HttpResponse(_("An error occurred: %(exception)s\n\n%(tb)s") %
-                                {'exception': exception, 'tb': tb}, mimetype='text/plain')
+                                {'exception': exception, 'tb': tb}, content_type='text/plain')
         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,
-    })