From ba43b6b02579406da96131827ccb749567f59016 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Tue, 25 Apr 2023 15:41:28 +0200
Subject: [PATCH] Fix: align ux design styles to chill theme

---
 .../views/Button/button_group.html.twig         |  2 +-
 .../AccompanyingCourseWork/_item.html.twig      |  2 +-
 .../_objectifs_results_evaluations.html.twig    | 17 +++++++++--------
 .../views/AccompanyingCourseWork/show.html.twig | 11 +++++------
 ...owEvaluationDocumentInNotification.html.twig | 17 +++++++++--------
 .../showInNotification.html.twig                |  2 +-
 6 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/Button/button_group.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/Button/button_group.html.twig
index f83cafd51..2babe1ad9 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/Button/button_group.html.twig
+++ b/src/Bundle/ChillDocStoreBundle/Resources/views/Button/button_group.html.twig
@@ -1,5 +1,5 @@
 {%- import "@ChillDocStore/Macro/macro.html.twig" as m -%}
-<div
+<div class="d-inline-flex"
     data-download-buttons
     data-stored-object="{{ document_json|json_encode|escape('html_attr') }}"
     data-can-edit="{{ can_edit ? '1' : '0' }}"
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_item.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_item.html.twig
index 2a6dea8a1..7891d8cd4 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_item.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_item.html.twig
@@ -133,7 +133,7 @@
                 <ul class="item-col record_actions">
                     {% if displayNotification is defined and displayNotification == true %}
                         <li>
-                            <a class="btn btn-notify btn-outline-primary" title="{{ 'notification.Notify'|trans }}"
+                            <a class="btn btn-notify" title="{{ 'notification.Notify'|trans }}"
                                href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWork', 'entityId': w.id}) }}">
 
                             </a>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_objectifs_results_evaluations.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_objectifs_results_evaluations.html.twig
index e66dde463..4ab0b6e08 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_objectifs_results_evaluations.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_objectifs_results_evaluations.html.twig
@@ -118,9 +118,7 @@
                                         </li>
                                     {% endif %}
                                 {% endif %}
-
                             </ul>
-
                         </li>
                     </ul>
                     {% if recordAction is defined %}
@@ -136,16 +134,19 @@
                         {% import "@ChillDocStore/Macro/macro.html.twig" as m %}
                         {% import "@ChillDocStore/Macro/macro_mimeicon.html.twig" as mm %}
                         {% if e.documents|length > 0 %}
-
-                            <table class="table mt-4 mx-auto">
+                            <table class="table table-hover align-middle mt-4 mx-auto">
                                 {% for d in e.documents %}
-                                    <tr class="border-0">
+                                    <tr>
                                         <td class="border-0">{{ d.title }}</td>
                                         <td class="border-0">{{ mm.mimeIcon(d.storedObject.type) }}</td>
