From 73c4a5d39dc149983669f8002dce16a553d4e4e9 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Sun, 30 Jan 2022 19:45:09 +0100
Subject: [PATCH] better color coherency with buttons

---
 .../Resources/views/Activity/list.html.twig          |  6 ++++--
 .../Resources/views/Activity/show.html.twig          |  3 +--
 .../Resources/views/Activity/showPerson.html.twig    |  3 +--
 .../views/AccompanyingCourseDocument/show.html.twig  | 12 ++++++------
 .../Resources/public/chill/scss/buttons.scss         |  2 +-
 .../_components/EntityWorkflow/ListWorkflowModal.vue |  6 +++---
 .../Resources/views/Notification/create.html.twig    |  4 ++--
 .../views/AccompanyingCourse/index.html.twig         |  3 +--
 8 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig
index 7ae24fa4b..f8b68eabd 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig
@@ -2,10 +2,12 @@
     {% if is_granted('CHILL_ACTIVITY_SEE_DETAILS', activity) %}
         {% if no_action is not defined or no_action == false %}
             <li>
-                <a class="btn btn-notify" href="{{ chill_path_add_return_path('chill_main_notification_create', {
+                <a class="btn btn-misc" href="{{ chill_path_add_return_path('chill_main_notification_create', {
                     'entityClass': 'Chill\\ActivityBundle\\Entity\\Activity',
                     'entityId': activity.id
-                }) }}">{{ 'notification.Notify'|trans }}</a>
+                }) }}">
+                    <i class="fa fa-paper-plane fa-fw"></i>
+                    {{ 'notification.Notify'|trans }}</a>
             </li>
         {% endif %}
         {% if context == 'person' and activity.accompanyingPeriod is not empty %}
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
index d133041a0..ccde41b42 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
@@ -205,8 +205,7 @@
         </a>
     </li>
     <li>
-        <a class="btn btn-misc" href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\ActivityBundle\\Entity\\Activity', 'entityId': entity.id}) }}">
-            <i class="fa fa-paper-plane fa-fw"></i>
+        <a class="btn btn-notify" href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\ActivityBundle\\Entity\\Activity', 'entityId': entity.id}) }}">
             {{ 'notification.Notify'|trans }}
         </a>
     </li>
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/showPerson.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/showPerson.html.twig
index 4723edf27..e593b0131 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/showPerson.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/showPerson.html.twig
@@ -28,8 +28,7 @@
     <div class="post-menu pt-4">
 
         <div class="d-grid gap-2">
-            <a class="btn btn-primary" href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\ActivityBundle\\Entity\\Activity', 'entityId': entity.id}) }}">
-                <i class="fa fa-paper-plane fa-fw"></i>
+            <a class="btn btn-notify" href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\ActivityBundle\\Entity\\Activity', 'entityId': entity.id}) }}">
                 {{ 'notification.Notify'|trans }}
             </a>
         </div>
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/show.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/show.html.twig
index fbb8cbde0..610b5249b 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/show.html.twig
+++ b/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/show.html.twig
@@ -46,12 +46,6 @@
                 {{ 'Back to the list' | trans }}
             </a>
         </li>
-        <li>
-            {% set workflows_frame = chill_entity_workflow_list('Chill\\DocStoreBundle\\Entity\\AccompanyingCourseDocument', document.id) %}
-            {% if workflows_frame is not empty %}
-                {{ workflows_frame|raw }}
-            {% endif %}
-        </li>
         <li>
             {{ m.download_button(document.object, document.title) }}
         </li>
@@ -62,6 +56,12 @@
                 </a>
             </li>
         {% endif %}
+        {% set workflows_frame = chill_entity_workflow_list('Chill\\DocStoreBundle\\Entity\\AccompanyingCourseDocument', document.id) %}
+        {% if workflows_frame is not empty %}
+            <li>
+                {{ workflows_frame|raw }}
+            </li>
+        {% endif %}
     </ul>
 </div>
 {% endblock %}
diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/buttons.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/buttons.scss
index 1eb437a2a..4c2f01a69 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/buttons.scss
+++ b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/buttons.scss
@@ -21,7 +21,7 @@ $chill-theme-buttons: (
    "download":      $gray-300,
    "cancel":        $gray-300,
    "choose":        $gray-300,
-   "notify":        $gray-300,
+   "notify":        $chill-blue,
    "unlink":        $chill-red,
    "tpchild":       $chill-pink,
 );
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/ListWorkflowModal.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/ListWorkflowModal.vue
index 0a0539ee3..d82553253 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/ListWorkflowModal.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/ListWorkflowModal.vue
@@ -1,7 +1,7 @@
 <template>
    
    <button v-if="hasWorkflow"
-      class="btn btn-misc"
+      class="btn btn-primary"
       @click="openModal">
       <b>{{ countWorkflows }}</b>
       <template v-if="countWorkflows > 1">{{ $t('workflows') }}</template>
@@ -100,8 +100,8 @@ export default {
       messages: {
          fr: {
             workflow_list: "Liste des workflows",
-            workflow: " workflow",
-            workflows: " workflows",
+            workflow: " workflow associé",
+            workflows: " workflows associés",
          }
       }
    }
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Notification/create.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Notification/create.html.twig
index ce5934e52..f15380083 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Notification/create.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Notification/create.html.twig
@@ -20,6 +20,8 @@
 
     {{ form_row(form.title, { 'label': 'notification.subject'|trans }) }}
     {{ form_row(form.addressees, { 'label': 'notification.sent_to'|trans }) }}
+    
+    {% include handler.template(notification) with handler.templateData(notification) %}
 
     <div class="mb-3 row">
         <label class="col-form-label col-sm-4" for="notification_message">{{ form_label(form.message) }}</label>
@@ -28,8 +30,6 @@
         </div>
     </div>
 
-    {% include handler.template(notification) with handler.templateData(notification) %}
-
     {{ form_end(form) }}
 
     <ul class="record_actions sticky-form-buttons">
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig
index 488179951..842152ac4 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig
@@ -197,8 +197,7 @@
                     </div>
                 {% endif %}
                 <div class="d-grid gap-2">
-                    <a class="btn btn-misc" href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod', 'entityId': accompanyingCourse.id}) }}">
-                        <i class="fa fa-paper-plane fa-fw"></i>
+                    <a class="btn btn-notify" href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod', 'entityId': accompanyingCourse.id}) }}">
                         {{ 'notification.Notify'|trans }}
                     </a>
                 </div>