Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-07 18:44:08 +00:00
Code Issues Actions Projects Releases Wiki Activity

fix button colors

Browse Source
This commit is contained in:
Mathieu Jaumotte 2021-07-06 14:17:39 +02:00
parent c96f407e6a
commit 36419cf5f0
13 changed files with 72 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Bundle/ChillCustomFieldsBundle/Resources/views/CustomFieldsGroup/index.html.twig
View File

@ -47,7 +47,7 @@
<td> <td>
<ul class="record_actions"> <ul class="record_actions">
<li> <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>
<li> <li>
<a href="{{ path('customfieldsgroup_edit', { 'id': entity.id }) }}" class="btn btn-edit">{{ 'edit'|trans|capitalize }}</a> <a href="{{ path('customfieldsgroup_edit', { 'id': entity.id }) }}" class="btn btn-edit">{{ 'edit'|trans|capitalize }}</a>

1
src/Bundle/ChillMainBundle/Resources/public/modules/bootstrap/custom/_buttons.scss
View File

@ -40,6 +40,7 @@
color: $light; color: $light;
} }
&.btn-misc,
&.btn-cancel { &.btn-cancel {
background-color: $chill-light-gray; background-color: $chill-light-gray;
color: $black; color: $black;

13
src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig
View File

@ -107,14 +107,11 @@
</li> </li>
{% if p.person.isSharingHousehold %} {% if p.person.isSharingHousehold %}
<li> <li>
<a <a href="{{ chill_path_add_return_path('chill_person_household_summary', { 'household_id': p.person.getCurrentHousehold.id }) }}"
href="{{ chill_path_add_return_path( class="btn btn-misc">
'chill_person_household_summary', <i class="fa fa-home"></i>
{ 'household_id': p.person.getCurrentHousehold.id } n°&nbsp;
) }}" {{ p.person.getCurrentHousehold.id }}
class="btn">
<i class="fa fa-home"></i>
n°&nbsp;{{ p.person.getCurrentHousehold.id }}
</a> </a>
</li> </li>
{% endif %} {% endif %}

15
src/Bundle/ChillPersonBundle/Resources/views/Household/members.html.twig
View File

@ -94,18 +94,15 @@
</ul> </ul>
<ul class="record_actions"> <ul class="record_actions">
<li> <li>
<a <a href="{{ chill_path_add_return_path('chill_person_household_members_editor', {'persons': [ m.person.id ], 'allow_leave_without_household': true } ) }}"
href="{{ chill_path_add_return_path('chill_person_household_members_editor', { class="btn btn-misc" title="{{ 'household.Leave household'|trans }}" />
'persons': [ m.person.id ], <i class="fa fa-sign-out"></i>
'allow_leave_without_household': true {{ 'household.Leave household'|trans }}
} ) }}" class="btn" title="{{ 'household.Leave household'|trans }}" /> </a>
<i class="fa fa-sign-out"></i>
{{ 'household.Leave household'|trans }}
</a>
</li> </li>
<li> <li>
<a href="{{ chill_path_add_return_path('chill_person_household_member_edit', { 'id': m.id }) }}" <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> </li>
</ul> </ul>
</div> </div>

45
src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig
View File

@ -108,40 +108,24 @@
</ul> </ul>
<ul class="record_actions"> <ul class="record_actions">
<li> <li>
<a <a href="{{ chill_path_add_return_path('chill_person_household_member_edit', { 'id': m.id }) }}"
href="{{ chill_path_add_return_path('chill_person_household_member_edit', { 'id': m.id }) }}" class="btn btn-edit" />
class="btn btn-edit" {{ 'household.Update membership'|trans }}
/> </a>
{{ 'household.Update membership'|trans }}
</a>
</li> </li>
<li> <li>
<a <a href="{{ chill_path_add_return_path('chill_person_household_members_editor', {'persons': [ m.person.id ], 'household': household.id} ) }}"
href="{{ chill_path_add_return_path( class="btn btn-misc" />
'chill_person_household_members_editor', <i class="fa fa-arrows-h"></i>
{ {{ 'household.Change position'|trans }}
'persons': [ m.person.id ], </a>
'household': household.id
} ) }}"
class="btn"
/>
<i class="fa fa-arrows-h"></i>
{{ 'household.Change position'|trans }}
</a>
</li> </li>
<li> <li>
<a <a href="{{ chill_path_add_return_path('chill_person_household_members_editor', {'persons': [ m.person.id ], 'allow_leave_without_household': true } ) }}"
href="{{ chill_path_add_return_path( class="btn btn-misc" />
'chill_person_household_members_editor', <i class="fa fa-sign-out"></i>
{ {{ 'household.Leave'|trans }}
'persons': [ m.person.id ], </a>
'allow_leave_without_household': true
} ) }}"
class="btn"
/>
<i class="fa fa-sign-out"></i>
{{ 'household.Leave'|trans }}
</a>
</li> </li>
</ul> </ul>
</div> </div>
@ -234,4 +218,3 @@
{% block js %} {% block js %}
{{ encore_entry_script_tags('household_edit_metadata') }} {{ encore_entry_script_tags('household_edit_metadata') }}
{% endblock %} {% endblock %}