-                                        <td class="border-0">
-                                            <a class="btn btn-notify btn-sm btn-outline-primary" title="{{ 'notification.Notify'|trans }} " href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWorkEvaluationDocument', 'entityId': d.id}) }}"></a>
+                                        <td class="border-0 text-end">
+                                            <a class="btn btn-notify btn-sm"
+                                               title="{{ 'notification.Notify'|trans }}"
+                                               href="{{ chill_path_add_return_path('chill_main_notification_create', {
+                                                   'entityClass': 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWorkEvaluationDocument', 'entityId': d.id
+                                               }) }}"></a>
+                                            {{ d.storedObject|chill_document_button_group(d.title, is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_UPDATE', w), {'small': true}) }}
                                         </td>
-                                        <td class="border-0 text-end">{{ d.storedObject|chill_document_button_group(d.title, is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_UPDATE', w), {'small': true}) }}</td>
                                     </tr>
                                 {% endfor %}
                             </table>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/show.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/show.html.twig
index 96b47e6c9..8d508539d 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/show.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/show.html.twig
@@ -35,7 +35,6 @@
                 <a href="{{ path('chill_person_accompanying_period_work_list', { 'id': accompanyingCourse.id }) }}"
                    class="btn btn-cancel">{{ 'Back to the list'|trans }}</a>
             </li>
-            <li>{{ macro.workflowButton(work) }}</li>
             <li>
                 <div class="d-grid gap-2 {% if accompanyingCourse.hasUser and accompanyingCourse.user is not same as(app.user) %}btn-group{% endif %}" {% if accompanyingCourse.hasUser and accompanyingCourse.user is not same as(app.user) %}role="group"{% endif %}>
                     {% if accompanyingCourse.hasUser and accompanyingCourse.user is not same as(app.user) %}
@@ -46,21 +45,21 @@
                                 <a class="dropdown-item" href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWork', 'entityId': work.id, 'tos': [accompanyingCourse.user.id]}) }}">{{ 'notification.Notify referrer'|trans }}</a>
                             </li>
                             <li>
-                                <a class="dropdown-item btn-outline-primary" href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWork', 'entityId': work.id}) }}">"{{ 'notification.Notify any'|trans }}"</a>
+                                <a class="dropdown-item" href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWork', 'entityId': work.id}) }}">{{ 'notification.Notify any'|trans }}</a>
                             </li>
                         </ul>
                     {% else %}
-                        <a class="btn btn-notify btn-outline-primary" title="{{ 'notification.Notify'|trans }}" href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWork', 'entityId': work.id}) }}">
+                        <a class="btn btn-notify" title="{{ 'notification.Notify'|trans }}" href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWork', 'entityId': work.id}) }}">
                         </a>
-
                     {% endif %}
                 </div>
             </li>
+            <li>{{ macro.workflowButton(work) }}</li>
             {% if is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_UPDATE', work) %}
                 <li>
-                    <a class="btn btn-edit" title="{{ 'Edit'|trans }}"
+                    <a class="btn btn-edit"
                        href="{{ chill_path_add_return_path('chill_person_accompanying_period_work_edit', { 'id': work.id }) }}"
-                    ></a>
+                    >{{ 'Edit'|trans }}</a>
                 </li>
             {% endif %}
             {% if is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_DELETE', work) %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/showEvaluationDocumentInNotification.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/showEvaluationDocumentInNotification.html.twig
index 6d5d22a7d..4ea70d9f0 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/showEvaluationDocumentInNotification.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/showEvaluationDocumentInNotification.html.twig
@@ -1,23 +1,24 @@
 {% macro recordAction(document) %}
     {% import "@ChillDocStore/Macro/macro_mimeicon.html.twig" as mm %}
     <div class="item-row">
-
-        <table class="table table-bordered border-dark mt-4 mx-auto">
+        <table class="table table-hover align-middle mt-4 mx-auto">
             <tr>
-                <td class="text-lg-center text-bg-primary">{{ document.title }}</td>
-                <td class="text-lg-center m-3">{{ mm.mimeIcon(document.storedObject.type) }}</td>
-                <td class="record-actions text-lg-center"><a
+                <td class="border-0">{{ document.title }}</td>
+                <td class="border-0">{{ mm.mimeIcon(document.storedObject.type) }}</td>
+                <td class="border-0 text-end record-actions">
+                    <a class="btn btn-show"
                         href="{{ path('chill_person_accompanying_period_work_show', { 'id': document.accompanyingPeriodWorkEvaluation.accompanyingPeriodWork.id }) }}"
-                        class="btn btn-show" title="{{ 'See the document'|trans }}"></a></td>
+                        title="{{ 'See the document'|trans }}"></a>
+                </td>
             </tr>
         </table>
     </div>
 {% endmacro %}
 {% if document is not null %}
 
-    <div class="flex-table">
+    <div class="flex-table accompanying-course-work">
         {% if is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_EVALUATION_DOCUMENT_SHOW', document) %}
-            <div class="item-bloc">
+            <div class="item-bloc colored">
                 {% include '@ChillPerson/AccompanyingCourseWork/_objectifs_results_evaluations.html.twig' with {
                     'w': document.accompanyingPeriodWorkEvaluation.accompanyingPeriodWork,
                     'd': document.storedObject,
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/showInNotification.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/showInNotification.html.twig
index 9b06e306c..fdafcc040 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/showInNotification.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/showInNotification.html.twig
@@ -6,7 +6,7 @@
     </li>
 {% endmacro %}
 {% if work is not null %}
-    <div class="flex-table">
+    <div class="flex-table accompanying-course-work">
         {% if is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_SEE', work) %}
             {% include "@ChillPerson/AccompanyingCourseWork/_item.html.twig" with {
                 'itemBlocClass': 'bg-chill-llight-gray',