diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-03-21 23:53:23 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-03-21 23:53:23 +0100 |
| commit | 9eacb3f2b2f5819ef3eea1a54bb2c4bfb13efda6 (patch) | |
| tree | 2a2b687acef6f878c05f7148a150c10c3a7fb71a /ishtar_common/templates/ishtar/sheet_person.html | |
| parent | 8eb09a666e7048ce8e531649566418670d94036d (diff) | |
| parent | c00bb6298a602f74c55cfd60b8601295470a8e3b (diff) | |
| download | Ishtar-9eacb3f2b2f5819ef3eea1a54bb2c4bfb13efda6.tar.bz2 Ishtar-9eacb3f2b2f5819ef3eea1a54bb2c4bfb13efda6.zip | |
Merge branch 'master' into v0.9
Conflicts:
Makefile.example
archaeological_operations/migrations/0061_regenerate_cached_label.py
archaeological_warehouse/migrations/0024_generate_cache_lbl_for_containers.py
Diffstat (limited to 'ishtar_common/templates/ishtar/sheet_person.html')
| -rw-r--r-- | ishtar_common/templates/ishtar/sheet_person.html | 41 |
1 files changed, 23 insertions, 18 deletions
diff --git a/ishtar_common/templates/ishtar/sheet_person.html b/ishtar_common/templates/ishtar/sheet_person.html index 5339e4f07..aa5192dc4 100644 --- a/ishtar_common/templates/ishtar/sheet_person.html +++ b/ishtar_common/templates/ishtar/sheet_person.html @@ -6,6 +6,7 @@ {% window_nav item window_id 'show-person' 'person_modify' %} <h3>{% trans "Identity" %}</h3> +<ul class='form-flex'> {% field_li "Title" item.full_title %} {% field_li "Name" item.name %} {% field_li "Surname" item.surname %} @@ -13,6 +14,7 @@ {% field_li_detail "Created by" item.history_creator.ishtaruser.person %} {% field_li "Email" item.email %} {% field_li "Type(s)" item.person_types_list %} +</ul> {% if item.phone or item.phone2 or item.phone3 or item.mobile_phone %} <table class='formset table-form'> @@ -42,30 +44,33 @@ {% if item.address or item.postal_code or item.town %} <h3>{% trans "Business address" %}</h3> -{% field_li "Address" item.address %} -{% field_li "Address complement" item.address_complement %} -{% field_li "Postal code" item.postal_code %} -{% field_li "Town" item.town %} -{% endif %} +<ul class='form-flex'> + {% field_li "Address" item.address %} + {% field_li "Address complement" item.address_complement %} + {% field_li "Postal code" item.postal_code %} + {% field_li "Town" item.town %} +</ul>{% endif %} {% if item.alt_address or item.alt_postal_code or item.alt_town %} <h3>{% trans "Other address" %}</h3> -{% field_li "Address" item.alt_address %} -{% field_li "Address complement" item.alt_address_complement %} -{% field_li "Postal code" item.alt_postal_code %} -{% field_li "Town" item.alt_town %} -{% endif %} +<ul class='form-flex'> + {% field_li "Address" item.alt_address %} + {% field_li "Address complement" item.alt_address_complement %} + {% field_li "Postal code" item.alt_postal_code %} + {% field_li "Town" item.alt_town %} +</ul>{% endif %} {% if item.attached_to %}<h3>{% trans "Associated organization"%}</h3> -{% field_li "Name" item.attached_to %} -{% field_li "Address" item.attached_to.address %} -{% field_li "Address complement" item.attached_to.address_complement %} -{% field_li "Postal code" item.attached_to.postal_code %} -{% field_li "Town" item.attached_to.town %} -{% field_li "Phone" item.attached_to.phone %} -{% field_li "Mobile phone" item.attached_to.mobile_phone %} -{% endif %} +<ul class='form-flex'> + {% field_li_detail "Name" item.attached_to %} + {% field_li "Address" item.attached_to.address %} + {% field_li "Address complement" item.attached_to.address_complement %} + {% field_li "Postal code" item.attached_to.postal_code %} + {% field_li "Town" item.attached_to.town %} + {% field_li "Phone" item.attached_to.phone %} + {% field_li "Mobile phone" item.attached_to.mobile_phone %} +</ul>{% endif %} {% trans "Associated operations as scientist" as ao %} |