From 1a4af35045908e4285dc18bce3733f069fada220 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Fri, 4 Sep 2020 16:22:44 +0200 Subject: Documents: COinS and Dublin Core tags --- ishtar_common/templates/base.html | 2 ++ ishtar_common/templates/ishtar/display_item.html | 13 ++++++++++++- ishtar_common/templates/ishtar/sheet_document.html | 2 +- 3 files changed, 15 insertions(+), 2 deletions(-) (limited to 'ishtar_common/templates') diff --git a/ishtar_common/templates/base.html b/ishtar_common/templates/base.html index 5fb935eb5..ecd9197cb 100644 --- a/ishtar_common/templates/base.html +++ b/ishtar_common/templates/base.html @@ -3,6 +3,8 @@ + {% block extra_meta %} + {% endblock %} {% block title %}Ishtar{% if APP_NAME %} - {{APP_NAME}}{%endif%}{% endblock %} {% compress js %} diff --git a/ishtar_common/templates/ishtar/display_item.html b/ishtar_common/templates/ishtar/display_item.html index e1c63b775..a7be3554b 100644 --- a/ishtar_common/templates/ishtar/display_item.html +++ b/ishtar_common/templates/ishtar/display_item.html @@ -1,10 +1,21 @@ {% extends "base.html" %} {% load i18n %} +{% block extra_meta %}{% if extra_meta %} +{{extra_meta|safe}} +{% endif %}{% endblock %} + {% block content %} +{% if view_content %} +
+{{view_content|safe}} +
+{% else %} +{% endif %} {% endblock %} diff --git a/ishtar_common/templates/ishtar/sheet_document.html b/ishtar_common/templates/ishtar/sheet_document.html index 598de5f76..292c964aa 100644 --- a/ishtar_common/templates/ishtar/sheet_document.html +++ b/ishtar_common/templates/ishtar/sheet_document.html @@ -10,7 +10,6 @@ {% block general %} - {% if item.main_image %}
@@ -116,6 +115,7 @@ {% field_flex_full "Containers" item.containers|add_links %} {% endif %} +{{ item.coins_tag|safe }} {% endblock %} {% endblock %} -- cgit v1.2.3