From b0864d58fdb76354a667f924e9e21dd715c4e8ec Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Mon, 12 Feb 2018 13:21:03 +0100 Subject: Add image export in ODT (refs #1366) --- ishtar_common/context_processors.py | 4 +++- ishtar_common/templates/ishtar/blocks/window_image.html | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'ishtar_common') diff --git a/ishtar_common/context_processors.py b/ishtar_common/context_processors.py index ff97079d5..cc3dd5782 100644 --- a/ishtar_common/context_processors.py +++ b/ishtar_common/context_processors.py @@ -28,7 +28,9 @@ from menus import Menu def get_base_context(request): - dct = {'URL_PATH': settings.URL_PATH} + dct = {'URL_PATH': settings.URL_PATH, + 'BASE_URL': "{}://{}".format( + request.scheme, request.META['HTTP_HOST'])} try: dct["APP_NAME"] = Site.objects.get_current().name except Site.DoesNotExist: diff --git a/ishtar_common/templates/ishtar/blocks/window_image.html b/ishtar_common/templates/ishtar/blocks/window_image.html index 4b8e67ea9..606b6b57a 100644 --- a/ishtar_common/templates/ishtar/blocks/window_image.html +++ b/ishtar_common/templates/ishtar/blocks/window_image.html @@ -1,8 +1,8 @@ {% if item.image %}
- - - + {% if output != "ODT" %}{% endif %} + + {% if output != "ODT" %}{% endif %} {% comment %}