diff options
10 files changed, 64 insertions, 8 deletions
diff --git a/archaeological_files/templates/ishtar/sheet_file.html b/archaeological_files/templates/ishtar/sheet_file.html index b2a1a71fc..e0f6c9d2d 100644 --- a/archaeological_files/templates/ishtar/sheet_file.html +++ b/archaeological_files/templates/ishtar/sheet_file.html @@ -63,7 +63,6 @@ {% field_flex _("Creation date") item.creation_date|date:"DATE_FORMAT" %} {% field_flex "Reception date" item.reception_date|date:"DATE_FORMAT" %} {% field_flex _("Instruction deadline") item.instruction_deadline|date:"DATE_FORMAT" %} - {% include "ishtar/blocks/sheet_creation_section.html" %} {% field_flex_detail _("File managed by") item.in_charge %} <dl class="col-12 col-md-6 col-lg-3 flex-wrap"> <dt>{%trans "State of the file"%}</dt> @@ -237,6 +236,13 @@ {% endif %} {% endif %} + {% if not is_external %} + <h3>{% trans "Sheet"%}</h3> + <div class="row"> + {% include "ishtar/blocks/sheet_creation_section.html" %} + </div> + {% endif %} + </div>{% if has_costs %} <div class="tab-pane fade show active" id="{{window_id}}-costs" role="tabpanel" aria-labelledby="{{window_id}}-costs-tab"> diff --git a/archaeological_finds/templates/ishtar/sheet_treatment.html b/archaeological_finds/templates/ishtar/sheet_treatment.html index 772cfd903..ea37897b6 100644 --- a/archaeological_finds/templates/ishtar/sheet_treatment.html +++ b/archaeological_finds/templates/ishtar/sheet_treatment.html @@ -97,6 +97,13 @@ {% include "ishtar/blocks/sheet_json.html" %} </div> + + {% if not is_external %} + <h3>{% trans "Sheet"%}</h3> + <div class="row"> + {% include "ishtar/blocks/sheet_creation_section.html" %} + </div> + {% endif %} {% if has_image %}</div>{% endif %} </div> diff --git a/archaeological_finds/templates/ishtar/sheet_treatmentfile.html b/archaeological_finds/templates/ishtar/sheet_treatmentfile.html index 676d3b4a6..eacbc894b 100644 --- a/archaeological_finds/templates/ishtar/sheet_treatmentfile.html +++ b/archaeological_finds/templates/ishtar/sheet_treatmentfile.html @@ -88,5 +88,12 @@ {% table_administrativact admact_lbl item.administrative_act.all %} {% endif %} +{% if not is_external %} +<h3>{% trans "Sheet"%}</h3> +<div class="row"> + {% include "ishtar/blocks/sheet_creation_section.html" %} +</div> +{% endif %} + {% endwith %}{% endwith %}{% endwith %} {% endblock %} diff --git a/archaeological_operations/templates/ishtar/sheet_administrativeact.html b/archaeological_operations/templates/ishtar/sheet_administrativeact.html index d952f66cb..61cc4a256 100644 --- a/archaeological_operations/templates/ishtar/sheet_administrativeact.html +++ b/archaeological_operations/templates/ishtar/sheet_administrativeact.html @@ -61,7 +61,6 @@ </dd> </div> {% endif %} - {% field_flex_detail "Created by" item.history_creator.ishtaruser.person %} {% comment %}{% if item.general_contractor.attached_to %}<p> <label>{% trans "General contractor organisation"%}</label> @@ -79,4 +78,11 @@ </div> {% endif %} +{% if not is_external %} +<h3>{% trans "Sheet"%}</h3> +<div class="row"> + {% include "ishtar/blocks/sheet_creation_section.html" %} +</div> +{% endif %} + {% endblock %} diff --git a/archaeological_operations/templates/ishtar/sheet_site.html b/archaeological_operations/templates/ishtar/sheet_site.html index 11717314b..6cc9a3454 100644 --- a/archaeological_operations/templates/ishtar/sheet_site.html +++ b/archaeological_operations/templates/ishtar/sheet_site.html @@ -46,7 +46,6 @@ {% field_flex_multiple_obj "Cultural attributions" item 'cultural_attributions' %} {% field_flex_multiple "Collaborators" item.collaborators %} {% field_flex_full "Comment" item.comment "<pre>" "</pre>" %} - {% include "ishtar/blocks/sheet_creation_section.html" %} </div> {% if item.affmar_number or item.drassm_number or item.oceanographic_service_localisation or item.shipwreck_code or item.sinking_date or item.discovery_area or item.shipwreck_name %} @@ -105,5 +104,12 @@ {% with geo_item=item %}{% include "ishtar/blocks/sheet_geographic.html" %}{% endwith %} {% endif %} +{% if not is_external %} +<h3>{% trans "Sheet"%}</h3> +<div class="row"> + {% include "ishtar/blocks/sheet_creation_section.html" %} +</div> +{% endif %} + {% endwith %} {% endwith %} {% endwith %} {% endblock %} diff --git a/archaeological_warehouse/templates/ishtar/sheet_container.html b/archaeological_warehouse/templates/ishtar/sheet_container.html index ff0cd0de7..a8e2ab13e 100644 --- a/archaeological_warehouse/templates/ishtar/sheet_container.html +++ b/archaeological_warehouse/templates/ishtar/sheet_container.html @@ -145,7 +145,6 @@ {% field_flex calculated_weight_kg_trans item.calculated_weight_kg|floatformat:"-3" %} {% endif %} {% endif %}{% endwith %} - {% include "ishtar/blocks/sheet_creation_section.html" %} {% field_flex_full "Comment" item.comment "<pre>" "</pre>" %} </div> </div> @@ -172,6 +171,13 @@ {% endwith %} </div> {% endif %} + + {% if not is_external %} + <h3>{% trans "Sheet"%}</h3> + <div class="row"> + {% include "ishtar/blocks/sheet_creation_section.html" %} + </div> + {% endif %} </div> <div class="tab-pane fade" id="{{window_id}}-content" diff --git a/archaeological_warehouse/templates/ishtar/sheet_warehouse.html b/archaeological_warehouse/templates/ishtar/sheet_warehouse.html index 2f953478e..d82b0ee6c 100644 --- a/archaeological_warehouse/templates/ishtar/sheet_warehouse.html +++ b/archaeological_warehouse/templates/ishtar/sheet_warehouse.html @@ -107,7 +107,6 @@ {% trans "Default divisions (imports)" as def_div_label %} {% field_flex def_div_label item.default_location_types|join:", " %} {% field_flex_full "Comment" item.comment "<pre>" "</pre>" %} - {% include "ishtar/blocks/sheet_creation_section.html" %} </div> {% include "ishtar/blocks/sheet_json.html" %} @@ -126,6 +125,13 @@ {% field_flex _("Mobile phone") item.mobile_phone %} </div> {% endif %} + + {% if not is_external %} + <h3>{% trans "Sheet"%}</h3> + <div class="row"> + {% include "ishtar/blocks/sheet_creation_section.html" %} + </div> + {% endif %} </div> <div class="tab-pane fade" id="{{window_id}}-content" diff --git a/ishtar_common/templates/ishtar/blocks/sheet_geographic.html b/ishtar_common/templates/ishtar/blocks/sheet_geographic.html index c48811de0..ae9d2bdf5 100644 --- a/ishtar_common/templates/ishtar/blocks/sheet_geographic.html +++ b/ishtar_common/templates/ishtar/blocks/sheet_geographic.html @@ -39,7 +39,7 @@ {% endfor %} </table> {% if not IS_HISTORY and permission_change_geo and output != "ODT" and output != "PDF" %} -<div class="text-center"> +<div class="text-center mb-2"> <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> {% trans "geo item" %}</a> </div> {% endif %} diff --git a/ishtar_common/templates/ishtar/sheet_document.html b/ishtar_common/templates/ishtar/sheet_document.html index 2ffcc451b..f3c8be108 100644 --- a/ishtar_common/templates/ishtar/sheet_document.html +++ b/ishtar_common/templates/ishtar/sheet_document.html @@ -40,7 +40,6 @@ title="{% trans 'Reference' %}">{{ item.reference|default:"" }}</p> <p class="window-refs" title="{% trans 'Internal reference' %}">{{ item.internal_reference|default:"" }}</p> - {% include "ishtar/blocks/sheet_external_id.html" %} </div> {% field_flex "Title" item.title %} {% field_flex "Type" item.source_type_html "" "" 1 %} @@ -144,5 +143,12 @@ </div> {% endif %} +{% if not is_external %} +<h3>{% trans "Sheet"%}</h3> +<div class="row"> + {% include "ishtar/blocks/sheet_creation_section.html" %} +</div> +{% endif %} + {% endblock %} {% endblock %} diff --git a/ishtar_common/templates/ishtar/sheet_person.html b/ishtar_common/templates/ishtar/sheet_person.html index 53cd7d84f..54e12496d 100644 --- a/ishtar_common/templates/ishtar/sheet_person.html +++ b/ishtar_common/templates/ishtar/sheet_person.html @@ -14,7 +14,6 @@ {% field_flex "Name" item.name %} {% field_flex "Surname" item.surname %} {% field_flex "Raw name" item.raw_name %} - {% field_flex_detail "Created by" item.history_creator.ishtaruser.person %} {% field_flex "Email" item.email %} {% field_flex "Type(s)" item.person_types_list %} {% field_flex_detail_multiple "Biographical notes" item.biographical_notes %} @@ -163,5 +162,12 @@ {% dynamic_table_document docs 'documents' 'authors__person__pk' item.pk '' output %} {% endif %} +{% if not is_external %} +<h3>{% trans "Sheet"%}</h3> +<div class="row"> + {% include "ishtar/blocks/sheet_creation_section.html" %} +</div> +{% endif %} + {% endblock %} |