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

design UX for duplicate person feature

Browse Source
This commit is contained in:
Mathieu Jaumotte
2021-03-21 14:36:59 +01:00
parent 76c9cd5be3
commit aa40716898
6 changed files with 181 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/confirm.html.twig
View File

@@ -1,31 +1,94 @@
{% extends "@ChillPerson/layout.html.twig" %}
{% extends "@ChillMain/layout.html.twig" %}
{% set activeRouteKey = 'chill_person_duplicate' %}
{% import '@ChillPerson/PersonDuplicate/_sidepane.html.twig' as sidepane %}
{% block title %}{{ 'Person duplicate'|trans|capitalize ~ ' ' ~ person.firstName|capitalize ~
' ' ~ person.lastName }}{% endblock %}
{% block personcontent %}
<h2>{{ 'Old person'|trans }}</h2>
{{ person2 }}
<a class="sc-button bt-show" target="_blank" href="{{ path('chill_person_view', { person_id : person2.id }) }}"></a>
{% block content %}
<style>
div.duplicate-content {
margin: 0 2rem;
}
div.col {
padding: 1em;
border: 3px solid #cccccc;
}
div.border {
border: 4px solid #3c9f8d;
}
<h2>{{ 'New person'|trans }}</h2>
{{ person }}
<a class="sc-button bt-show" target="_blank" href="{{ path('chill_person_view', { person_id : person.id }) }}"></a>
</style>
<div class="container content"><div class="duplicate-content">
<h1>{{ 'Merge duplicate persons folders'|trans }}</h1>
<div class="grid-6 grid-tablet-12 gid-mobile-12">
<p><b>{{ 'Old person'|trans }}</b>:
{{ 'Old person explain'|trans }}
</p>
<div class="col">
<h1><span><a class="sc-button bt-show" target="_blank" title="{{ 'Open in another window'|trans }}" href="{{ path('chill_person_view', { person_id : person2.id }) }}"></a></span>
{{ person2 }}
</h1>
<h4>{{ 'Deleted datas'|trans ~ ':' }}</h4>
{{ sidepane.details(person2) }}
<h4>{{ 'Moved datas'|trans ~ ':' }}</h4>
{{ sidepane.links(person2) }}
</div>
</div>
<div class="grid-6 grid-tablet-12 gid-mobile-12">
<p><b>{{ 'New person'|trans }}</b>:
{{ 'New person explain'|trans }}
</p>
<div class="col border">
<h1><span><a class="sc-button bt-show" target="_blank" title="{{ 'Open in another window'|trans }}" href="{{ path('chill_person_view', { person_id : person.id }) }}"></a></span>
{{ person }}
</h1>
<h4>{{ 'Keeped datas'|trans ~ ':' }}</h4>
{{ sidepane.details(person) }}
<h4>{{ 'Keeped datas'|trans ~ ':' }}</h4>
{{ sidepane.links(person) }}
</div>
</div>
{{ form_start(form) }}
{{ form_rest(form) }}
<div class="grid-4 grid-tablet-12 gid-mobile-12 centered">
<ul class="grid-12 sticky-form-buttons record_actions ">
<div class="container" style="padding-top: 1em;">
<div class="grid-1 clear" style="padding-top: 10px;">
{{ form_widget(form.confirm) }}
</div>
<div class="grid-11">
{{ form_label(form.confirm) }}
</div>
</div>
</div>
<ul class="grid-12 record_actions">
<li class="cancel">
<a href="{{ app.request.headers.get('referer') }}" class="sc-button grey center margin-5">
<i class="fa fa-arrow-left"></i>
{{ 'Return'|trans }}
</a>
</li>
<li class="cancel">
<a href="{{ path('chill_person_duplicate_confirm', { person1_id : person2.id, person2_id : person.id }) }}"
class="sc-button bt-action">
<i class="fa fa-exchange"></i>
{{ 'Invert'|trans }}
</a>
</li>
<li>
<button class="sc-button bt-save" type="submit">{{ 'Confirm'|trans }}</button>
</li>
@@ -33,4 +96,5 @@
{{ form_end(form) }}
</div></div>
{% endblock %}