many corrections in twig templates

src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/form.html.twig

@@ -71,4 +71,4 @@
 {{ form_end(form) }}
 
 
-{% endblock personcontent %}
+{% endblock %}

src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/re_open.html.twig

@@ -24,4 +24,4 @@
     </ul>
     
    
-{% endblock personcontent %}
+{% endblock %}

src/Bundle/ChillPersonBundle/Resources/views/Address/edit.html.twig

@@ -21,13 +21,21 @@
 {% block title 'Modify address for %name%'|trans({ '%name%': person.firstName ~ ' ' ~ person.lastName } ) %}
 
 {% block personcontent %}
+<div class="address-new">
+    <div class="row justify-content-center">
+        <div class="col-md-10 col-xxl">     
             
             {% block content %}
                 <h1>{{ block('title') }}</h1>
                 <div id="address"></div>
             {% endblock %}
 
-    {% block stylesheets %}
+        </div>    
+    </div>
+</div>
+{% endblock %}
+
+{% block css %}
     {{ encore_entry_link_tags('vue_address') }}
 {% endblock %}
 
@@ -40,5 +48,3 @@
     </script>
     {{ encore_entry_script_tags('vue_address') }}
 {% endblock %}
-
-{% endblock personcontent %}

src/Bundle/ChillPersonBundle/Resources/views/Address/list.html.twig

@@ -24,6 +24,8 @@
 
 {% block personcontent %}
 <div class="person-addresses">
+    <div class="row justify-content-center">
+        <div class="col-md-10 col-xxl">
                 
             <h1>{{ 'Addresses history'|trans }}</h1>
             
@@ -122,4 +124,6 @@
             </ul>
     
         </div>
-{% endblock personcontent %}
+    </div>
+</div>
+{% endblock %}

src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig

@@ -25,13 +25,17 @@
     <div class="row justify-content-center">
         <div class="col-md-10 col-xxl">            
 
-
             {% block content %}
                 <h1>{{ block('title') }}</h1>
                 <div id="address"></div>
             {% endblock %}
             
-    {% block stylesheets %}
+        </div>    
+    </div>
+</div>
+{% endblock %}
+
+{% block css %}
     {{ encore_entry_link_tags('vue_address') }}
 {% endblock %}
 
@@ -43,9 +47,3 @@
     </script>
     {{ encore_entry_script_tags('vue_address') }}
 {% endblock %}
-
-    
-        </div>    
-    </div>
-</div>
-{% endblock personcontent %}

src/Bundle/ChillPersonBundle/Resources/views/CRUD/index.html.twig

@@ -12,4 +12,4 @@
             </li>
         {% endblock %}
     {% endembed %}
-{% endblock personcontent %}
+{% endblock %}

src/Bundle/ChillPersonBundle/Resources/views/Person/create_review.html.twig

@@ -24,7 +24,7 @@
         
         <div class="col-md-10 col-xxl">
             
-            <div class="warning flash_message">
+            <div class="alert alert-warning flash_message">
                 <span>
                 {% transchoice alternatePersons|length with { '%nb%': alternatePersons|length } %}
                 %nb% person with similar name. Please verify that this is a new person
@@ -33,7 +33,7 @@
             </div>
             
             {% if alternatePersons is not empty %}
-                <table>
+                <table class="table table-bordered border-dark">
                     <thead>
                         <tr>
                             <th class="chill-red">{{ 'Name'|trans }}</th>
@@ -63,7 +63,7 @@
                 </table>
             {% endif %}
         
-            <div id="person_details">
+            <div id="person_details" class="my-5">
                 {{ form_start(form) }}
                     <h2>{{ 'You will create this person'|trans }}</h2>
                     <dl>
@@ -86,9 +86,11 @@
                     </dl>
                     
                     {{ form_rest(form) }}
-                    <button class="btn btn-create change-icon" type="submit"><i class="fa fa-check"></i> {{ 'Confirm the creation'|trans }}</button>
+                    <button class="btn btn-submit" type="submit"><i class="fa fa-check"></i> {{ 'Confirm the creation'|trans }}</button>
                 {{ form_end(form) }}
             </div>
+
+        </div>
     </div>
 </div>    
 {% endblock content %}

src/Bundle/ChillPersonBundle/Resources/views/Person/edit.html.twig

