X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/1f9103b1e752a6c41d2304bf5e41a7d6ae0c45c8..ad39c2501159fa52e980c95af3e735e36b459c15:/apps/picture/views.py?ds=sidebyside

diff --git a/apps/picture/views.py b/apps/picture/views.py
index 65e5fa4b5..4bc2ab04b 100644
--- a/apps/picture/views.py
+++ b/apps/picture/views.py
@@ -1,10 +1,14 @@
-
+# -*- 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 collections import OrderedDict
 from django.contrib.auth.decorators import permission_required
-from django.utils.datastructures import SortedDict
-from django.shortcuts import render_to_response, get_object_or_404
+from django.shortcuts import render_to_response, get_object_or_404, render
 from django.template import RequestContext
-from django.core.paginator import Paginator
-from picture.models import Picture
+from picture.models import Picture, PictureArea
+from catalogue.utils import split_tags
+from ssify import ssi_included
 
 # 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):
@@ -13,7 +17,7 @@ def picture_list(request, filter=None, get_filter=None, template_name='catalogue
     if get_filter:
         filt = get_filter()
     pictures_by_author, orphans = Picture.picture_list(filt)
-    books_nav = SortedDict()
+    books_nav = OrderedDict()
     for tag in pictures_by_author:
         if pictures_by_author[tag]:
             books_nav.setdefault(tag.sort_key[0], []).append(tag)
@@ -28,17 +32,24 @@ def picture_list_thumb(request, filter=None, get_filter=None, template_name='pic
         book_list = book_list.filter(filter)
     if get_filter:
         book_list = book_list.filter(get_filter())
+    book_list = book_list.order_by('sort_key_author')
+    book_list = list(book_list)
     return render_to_response(template_name, locals(),
                               context_instance=RequestContext(request))
 
 def picture_detail(request, slug):
     picture = get_object_or_404(Picture, slug=slug)
 
-    categories = SortedDict()
-    for tag in picture.tags.iterator():
-        categories.setdefault(tag.category, []).append(tag)
+    theme_things = split_tags(picture.related_themes())
+
+    # categories = SortedDict()
+    # for tag in picture.tags.iterator():
+    #     categories.setdefault(tag.category, []).append(tag)
 
-    picture_themes = []
+    themes = theme_things.get('theme', [])
+    things = theme_things.get('thing', [])
+
+    extra_info = picture.extra_info
 
     return render_to_response("picture/picture_detail.html", locals(),
                               context_instance=RequestContext(request))
@@ -46,10 +57,9 @@ def picture_detail(request, slug):
 
 def picture_viewer(request, slug):
     picture = get_object_or_404(Picture, slug=slug)
-    
     return render_to_response("picture/picture_viewer.html", locals(),
                               context_instance=RequestContext(request))
-                              
+
 
 # =========
 # = Admin =
@@ -78,3 +88,23 @@ def import_picture(request):
         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,
+        'main_link': picture.get_absolute_url(),
+        'request': request,
+        'tags': split_tags(picture.tags),
+        })
+
+
+@ssi_included
+def picturearea_short(request, pk):
+    area = get_object_or_404(PictureArea, pk=pk)
+    theme = area.tags.filter(category='theme')
+    theme = theme and theme[0] or None
+    thing = area.tags.filter(category='thing')
+    thing = thing and thing[0] or None
+    return render(request, 'picture/picturearea_short.html', locals())