Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-08-22 23:53:50 +00:00
Code Issues Actions Projects Releases Wiki Activity

Merge branch 'bootstrap5_replacing_scratch_mat' into bootstrap5_replacing_scratch

Browse Source
This commit is contained in:
Mathieu Jaumotte
2021-07-06 13:50:17 +02:00
parent f32ffc572d 690688f5e1
commit c96f407e6a
166 changed files with 693 additions and 537 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Bundle/ChillPersonBundle/Resources/views/Household/Member/edit.html.twig
View File

@@ -13,13 +13,13 @@
<li class="cancel">
<a
href="{{ chill_return_path_or('chill_person_household_summary', { 'household_id': household.id}) }}"
class="sc-button bt-cancel"
class="btn btn-cancel"
>
{{ 'Cancel'|trans }}
</a>
</li>
<li>
<button type="submit" class="sc-button bt-save">{{ 'Save'|trans }}</button>
<button type="submit" class="btn btn-save">{{ 'Save'|trans }}</button>
</li>
</ul>

4
src/Bundle/ChillPersonBundle/Resources/views/Household/accompanying_period.html.twig
View File

@@ -10,12 +10,12 @@
<div class="form_control">
<ul class="record_actions">
<li class="cancel">
<a href="{{ path ('chill_person_household_summary', {'household_id' : household.id } ) }}" class="sc-button bt-cancel">
<a href="{{ path ('chill_person_household_summary', {'household_id' : household.id } ) }}" class="btn btn-cancel">
{{ 'Household summary'|trans }}
</a>
</li>
{#<li>
<a href="{{ path ('chill_person_household_accompanying_course_new', {'household_id' : [ household.id ] } ) }}" class="sc-button bt-create">
<a href="{{ path ('chill_person_household_accompanying_course_new', {'household_id' : [ household.id ] } ) }}" class="btn btn-create">
{{ 'Create an accompanying period'|trans }}
</a>
</li>#}

4
src/Bundle/ChillPersonBundle/Resources/views/Household/addresses.html.twig
View File

@@ -42,7 +42,7 @@
{#<ul class="record_actions">
<li>
<a href="{{ path('chill_person_household_address_edit', { 'household_id': household.id, 'address_id' : address.id } ) }}" class="sc-button bt-edit"></a>
<a href="{{ path('chill_person_household_address_edit', { 'household_id': household.id, 'address_id' : address.id } ) }}" class="btn btn-edit"></a>
</li>
</ul> #}
</div>
@@ -59,7 +59,7 @@
<ul class="record_actions">
<li>
<a class="sc-button bt-create"
<a class="btn btn-create"
href="{{ chill_path_add_return_path('chill_person_household_address_move', { 'household_id': household.id }) }}">
{{ 'Move household'|trans }}
</a>

4
src/Bundle/ChillPersonBundle/Resources/views/Household/edit_member_metadata.html.twig
View File

@@ -21,13 +21,13 @@
<li class="cancel">
<a
href="{{ chill_path_add_return_path('chill_person_household_members', { 'household_id': household.id }) }}"
class="sc-button bt-cancel"
class="btn btn-cancel"
/>
{{ 'Cancel'|trans }}
</a>
</li>
<li>
<button type="submit" class="sc-button bt-save">
<button type="submit" class="btn btn-save">
{{ 'Save'|trans }}
</button>
</li>

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

@@ -20,7 +20,7 @@
<ul class="record_actions">
<li>
<button type="submit" class="sc-button bt-save">
<button type="submit" class="btn btn-save">
{{ 'Save'|trans }}
</button>
</li>
@@ -50,7 +50,7 @@
<li>
<a
href="{{ chill_path_add_return_path('chill_person_household_members', { 'household_id': household.id, 'edit': 1 }) }}"
class="sc-button bt-edit"
class="btn btn-edit"
>
{{ 'household.Comment and expecting birth'|trans }}
</a>
@@ -98,14 +98,14 @@
href="{{ chill_path_add_return_path('chill_person_household_members_editor', {
'persons': [ m.person.id ],
'allow_leave_without_household': true
} ) }}" class="sc-button" title="{{ 'household.Leave household'|trans }}" />
} ) }}" class="btn" 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="sc-button bt-edit" title="{{ 'household.Update membership'|trans }}"/></a>
class="btn btn-edit" title="{{ 'household.Update membership'|trans }}"/></a>
</li>
</ul>
</div>
@@ -127,7 +127,7 @@
{% set members = household.nonCurrentMembersByPosition(p) %}
{% if members|length > 0 %}
<p><!-- force a space after table --></p>
<button class="sc-button bt-green" type="button" data-toggle="collapse" data-target="#nonCurrent_{{ p.id }}" aria-expanded="false" aria-controls="collapse non current members">
<button class="btn btn-green" type="button" data-toggle="collapse" data-target="#nonCurrent_{{ p.id }}" aria-expanded="false" aria-controls="collapse non current members">
{{ 'household.Show future or past memberships'|trans({'length': members|length}) }}
</button>
@@ -160,7 +160,7 @@
<li>
<a
href="{{ chill_path_add_return_path('chill_person_household_member_edit', { 'id': m.id }) }}"
class="sc-button bt-edit" title="{{ 'household.Update membership'|trans }}" /></a>
class="btn btn-edit" title="{{ 'household.Update membership'|trans }}" /></a>
</li>
</ul>
</div>
@@ -185,7 +185,7 @@
<li>
<a
href="{{ chill_path_add_return_path('chill_person_household_members_editor', {'household': household.id }) }}"
class="sc-button bt-create">
class="btn btn-create">
{{ 'household.Add a member'|trans }}
</a>
</li>

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

