diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2023-01-20 17:08:54 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2023-01-20 17:08:54 +0100 |
| commit | fe446a41c3ff945c94314bf64b5287bf4c3397d3 (patch) | |
| tree | 506ba84eae7db7612285aad8d50118aba0d15bb1 /ishtar_common | |
| parent | a80eeaa93696c10d1f5c2b224fbdb1251b3315aa (diff) | |
| download | Ishtar-fe446a41c3ff945c94314bf64b5287bf4c3397d3.tar.bz2 Ishtar-fe446a41c3ff945c94314bf64b5287bf4c3397d3.zip | |
PDF export: fix new line on <pre> blocks
Diffstat (limited to 'ishtar_common')
| -rw-r--r-- | ishtar_common/templates/ishtar/blocks/sheet_geographic.html | 4 | ||||
| -rw-r--r-- | ishtar_common/views_item.py | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/ishtar_common/templates/ishtar/blocks/sheet_geographic.html b/ishtar_common/templates/ishtar/blocks/sheet_geographic.html index 8b6255f26..bad399ef2 100644 --- a/ishtar_common/templates/ishtar/blocks/sheet_geographic.html +++ b/ishtar_common/templates/ishtar/blocks/sheet_geographic.html @@ -26,7 +26,7 @@ <td>{% if geo.origin %}{{ geo.origin }}{% else %}-{% endif %}</td> <td>{% if geo.provider %}{{ geo.provider }}{% else %}-{% endif %}</td> <td>{% if geo.comment %}{{ geo.comment }}{% else %}-{% endif %}</td> - {% if permission_change_geo %}<td> + {% if permission_change_geo and output != "ODT" and output != "PDF" %}<td> <a title="{% trans 'Delete' %}" href="{% url 'delete-geo' geo.pk %}{% if search_url %}?back_url={{search_url}}%3Fopen_item={{geo_item.pk}}{% endif %}"> {% if geo|can_edit_item:request %}<i class="fa fa-trash text-danger"></i></a>{% else %}–{% endif %} @@ -34,7 +34,7 @@ </tr> {% endfor %} </table> -{% if permission_change_geo %} +{% if permission_change_geo and output != "ODT" and output != "PDF" %} <div class="text-center"> <a class="btn btn-success" href="{% url 'create-pre-geo' item.app_label item.model_name item.pk %}{% if search_url %}?back_url={{search_url}}%3Fopen_item={{geo_item.pk}}{% endif %}"><i class="fa fa-plus"></i> {% trans "geo item" %}</a> </div> diff --git a/ishtar_common/views_item.py b/ishtar_common/views_item.py index f905d677c..531eef995 100644 --- a/ishtar_common/views_item.py +++ b/ishtar_common/views_item.py @@ -492,6 +492,9 @@ def show_item(model, name, extra_dct=None, model_for_perms=None): body{ font-family: Gentium } + pre { + white-space: pre-wrap; + } """ % (base_url + static("gentium/GentiumPlus-R.ttf")) ) |