diff options
Diffstat (limited to 'ishtar_common/templates')
3 files changed, 80 insertions, 23 deletions
diff --git a/ishtar_common/templates/ishtar/blocks/sheet_creation_section.html b/ishtar_common/templates/ishtar/blocks/sheet_creation_section.html index fb011dedc..3d1011af1 100644 --- a/ishtar_common/templates/ishtar/blocks/sheet_creation_section.html +++ b/ishtar_common/templates/ishtar/blocks/sheet_creation_section.html @@ -1,4 +1,5 @@ -{% load i18n link_to_window %} +{% load i18n link_to_window window_field %} +{% field_flex_detail_multiple _("Editors") item.editors %} {% if not is_external %} {% if item.history_creator.ishtaruser.person %} <div class="col-12 col-md-6 col-lg-3 flex-wrap text-muted" diff --git a/ishtar_common/templates/ishtar/blocks/sheet_relations.html b/ishtar_common/templates/ishtar/blocks/sheet_relations.html new file mode 100644 index 000000000..e18cb5532 --- /dev/null +++ b/ishtar_common/templates/ishtar/blocks/sheet_relations.html @@ -0,0 +1,22 @@ +{% load i18n l10n %} + {% if display_relations %} + <h3>{% trans "Relations"%}</h3> + {% for rel in item.right_relations.all %} + {% ifchanged rel.relation_type %} + {% if forloop.counter0 %}</div>{% endif %} + <h4>{{rel.relation_type}}</h4> + <div class="row">{% endifchanged %} + <div class="col-12"> + <a href="#" onclick="load_window('{{relation_url}}{{rel.right_record.pk|unlocalize}}/');" class="display_details"> + <i class="fa fa-info-circle" aria-hidden="true"></i> + </a> {{rel.right_record}} + </div> + {% if forloop.last %} + </div>{% endif %} + {% endfor %} + {% else %} + <div class="alert alert-info" role="alert"> + <i class="fa fa-info-circle" aria-hidden="true"></i> + {% trans "No relations" %} + </div> + {% endif %} diff --git a/ishtar_common/templates/ishtar/sheet_person.html b/ishtar_common/templates/ishtar/sheet_person.html index d8f07ac2b..aa682b31d 100644 --- a/ishtar_common/templates/ishtar/sheet_person.html +++ b/ishtar_common/templates/ishtar/sheet_person.html @@ -10,13 +10,13 @@ {% block content %} <div class="row"> - {% field_flex "Title" item.full_title %} - {% field_flex "Name" item.name %} - {% field_flex "Surname" item.surname %} - {% field_flex "Raw name" item.raw_name %} - {% field_flex "Email" item.email %} - {% field_flex "Type(s)" item.person_types_list %} - {% field_flex_detail_multiple "Biographical notes" item.biographical_notes %} + {% field_flex _("Title") item.full_title %} + {% field_flex _("Name") item.name %} + {% field_flex _("Surname") item.surname %} + {% field_flex _("Raw name") item.raw_name %} + {% field_flex _("Email") item.email %} + {% field_flex _("Type(s)") item.person_types_list %} + {% field_flex_detail_multiple _("Biographical notes") item.biographical_notes %} {% if ADMIN %} {% field_flex_detail _("Account") item.ishtaruser %} {% endif %} @@ -51,9 +51,9 @@ {% if item.address or item.postal_code or item.town or item.precise_town %} <h3>{% trans "Business address" %}</h3> <div class="row"> - {% field_flex "Address" item.address %} - {% field_flex "Address complement" item.address_complement %} - {% field_flex "Postal code" item.postal_code %} + {% field_flex _("Address") item.address %} + {% field_flex _("Address complement") item.address_complement %} + {% field_flex _("Postal code") item.postal_code %} {% field_flex _("Town (freeform)") item.town %} {% field_flex_detail _("Town") item.precise_town %} </div>{% endif %} @@ -61,26 +61,25 @@ {% if item.alt_address or item.alt_postal_code or item.alt_town %} <h3>{% trans "Other address" %}</h3> <div class="row"> - {% field_flex "Address" item.alt_address %} - {% field_flex "Address complement" item.alt_address_complement %} - {% field_flex "Postal code" item.alt_postal_code %} - {% field_flex "Town" item.alt_town %} + {% field_flex _("Address") item.alt_address %} + {% field_flex _("Address complement") item.alt_address_complement %} + {% field_flex _("Postal code") item.alt_postal_code %} + {% field_flex _("Town") item.alt_town %} </div>{% endif %} {% if item.attached_to %}<h3>{% trans "Associated organization"%}</h3> <div class="row"> - {% field_flex_detail "Name" item.attached_to %} - {% field_flex "Address" item.attached_to.address %} - {% field_flex "Address complement" item.attached_to.address_complement %} - {% field_flex "Postal code" item.attached_to.postal_code %} + {% field_flex_detail _("Name") item.attached_to %} + {% field_flex _("Address") item.attached_to.address %} + {% field_flex _("Address complement") item.attached_to.address_complement %} + {% field_flex _("Postal code") item.attached_to.postal_code %} {% field_flex _("Town (freeform)") item.attached_to.town %} {% field_flex_detail _("Town") item.attached_to.precise_town %} - {% field_flex "Phone" item.attached_to.phone %} - {% field_flex "Mobile phone" item.attached_to.mobile_phone %} + {% field_flex _("Phone") item.attached_to.phone %} + {% field_flex _("Mobile phone") item.attached_to.mobile_phone %} </div>{% endif %} - {% trans "Associated operations as scientist" as ao %} {% if item.operation_scientist_responsability.count %} {% dynamic_table_document ao 'operations' 'scientist__pk' item.pk '' output %} @@ -173,6 +172,42 @@ {% dynamic_table_document docs 'documents' 'authors__person__pk' item.pk '' output %} {% endif %} +{% if item.file_edited.count %} +{% dynamic_table_document _("Edited file sheets") 'files' 'editors__person_id' item.pk '' output %} +{% endif %} + +{% if item.site_edited.count %} +{% dynamic_table_document _("Edited site sheets") 'sites' 'editors__person_id' item.pk '' output %} +{% endif %} + +{% if item.operation_edited.count %} +{% dynamic_table_document _("Edited operation sheets") 'operations' 'editors__person_id' item.pk '' output %} +{% endif %} + +{% if item.context_record_edited.count %} +{% dynamic_table_document _("Edited context record sheets") 'context_records' 'editors__person_id' item.pk '' output %} +{% endif %} + +{% if item.find_edited.count %} +{% dynamic_table_document _("Edited find sheets") 'finds' 'editors__person_id' item.pk '' output %} +{% endif %} + +{% if item.treatment_edited.count %} +{% dynamic_table_document _("Edited treatement sheets") 'treatments' 'editors__person_id' item.pk '' output %} +{% endif %} + +{% if item.warehouse_edited.count %} +{% dynamic_table_document _("Edited warehouse sheets") 'warehouses' 'editors__person_id' item.pk '' output %} +{% endif %} + +{% if item.container_edited.count %} +{% dynamic_table_document _("Edited container sheets") 'containers' 'editors__person_id' item.pk '' output %} +{% endif %} + +{% if item.adminact_edited.count %} +{% dynamic_table_document _("Edited administrative act sheets") 'admin_acts' 'editors__person_id' item.pk '' output %} +{% endif %} + {% if not is_external %} {% if item.history_creator or item.last_edition_date or item.created %} <h3>{% trans "Sheet"%}</h3> @@ -182,5 +217,4 @@ {% endif %} {% endif %} - {% endblock %} |