From bb9e9cb8d1f5f7fb8b30cce231fccbd4b1cf86cf 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/templates/blocks/table_field.html    |  4 ++
 .../templates/ishtar/wizard/default_wizard.html    |  2 +
 .../templates/ishtar/wizard/wizard_person.html     | 59 ++++++++++++++++++++++
 3 files changed, 65 insertions(+)
 create mode 100644 ishtar_common/templates/blocks/table_field.html
 create mode 100644 ishtar_common/templates/ishtar/wizard/wizard_person.html

(limited to 'ishtar_common/templates')

diff --git a/ishtar_common/templates/blocks/table_field.html b/ishtar_common/templates/blocks/table_field.html
new file mode 100644
index 000000000..5816a4b90
--- /dev/null
+++ b/ishtar_common/templates/blocks/table_field.html
@@ -0,0 +1,4 @@
+  <tr{% if required %} class='required'{% endif %}>
+    <th>{{ field.label_tag }}</th>
+    <td> {{ field.errors }}{{field|safe}}</td>
+  </tr>
diff --git a/ishtar_common/templates/ishtar/wizard/default_wizard.html b/ishtar_common/templates/ishtar/wizard/default_wizard.html
index 1a17cf32b..6491b7a0f 100644
--- a/ishtar_common/templates/ishtar/wizard/default_wizard.html
+++ b/ishtar_common/templates/ishtar/wizard/default_wizard.html
@@ -24,6 +24,7 @@
 <div class='form'>
 {{ wizard.form.media }}
 {{ wizard.management_form }}
+{% block form_detail %}
 {% if wizard.form.forms %}
   {{ wizard.form.management_form }}
 <div class='top_button'><input type="submit" id="submit_form" value="{% trans "Validate" %}"/></div>
@@ -39,6 +40,7 @@
 {% table_form wizard.form %}
 {% if not is_search %}</table>{% endif %}
 {% endif %}
+{% endblock %}
 <input type="hidden" name="{{ step_field }}" value="{{ step0 }}" />
 {{ previous_fields|safe }}
 {% block "validation_bar" %}
diff --git a/ishtar_common/templates/ishtar/wizard/wizard_person.html b/ishtar_common/templates/ishtar/wizard/wizard_person.html
new file mode 100644
index 000000000..c1806132f
--- /dev/null
+++ b/ishtar_common/templates/ishtar/wizard/wizard_person.html
@@ -0,0 +1,59 @@
+{% extends "ishtar/wizard/default_wizard.html" %}
+{% load i18n range table_form %}
+{% block form_detail %}
+
+<table class='formset'>
+  <caption>{% trans "Identity" %}</caption>
+  {% table_field wizard.form.title %}
+  {% table_field wizard.form.surname 1 %}
+  {% table_field wizard.form.name 1 %}
+  {% table_field wizard.form.raw_name %}
+  {% table_field wizard.form.email %}
+  {% table_field wizard.form.attached_to %}
+</table>
+
+<hr class='spacer'/>
+<table class='formset table-form'>
+  <caption>{% trans "Phone" %}</caption>
+  <tr>
+    <th>{% trans "Phone type" %}</th>
+    <th>{% trans "Number" %}</th>
+  </tr>
+  <tr>
+    <td>{{ wizard.form.phone_desc.errors }}{{wizard.form.phone_desc|safe}}</td>
+    <td>{{ wizard.form.phone.errors }}{{wizard.form.phone|safe}}</td>
+  </tr>
+  <tr>
+    <td>{{ wizard.form.phone_desc2.errors }}{{wizard.form.phone_desc2|safe}}</td>
+    <td>{{ wizard.form.phone2.errors }}{{wizard.form.phone2|safe}}</td>
+  </tr>
+  <tr>
+    <td>{{ wizard.form.phone_desc3.errors }}{{wizard.form.phone_desc3|safe}}</td>
+    <td>{{ wizard.form.phone3.errors }}{{wizard.form.phone3|safe}}</td>
+  </tr>
+  <tr>
+    <td>{% trans "Mobile phone" %}</td>
+    <td>{{ wizard.form.mobile_phone.errors }}{{wizard.form.mobile_phone|safe}}</td>
+  </tr>
+</table>
+<hr class='spacer'/>
+
+<table class='formset'>
+  <caption>{% trans "Business address" %}</caption>
+  {% table_field wizard.form.address %}
+  {% table_field wizard.form.address_complement %}
+  {% table_field wizard.form.postal_code %}
+  {% table_field wizard.form.town %}
+  {% table_field wizard.form.country %}
+</table>
+<hr class='spacer'/>
+<table class='formset'>
+  <caption>{% trans "Other address" %}</caption>
+  {% table_field wizard.form.alt_address %}
+  {% table_field wizard.form.alt_address_complement %}
+  {% table_field wizard.form.alt_postal_code %}
+  {% table_field wizard.form.alt_town %}
+  {% table_field wizard.form.alt_country %}
+</table>
+
+{% endblock %}
-- 
cgit v1.2.3