summaryrefslogtreecommitdiff
path: root/ishtar_common/templates
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2024-11-15 11:51:49 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2025-02-19 14:45:55 +0100
commitf3764eea1ac4a6cdb12095322a00fd93d377c2c5 (patch)
tree878cc3ba5ce98d1d7ed28e264d54f4ca4efbdf0d /ishtar_common/templates
parenta2de2eb42009de3b8bf56f2af2a6071a4a98fd8f (diff)
downloadIshtar-f3764eea1ac4a6cdb12095322a00fd93d377c2c5.tar.bz2
Ishtar-f3764eea1ac4a6cdb12095322a00fd93d377c2c5.zip
✨ adapt sheet to manage sheet filters
Diffstat (limited to 'ishtar_common/templates')
-rw-r--r--ishtar_common/templates/ishtar/blocks/sheet_geographic.html6
-rw-r--r--ishtar_common/templates/ishtar/sheet_organization.html4
-rw-r--r--ishtar_common/templates/ishtar/sheet_person.html4
3 files changed, 12 insertions, 2 deletions
diff --git a/ishtar_common/templates/ishtar/blocks/sheet_geographic.html b/ishtar_common/templates/ishtar/blocks/sheet_geographic.html
index ae9d2bdf5..d5f8a4d84 100644
--- a/ishtar_common/templates/ishtar/blocks/sheet_geographic.html
+++ b/ishtar_common/templates/ishtar/blocks/sheet_geographic.html
@@ -36,6 +36,10 @@
{% endautoescape %}
</td>{% endif %}
</tr>
+{% empty %}
+ <tr>
+ <td colspan="10">{% trans "No geo items" %}</td>
+ </tr>
{% endfor %}
</table>
{% if not IS_HISTORY and permission_change_geo and output != "ODT" and output != "PDF" %}
@@ -43,4 +47,4 @@
<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|unlocalize}}{% endif %}"><i class="fa fa-plus"></i> &nbsp;{% trans "geo item" %}</a>
</div>
{% endif %}
-{% endwith %} \ No newline at end of file
+{% endwith %}
diff --git a/ishtar_common/templates/ishtar/sheet_organization.html b/ishtar_common/templates/ishtar/sheet_organization.html
index b6d18469d..ad629b21b 100644
--- a/ishtar_common/templates/ishtar/sheet_organization.html
+++ b/ishtar_common/templates/ishtar/sheet_organization.html
@@ -19,6 +19,7 @@
{% field_flex_detail_multiple "Biographical notes" item.biographical_notes %}
</div>
+{% if item.members.count %}
<h3>{%trans "Person in the organization"%}</h3>
<table class='table table-striped'>
@@ -39,6 +40,7 @@
<tr><td colspan="8" class='no_items'>{% trans "No person in this organization" %}</td></tr>
{% endfor %}
</table>
+{% endif %}
{% trans "Associated operations as operator" as ao %}
{% if item.operator.count %}
@@ -80,10 +82,12 @@
{% endif %}
{% if not is_external %}
+{% if item.history_creator or item.last_edition_date or item.created %}
<h3>{% trans "Sheet"%}</h3>
<div class="row">
{% include "ishtar/blocks/sheet_creation_section.html" %}
</div>
{% endif %}
+{% endif %}
{% endblock %}
diff --git a/ishtar_common/templates/ishtar/sheet_person.html b/ishtar_common/templates/ishtar/sheet_person.html
index c34997d30..e0ec0d887 100644
--- a/ishtar_common/templates/ishtar/sheet_person.html
+++ b/ishtar_common/templates/ishtar/sheet_person.html
@@ -1,7 +1,7 @@
{% extends "ishtar/sheet.html" %}
{% load i18n window_field window_tables window_header %}
-{% block head_title %}<strong>{% trans "Person"%}</strong> - {{item}}{% endblock %}
+{% block head_title %}<strong>{% trans "Person"%}</strong> - {{item.raw_name}}{% endblock %}
{% block toolbar %}
{% window_nav item window_id 'show-person' 'person_modify' %}
@@ -173,11 +173,13 @@
{% endif %}
{% if not is_external %}
+{% if item.history_creator or item.last_edition_date or item.created %}
<h3>{% trans "Sheet"%}</h3>
<div class="row">
{% include "ishtar/blocks/sheet_creation_section.html" %}
</div>
{% endif %}
+{% endif %}
{% endblock %}