New screen to find duplicate person manually

Signed-off-by: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>

src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/confirm.html.twig

@@ -21,7 +21,7 @@
 
     <ul class="grid-12 sticky-form-buttons record_actions ">
         <li class="cancel">
-            <a href="{{ path('chill_person_duplicate_view',  {'person_id' : person.id}) }}" class="sc-button grey center margin-5">
+            <a href="{{ app.request.headers.get('referer') }}" class="sc-button grey center margin-5">
                 <i class="fa fa-arrow-left"></i>
                 {{ 'Return'|trans }}
             </a>

src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/find_manually.html.twig

@@ -0,0 +1,29 @@
+{% extends "@ChillPerson/layout.html.twig"  %}
+
+{% set activeRouteKey = 'chill_person_duplicate' %}
+
+{% block title %}{{ 'Find duplicate'|trans|capitalize ~ ' ' ~ person.firstName|capitalize ~
+' ' ~ person.lastName }}{% endblock %}
+
+
+{% block personcontent %}
+
+    {{ form_start(form) }}
+
+    {{ form_rest(form) }}
+
+    <ul class="grid-12 sticky-form-buttons record_actions ">
+        <li class="cancel">
+            <a href="{{ path('chill_person_duplicate_view',  {'person_id' : person.id}) }}" class="sc-button grey center margin-5">
+                <i class="fa fa-arrow-left"></i>
+                {{ 'Return'|trans }}
+            </a>
+        </li>
+        <li>
+            <button class="sc-button bt-save" type="submit">{{ 'Confirm'|trans }}</button>
+        </li>
+    </ul>
+
+    {{ form_end(form) }}
+
+{% endblock %}

src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/view.html.twig

@@ -63,9 +63,10 @@
             </td>
         </tr>
     {% endfor %}
+    </table>
 {% endif %}
 
-
+    <a href="{{ path('chill_person_find_manually_duplicate', {person_id: person.id}) }}" class="sc-button">{{ 'Associate manually a duplicate person' | trans }}</a>
 
 {% if notDuplicatePersons|length > 0 %}
     <h2>{{ 'Person flaged as duplicate' | trans }}</h2>
@@ -122,5 +123,4 @@
     </table>
 {% endif %}
 
-</table>
 {% endblock %}