@@ -34,7 +34,7 @@
<ul class="record_actions">
<li>
<button type="submit" class="sc-button bt-save">
<button type="submit" class="btn btn-save">
{{ 'Save'|trans }}
</button>
</li>
@@ -63,7 +63,7 @@
<li>
<a
href="{{ chill_path_add_return_path('chill_person_household_summary', { 'household_id': household.id, 'edit': 1 }) }}"
class="sc-button bt-edit"
class="btn btn-edit"
>
{{ 'household.Comment and expecting birth'|trans }}
</a>
@@ -110,7 +110,7 @@
<li>
<a
href="{{ chill_path_add_return_path('chill_person_household_member_edit', { 'id': m.id }) }}"
class="sc-button bt-edit"
class="btn btn-edit"
/>
{{ 'household.Update membership'|trans }}
</a>
@@ -123,7 +123,7 @@
'persons': [ m.person.id ],
'household': household.id
} ) }}"
class="sc-button"
class="btn"
/>
<i class="fa fa-arrows-h"></i>
{{ 'household.Change position'|trans }}
@@ -137,7 +137,7 @@
'persons': [ m.person.id ],
'allow_leave_without_household': true
} ) }}"
class="sc-button"
class="btn"
/>
<i class="fa fa-sign-out"></i>
{{ 'household.Leave'|trans }}
@@ -163,7 +163,7 @@
{% set members = household.nonCurrentMembersByPosition(p) %}
{% if members|length > 0 %}
<p><!-- force a space after table --></p>
<button class="sc-button bt-green" type="button" data-toggle="collapse" data-target="#nonCurrent_{{ p.id }}" aria-expanded="false" aria-controls="collapse non current members">
<button class="btn btn-green" type="button" data-toggle="collapse" data-target="#nonCurrent_{{ p.id }}" aria-expanded="false" aria-controls="collapse non current members">
{{ 'household.Show future or past memberships'|trans({'length': members|length}) }}
</button>
@@ -196,7 +196,7 @@
<li>
<a
href="{{ chill_path_add_return_path('chill_person_household_member_edit', { 'id': m.id }) }}"
class="sc-button bt-edit"
class="btn btn-edit"
/>
{{ 'household.Update membership'|trans }}
</a>
@@ -223,7 +223,7 @@
<li>
<a
href="{{ chill_path_add_return_path('chill_person_household_members_editor', {'household': household.id }) }}"
class="sc-button bt-create">
class="btn btn-create">
{{ 'household.Add a member'|trans }}
</a>
</li>