X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/9fbf0c4158a9427442171629a564e2de7780b5b7..d69fc5f16ed739c02685e7d695abf6de59c2bf5e:/apps/picture/views.py?ds=inline diff --git a/apps/picture/views.py b/apps/picture/views.py index 24457e297..4bc2ab04b 100644 --- a/apps/picture/views.py +++ b/apps/picture/views.py @@ -1,36 +1,66 @@ -from picture.models import Picture +# -*- 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 picture.models import Picture, PictureArea +from catalogue.utils import split_tags +from ssify import ssi_included - -def picture_list(request, filter=None, template_name='catalogue/picture_list.html'): +# 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 """ - pictures_by_author, orphans = Picture.picture_list() - books_nav = SortedDict() + 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) - # import pdb; pdb.set_trace() return render_to_response(template_name, locals(), context_instance=RequestContext(request)) -def picture_detail(request, picture): - picture = get_object_or_404(Picture, slug=picture) +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() + if filter: + 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) + + theme_things = split_tags(picture.related_themes()) + + # categories = SortedDict() + # for tag in picture.tags.iterator(): + # categories.setdefault(tag.category, []).append(tag) - categories = SortedDict() - for tag in picture.tags: - categories.setdefault(tag.category, []).append(tag) + themes = theme_things.get('theme', []) + things = theme_things.get('thing', []) - picture_themes = [] + extra_info = picture.extra_info - return render_to_response("catalogue/picture_detail.html", locals(), + return render_to_response("picture/picture_detail.html", locals(), context_instance=RequestContext(request)) + +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 = # ========= @@ -56,3 +86,25 @@ def import_picture(request): 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, + '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())