2
src/Bundle/ChillPersonBundle/Resources/views/Person/edit.html.twig
View File

@ -90,7 +90,7 @@
{{ form_rest(form) }} {{ form_rest(form) }}
<ul class="col-12 record_actions sticky-form-buttons"> <ul class="record_actions sticky-form-buttons">
<li class="cancel"> <li class="cancel">
<a href="{{ path('chill_person_view', {'person_id' : person.id}) }}" class="btn btn-cancel"> <a href="{{ path('chill_person_view', {'person_id' : person.id}) }}" class="btn btn-cancel">
{{ 'Return'|trans }} {{ 'Return'|trans }}

64
src/Bundle/ChillPersonBundle/Resources/views/Person/household_history.html.twig
View File

@ -17,15 +17,10 @@
<ul class="record_actions"> <ul class="record_actions">
<li> <li>
<a class="btn" <a class="btn btn-misc" href="{{chill_path_add_return_path('chill_person_household_members_editor', { 'persons': [ person.id ]}) }}">
href="{{ <i class="fa fa-sign-out"></i>
chill_path_add_return_path( {{ 'household.Join'|trans }}
'chill_person_household_members_editor', </a>
{ 'persons': [ person.id ]}) }}"
>
<i class="fa fa-sign-out"></i>
{{ 'household.Join'|trans }}
</a>
</li> </li>
</ul> </ul>
@ -39,15 +34,10 @@
<div class="household__address--date"></div> <div class="household__address--date"></div>
<div class="household__address--content"> <div class="household__address--content">
<div class="cell"> <div class="cell">
<a class="btn" <a class="btn btn-misc" href="{{ chill_path_add_return_path('chill_person_household_members_editor', { 'persons': [ person.id ]}) }}">
href="{{ <i class="fa fa-sign-out"></i>
chill_path_add_return_path( {{ 'household.Join'|trans }}
'chill_person_household_members_editor', </a>
{ 'persons': [ person.id ]}) }}"
>
<i class="fa fa-sign-out"></i>
{{ 'household.Join'|trans }}
</a>
</div> </div>
</div> </div>
</div> </div>
@ -69,14 +59,9 @@
<div> <div>
<p> <p>
<i class="fa fa-home"></i> <i class="fa fa-home"></i>
<a <a href="{{ chill_path_add_return_path('chill_person_household_summary',{ 'household_id': p.household.id }) }}">
href="{{ chill_path_add_return_path( {{ 'household.Household number'|trans({'household_num': p.household.id }) }}
'chill_person_household_summary', </a>
{ 'household_id': p.household.id }
) }}"
>
{{ 'household.Household number'|trans({'household_num': p.household.id }) }}
</a>
</p> </p>
<p>{{ p.position.label|localize_translatable_string }} {% if p.holder %}<span class="badge bg-primary">{{ 'household.holder'|trans }}</span>{% endif %} <p>{{ p.position.label|localize_translatable_string }} {% if p.holder %}<span class="badge bg-primary">{{ 'household.holder'|trans }}</span>{% endif %}
</div> </div>
@ -95,24 +80,19 @@
{%- endfor -%} {%- endfor -%}
{% endif %} {% endif %}
<ul class="record_actions"> <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> <li>
<a class="btn" <a href="{{ chill_path_add_return_path('chill_person_household_member_edit', { id: p.id }) }}"
href="{{ chill_path_add_return_path( class="btn btn-edit">
'chill_person_household_members_editor', </a>
{ 'persons': [ person.id ], 'allow_leave_without_household': true }) }}"
>
<i class="fa fa-sign-out"></i>
{{ 'household.Leave'|trans }}
</a>
</li> </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> </ul>
</div> </div>
</div> </div>

