3 files changed, 79 insertions, 0 deletions
diff --git a/ishtar_common/templates/ishtar/merge.html b/ishtar_common/templates/ishtar/merge.html
new file mode 100644
index 000000000..edd27a722
--- /dev/null
+++ b/ishtar_common/templates/ishtar/merge.html
@@ -0,0 +1,34 @@
+{% extends "base.html" %}
+{% load url from future %}
+{% load i18n inline_formset %}
+{% block content %}
+<h2>{% trans "Merge" %}</h2>
+<div class='form'>
+<p class='alert'><label>{%trans "Every operation on this form is irreversible"%}</label></p>
+  <p>{% if previous_page %}<a href='{% url current_url 1 %}'>&Larr;</a><a href='{% url current_url previous_page %}'>&larr;</a>{% else %}&nbsp;{% endif %}
+    {% trans "Page " %}{{current_page}}/{{max_page}}
+{% if next_page %}<a href='{% url current_url next_page %}'>&rarr;</a><a href='{% url current_url max_page %}'>&Rarr;</a>{% else %}&nbsp;{% endif %} </p>
+  <form action="." method="post">{% csrf_token %}
+  {{formset.management_form}}
+  {% for form in formset %}{% for hidden_field in form.hidden_fields %}{{hidden_field}}{% endfor %}{% endfor %}
+  <table id='merge-table'>
+    <thead>
+      <tr>
+        <th colspan='2'>{% trans "Item A" %}</th>
+        <th colspan='2'>{% trans "Item B" %}</th>
+        <th class='small'>{% trans "B is a duplicate of A" %}</th>
+        <th class='small'>{% trans "A is a duplicate of B" %}</th>
+        <th class='small'>{% trans "Is not duplicate" %}</th>
+      </tr>
+    </thead>
+    <tbody>
+      {% for form in formset %}
+{% block merge_field_row %}
+{% endblock %}
+      {% endfor %}
+    <tbody>
+</table>
+<input type="submit" value="{% trans "Validate" %}"/>
+</form>
+</div>
+{% endblock %}
diff --git a/ishtar_common/templates/ishtar/merge_organization.html b/ishtar_common/templates/ishtar/merge_organization.html
new file mode 100644
index 000000000..4118ee6d5
--- /dev/null
+++ b/ishtar_common/templates/ishtar/merge_organization.html
@@ -0,0 +1,23 @@
+{% extends "ishtar/merge.html" %}
+{% load url from future %}
+{% block merge_field_row %}
+      {% if form.non_field_errors %}<tr><td colspan='4'></td><td colspan='3' class='errorlist'>{% for error in form.non_field_errors %}{{error}} {% endfor%}</tr>{% endif %}
+      <tr>
+        <td>
+          <a href="#" onclick="load_window('{% url 'show-organization' form.instance.from_organization.pk '' %}', 'organization');" class="display_details">Détails</a>
+        </td>
+        <td>
+          {{form.instance.from_organization}} ({{form.instance.from_organization.pk}})
+        </td>
+        <td>
+          <a href="#" onclick="load_window('{% url 'show-organization' form.instance.to_organization.pk '' %}', 'organization');" class="display_details">Détails</a>
+        </td>
+        <td>
+          {{form.instance.to_organization}} ({{form.instance.to_organization.pk}})
+        </td>
+        <td class='check'>{{form.b_is_duplicate_a}}</td>
+        <td class='check'>{{form.a_is_duplicate_b}}</td>
+        <td class='check'>{{form.not_duplicate}}</td>
+      </tr>
+{% endblock %}
+
diff --git a/ishtar_common/templates/ishtar/merge_person.html b/ishtar_common/templates/ishtar/merge_person.html
new file mode 100644
index 000000000..6b67182b3
--- /dev/null
+++ b/ishtar_common/templates/ishtar/merge_person.html
@@ -0,0 +1,22 @@
+{% extends "ishtar/merge.html" %}
+{% load url from future %}
+{% block merge_field_row %}
+      {% if form.non_field_errors %}<tr><td colspan='4'></td><td colspan='3' class='errorlist'>{% for error in form.non_field_errors %}{{error}} {% endfor%}</tr>{% endif %}
+      <tr>
+        <td>
+          <a href="#" onclick="load_window('{% url 'show-person' form.instance.from_person.pk '' %}', 'person');" class="display_details">Détails</a>
+        </td>
+        <td>
+          {{form.instance.from_person}} ({{form.instance.from_person.pk}})
+        </td>
+        <td>
+          <a href="#" onclick="load_window('{% url 'show-person' form.instance.to_person.pk '' %}', 'person');" class="display_details">Détails</a>
+        </td>
+        <td>
+          {{form.instance.to_person}} ({{form.instance.to_person}}.pk)
+        </td>
+        <td class='check'>{{form.b_is_duplicate_a}}</td>
+        <td class='check'>{{form.a_is_duplicate_b}}</td>
+        <td class='check'>{{form.not_duplicate}}</td>
+      </tr>
+{% endblock %}