From 1cc8d6156a79d8eff8d9f6ee82797df6e464408d Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Fri, 28 Nov 2014 11:30:02 +0100 Subject: Merge action implementation (person and organization) --- ishtar_common/templates/ishtar/merge.html | 34 +++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 ishtar_common/templates/ishtar/merge.html (limited to 'ishtar_common/templates/ishtar/merge.html') 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 %} +

{% trans "Merge" %}

+
+

+

{% if previous_page %}{% else %} {% endif %} + {% trans "Page " %}{{current_page}}/{{max_page}} +{% if next_page %}{% else %} {% endif %}

+
{% csrf_token %} + {{formset.management_form}} + {% for form in formset %}{% for hidden_field in form.hidden_fields %}{{hidden_field}}{% endfor %}{% endfor %} + + + + + + + + + + + + {% for form in formset %} +{% block merge_field_row %} +{% endblock %} + {% endfor %} + +
{% trans "Item A" %}{% trans "Item B" %}{% trans "B is a duplicate of A" %}{% trans "A is a duplicate of B" %}{% trans "Is not duplicate" %}
+ +
+
+{% endblock %} -- cgit v1.2.3