3
src/Bundle/ChillPersonBundle/Resources/views/Person/list.html.twig
View File

@ -97,7 +97,7 @@
{% endif %} {% endif %}
{% if preview == true and persons|length < total %} {% if preview == true and persons|length < total %}
<li> <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 }} {{ 'See all results'|trans }}
</a> </a>
</li> </li>
@ -116,4 +116,3 @@
{% if preview == false %} {% if preview == false %}
{{ chill_pagination(paginator) }} {{ chill_pagination(paginator) }}
{% endif %} {% endif %}

3
src/Bundle/ChillPersonBundle/Resources/views/Person/list_by_phonenumber.html.twig
View File

@ -94,7 +94,7 @@
{% endif %} {% endif %}
{% if preview == true and persons|length < total %} {% if preview == true and persons|length < total %}
<li> <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 }} {{ 'See all results'|trans }}
</a> </a>
</li> </li>
@ -105,4 +105,3 @@
{% if preview == false %} {% if preview == false %}
{{ chill_pagination(paginator) }} {{ chill_pagination(paginator) }}
{% endif %} {% endif %}

4
src/Bundle/ChillPersonBundle/Resources/views/Person/list_with_period.html.twig
View File

@ -27,7 +27,7 @@
{% endif %} {% endif %}
{% if preview == true and persons | length < total %} {% if preview == true and persons | length < total %}
<li> <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 }} {{ 'See all results'|trans }}
</a> </a>
</li> </li>
@ -156,7 +156,7 @@
{% endif %} {% endif %}
{% if preview == true and persons|length < total %} {% if preview == true and persons|length < total %}
<li> <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 }} {{ 'See all results'|trans }}
</a> </a>
</li> </li>

14
src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/view.html.twig
View File

@ -63,9 +63,11 @@
<i class="fa fa-cog fa-fw"></i>{{ 'Merge'|trans }}</a> <i class="fa fa-cog fa-fw"></i>{{ 'Merge'|trans }}</a>
</li> </li>
<li> <li>
<a class="btn" title="{{ 'Switch to truefalse'|trans }}" <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}) }}"> 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> <i class="fa fa-toggle-on fa-fw"></i>
{{ 'duplicate'|trans }}
</a>
</li> </li>
</ul> </ul>
</td> </td>
@ -125,9 +127,11 @@
<a class="btn btn-show" target="_blank" href="{{ path('chill_person_view', { person_id : notDuplicatePerson.id }) }}"></a> <a class="btn btn-show" target="_blank" href="{{ path('chill_person_view', { person_id : notDuplicatePerson.id }) }}"></a>
</li> </li>
<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}) }}"> 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> </li>
</ul> </ul>
</td> </td>

4
src/Bundle/ChillTaskBundle/Resources/views/SingleTask/_list.html.twig
View File

@ -127,7 +127,7 @@
{% else %} {% else %}
<ul class="record_actions"> <ul class="record_actions">
<li> <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 }} {{ 'See more' | trans }}
</a> </a>
</li> </li>
@ -166,7 +166,7 @@
<ul class="record_actions"> <ul class="record_actions">
<li> <li>
<button type="submit" class="btn">{{ 'Filter'|trans }}</button> <button type="submit" class="btn btn-submit">{{ 'Filter'|trans }}</button>
</li> </li>
</ul> </ul>
{{ form_end(form)}} {{ form_end(form)}}

12
src/Bundle/ChillTaskBundle/Resources/views/SingleTask/edit.html.twig
View File

@ -36,11 +36,13 @@
<ul class="record_actions sticky-form-buttons"> <ul class="record_actions sticky-form-buttons">
<li class="cancel"> <li class="cancel">
<a class="btn btn-cancel" href="{% if app.request.query.has('returnPath') %} <a class="btn btn-cancel" href="{% apply spaceless %}
{{ app.request.query.get('returnPath')|escape('html_attr') }}"> {% if app.request.query.has('returnPath') %}
{% else %} {{ app.request.query.get('returnPath')|escape('html_attr') }}">
{{ path('chill_task_single_task_show', { 'id': task.id, 'list_params': app.request.query.get('list_params', { } )} ) }}" class="btn"> {% else %}
{% endif %} {{ 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) }} {{ app.request.query.get('returnLabel')|default('Cancel'|trans) }}
</a> </a>
</li> </li>