From 36419cf5f0dbecf3f79ba59b626b92fe368e7b44 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Tue, 6 Jul 2021 14:17:39 +0200
Subject: [PATCH] fix button colors

---
 .../views/CustomFieldsGroup/index.html.twig   |  2 +-
 .../modules/bootstrap/custom/_buttons.scss    |  1 +
 .../views/AccompanyingCourse/index.html.twig  | 13 ++--
 .../views/Household/members.html.twig         | 15 ++---
 .../views/Household/summary.html.twig         | 45 ++++---------
 .../Resources/views/Person/edit.html.twig     |  2 +-
 .../views/Person/household_history.html.twig  | 64 +++++++------------
 .../Resources/views/Person/list.html.twig     |  3 +-
 .../Person/list_by_phonenumber.html.twig      |  3 +-
 .../views/Person/list_with_period.html.twig   |  4 +-
 .../views/PersonDuplicate/view.html.twig      | 14 ++--
 .../views/SingleTask/_list.html.twig          |  4 +-
 .../Resources/views/SingleTask/edit.html.twig | 12 ++--
 13 files changed, 72 insertions(+), 110 deletions(-)

diff --git a/src/Bundle/ChillCustomFieldsBundle/Resources/views/CustomFieldsGroup/index.html.twig b/src/Bundle/ChillCustomFieldsBundle/Resources/views/CustomFieldsGroup/index.html.twig
index 9e31c1b75..8ca67a721 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Resources/views/CustomFieldsGroup/index.html.twig
+++ b/src/Bundle/ChillCustomFieldsBundle/Resources/views/CustomFieldsGroup/index.html.twig
@@ -47,7 +47,7 @@
                 <td>
                 <ul class="record_actions">
                     <li>
-                        <a href="{{ path('customfieldsgroup_show', { 'id': entity.id }) }}" class="btn">{{ 'show'|trans|capitalize }}</a>
+                        <a href="{{ path('customfieldsgroup_show', { 'id': entity.id }) }}" class="btn btn-show">{{ 'show'|trans|capitalize }}</a>
                     </li>
                     <li>
                         <a href="{{ path('customfieldsgroup_edit', { 'id': entity.id }) }}" class="btn btn-edit">{{ 'edit'|trans|capitalize }}</a>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/bootstrap/custom/_buttons.scss b/src/Bundle/ChillMainBundle/Resources/public/modules/bootstrap/custom/_buttons.scss
index 07f61e9bf..359d81ccb 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/modules/bootstrap/custom/_buttons.scss
+++ b/src/Bundle/ChillMainBundle/Resources/public/modules/bootstrap/custom/_buttons.scss
@@ -40,6 +40,7 @@
        color: $light;
    }
    
+   &.btn-misc,
    &.btn-cancel {
       background-color: $chill-light-gray;
       color: $black;
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig
index 92fbb5ef1..68ecf3edb 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig
@@ -107,14 +107,11 @@
                             </li>
                             {% if p.person.isSharingHousehold %}
                             <li>
-                                <a
-                                  href="{{ chill_path_add_return_path(
-                                    'chill_person_household_summary',
-                                    { 'household_id': p.person.getCurrentHousehold.id }
-                                    ) }}"
-                                  class="btn">
-                                  <i class="fa fa-home"></i>
-                                  n°&nbsp;{{ p.person.getCurrentHousehold.id }}
+                                <a href="{{ chill_path_add_return_path('chill_person_household_summary', { 'household_id': p.person.getCurrentHousehold.id }) }}"
+                                    class="btn btn-misc">
+                                    <i class="fa fa-home"></i>
+                                    n°&nbsp;
+                                    {{ p.person.getCurrentHousehold.id }}
                                 </a>
                             </li>
                             {% endif %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/members.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/members.html.twig
index 70eb9a386..c761747aa 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/members.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/members.html.twig
@@ -94,18 +94,15 @@
               </ul>
               <ul class="record_actions">
                 <li>
-                  <a 
-                  href="{{ chill_path_add_return_path('chill_person_household_members_editor', {
-                      'persons': [ m.person.id ], 
-                      'allow_leave_without_household': true 
-                    } ) }}" class="btn" title="{{ 'household.Leave household'|trans }}" />
-                    <i class="fa fa-sign-out"></i>
-                    {{ 'household.Leave household'|trans }}
-                  </a>
+                    <a href="{{ chill_path_add_return_path('chill_person_household_members_editor', {'persons': [ m.person.id ], 'allow_leave_without_household': true } ) }}" 
+                        class="btn btn-misc" title="{{ 'household.Leave household'|trans }}" />
+                        <i class="fa fa-sign-out"></i>
+                        {{ 'household.Leave household'|trans }}
+                    </a>
                 </li>
                 <li>
                     <a href="{{ chill_path_add_return_path('chill_person_household_member_edit', { 'id': m.id }) }}" 