@@ -143,8 +143,8 @@
         </div>
     </div>
 </div>
-{% endblock personcontent %}
+{% endblock %}
 
 {% block js %}
     {{ encore_entry_link_tags('person') }}
-{% endblock js %}
+{% endblock %}

src/Bundle/ChillPersonBundle/Resources/views/Person/household_history.html.twig

@@ -4,10 +4,12 @@
 
 {% block title 'household.Household history for %name%'|trans({'name': person|chill_entity_render_string}) %}
 
-
 {% block personcontent %}
-<h1>{{ block('title') }}</h1>
+<div class="person-household">
+    <div class="row justify-content-center">
+        <div class="col-md-10 col-xxl">
                 
+            <h1>{{ block('title') }}</h1>
             <h2>{{ 'household.Household shared'|trans }}</h2>
 
             {% set memberships = person.getHouseholdParticipationsShareHousehold() %}
@@ -82,8 +84,7 @@
                                         <ul class="record_actions">
                                             <li>
                                                 <a href="{{ chill_path_add_return_path('chill_person_household_member_edit', { id: p.id }) }}"
-                                        class="btn btn-edit">
-                                    </a>
+                                                    class="btn btn-edit"></a>
                                             </li>
                                             {% if p.isCurrent() %}
                                             <li>
@@ -112,7 +113,7 @@
             {% if memberships|length == 0 %}
                 <p class="chill-no-data-statement">{{ 'household.Never in any household'|trans }}</p>
             {% else %}
-  <table>
+                <table class="table table-bordered border-dark">
                     <thead>
                         <tr>
                             <th>{{ 'household.from'|trans }}</th>
@@ -135,16 +136,15 @@
                                 <div>
                                 <p>
                                     <i class="fa fa-home"></i>
-            <a 
-               href="{{ chill_path_add_return_path(
-                'chill_person_household_summary',
-                { 'household_id': p.household.id }
-                ) }}"
-                >
+                                    <a href="{{ chill_path_add_return_path('chill_person_household_summary', { 'household_id': p.household.id }) }}">
                                         {{ 'household.Household number'|trans({'household_num': p.household.id }) }}
                                     </a>
                                 </p>
-            <p>{{ p.position.label|localize_translatable_string }} {% if p.holder %}<span class="badge bg-primary">{{ 'household.holder'|trans }}</span>{% endif %} 
+                                <p>
+                                    {{ p.position.label|localize_translatable_string }} 
+                                    {% if p.holder %}
+                                        <span class="badge bg-primary">{{ 'household.holder'|trans }}</span>
+                                    {% endif %} 
                                 </div>
                                 <div>
                                 {% set simultaneous = p.household.getMembersDuringMembership(p) %}
@@ -163,12 +163,11 @@
                               </div>
                             </td>
                             <td>
-          <ul class="record_actions">
+                                <ul class="record_actions sticky-form-buttons">
                                     <li>
-              <a 
-                href="{{ chill_path_add_return_path('chill_person_household_member_edit', { id: p.id }) }}"
-                class="btn btn-edit"
-                ></a>
+                                        <a href="{{ chill_path_add_return_path('chill_person_household_member_edit', { id: p.id }) }}"
+                                            class="btn btn-edit">
+                                        </a>
                                     </li>
                                 </ul>
                             </td>
@@ -178,4 +177,7 @@
                 </table>
             {% endif %}
 
+        </div>
+    </div>
+</div>
 {% endblock %}

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

@@ -7,13 +7,16 @@
 
 
 {% block personcontent %}
+<div class="person-duplicate">
+    <div class="row justify-content-center">
+        <div class="col-md-10 col-xxl">
             
-    <h1>Désigner un dossier doublon</h1>
+            <h1>{{ 'Désigner un dossier doublon'|trans }}</h1>
             
             {{ form_start(form) }}
             {{ form_rest(form) }}
 
-    <ul class="col-12 record_actions ">
+            <ul class="record_actions sticky-form-buttons">
                 <li class="cancel">
                     <a href="{{ path('chill_person_duplicate_view',  {'person_id' : person.id}) }}" class="btn btn-cancel">
                         {{ 'Return'|trans }}
@@ -26,4 +29,7 @@
 
             {{ form_end(form) }}
 
+        </div>
+    </div>
+</div>
 {% endblock %}

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

