diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-08-01 15:18:48 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-08-13 18:26:03 +0200 |
| commit | dd2e367dde3d8df4fdfbc10b8f0d87607b160ef6 (patch) | |
| tree | 7ee999b7ffcf660f7846b863ba94c3f7b31e5573 | |
| parent | b93797feaa842068f7b93676bddb7ca3e14eb356 (diff) | |
| download | Ishtar-dd2e367dde3d8df4fdfbc10b8f0d87607b160ef6.tar.bz2 Ishtar-dd2e367dde3d8df4fdfbc10b8f0d87607b160ef6.zip | |
Fix weasyprint warnings
| -rw-r--r-- | ishtar_common/static/media/style_basic.css | 2 | ||||
| -rw-r--r-- | ishtar_common/views_item.py | 13 |
2 files changed, 9 insertions, 6 deletions
diff --git a/ishtar_common/static/media/style_basic.css b/ishtar_common/static/media/style_basic.css index d0f5bbe4a..bfd89dfca 100644 --- a/ishtar_common/static/media/style_basic.css +++ b/ishtar_common/static/media/style_basic.css @@ -4,14 +4,12 @@ background-image: url("images/ishtar-bg.jpg"); background-repeat: no-repeat; @frame footer { - -pdf-frame-content: pdffooter; bottom: 1cm; margin-left: 1cm; margin-right: 1cm; height: 1cm; } @frame header { - -pdf-frame-content: pdfheader; top: 1.2cm; margin-left: 1cm; margin-right: 1cm; diff --git a/ishtar_common/views_item.py b/ishtar_common/views_item.py index 950fa00fe..0b36b9bc1 100644 --- a/ishtar_common/views_item.py +++ b/ishtar_common/views_item.py @@ -205,6 +205,10 @@ def show_item(model, name, extra_dct=None): response.write(odt_file.read()) return response elif doc_type == 'pdf': + base_url = "/".join( + request.build_absolute_uri().split("/")[0:3] + ) + tpl = loader.get_template('ishtar/sheet_%s_pdf.html' % name) context_instance['output'] = 'PDF' html = tpl.render(context_instance, request) @@ -217,11 +221,12 @@ def show_item(model, name, extra_dct=None): body{ font-family: Gentium } - ''' % (static("gentium/GentiumPlus-R.ttf"))) + ''' % (base_url + static("gentium/GentiumPlus-R.ttf"))) css2 = CSS(filename=settings.STATIC_ROOT + '/media/style_basic.css') - pdf = HTML(string=html, base_url=request.build_absolute_uri() - ).write_pdf(stylesheets=[css, css2], - font_config=font_config) + pdf = HTML( + string=html, base_url=base_url + ).write_pdf( + stylesheets=[css, css2], font_config=font_config) response = HttpResponse(pdf, content_type='application/pdf') response['Content-Disposition'] = 'attachment; filename=%s.pdf' % \ filename |