X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/99f6dd4f1ff0390de9a9bbd4e3352b953cb9a235..82c3054bcdeb000aa9782da80d644070797b5cbe:/apps/picture/views.py diff --git a/apps/picture/views.py b/apps/picture/views.py index 3e471b0e8..1f8738650 100644 --- a/apps/picture/views.py +++ b/apps/picture/views.py @@ -2,13 +2,14 @@ # 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 +from sponsors.models import Sponsor # 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): @@ -17,7 +18,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) @@ -57,9 +58,14 @@ 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', []): + have_sponsors = Sponsor.objects.filter(name=sponsor) + if have_sponsors.exists(): + sponsors.append(have_sponsors[0]) return render_to_response("picture/picture_viewer.html", locals(), context_instance=RequestContext(request)) - + # ========= # = Admin = @@ -88,3 +94,35 @@ def import_picture(request): 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) + author_str = ", ".join(tag.name + for tag in picture.tags.filter(category='author')) + return render(request, 'picture/picture_mini_box.html', { + 'picture': picture, + 'author_str': author_str, + '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, + '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())