@@ -5,14 +5,17 @@
 {% block title %}{{ 'Person duplicate'|trans|capitalize ~ ' ' ~ person.firstName|capitalize ~
     ' ' ~ person.lastName }}{% endblock %}
 
-
 {% block personcontent %}
+<div class="person-duplicate">
+    <div class="row justify-content-center">
+        <div class="col-md-10 col-xxl">
+                        
             <h1>{{ title|default('Person duplicate')|trans }}</h1>
 
             {% if duplicatePersons|length > 0 %}
                 <p>{{ title|default('Person duplicate explained')|trans }}</p>
 
-    <table>
+                <table class="table table-bordered border-dark">
                 <thead>
                     <tr>
                         <th class="chill-green">{% trans %}Name{% endtrans %}</th>
@@ -80,7 +83,7 @@
                 <h2>{{ 'Person flaged as duplicate' | trans }}</h2>
                 <p>{{ 'Person flaged as duplicate explained' | trans }}</p>
 
-    <table>
+                <table class="table table-bordered border-dark">
                     <thead>
                     <tr>
                         <th class="chill-orange">{% trans %}Name{% endtrans %}</th>
@@ -144,7 +147,7 @@
                 <span class="chill-no-data-statement">{{ 'No duplicate candidates'|trans }}</span>
             {% endif %}
                 
-<ul class="record_actions">
+            <ul class="record_actions sticky-form-buttons">
                 <li class="cancel">
                     <a href="{{ path('chill_person_view', {person_id: person.id }) }}" class="btn btn-cancel">
                         {{ 'Return'|trans }}</a>
@@ -156,4 +159,7 @@
                 </li>
             </ul>
 
+        </div>
+    </div>
+</div>            
 {% endblock %}

src/Bundle/ChillPersonBundle/Resources/views/Timeline/index.html.twig

@@ -27,9 +27,17 @@ This view should receive those arguments:
 
 
 {% block personcontent %}
+<div class="timeline">
+    <div class="row justify-content-center">
+        <div class="col-md-10 col-xxl">
+            
             {{ timeline|raw }}
             
             {% if nb_items > paginator.getItemsPerPage %}
             {{ chill_pagination(paginator) }}
             {% endif %}
-{% endblock personcontent %}
+    
+        </div>
+    </div>
+</div>    
+{% endblock %}

src/Bundle/ChillTaskBundle/Resources/views/SingleTask/_list.html.twig

@@ -2,12 +2,11 @@
     {% if tasks|length > 0 %}
         <h3>{{ title|trans }}</h3>
 
-            <table class="records_list chill-task-list">
+        <table class="table table-bordered border-dark chill-task-list">
             <tbody>
                 {% for task in tasks %}
                 <tr>
-                            <td class="chill-task-list__row">
-                                
+                    <td>
                         <div>
                             <span class="chill-task-list__row__title">{{ task.title }}</span>
                         </div>
@@ -22,10 +21,7 @@
                             <span class="chill-task-list__row__type">{{ task_workflow_metadata(task, 'definition.name')|trans }}</span>
                         </div>
                             
-
-                                    
                         <div>
-                                
                             {% for place in workflow_marked_places(task) %}
                                 <span class="task-status box type-{{ task.type }} place-{{ place }}">{{ place|trans }}</span>
                             {% endfor %}
@@ -34,7 +30,6 @@
                             {% endif %}
                         </div>
                         
-                                
                         {% if task.startDate is not null or task.warningDate is not null or task.endDate is not null %}
                         <div class="chill-task-list__row__dates">
                             <ul class="record_actions_column">
@@ -62,24 +57,35 @@
                         <ul class="record_actions">
                             {% if workflow_transitions(task)|length > 0 %}
                             <li>
-                                        <div class="btn dropdown-toggle">
-                                            <a href="" class="btn btn-task-exchange">&nbsp;</a>
-                                            <div class="dropdown-menu">
+                                <div class="btn-group">
+                                    <a class="btn btn-task-exchange dropdown-toggle" href="#" role="button" 
+                                        id="taskExchange" data-bs-toggle="dropdown" aria-expanded="false">
+                                        {{'Change task status'|trans}}
+                                    </a>
+                                    <ul class="dropdown-menu" aria-labelledby="taskExchange">
                                         {% for transition in workflow_transitions(task) %}
