From 5bd178db63db3ff05165fc131960f198b2fbbca3 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Tue, 26 Feb 2019 20:14:22 +0100 Subject: QR code: QR code export, display on ODT and PDF --- .../templates/ishtar/blocks/window_nav.html | 9 ++++--- ishtar_common/templates/ishtar/sheet.html | 31 ++++++++++++++-------- 2 files changed, 26 insertions(+), 14 deletions(-) (limited to 'ishtar_common/templates') diff --git a/ishtar_common/templates/ishtar/blocks/window_nav.html b/ishtar_common/templates/ishtar/blocks/window_nav.html index a53e62b0d..92fa15352 100644 --- a/ishtar_common/templates/ishtar/blocks/window_nav.html +++ b/ishtar_common/templates/ishtar/blocks/window_nav.html @@ -71,15 +71,18 @@ aria-labelledby="dropdown-sheet-export-{{window_id}}"> {% for template_name, template_url in extra_templates %} {% endfor %} + {% if item.HAS_QR_CODE %}{% endif %} diff --git a/ishtar_common/templates/ishtar/sheet.html b/ishtar_common/templates/ishtar/sheet.html index e937f1474..6b9c97948 100644 --- a/ishtar_common/templates/ishtar/sheet.html +++ b/ishtar_common/templates/ishtar/sheet.html @@ -8,28 +8,37 @@ {% endblock %} -

+ + {% if output != "ODT" and output != "PDF" %}

- {% if output != "ODT" and output != "PDF"%}

- {% else %} -
- {% endif %} + {% else %} + {% if item.qrcode.name %} + + + + + +
+ {% endif %} +
+ {% endif %} {% block head_title %}{% endblock %} - {% if output == "ODT" or output == "PDF"%} -
- {% else %} + {% if output == "ODT" or output == "PDF" %} + + {% if item.qrcode.name %} +
+ {% endif %} + {% else %}
- {% endif %}

- {% if output != "ODT" and output != "PDF"%}

@@ -53,8 +62,8 @@

- {% endif %}

+ {% endif %} {% block header_title %}{% endblock %}

-- cgit v1.2.3

- {% endif %} + {% else %} + {% if item.qrcode.name %} + + + + + + + {% endif %} + + {% endif %} {% block head_title %}{% endblock %} - {% if output == "ODT" or output == "PDF"%} - - {% else %} + {% if output == "ODT" or output == "PDF" %} + + {% if item.qrcode.name %} + + {% endif %} + {% else %}

+ {% endif %} {% block head_title %}{% endblock %} - {% if output == "ODT" or output == "PDF"%} -

- {% endif %} + {% else %} + {% if item.qrcode.name %} + + + + + +
+ {% endif %} +
+ {% endif %} {% block head_title %}{% endblock %} - {% if output == "ODT" or output == "PDF"%} -
- {% else %} + {% if output == "ODT" or output == "PDF" %} + + {% if item.qrcode.name %} +
+ {% endif %} + {% else %}