summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--archaeological_finds/templates/ishtar/sheet_find.html20
-rw-r--r--archaeological_finds/templates/ishtar/sheet_museum_find.html26
2 files changed, 15 insertions, 31 deletions
diff --git a/archaeological_finds/templates/ishtar/sheet_find.html b/archaeological_finds/templates/ishtar/sheet_find.html
index 1ba8fab52..8b23000ed 100644
--- a/archaeological_finds/templates/ishtar/sheet_find.html
+++ b/archaeological_finds/templates/ishtar/sheet_find.html
@@ -29,7 +29,6 @@
{% with can_view_container=permission_view_own_container|or_:permission_view_container %}
{% with display_warehouse_treatments=item.container|or_:item.container_ref|or_:item.upstream_treatment|or_:item.downstream_treatment|or_:non_modif_treatments_count|or_:associated_treatment_files_count %}
{% with dating_list=item|m2m_listing:"datings" %}
-{% with display_datations=dating_list %}
{% with can_view_documents=permission_view_own_document|or_:permission_view_document %}
{% with can_change=permission_change_own_find|or_:permission_change_find %}
{% with has_documents=item|safe_or:"documents.count|documents_list"|safe_and_not:"documents_not_available" %}
@@ -52,7 +51,6 @@
{% trans "Archaeological context" %}
</a>
</li>
- {% if display_datations or can_change %}
<li class="nav-item">
<a class="nav-link" id="{{window_id}}-datations-tab"
data-toggle="tab" href="#{{window_id}}-datations" role="tab"
@@ -60,7 +58,6 @@
{% trans "Periods / Datings" %}
</a>
</li>
- {% endif %}
<li class="nav-item">
<a class="nav-link" id="{{window_id}}-warehouse-tab"
data-toggle="tab" href="#{{window_id}}-warehouse" role="tab"
@@ -273,27 +270,22 @@
</div>
</div>
- {% if display_datations or can_change %}
<div class="tab-pane fade" id="{{window_id}}-datations"
role="tabpanel" aria-labelledby="{{window_id}}-datations-tab">
<h3>{% trans "Periods / Datings" %}</h3>
- {% field_flex_multiple_obj _("Periods") item 'periods' %}
- {% with url_dating="find-dating" %}
- {% include "ishtar/blocks/sheet_dating_list.html" %}
- {% endwith %}
- {% if item.cultural_attributions_count or item.taq or item.taq_estimated or item.tpq or item.tpq_estimated or datings_comment %}
- <h3>{% trans "Dating complements" %}</h3>
<div class='row'>
+ {% field_flex_multiple_obj _("Periods") item 'periods' %}
{% field_flex_multiple_obj "Cultural attributions" item 'cultural_attributions' %}
{% field_flex "TAQ" item.taq %}
{% field_flex "Estimated TAQ" item.taq_estimated %}
{% field_flex "TPQ" item.tpq %}
{% field_flex "Estimated TPQ" item.tpq_estimated %}
- {% field_flex_full "Comment on datings" item.datings_comment "<pre>" "</pre>" has_image %}
+ {% field_flex_full "Comment on datings" item.dating_comment "<pre>" "</pre>" has_image %}
</div>
- {% endif %}
+ {% with url_dating="find-dating" %}
+ {% include "ishtar/blocks/sheet_dating_list.html" %}
+ {% endwith %}
</div>
- {% endif %}
{% include "ishtar/sheet_find_treatments.html" %}
@@ -332,7 +324,7 @@
{% endif %}
</div>
-{% endwith %}{% endwith %}{% endwith %}{% endwith %}{% endwith %}{% endwith %}{% endwith %}{% endwith %}{% endwith %}{% endwith %}{% endwith %}{% endwith %}{% endwith %}{% endwith %}{% endwith %}{% endwith %}
+{% endwith %}{% endwith %}{% endwith %}{% endwith %}{% endwith %}{% endwith %}{% endwith %}{% endwith %}{% endwith %}{% endwith %}{% endwith %}{% endwith %}{% endwith %}{% endwith %}{% endwith %}
<script type='text/javascript'>
$( "#{{window_id}}-tabs" ).on( "tabsactivate", function( event, ui ) {
diff --git a/archaeological_finds/templates/ishtar/sheet_museum_find.html b/archaeological_finds/templates/ishtar/sheet_museum_find.html
index 1886f2b7b..502d8cc5c 100644
--- a/archaeological_finds/templates/ishtar/sheet_museum_find.html
+++ b/archaeological_finds/templates/ishtar/sheet_museum_find.html
@@ -29,7 +29,6 @@
{% with can_view_container=permission_view_own_container|or_:permission_view_container %}
{% with display_warehouse_treatments=item.container|or_:item.container_ref|or_:item.upstream_treatment|or_:item.downstream_treatment|or_:non_modif_treatments_count|or_:associated_treatment_files_count %}
{% with dating_list=item|m2m_listing:"datings" %}
-{% with display_datations=dating_list %}
{% with can_view_documents=permission_view_own_document|or_:permission_view_document %}
{% with can_change=permission_change_own_find|or_:permission_change_find %}
{% with has_documents=item|safe_or:"documents.count|documents_list"|safe_and_not:"documents_not_available" %}
@@ -52,7 +51,6 @@
{% trans "Archaeological context" %}
</a>
</li>
- {% if display_datations or can_change %}
<li class="nav-item">
<a class="nav-link" id="{{window_id}}-datations-tab"
data-toggle="tab" href="#{{window_id}}-datations" role="tab"
@@ -60,7 +58,6 @@
{% trans "Periods / Datings" %}
</a>
</li>
- {% endif %}
<li class="nav-item">
<a class="nav-link" id="{{window_id}}-warehouse-tab"
data-toggle="tab" href="#{{window_id}}-warehouse" role="tab"
@@ -211,6 +208,9 @@
{% field_flex_full "Dimensions comment" item.dimensions_comment "<pre>" "</pre>" %}
</div>
{% endif %}
+ {% if has_image %}
+ </div>
+ {% endif %}
{% if not is_external %}
{% if item.history_creator or item.last_edition_date or item.created %}
@@ -225,9 +225,6 @@
</div>
{% endif %}
{% endif %}
- {% if has_image %}
- </div>
- {% endif %}
</div>
<div class="tab-pane fade" id="{{window_id}}-basefind"
@@ -273,27 +270,22 @@
</div>
</div>
- {% if display_datations or can_change %}
<div class="tab-pane fade" id="{{window_id}}-datations"
role="tabpanel" aria-labelledby="{{window_id}}-datations-tab">
<h3>{% trans "Periods / Datings" %}</h3>
- {% field_flex_multiple_obj _("Periods") item 'periods' %}
- {% with url_dating="find-dating" %}
- {% include "ishtar/blocks/sheet_dating_list.html" %}
- {% endwith %}
- {% if item.cultural_attributions_count or item.taq or item.taq_estimated or item.tpq or item.tpq_estimated or datings_comment %}
- <h3>{% trans "Dating complements" %}</h3>
<div class='row'>
+ {% field_flex_multiple_obj _("Periods") item 'periods' %}
{% field_flex_multiple_obj "Cultural attributions" item 'cultural_attributions' %}
{% field_flex "TAQ" item.taq %}
{% field_flex "Estimated TAQ" item.taq_estimated %}
{% field_flex "TPQ" item.tpq %}
{% field_flex "Estimated TPQ" item.tpq_estimated %}
- {% field_flex_full "Comment on datings" item.datings_comment "<pre>" "</pre>" has_image %}
+ {% field_flex_full "Comment on datings" item.dating_comment "<pre>" "</pre>" has_image %}
</div>
- {% endif %}
+ {% with url_dating="find-dating" %}
+ {% include "ishtar/blocks/sheet_dating_list.html" %}
+ {% endwith %}
</div>
- {% endif %}
{% include "ishtar/sheet_find_treatments.html" %}
@@ -332,7 +324,7 @@
{% endif %}
</div>
-{% endwith %}{% endwith %}{% endwith %}{% endwith %}{% endwith %}{% endwith %}{% endwith %}{% endwith %}{% endwith %}{% endwith %}{% endwith %}{% endwith %}{% endwith %}{% endwith %}{% endwith %}{% endwith %}
+{% endwith %}{% endwith %}{% endwith %}{% endwith %}{% endwith %}{% endwith %}{% endwith %}{% endwith %}{% endwith %}{% endwith %}{% endwith %}{% endwith %}{% endwith %}{% endwith %}{% endwith %}
<script type='text/javascript'>
$( "#{{window_id}}-tabs" ).on( "tabsactivate", function( event, ui ) {
generated by cgit v1.2.3 (git 2.39.1) at 2026-04-01 11:46:00 +0000