-                                                    <a href="{{ path('chill_task_task_transition', { 'taskId': task.id, 'transition': transition.name, 'kind': 'single-task', 'list_params': app.request.query.all }) }}" class="{{ task_workflow_metadata(task, 'transition.class', transition)|e('html_attr') }}">{{ task_workflow_metadata(task, 'transition.verb', transition)|trans }}</a>
+                                        <li>
+                                            <a class="dropdown-item"
+                                                href="{{ path('chill_task_task_transition', { 'taskId': task.id, 'transition': transition.name, 'kind': 'single-task', 'list_params': app.request.query.all }) }}" class="{{ task_workflow_metadata(task, 'transition.class', transition)|e('html_attr') }}">
+                                                {{ task_workflow_metadata(task, 'transition.verb', transition)|trans }}
+                                            </a>
+                                        </li>
                                         {% endfor %}
-                                            </div>
+                                    </ul>
                                 </div>
                             </li>
                             {% endif %}
+                            
                             <li>
                                 <a href="{{ path('chill_task_single_task_show', { 'id': task.id, 'list_params': app.request.query.all }) }}" class="btn btn-show "></a>
                             </li>
+                            
                             {% if is_granted('CHILL_TASK_TASK_UPDATE', task) %}
                             <li>
                                 <a href="{{ path('chill_task_single_task_edit', { 'id': task.id, 'list_params': app.request.query.all }) }}" class="btn btn-update "></a>
                             </li>
                             {% endif %}
+                            
                             {% if is_granted('CHILL_TASK_TASK_DELETE', task) %}
                             <li>
                                 <a href="{{ path('chill_task_single_task_delete', { 'id': task.id, 'list_params': app.request.query.all } ) }}" class="btn btn-delete "></a>
@@ -140,7 +146,6 @@
 
 {% import _self as helper %}
 
-
     <h1>{{ app.request.query.get('title', null)|escape('html')|default('Task list'|trans) }}</h1>
 
     {% if false == app.request.query.boolean('hide_form', false) %}
@@ -169,11 +174,10 @@
                 <button type="submit" class="btn btn-submit">{{ 'Filter'|trans }}</button>
             </li>
         </ul>
+        
         {{ form_end(form)}}
     {% endif %}
 
-    
-
     {% if tasks_count == 0 %}
         <p class="chill-no-data-statement">{{ "There is no tasks."|trans }}</p>
         {% if person is not null and is_granted('CHILL_TASK_TASK_CREATE', person)  %}

src/Bundle/ChillTaskBundle/Resources/views/SingleTask/edit.html.twig

@@ -22,7 +22,11 @@
 {% block title %}{{ 'Edit task'|trans }}{% endblock %}
 
 {% block personcontent %}
-<h1 class="chill-red">{{ 'Edit task'|trans }}</h1>
+<div class="task-edit">
+    <div class="row justify-content-center">
+        <div class="col-md-10 col-xxl">    
+                    
+            <h1>{{ 'Edit task'|trans }}</h1>
 
             {{ form_start(form) }}
 
@@ -53,4 +57,7 @@
 
             {{ form_end(form) }}
 
+        </div>
+    </div>
+</div>
 {% endblock %}

src/Bundle/ChillTaskBundle/Resources/views/SingleTask/index.html.twig

@@ -27,17 +27,24 @@
 {% macro row(task) %}
 {% endmacro %}
 
-
 {% block filtertasks %}
 {% if person is not null %}
     {% block personcontent %}
+        <div class="tasks">
+            <div class="row justify-content-center">
+                <div class="col-md-10 col-xxl">
                     {% include 'ChillTaskBundle:SingleTask:_list.html.twig' %}
+                </div>
+            </div>
+        </div>
     {% endblock %}
 {% else %}
     {% block content %}
-        <div class="col-8 col-md-9 offset-md-1">
+        <div class="col-md-10 col-xxl">
+            <div class="tasks my-5">
                 {% include 'ChillTaskBundle:SingleTask:_list.html.twig' %}
             </div>
+        </div>
     {% endblock %}
 {% endif %}
 {% endblock %}

src/Bundle/ChillTaskBundle/Resources/views/SingleTask/new.html.twig

@@ -22,7 +22,11 @@
 {% block title %}{{ 'New task'|trans }}{% endblock %}
 
 {% block personcontent %}
