Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-08-21 07:03:49 +00:00
Code Issues Actions Projects Releases Wiki Activity

improve duplicate ux

Browse Source
This commit is contained in:
Mathieu Jaumotte
2021-03-21 14:40:16 +01:00
parent a86feafa53
commit 03ef68dc36
3 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/view.html.twig
View File

@@ -7,10 +7,8 @@
{% block personcontent %}
<h1>{{ title|default('Person duplicate')|trans }}</h1>
{% if duplicatePersons|length > 0 %}
<p>{{ title|default('Person duplicate explained')|trans }}</p>
@@ -62,11 +60,12 @@
</li>
<li>
<a class="sc-button bt-action" href="{{ path('chill_person_duplicate_confirm', { person1_id : person.id, person2_id : duplicatePerson.id }) }}">
{{ 'Merge'|trans }}</a>
<i class="fa fa-cog fa-fw"></i>{{ 'Merge'|trans }}</a>
</li>
<li>
<a class="sc-button bt-not-duplicate" href="{{ path('chill_person_duplicate_not_duplicate', {person1_id : person.id, person2_id : duplicatePerson.id}) }}">
{{ 'Switch to truefalse'|trans }}</a>
<a class="sc-button" title="{{ 'Switch to truefalse'|trans }}"
href="{{ path('chill_person_duplicate_not_duplicate', {person1_id : person.id, person2_id : duplicatePerson.id}) }}">
<i class="fa fa-toggle-on fa-fw"></i>{{ 'duplicate'|trans }}</a>
</li>
</ul>
</td>
@@ -126,8 +125,9 @@
<a class="sc-button bt-show" target="_blank" href="{{ path('chill_person_view', { person_id : notDuplicatePerson.id }) }}"></a>
</li>
<li>
<a class="sc-button bt-not-duplicate" href="{{ path('chill_person_remove_duplicate_not_duplicate', {person1_id : person.id, person2_id : notDuplicatePerson.id}) }}">
{{ 'Switch to duplicate'|trans }}</a>
<a class="sc-button" title="{{ 'Switch to duplicate'|trans }}"
href="{{ path('chill_person_remove_duplicate_not_duplicate', {person1_id : person.id, person2_id : notDuplicatePerson.id}) }}">
<i class="fa fa-toggle-off fa-fw"></i>{{ 'not-duplicate'|trans }}</a>
</li>
</ul>
</td>
@@ -135,7 +135,11 @@
{% endfor %}
</table>
{% endif %}
{% if notDuplicatePersons|length == 0 and duplicatePersons|length == 0 %}
<span class="chill-no-data-statement">{{ 'No duplicate candidates'|trans }}</span>
{% endif %}
<ul class="record_actions">
<li class="cancel">
<a href="{{ path('chill_person_view', {person_id: person.id }) }}" class="sc-button">