1 files changed, 38 insertions, 35 deletions

diff --git a/ishtar_common/templates/ishtar/sheet_person.html b/ishtar_common/templates/ishtar/sheet_person.html
index aa5192dc4..b9a7055b8 100644
--- a/ishtar_common/templates/ishtar/sheet_person.html
+++ b/ishtar_common/templates/ishtar/sheet_person.html
@@ -1,23 +1,26 @@
 {% extends "ishtar/sheet.html" %}
 {% load i18n window_field window_tables window_header %}
 
-{% block head_title %}{% trans "Person"%}{% endblock %}
-{% block content %}
+{% block head_title %}{% trans "Person:"%} {{item}}{% endblock %}
+
+{% block toolbar %}
 {% 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 %}
-{% field_li "Raw name" item.raw_name %}
-{% field_li_detail "Created by" item.history_creator.ishtaruser.person %}
-{% field_li "Email" item.email %}
-{% field_li "Type(s)" item.person_types_list %}
-</ul>
+{% endblock %}
+
+{% 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_detail "Created by" item.history_creator.ishtaruser.person %}
+{% field_flex "Email" item.email %}
+{% field_flex "Type(s)" item.person_types_list %}
+</div>
 
 {% if item.phone or item.phone2 or item.phone3 or item.mobile_phone %}
-<table class='formset table-form'>
+<table class='table table-striped'>
   <caption>{% trans "Phone" %}</caption>
   <tr>
     <th>{% trans "Phone type" %}</th>
@@ -44,33 +47,33 @@
 
 {% if item.address or item.postal_code or item.town %}
 <h3>{% trans "Business address" %}</h3>
-<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 %}
+<div class="row">
+    {% field_flex "Address" item.address %}
+    {% field_flex "Address complement" item.address_complement %}
+    {% field_flex "Postal code" item.postal_code %}
+    {% field_flex "Town" item.town %}
+</div>{% endif %}
 
 {% if item.alt_address or item.alt_postal_code or item.alt_town %}
 <h3>{% trans "Other address" %}</h3>
-<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 %}
+<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 %}
+</div>{% endif %}
 
 
 {% if item.attached_to %}<h3>{% trans "Associated organization"%}</h3>
-<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 %}
+<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 "Town" item.attached_to.town %}
+    {% 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 %}