-<h1 class="chill-red">{{ 'New task'|trans }}</h1>
+<div class="task-new">
+    <div class="row justify-content-center">
+        <div class="col-md-10 col-xxl">    
+            
+            <h1>{{ 'New task'|trans }}</h1>
 
             {{ form_start(form) }}
             
@@ -38,10 +42,13 @@
 
             <ul class="record_actions sticky-form-buttons">
                 <li>
-            {{ form_row(form.submit, { 'label': 'Add a new task'|trans, 'attr': {'class': 'btn btn-save'}  })  }}
+                    {{ form_widget(form.submit, { 'label': 'Add a new task'|trans, 'attr': {'class': 'btn btn-save'}  })  }}
                 </li>
             </ul>
 
             {{ form_end(form) }}
 
+        </div>
+    </div>
+</div>
 {% endblock %}

src/Bundle/ChillTaskBundle/Resources/views/SingleTask/show.html.twig

@@ -23,7 +23,11 @@
 
 
 {% block personcontent %}
-<h1 class="chill-red">{{ 'Task'|trans }}</h1>
+<div class="task-show">
+    <div class="row justify-content-center">
+        <div class="col-md-10 col-xxl">   
+            
+            <h1>{{ 'Task'|trans }}</h1>
             
             <h2>{{ task.title }} {% for place in workflow_marked_places(task) %}
                 <span class="task-status box type-{{ task.type }} place-{{ place }}">{{ place|trans }}</span>
@@ -83,7 +87,7 @@
                 {{ timeline|raw }}
             {% endif %}
             
-    <ul class="record_actions">
+            <ul class="record_actions sticky-form-buttons">
                 <li class="cancel">
                     <a class="btn btn-cancel" href="{%- if app.request.query.has('returnPath') -%}
                         {{ app.request.query.get('returnPath')|escape('html_attr') }}
@@ -93,18 +97,28 @@
                         {{ app.request.query.get('returnLabel')|default('Back to the list'|trans) }}
                     </a>
                 </li>
+                
                 {% if workflow_transitions(task)|length > 0 %}
                 <li>
-            <div class="btn dropdown-toggle">
-                <a href="" class="btn btn-task-exchange">&nbsp;{{'Change task status'|trans}}</a>
-                <div class="dropdown-menu">
+                    <div class="btn-group">
+                        <a class="btn btn-task-exchange dropdown-toggle" href="#" role="button" 
+                            id="taskExchange" data-bs-toggle="dropdown" aria-expanded="false">
+                            {{'Change task status'|trans}}
+                        </a>
+                        <ul class="dropdown-menu" aria-labelledby="taskExchange">
                             {% for transition in workflow_transitions(task) %}
-                        <a href="{{ path('chill_task_task_transition', { 'taskId': task.id, 'transition': transition.name, 'kind': 'single-task', 'return_path':  app.request.uri }) }}" class="{{ task_workflow_metadata(task, 'transition.class', transition)|e('html_attr') }}">{{ task_workflow_metadata(task, 'transition.verb', transition)|trans }}</a>
+                            <li>
+                                <a class="dropdown-item"
+                                    href="{{ path('chill_task_task_transition', { 'taskId': task.id, 'transition': transition.name, 'kind': 'single-task', 'return_path':  app.request.uri }) }}" class="{{ task_workflow_metadata(task, 'transition.class', transition)|e('html_attr') }}">
+                                    {{ task_workflow_metadata(task, 'transition.verb', transition)|trans }}
+                                </a>
+                            </li>
                             {% endfor %}
-                </div>
+                        </ul>
                     </div>
                 </li>
                 {% endif %}
+                
                 {% if is_granted('CHILL_TASK_TASK_UPDATE', task) %}
                 <li>
                     <a class="btn btn-update" href="{{ path('chill_task_single_task_edit', { 'id': task.id }) }}">
@@ -112,6 +126,7 @@
                     </a>
                 </li>
                 {% endif %}
+                
                 {% if is_granted('CHILL_TASK_TASK_CREATE', task) %}
                 <li>
                     <a href="{{ path('chill_task_single_task_delete', { 'id': task.id } ) }}" class="btn btn-delete">
@@ -119,7 +134,10 @@
                     </a>
                 </li>
                 {% endif %}
-
             </ul>
             
+        </div>
+    </div>
+</div>
+
 {% endblock %}