fix button colors

2025-08-21 15:13:50 +00:00 · 2021-07-06 14:17:39 +02:00
parent c96f407e6a
commit 36419cf5f0
13 changed files with 72 additions and 110 deletions
--- 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 %}
--- 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>
--- 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 %}
-
--- 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 }}
--- 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>
--- 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 %}
-
--- 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 %}
-
--- 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>
--- 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>