-                    class="btn btn-edit" title="{{ 'household.Update membership'|trans }}"/></a>
+                        class="btn btn-edit" title="{{ 'household.Update membership'|trans }}"/></a>
                 </li>
               </ul>
             </div>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig
index a51dd49bd..abfdb45aa 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig
@@ -108,40 +108,24 @@
               </ul>
               <ul class="record_actions">
                 <li>
-                  <a 
-                  href="{{ chill_path_add_return_path('chill_person_household_member_edit', { 'id': m.id }) }}" 
-                  class="btn btn-edit" 
-                  />
-                    {{ 'household.Update membership'|trans }}
-                  </a>
+                    <a href="{{ chill_path_add_return_path('chill_person_household_member_edit', { 'id': m.id }) }}" 
+                        class="btn btn-edit" />
+                        {{ 'household.Update membership'|trans }}
+                    </a>
                 </li>
                 <li>
-                  <a 
-                  href="{{ chill_path_add_return_path(
-                    'chill_person_household_members_editor', 
-                    {
-                      'persons': [ m.person.id ],
-                      'household': household.id
-                    } ) }}"
-                    class="btn" 
-                    />
-                    <i class="fa fa-arrows-h"></i>
-                    {{ 'household.Change position'|trans }}
-                  </a>
+                    <a href="{{ chill_path_add_return_path('chill_person_household_members_editor', {'persons': [ m.person.id ], 'household': household.id} ) }}"
+                        class="btn btn-misc" />
+                        <i class="fa fa-arrows-h"></i>
+                        {{ 'household.Change position'|trans }}
+                    </a>
                 </li>
                 <li>
-                  <a 
-                  href="{{ chill_path_add_return_path(
-                    'chill_person_household_members_editor', 
-                    {
-                      'persons': [ m.person.id ], 
-                      'allow_leave_without_household': true 
-                    } ) }}"
-                    class="btn" 
-                    />
-                    <i class="fa fa-sign-out"></i>
-                    {{ 'household.Leave'|trans }}
-                  </a>
+                    <a href="{{ chill_path_add_return_path('chill_person_household_members_editor', {'persons': [ m.person.id ], 'allow_leave_without_household': true } ) }}"
+                        class="btn btn-misc" />
+                        <i class="fa fa-sign-out"></i>
+                        {{ 'household.Leave'|trans }}
+                    </a>
                 </li>
               </ul>
             </div>
@@ -234,4 +218,3 @@
 {% block js %}
 {{ encore_entry_script_tags('household_edit_metadata') }}
 {% endblock %}
-
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/edit.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/edit.html.twig
index 0c8d54803..9f65d150c 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/edit.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/edit.html.twig
@@ -90,7 +90,7 @@
 
     {{ form_rest(form) }}
 
-    <ul class="col-12 record_actions sticky-form-buttons">
+    <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 }}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/household_history.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/household_history.html.twig
index 453afc1e2..8bf415380 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/household_history.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/household_history.html.twig
@@ -17,15 +17,10 @@
 
   <ul class="record_actions">
     <li>
-      <a class="btn"
-        href="{{ 
-          chill_path_add_return_path(
-          'chill_person_household_members_editor', 
-            { 'persons': [ person.id ]}) }}"
-      >
-        <i class="fa fa-sign-out"></i>
-        {{ 'household.Join'|trans }}
-      </a>
+        <a class="btn btn-misc" href="{{chill_path_add_return_path('chill_person_household_members_editor', { 'persons': [ person.id ]}) }}">
+            <i class="fa fa-sign-out"></i>
+            {{ 'household.Join'|trans }}
+        </a>
     </li>
   </ul>
 
