X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/87bd94a94dc6cc3dbf47db2bdd17761b3f400138..309ec8b919d57858254b78cd7ba3b4d84d90da9a:/src/cover/views.py?ds=inline diff --git a/src/cover/views.py b/src/cover/views.py index 82bc911f..302f5f52 100644 --- a/src/cover/views.py +++ b/src/cover/views.py @@ -65,7 +65,11 @@ def preview(request, book, chunk=None, rev=None): cover_class = request.GET.get('cover_class', 'default') - cover = make_cover(info, cover_class=cover_class, width=width, height=height) + kwargs = {} + if chunk.book.project is not None: + if chunk.book.project.logo_mono or chunk.book.project.logo: + kwargs['cover_logo'] = (chunk.book.project.logo_mono or chunk.book.project.logo).path + cover = make_cover(info, cover_class=cover_class, width=width, height=height, **kwargs) response = HttpResponse(content_type=cover.mime_type()) img = cover.final_image() img.save(response, cover.format) @@ -105,6 +109,11 @@ def image(request, pk): if not request.accepts('text/html') and request.accepts('application/json') or request.GET.get('format') == 'json': return JsonResponse({ + 'title': img.title, + 'author': img.author, + 'license_name': img.license_name, + 'license_url': img.license_url, + 'source_url': img.source_url, 'attribution': img.attribution, 'cut_left': img.cut_left, 'cut_right': img.cut_right, @@ -141,9 +150,14 @@ def image_file(request, pk): @active_tab('cover') def image_list(request): + qs = Image.objects.all().order_by('-id') + only_unused = request.GET.get('unused') + if only_unused: + qs = qs.filter(book=None) return render(request, "cover/image_list.html", { - 'object_list': Image.objects.all().order_by('-id'), + 'object_list': qs, 'can_add': request.user.has_perm('cover.add_image'), + 'only_unused': only_unused, })