From c1446cc1224ff0d0fd61b91edc3d52f15461a582 Mon Sep 17 00:00:00 2001
From: Serghei Mihai <smihai@entrouvert.com>
Date: Fri, 11 Aug 2017 18:44:02 +0200
Subject: [PATCH] family: update family infos template (#16181)

In order to allow better styling.
---
 combo/apps/family/templates/family/infos.html  | 30 +++++++++++++----------
 combo/apps/family/templates/family/person.html | 34 ++++++++++++++++++++------
 2 files changed, 44 insertions(+), 20 deletions(-)

diff --git a/combo/apps/family/templates/family/infos.html b/combo/apps/family/templates/family/infos.html
index e2c0436..06f81c5 100644
--- a/combo/apps/family/templates/family/infos.html
+++ b/combo/apps/family/templates/family/infos.html
@@ -24,22 +24,26 @@
   </div>
 
   {% with data=family.data %}
-    {% if data.adults %}
+  {% if data.adults %}
+  <div id="family_adults">
     <h3>{% trans "Adults" %}</h3>
-    <ul>
-      {% for adult in data.adults %}
-      <li>{% include 'family/person.html' with person=adult %}</li>
-      {% endfor %}
-    </ul>
-    {% endif %}
+    {% for adult in data.adults %}
+    <div>
+      {% include 'family/person.html' with person=adult %}
+    </div>
+    {% endfor %}
+  </div>
+  {% endif %}
 
-    {% if data.children %}
+  {% if data.children %}
+  <div id="family_children">
     <h3>{% trans "Children" %}</h3>
-    <ul>
-      {% for child in data.children %}
-      <li>{% include 'family/person.html' with person=child %}</li>
-      {% endfor %}
-    </ul>
+    {% for child in data.children %}
+    <div>
+      {% include 'family/person.html' with person=child %}
+    </div>
+    {% endfor %}
+  </div>
     {% endif %}
   {% endwith %}
   {% endif %}
diff --git a/combo/apps/family/templates/family/person.html b/combo/apps/family/templates/family/person.html
index 8493709..a9801ae 100644
--- a/combo/apps/family/templates/family/person.html
+++ b/combo/apps/family/templates/family/person.html
@@ -1,15 +1,35 @@
 {% load i18n %}
 <p class="name"><span>{{ person.first_name }} {{ person.last_name }}</span></p>
+{% if person.birthdate %}
 <p class="birthdate">
-<span>{% trans "Born on" %}</span> {{ person.birthdate }}
+  <span>{% trans "Born on" %}</span> {{ person.birthdate }}
 </p>
+{% endif %}
 
-<h4>{% trans "Address" %}</h4>
-<p class="address"><span>{% trans "Address:" %}</span> {{ person.address }}</p>
+<div class="address">
+  <h4>{% trans "Address" %}</h4>
+  <p>{{ person.address }}</p>
+</div>
 
 {% if person.phone or person.cellphone or person.email %}
-<h4>{% trans "Contact" %}</h4>
-{% if person.phone %}<p class='phone'><span>{% trans "Phone:" %}</span> {{ person.phone }}</p>{% endif %}
-{% if person.cellphone %}<p class='cellphone'><span>{% trans "Cellphone:" %}</span> {{ person.cellphone }}</p>{% endif %}
-{% if person.email %}<p class='email'><span>{% trans "Email:" %}</span> {{ person.email }}</p>{% endif %}
+<div class="contact">
+{% if person.phone %}
+  <p class='phone'>
+    <span class="label">{% trans "Phone:" %}</span>
+    <span class="value"{{ person.phone }}</span>
+  </p>
+{% endif %}
+{% if person.cellphone %}
+  <p class='cellphone'>
+    <span class="lavel">{% trans "Cellphone:" %}</span>
+    <span class="value">{{ person.cellphone }}</span>
+  </p>
+{% endif %}
+{% if person.email %}
+  <p class='email'>
+    <span class="label">{% trans "Email:" %}</span>
+    <span class="value"{{ person.email }}</span>
+  </p>
+{% endif %}
+</div>
 {% endif %}
-- 
2.14.1