@@ -39,15 +34,10 @@
                 <div class="household__address--date"></div>
                 <div class="household__address--content">
                     <div class="cell">
-                      <a class="btn"
-                      href="{{ 
-                        chill_path_add_return_path(
-                        'chill_person_household_members_editor', 
-                          { 'persons': [ person.id ]}) }}"
-                      >
-                      <i class="fa fa-sign-out"></i>
-                      {{ 'household.Join'|trans }}
-                      </a>
+                        <a class="btn btn-misc" href="{{ chill_path_add_return_path('chill_person_household_members_editor', { 'persons': [ person.id ]}) }}">
+                            <i class="fa fa-sign-out"></i>
+                            {{ 'household.Join'|trans }}
+                        </a>
                     </div>
                 </div>
             </div>
@@ -69,14 +59,9 @@
                         <div>
                           <p>
                           <i class="fa fa-home"></i>
-                          <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>
+                            <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 %} 
                         </div>
@@ -95,24 +80,19 @@
                             {%- endfor -%}
                             {% endif %}
                             <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>
-                              </li>
-                              {% if p.isCurrent() %}
                                 <li>
-                                  <a class="btn"
-                                  href="{{ chill_path_add_return_path(
-                                    'chill_person_household_members_editor', 
-                                      { 'persons': [ person.id ], 'allow_leave_without_household': true }) }}"
-                                  >
-                                  <i class="fa fa-sign-out"></i>
-                                  {{ 'household.Leave'|trans }}
-                                  </a>
+                                    <a href="{{ chill_path_add_return_path('chill_person_household_member_edit', { id: p.id }) }}"
+                                        class="btn btn-edit">
+                                    </a>
                                 </li>
-                              {% endif %}
+                                {% if p.isCurrent() %}
+                                <li>
+                                    <a class="btn btn-misc" href="{{ chill_path_add_return_path( 'chill_person_household_members_editor', { 'persons': [ person.id ], 'allow_leave_without_household': true }) }}">
+                                        <i class="fa fa-sign-out"></i>
+                                        {{ 'household.Leave'|trans }}
+                                    </a>
+                                </li>
+                                {% endif %}
                             </ul>
                         </div>
                       </div>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/list.html.twig
index 18380d7ce..2371ded7b 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/list.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/list.html.twig
@@ -97,7 +97,7 @@
                 {% endif %}
                 {% if preview == true and persons|length < total %}
                 <li>
-                    <a href="{{ path('chill_main_search', { "name": search_name|default('abcd'), "q" : pattern }) }}" class="btn">
+                    <a href="{{ path('chill_main_search', { "name": search_name|default('abcd'), "q" : pattern }) }}" class="btn btn-misc">
                         {{ 'See all results'|trans }}
                     </a>
                 </li>
@@ -116,4 +116,3 @@
 {% if preview == false %}
 {{ chill_pagination(paginator) }}
 {% endif %}
-
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/list_by_phonenumber.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/list_by_phonenumber.html.twig
index 2b8ac99d9..c182047b2 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/list_by_phonenumber.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/list_by_phonenumber.html.twig
@@ -94,7 +94,7 @@
                 {% endif %}
                 {% if preview == true and persons|length < total %}
                 <li>
-                    <a href="{{ path('chill_main_search', { "name": search_name|default('abcd'), "q" : pattern }) }}" class="btn">
+                    <a href="{{ path('chill_main_search', { "name": search_name|default('abcd'), "q" : pattern }) }}" class="btn btn-misc">
                         {{ 'See all results'|trans }}
                     </a>
                 </li>
@@ -105,4 +105,3 @@
 {% if preview == false %}
 {{ chill_pagination(paginator) }}
 {% endif %}
-
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 feca248a1..192f69d7a 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
@@ -27,7 +27,7 @@
     {% endif %}
     {% if preview == true and persons | length < total %}
         <li>
-            <a href="{{ path('chill_main_search', { "name": search_name|default('abcd'), "q" : pattern }) }}" class="btn">
+            <a href="{{ path('chill_main_search', { "name": search_name|default('abcd'), "q" : pattern }) }}" class="btn btn-misc">
                 {{ 'See all results'|trans }}
             </a>
         </li>
