diff options
Diffstat (limited to 'ishtar_common/templates')
-rw-r--r-- | ishtar_common/templates/base.html | 2 | ||||
-rw-r--r-- | ishtar_common/templates/ishtar/display_item.html | 13 | ||||
-rw-r--r-- | ishtar_common/templates/ishtar/sheet_document.html | 2 |
3 files changed, 15 insertions, 2 deletions
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 @@ <head> <meta charset="utf-8"> <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"> + {% block extra_meta %} + {% endblock %} <link rel="shortcut icon" href="{{STATIC_URL}}/media/images/favicon.png"/> <title>{% block title %}Ishtar{% if APP_NAME %} - {{APP_NAME}}{%endif%}{% endblock %}</title> {% 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 %} +<div class="container"> +{{view_content|safe}} +</div> +{% else %} <script type='text/javascript'> $(document).ready( +{% if show_url %} function(){ load_window("{{show_url}}"); -}); +});{% endif %} </script> +{% 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 %} <div class="clearfix"> <div class="card float-left col-12 col-md-4"> @@ -116,6 +115,7 @@ {% field_flex_full "Containers" item.containers|add_links %} {% endif %} +{{ item.coins_tag|safe }} {% endblock %} {% endblock %} |