From 9d87e9f47fa4d29d818d541815d92e0a43acd995 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Fri, 8 Apr 2016 02:52:33 +0200
Subject: Adpat person form to new fields

---
 ishtar_common/static/media/style.css | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

(limited to 'ishtar_common/static')

diff --git a/ishtar_common/static/media/style.css b/ishtar_common/static/media/style.css
index 4467a0639..09c39f598 100644
--- a/ishtar_common/static/media/style.css
+++ b/ishtar_common/static/media/style.css
@@ -57,6 +57,12 @@ div.form {
     border-bottom:1px solid #D14;
 }
 
+hr.spacer{
+    clear:both;
+    border:0;
+    margin: 13px;
+}
+
 /* shadows */
 #progress-content,
 .sheet{
@@ -1103,3 +1109,27 @@ a.remove{
     background-image: none;
 }
 
+table.table-form{
+    background: #fff;
+    border-collapse: collapse;
+    text-align: center;
+    padding: 10px 8px;
+}
+
+table.table-form th {
+    text-align: center;
+    font-weight: normal;
+    padding: 8px 6px;
+    color: #922;
+    border-bottom: 2px solid #922;
+}
+
+table.table-form td {
+    text-align: center;
+    color: #666;
+    padding: 6px 2px;
+}
+
+table.table-form td input{
+    border-color:#922;
+}
-- 
cgit v1.2.3


From eb360527e8a20d524766fc691b080fffd6e67277 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Fri, 8 Apr 2016 03:10:17 +0200
Subject: Adapt person sheet to new fields

---
 ishtar_common/static/media/style.css             |  6 +++-
 ishtar_common/templates/ishtar/sheet_person.html | 43 ++++++++++++++++++++++--
 2 files changed, 46 insertions(+), 3 deletions(-)

(limited to 'ishtar_common/static')

diff --git a/ishtar_common/static/media/style.css b/ishtar_common/static/media/style.css
index 09c39f598..1590c1738 100644
--- a/ishtar_common/static/media/style.css
+++ b/ishtar_common/static/media/style.css
@@ -1116,6 +1116,10 @@ table.table-form{
     padding: 10px 8px;
 }
 
+#window table.table-form{
+    margin: 10px 80px;
+}
+
 table.table-form th {
     text-align: center;
     font-weight: normal;
@@ -1127,7 +1131,7 @@ table.table-form th {
 table.table-form td {
     text-align: center;
     color: #666;
-    padding: 6px 2px;
+    padding: 6px 15px;
 }
 
 table.table-form td input{
diff --git a/ishtar_common/templates/ishtar/sheet_person.html b/ishtar_common/templates/ishtar/sheet_person.html
index 796fe2c4a..6fd5f4336 100644
--- a/ishtar_common/templates/ishtar/sheet_person.html
+++ b/ishtar_common/templates/ishtar/sheet_person.html
@@ -9,18 +9,57 @@
 {% block content %}
 <div class='tool'>{%trans "Export as:"%} <a href='{% url show-person item.pk "odt" %}'>{%trans "OpenOffice.org file"%}</a>, <a href='{% url show-person item.pk "pdf" %}'>{%trans "PDF file"%}</a></div>
 
+<h3>{% trans "Identity" %}</h3>
+
 {% field "Name" item.name %}
 {% field "Surname" item.surname %}
 {% field "Raw name" item.raw_name %}
 {% field "Created by" item.history_creator.ishtaruser.full_label %}
 {% field "Email" item.email %}
 {% field "Type(s)" item.person_types_list %}
+
+{% if item.phone or item.phone2 or item.phone3 or item.mobile_phone %}
+<table class='formset table-form'>
+  <caption>{% trans "Phone" %}</caption>
+  <tr>
+    <th>{% trans "Phone type" %}</th>
+    <th>{% trans "Number" %}</th>
+  </tr>
+  <tr>
+    <td>{{item.phone_desc}}</td>
+    <td>{{item.phone}}</td>
+  </tr>
+  <tr>
+    <td>{{item.phone_desc2}}</td>
+    <td>{{item.phone2}}</td>
+  </tr>
+  <tr>
+    <td>{{item.phone_desc3}}</td>
+    <td>{{item.phone3}}</td>
+  </tr>
+  <tr>
+    <td>{% trans "Mobile phone" %}</td>
+    <td>{{item.mobile_phone}}</td>
+  </tr>
+</table>
+{% endif %}
+
+{% if item.address or item.postal_code or item.town %}
+<h3>{% trans "Business address" %}</h3>
 {% field "Address" item.address %}
 {% field "Address complement" item.address_complement %}
 {% field "Postal code" item.postal_code %}
 {% field "Town" item.town %}
-{% field "Phone" item.phone %}
-{% field "Mobile phone" item.mobile_phone %}
+{% endif %}
+
+{% if item.alt_address or item.alt_postal_code or item.alt_town %}
+<h3>{% trans "Other address" %}</h3>
+{% field "Address" item.alt_address %}
+{% field "Address complement" item.alt_address_complement %}
+{% field "Postal code" item.alt_postal_code %}
+{% field "Town" item.alt_town %}
+{% endif %}
+
 
 {% if item.attached_to %}<h3>{% trans "Associated organization"%}</h3>
 {% field "Name" item.attached_to %}
-- 
cgit v1.2.3