Cite base

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

diff --git a/src/picture/views.py b/src/picture/views.py
index 35e9b5f..ecd5d66 100644 (file)
--- a/src/picture/views.py
+++ b/src/picture/views.py
@@ -1,45 +1,24 @@
-# -*- 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 sponsors.models import Sponsor
 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
 
 
 def picture_list_thumb(request, filter=None, get_filter=None, template_name='picture/picture_list_thumb.html',
                        cache_key=None, context=None):
 from wolnelektury.utils import ajax
 
 
 def picture_list_thumb(request, filter=None, get_filter=None, template_name='picture/picture_list_thumb.html',
                        cache_key=None, context=None):

-    book_list = Picture.objects.all()
+    pictures = Picture.objects.all()

     if filter:
     if filter:

-        book_list = book_list.filter(filter)
+        pictures = pictures.filter(filter)

     if get_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, {'book_list': book_list}, context_instance=RequestContext(request))
+        pictures = pictures.filter(get_filter())
+    return render(request, template_name, {'book_list': list(pictures)})

 
 
 def picture_detail(request, slug):
 
 
 def picture_detail(request, slug):


@@ -47,15 +26,12 @@ def picture_detail(request, slug):
 
     theme_things = split_tags(picture.related_themes())
 
 
     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', []),
         'picture': picture,
         'themes': theme_things.get('theme', []),
         'things': theme_things.get('thing', []),

-    }, context_instance=RequestContext(request))
+        'active_menu_item': 'gallery',
+    })

 
 
 def picture_viewer(request, slug):
 
 
 def picture_viewer(request, slug):


@@ -65,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')


@@ -82,6 +58,10 @@ def picture_page(request, key=None):
             'id': picture.id,
             'title': picture.title,
             'author': picture.author_unicode(),
             'id': picture.id,
             'title': picture.title,
             'author': picture.author_unicode(),

+            'epoch': picture.tag_unicode('epoch'),
+            'kind': picture.tag_unicode('kind'),
+            'genre': picture.tag_unicode('genre'),
+            'style': picture.extra_info['style'],

             'image_url': picture.image_file.url,
             'width': picture.width,
             'height': picture.height,
             'image_url': picture.image_file.url,
             'width': picture.width,
             'height': picture.height,


@@ -125,10 +105,9 @@ def import_picture(request):
 @ssi_included
 def picture_mini(request, pk, with_link=True):
     picture = get_object_or_404(Picture, pk=pk)
 @ssi_included
 def picture_mini(request, pk, with_link=True):
     picture = get_object_or_404(Picture, pk=pk)

-    author_str = ", ".join(tag.name for tag in picture.tags.filter(category='author'))

     return render(request, 'picture/picture_mini_box.html', {
         'picture': picture,
     return render(request, 'picture/picture_mini_box.html', {
         'picture': picture,

-        'author_str': author_str,
+        'author': picture.author_unicode(),

         'with_link': with_link,
     })
 
         'with_link': with_link,
     })
 


@@ -139,10 +118,7 @@ def picture_short(request, pk):
 
     return render(request, 'picture/picture_short.html', {
         'picture': picture,
 
     return render(request, 'picture/picture_short.html', {
         'picture': picture,

-        'main_link': picture.get_absolute_url(),
-        'request': request,
-        'tags': split_tags(picture.tags),
-        })
+    })

 
 
 @ssi_included
 
 
 @ssi_included