Merge page - add more fields on table (refs #5447)

3 files changed, 34 insertions, 11 deletions

diff --git a/ishtar_common/templates/ishtar/merge.html b/ishtar_common/templates/ishtar/merge.html
index 7f46231f1..a77ed2f91 100644
--- a/ishtar_common/templates/ishtar/merge.html
+++ b/ishtar_common/templates/ishtar/merge.html
@@ -39,7 +39,12 @@
       {% endfor %}
     <tbody>
 </table>
-<input type="submit" value="{% trans "Validate" %}"/>
+    {% block "footer" %}
+    <div id="footer">
+      {% include 'ishtar/wizard/validation_bar.html' %}
+      {% include 'ishtar/blocks/footer.html' %}
+    </div>
+    {% endblock %}
 </form>
 </div>
 {% endblock %}
diff --git a/ishtar_common/templates/ishtar/merge_organization.html b/ishtar_common/templates/ishtar/merge_organization.html
index 10730e8c5..f2ce05b41 100644
--- a/ishtar_common/templates/ishtar/merge_organization.html
+++ b/ishtar_common/templates/ishtar/merge_organization.html
@@ -1,4 +1,4 @@
-{% extends "ishtar/merge.html" %}
+{% extends "ishtar/merge.html" %}{% load i18n %}
 {% 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>
@@ -6,15 +6,23 @@
           <a href="#" onclick="load_window('{% url 'show-organization' form.instance.from_organization.pk '' %}', 'organization');" class="display_details"><i class="fa fa-info-circle" aria-hidden="true"></i></a>
         </td>
         <td>
-          {{form.instance.from_organization}} ({{form.instance.from_organization.pk}})<br />
-          {{form.instance.from_organization.address_lbl|linebreaksbr}}
+          <span title="{% trans 'Name' %}">{{form.instance.from_organization.name}}</span> ({{form.instance.from_organization.pk}})<br>
+          {% if form.instance.from_organization.organization_type %}<span title="{% trans 'Type' %}">{{form.instance.from_organization.organization_type}}</span><br>{% endif %}
+          {% if form.instance.from_organization.url %}<span title="{% trans 'URL' %}">{{form.instance.from_organization.url}}</span><br>{% endif %}
+          {% for value, title in form.instance.from_organization.address_lbl_list %}
+          <span title="{{title}}">{{value}}</span>{% if not forloop.last %}<br>{% endif %}
+          {% endfor %}
         </td>
         <td>
           <a href="#" onclick="load_window('{% url 'show-organization' form.instance.to_organization.pk '' %}', 'organization');" class="display_details"><i class="fa fa-info-circle" aria-hidden="true"></i></a>
         </td>
         <td>
-          {{form.instance.to_organization}} ({{form.instance.to_organization.pk}})<br />
-          {{form.instance.to_organization.address_lbl|linebreaksbr}}
+          <span title="{% trans 'Name' %}">{{form.instance.to_organization.name}}</span> ({{form.instance.to_organization.pk}})<br>
+          {% if form.instance.to_organization.organization_type %}<span title="{% trans 'Type' %}">{{form.instance.to_organization.organization_type}}</span><br>{% endif %}
+          {% if form.instance.to_organization.url %}<span title="{% trans 'URL' %}">{{form.instance.to_organization.url}}</span><br>{% endif %}
+          {% for value, title in form.instance.to_organization.address_lbl_list %}
+          <span title="{{title}}">{{value}}</span>{% if not forloop.last %}<br>{% endif %}
+          {% endfor %}
         </td>
         <td class='check'>{{form.b_is_duplicate_a}}</td>
         <td class='check'>{{form.a_is_duplicate_b}}</td>
diff --git a/ishtar_common/templates/ishtar/merge_person.html b/ishtar_common/templates/ishtar/merge_person.html
index 0d03112c5..bb80a5645 100644
--- a/ishtar_common/templates/ishtar/merge_person.html
+++ b/ishtar_common/templates/ishtar/merge_person.html
@@ -1,4 +1,4 @@
-{% extends "ishtar/merge.html" %}
+{% extends "ishtar/merge.html" %}{% load i18n %}
 {% 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>
@@ -6,15 +6,25 @@
           <a href="#" onclick="load_window('{% url 'show-person' form.instance.from_person.pk '' %}', 'person');" class="display_details"><i class="fa fa-info-circle" aria-hidden="true"></i></a>
         </td>
         <td>
-          {{form.instance.from_person}} ({{form.instance.from_person.pk}})<br/>
-          {{form.instance.from_person.address_lbl|linebreaksbr}}
+          <span title="{% trans 'Raw name' %}">{{form.instance.from_person.raw_name}}</span> ({{form.instance.from_person.pk}})<br>
+          <span title="{% trans 'Title' %}">{{form.instance.from_person.title|default:""}}</span> <span title="{% trans 'Name' %}">{{form.instance.from_person.name|default:""}}</span> <span title="{% trans 'Name' %}">{{form.instance.from_person.surname|default:""}}</span><br>
+          {% if form.instance.from_person.attached_to %}<span title="{% trans 'Organization' %}">{{form.instance.from_person.attached_to}}</span><br>{% endif %}
+          {% if form.instance.from_person.salutation %}<span title="{% trans 'Salutation' %}">{{form.instance.from_person.salutation}}</span><br>{% endif %}
+          {% for value, title in form.instance.from_person.address_lbl_list %}
+          <span title="{{title}}">{{value}}</span>{% if not forloop.last %}<br>{% endif %}
+          {% endfor %}
         </td>
         <td>
           <a href="#" onclick="load_window('{% url 'show-person' form.instance.to_person.pk '' %}', 'person');" class="display_details"><i class="fa fa-info-circle" aria-hidden="true"></i></a>
         </td>
         <td>
-          {{form.instance.to_person}} ({{form.instance.to_person.pk}})<br/>
-          {{form.instance.to_person.address_lbl|linebreaksbr}}
+          <span title="{% trans 'Raw name' %}">{{form.instance.to_person.raw_name}}</span> ({{form.instance.to_person.pk}})<br>
+          <span title="{% trans 'Title' %}">{{form.instance.to_person.title|default:""}}</span> <span title="{% trans 'Name' %}">{{form.instance.to_person.name|default:""}}</span> <span title="{% trans 'Name' %}">{{form.instance.to_person.surname|default:""}}</span><br>
+          {% if form.instance.to_person.attached_to %}<span title="{% trans 'Organization' %}">{{form.instance.to_person.attached_to}}</span><br>{% endif %}
+          {% if form.instance.to_person.salutation %}<span title="{% trans 'Salutation' %}">{{form.instance.to_person.salutation}}</span><br>{% endif %}
+          {% for value, title in form.instance.to_person.address_lbl_list %}
+          <span title="{{title}}">{{value}}</span>{% if not forloop.last %}<br>{% endif %}
+          {% endfor %}
         </td>
         <td class='check'>{{form.b_is_duplicate_a}}</td>
         <td class='check'>{{form.a_is_duplicate_b}}</td>