From 9f5086e9c17fad761772d7a171f9a764935b4f58 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Sun, 1 Aug 2021 19:42:21 +0200
Subject: [PATCH] small buttons in lists, coherence of messages

---
 .../Resources/views/Activity/list.html.twig   |  9 +-
 .../views/AccompanyingCourse/index.html.twig  |  2 +-
 .../views/AccompanyingPeriod/_list.html.twig  | 98 +++++++++----------
 .../Resources/views/Entity/person.html.twig   |  2 +-
 .../views/Person/list_with_period.html.twig   |  2 +-
 .../translations/messages.fr.yml              |  3 +-
 .../views/Entity/thirdparty.html.twig         |  2 +-
 7 files changed, 58 insertions(+), 60 deletions(-)

diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig
index 449f48077..a312b3858 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig
@@ -125,20 +125,23 @@
                     </ul>
                     <ul class="record_actions">
                         <li>
-                            <a href="{{ path('chill_activity_activity_show', { 'id': activity.id, 'person_id': person_id, 'accompanying_period_id': accompanying_course_id }) }}" class="btn btn-show "></a>
+                            <a href="{{ path('chill_activity_activity_show', { 'id': activity.id, 'person_id': person_id, 'accompanying_period_id': accompanying_course_id }) }}"
+                               class="btn btn-sm btn-show "></a>
                         </li>
                         {# TOOD
                         {% if is_granted('CHILL_ACTIVITY_UPDATE', activity) %}
                         #}
                         <li>
-                            <a href="{{ path('chill_activity_activity_edit', { 'id': activity.id, 'person_id': person_id, 'accompanying_period_id': accompanying_course_id }) }}" class="btn btn-update "></a>
+                            <a href="{{ path('chill_activity_activity_edit', { 'id': activity.id, 'person_id': person_id, 'accompanying_period_id': accompanying_course_id }) }}"
+                               class="btn btn-sm btn-update "></a>
                         </li>
                         {# TOOD
                         {% endif %}
                         {% if is_granted('CHILL_ACTIVITY_DELETE', activity) %}
                         #}
                         <li>
-                            <a href="{{ path('chill_activity_activity_delete', { 'id': activity.id, 'person_id' : person_id, 'accompanying_period_id': accompanying_course_id } ) }}" class="btn btn-delete "></a>
+                            <a href="{{ path('chill_activity_activity_delete', { 'id': activity.id, 'person_id' : person_id, 'accompanying_period_id': accompanying_course_id } ) }}"
+                               class="btn btn-sm btn-delete "></a>
                         </li>
                         {#
                         {% endif %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig
index 3294ba57c..d488c2684 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig
@@ -8,7 +8,7 @@
     {% if person.isSharingHousehold %}
         <li>
             <a href="{{ chill_path_add_return_path('chill_person_household_summary', { 'household_id': person.getCurrentHousehold.id }) }}"
-               class="btn btn-chill-pink" title="{{ 'Show household'|trans ~ ' n° ' ~ person.getCurrentHousehold.id }}">
+               class="btn btn-sm btn-chill-pink" title="{{ 'Show household'|trans ~ ' n° ' ~ person.getCurrentHousehold.id }}">
                 <i class="fa fa-home"></i>
             </a>
         </li>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list.html.twig
index 997494a8d..8ad71196e 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list.html.twig
@@ -2,47 +2,44 @@
     <div class="flex-table">
         {% for accompanying_period in accompanying_periods %}
             <div class="item-bloc">
-                <div class="item-row">
 
+                <div class="item-row">
                     <div class="item-col">
                         <span class="h3">
                             <i class="fa fa-fw fa-random"></i>
                             <b>{{ accompanying_period.id }}</b>
                         </span>
                         {% if accompanying_period.step == 'DRAFT' %}
-                            <span class="badge bg-primary">{{- 'Draft'|trans|upper -}}</span>
+                            <span class="badge bg-secondary">{{- 'Draft'|trans|upper -}}</span>
                         {% else %}
-                            <span class="badge bg-primary">{{- 'Confirmed'|trans|upper -}}</span>
+                            <span class="badge bg-success">{{- 'Confirmed'|trans|upper -}}</span>
                         {% endif %}
                         {% if accompanying_period.emergency %}
-                            <span class="badge bg-primary">{{- 'Emergency'|trans|upper -}}</span>
+                            <span class="badge bg-danger">{{- 'Emergency'|trans|upper -}}</span>
                         {% endif %}
                         {% if accompanying_period.confidential %}
-                            <span class="badge bg-primary">{{- 'Confidential'|trans|upper -}}</span>
+                            <span class="badge bg-warning">{{- 'Confidential'|trans|upper -}}</span>
                         {% endif %}
                     </div>
                     <div class="item-col"></div>
-
                 </div>
                 <div class="item-row">
-
                     <div class="item-col">
-                    {% if accompanying_period.closingDate == null %}
-                        {{ 'accompanying_period.dates_from_%opening_date%'|trans({ '%opening_date%': accompanying_period.openingDate|format_date('long') } ) }}
-                    {% else %}
-                        {{ 'accompanying_period.dates_from_%opening_date%_to_%closing_date%'|trans({
-                            '%opening_date%': accompanying_period.openingDate|format_date('long'),
-                            '%closing_date%': accompanying_period.closingDate|format_date('long')}
-                        ) }}
-                        {% if accompanying_period.isOpen == false %}
-                            <dl class="chill_view_data">
-                                <dt>{{ 'Closing motive'|trans }}&nbsp;:</dt>
-                                <dd>{{ accompanying_period.closingMotive|chill_entity_render_box }}</dd>
-                            </dl>
+                        {% if accompanying_period.closingDate == null %}
+                            {{ 'accompanying_period.dates_from_%opening_date%'|trans({ '%opening_date%': accompanying_period.openingDate|format_date('long') } ) }}
+                        {% else %}
+                            {{ 'accompanying_period.dates_from_%opening_date%_to_%closing_date%'|trans({
+                                '%opening_date%': accompanying_period.openingDate|format_date('long'),
+                                '%closing_date%': accompanying_period.closingDate|format_date('long')}
+                            ) }}
+                            {% if accompanying_period.isOpen == false %}
+                                <dl class="chill_view_data">
+                                    <dt>{{ 'Closing motive'|trans }}&nbsp;:</dt>
+                                    <dd>{{ accompanying_period.closingMotive|chill_entity_render_box }}</dd>
+                                </dl>
+                            {% endif %}
                         {% endif %}
-                    {% endif %}
                     </div>
-
                     <div class="item-col">
                         {% if chill_accompanying_periods.fields.user == 'visible'  %}
                             {% if accompanying_period.user %}
@@ -52,10 +49,9 @@
                             {% endif %}
                         {% endif %}
                     </div>
-
                 </div>
-                <div class="item-row separator">
 
+                <div class="item-row separator">
                     <div class="item-col"><h3>{{ 'Participants'|trans }}</h3></div>
                     <div class="item-col">
                         {% if accompanying_period.participations.count > 0 %}
@@ -70,10 +66,8 @@
                             <span class="chill-no-data-statement">{{ 'No data given'|trans }}</span>
                         {% endif %}
                     </div>
-
                 </div>
                 <div class="item-row">
-
                     <div class="item-col"><h3>{{ 'Requestor'|trans }}</h3></div>
                     <div class="item-col">
                         {% if accompanying_period.requestorPerson is not null or accompanying_period.requestorThirdParty is not null %}
@@ -91,10 +85,8 @@
                             <span class="chill-no-data-statement">{{ 'No data given'|trans }}</span>
                         {% endif %}
                     </div>
-
                 </div>
                 <div class="item-row">
-
                     <h3>{{ 'Social issues'|trans }}</h3>
                     {% if accompanying_period.socialIssues.count > 0 %}
                         {% for si in accompanying_period.socialIssues %}
@@ -103,45 +95,47 @@
                     {% else %}
                         <span class="chill-no-data-statement">{{ 'No data given'|trans }}</span>
                     {% endif %}
-
                 </div>
-                <div class="item-row separator">
 
+                <div class="item-row separator">
                     <ul class="record_actions">
 
                         {# TODO if enable_accompanying_course_with_multiple_persons is true ... #}
                         <li>
                             <a href="{{ path('chill_person_accompanying_course_index', { 'accompanying_period_id': accompanying_period.id }) }}"
-                               class="btn btn-show" title="{{ 'See accompanying period'|trans }}">{{ 'See this period'|trans }}</a>
+                               class="btn btn-sm btn-show" title="{{ 'See accompanying period'|trans }}">{# {{ 'See this period'|trans }} #}</a>
                         </li>
 
-                        {# TODO cause error in household context. only works in person context
-                        <li>
-                            <a  href="{{ path('chill_person_accompanying_period_update', {'person_id' : person.id, 'period_id' : accompanying_period.id } ) }}"
-                                class="btn btn-update" title="{{ 'Edit Accompanying Course'|trans }}"></a>
-                        </li>
-                        {% if accompanying_period.isOpen == true %}
+                        {% if person is defined %}
                             <li>
-                                <a href="{{ path('chill_person_accompanying_period_close', {'person_id' : person.id}) }}"
-                                   class="btn btn-update change-icon">
-                                    <i class="fa fa-fw fa-lock" aria-hidden="true"></i>
-                                    {{'Close accompanying period'|trans }}
-                                </a>
+                                <a  href="{{ path('chill_person_accompanying_period_update', {'person_id' : person.id, 'period_id' : accompanying_period.id } ) }}"
+                                    class="btn btn-sm btn-update" title="{{ 'Edit accompanying period'|trans }}"></a>
                             </li>
+                            {% if accompanying_period.isOpen == true %}
+                                <li>
+                                    <a href="{{ path('chill_person_accompanying_period_close', {'person_id' : person.id}) }}"
+                                       class="btn btn-sm btn-update change-icon">
+                                        <i class="fa fa-fw fa-lock" aria-hidden="true"></i>
+                                        {{'Close accompanying period'|trans }}
+                                    </a>
+                                </li>
+                            {% endif %}
+                            {% if accompanying_period.canBeReOpened(person) == true %}
+                                <li>
+                                    <a href="{{ path('chill_person_accompanying_period_re_open', {'person_id' : person.id, 'period_id' : accompanying_period.id } ) }}"
+                                       class="btn btn-sm btn-create change-icon">
+                                        <i class="fa fa-fw fa-unlock" aria-hidden="true"></i>
+                                        {{'Re-open accompanying period'|trans }}
+                                    </a>
+                                </li>
+                            {% endif %}
+                        {% elseif household is defined %}
+                            {# TODO buttons specific for household ? #}
                         {% endif %}
-                        {% if accompanying_period.canBeReOpened(person) == true %}
-                            <li>
-                                <a href="{{ path('chill_person_accompanying_period_re_open', {'person_id' : person.id, 'period_id' : accompanying_period.id } ) }}"
-                                   class="btn btn-create change-icon">
-                                    <i class="fa fa-fw fa-unlock" aria-hidden="true"></i>
-                                    {{'Re-open accompanying period'|trans }}
-                                </a>
-                            </li>
-                        {% endif %}
-                        #}
+
                     </ul>
-
                 </div>
+
             </div>
         {% endfor %}
     </div>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig
index 67c5fc59f..e618eeab2 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig
@@ -128,7 +128,7 @@
 
             {%- if options['customButtons']['replace'] is not defined and is_granted('CHILL_PERSON_SEE', person) -%}
                 <li>
-                    <a class="btn btn-show" target="_blank" title="{{ 'Show person'|trans }}"
+                    <a class="btn btn-sm btn-show" target="_blank" title="{{ 'Show person'|trans }}"
                     href="{{ path('chill_person_view', { person_id: person.id }) }}"></a>
                 </li>
             {%- else -%}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/list_with_period.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/list_with_period.html.twig
index dc2f5e054..f35ca0a60 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/list_with_period.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/list_with_period.html.twig
@@ -1,7 +1,7 @@
 {%  macro button_person(person) %}
     <li>
         <a href="{{ path('chill_person_accompanying_period_list', { 'person_id' : person.id }) }}"
-           class="btn btn-primary" title="{{ 'See accompanying periods'|trans }}"><i class="fa fa-random"></i></a>
+           class="btn btn-sm btn-primary" title="{{ 'See accompanying periods'|trans }}"><i class="fa fa-random"></i></a>
     </li>
 {% endmacro %}
 
diff --git a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
index 048d4a61a..52254295b 100644
--- a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
@@ -192,7 +192,8 @@ Social issues: Problématiques sociales
 Last events on accompanying course: Dernières actions de suivi
 Edit & activate accompanying course: Modifier et valider
 See accompanying periods: Voir les périodes d'accompagnement
-See accompanying period: Voir cette période d'accompagnement
+See accompanying period: Voir la période
+Edit accompanying period: Modifier la période
 See this period: Voir cette période
 Referrer: Référent
 Some peoples does not belong to any household currently. Add them to an household soon: Certaines personnes n'appartiennent à aucun ménage actuellement. Renseignez leur appartenance à un ménage dès que possible.
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/views/Entity/thirdparty.html.twig b/src/Bundle/ChillThirdPartyBundle/Resources/views/Entity/thirdparty.html.twig
index 44a6beabe..4ad66ce1d 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/views/Entity/thirdparty.html.twig
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/views/Entity/thirdparty.html.twig
@@ -94,7 +94,7 @@
 
                 {%- if options['customButtons']['replace'] is not defined and is_granted('CHILL_3PARTY_3PARTY_SHOW', thirdparty) -%}
                     <li>
-                        <a class="btn btn-show" target="_blank" title="{{ 'Show thirdparty'|trans }}"
+                        <a class="btn btn-sm btn-show" target="_blank" title="{{ 'Show thirdparty'|trans }}"
                             href="{{ path('chill_3party_3party_show', { thirdparty_id: thirdparty.id }) }}"></a>
                     </li>
                 {%- else -%}