diff options
author | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-02-12 13:21:03 +0100 |
---|---|---|
committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-02-12 13:21:03 +0100 |
commit | b0864d58fdb76354a667f924e9e21dd715c4e8ec (patch) | |
tree | ac7770ec948f4edc38310511098318d01923115a /ishtar_common | |
parent | 3af31a66fb21ef91d9336ce27c42387b7e46ef65 (diff) | |
download | Ishtar-b0864d58fdb76354a667f924e9e21dd715c4e8ec.tar.bz2 Ishtar-b0864d58fdb76354a667f924e9e21dd715c4e8ec.zip |
Add image export in ODT (refs #1366)
Diffstat (limited to 'ishtar_common')
-rw-r--r-- | ishtar_common/context_processors.py | 4 | ||||
-rw-r--r-- | ishtar_common/templates/ishtar/blocks/window_image.html | 6 |
2 files changed, 6 insertions, 4 deletions
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 %} <div id="lightgallery-{{window_id}}"> - <a href="{{item.image.url}}"> - <img class='card-img-top' src="{{item.thumbnail.url}}"> - </a> + {% if output != "ODT" %}<a href="{{item.image.url}}">{% endif %} + <img class='card-img-top' src="{{BASE_URL}}{{item.thumbnail.url}}"> + {% if output != "ODT" %}</a>{% endif %} {% comment %} <!-- gallery test --> <a href="{{item.image.url}}" |