@@ -156,7 +156,7 @@
         {% endif %}
         {% if preview == true and persons|length < total %}
         <li>
-            <a href="{{ path('chill_main_search', { "name": search_name|default('abcd'), "q" : pattern }) }}" class="btn">
+            <a href="{{ path('chill_main_search', { "name": search_name|default('abcd'), "q" : pattern }) }}" class="btn btn-misc">
                 {{ 'See all results'|trans }}
             </a>
         </li>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/view.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/view.html.twig
index 84e75c20a..e92fb9181 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/view.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/view.html.twig
@@ -63,9 +63,11 @@
                         <i class="fa fa-cog fa-fw"></i>{{ 'Merge'|trans }}</a>
                     </li>
                     <li>
-                        <a class="btn" title="{{ 'Switch to truefalse'|trans }}"
-                           href="{{ path('chill_person_duplicate_not_duplicate', {person1_id : person.id, person2_id : duplicatePerson.id}) }}">
-                        <i class="fa fa-toggle-on fa-fw"></i>{{ 'duplicate'|trans }}</a>
+                        <a class="btn btn-misc" title="{{ 'Switch to truefalse'|trans }}"
+                            href="{{ path('chill_person_duplicate_not_duplicate', {person1_id : person.id, person2_id : duplicatePerson.id}) }}">
+                            <i class="fa fa-toggle-on fa-fw"></i>
+                            {{ 'duplicate'|trans }}
+                        </a>
                     </li>
                 </ul>
             </td>
@@ -125,9 +127,11 @@
                             <a class="btn btn-show" target="_blank" href="{{ path('chill_person_view', { person_id : notDuplicatePerson.id }) }}"></a>
                         </li>
                         <li>
-                            <a class="btn" title="{{ 'Switch to duplicate'|trans }}"
+                            <a class="btn btn-misc" title="{{ 'Switch to duplicate'|trans }}"
                                href="{{ path('chill_person_remove_duplicate_not_duplicate', {person1_id : person.id, person2_id : notDuplicatePerson.id}) }}">
-                            <i class="fa fa-toggle-off fa-fw"></i>{{ 'not-duplicate'|trans }}</a>
+                               <i class="fa fa-toggle-off fa-fw"></i>
+                               {{ 'not-duplicate'|trans }}
+                           </a>
                         </li>
                     </ul>
                 </td>
diff --git a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/_list.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/_list.html.twig
index 2e105fa84..d8d8565aa 100644
--- a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/_list.html.twig
+++ b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/_list.html.twig
@@ -127,7 +127,7 @@
             {% else %}
                 <ul class="record_actions">
                     <li>
-                        <a href="{{ path('chill_task_singletask_list', app.request.query.all|merge({ 'status': [ status ] })) }}" class="btn">
+                        <a href="{{ path('chill_task_singletask_list', app.request.query.all|merge({ 'status': [ status ] })) }}" class="btn btn-misc">
                             {{ 'See more' | trans }}
                         </a>
                     </li>
@@ -166,7 +166,7 @@
     
     <ul class="record_actions">
         <li>
-            <button type="submit" class="btn">{{ 'Filter'|trans }}</button>
+            <button type="submit" class="btn btn-submit">{{ 'Filter'|trans }}</button>
         </li>
     </ul>
     {{ form_end(form)}}
diff --git a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/edit.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/edit.html.twig
index 9db73cf34..9203180f7 100644
--- a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/edit.html.twig
+++ b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/edit.html.twig
@@ -36,11 +36,13 @@
 
     <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') }}">
-                {% else %}
-                {{ path('chill_task_single_task_show', { 'id': task.id, 'list_params': app.request.query.get('list_params', { } )} ) }}" class="btn">
-                {% endif %}
+            <a class="btn btn-cancel" href="{% apply spaceless %}
+                    {% if app.request.query.has('returnPath') %}
+                        {{ app.request.query.get('returnPath')|escape('html_attr') }}">
+                    {% else %}
+                        {{ path('chill_task_single_task_show', { 'id': task.id, 'list_params': app.request.query.get('list_params', { } )} ) }}
+                    {% endif %}
+                {% endapply %}">
                 {{ app.request.query.get('returnLabel')|default('Cancel'|trans) }}
             </a>
         </li>