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

adding unlink chill button

Browse Source
This commit is contained in:
Mathieu Jaumotte 2021-09-10 11:38:18 +02:00
parent 753e6c1105
commit ff7cb6ca79
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Bundle/ChillMainBundle/Resources/public/chill/scss/buttons.scss
View File

@ -19,7 +19,8 @@ $chill-theme-buttons: (
"view": $chill-blue, "view": $chill-blue,
"misc": $gray-300, "misc": $gray-300,
"cancel": $gray-300, "cancel": $gray-300,
"choose": $gray-300 "choose": $gray-300,
"unlink": $chill-red,
); );
@each $button, $color in $chill-theme-buttons { @each $button, $color in $chill-theme-buttons {
@ -45,6 +46,7 @@ $chill-theme-buttons: (
&.btn-delete, &.btn-delete,
&.btn-danger, &.btn-danger,
&.btn-remove, &.btn-remove,
&.btn-unlink,
&.btn-action, &.btn-action,
&.btn-edit, &.btn-edit,
&.btn-update { &.btn-update {
@ -67,6 +69,7 @@ $chill-theme-buttons: (
// &.btn-submit::before, // &.btn-submit::before,
// &.btn-reset::before, // &.btn-reset::before,
// &.btn-action::before, // &.btn-action::before,
&.btn-unlink::before,
&.btn-delete::before, &.btn-delete::before,
&.btn-remove::before, &.btn-remove::before,
&.btn-choose::before, &.btn-choose::before,
@ -94,6 +97,7 @@ $chill-theme-buttons: (
&.btn-remove::before { content: "\f00d"; } // fa-times &.btn-remove::before { content: "\f00d"; } // fa-times
&.btn-cancel::before { content: "\f060"; } // fa-arrow-left &.btn-cancel::before { content: "\f060"; } // fa-arrow-left
&.btn-choose::before { content: "\f00c"; } // fa-check // f046 fa-check-square-o &.btn-choose::before { content: "\f00c"; } // fa-check // f046 fa-check-square-o
&.btn-unlink::before { content: "\f127"; } // fa-chain-broken
} }

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

@ -88,14 +88,13 @@
{% macro customButtons(member, household) %} {% macro customButtons(member, household) %}
<li> <li>
<a href="{{ chill_path_add_return_path('chill_person_household_members_editor', {'persons': [ member.person.id ], 'household': household.id} ) }}" <a href="{{ chill_path_add_return_path('chill_person_household_members_editor', {'persons': [ member.person.id ], 'allow_leave_without_household': true } ) }}"
class="btn btn-sm btn-misc"><i class="fa fa-arrows-h"></i> class="btn btn-sm btn-unlink" title="{{ 'household.person.leave'|trans }}">
{{ 'household.Change position'|trans }}</a> {{ 'household.Leave'|trans }}</a>
</li> </li>
<li> <li>
<a href="{{ chill_path_add_return_path('chill_person_household_members_editor', {'persons': [ member.person.id ], 'allow_leave_without_household': true } ) }}" <a href="{{ chill_path_add_return_path('chill_person_household_members_editor', {'persons': [ member.person.id ], 'household': household.id} ) }}"
class="btn btn-sm btn-misc"><i class="fa fa-sign-out"></i> class="btn btn-sm btn-misc" title="{{ 'household.Change position'|trans }}"><i class="fa fa-arrows-h"></i></a>
{{ 'household.Leave'|trans }}</a>
</li> </li>
{% endmacro %} {% endmacro %}

6
src/Bundle/ChillPersonBundle/translations/messages+intl-icu.fr.yaml
View File

@ -23,7 +23,9 @@ household:
Those members does not share address: Ces usagers ne partagent pas l'adresse du ménage. Those members does not share address: Ces usagers ne partagent pas l'adresse du ménage.
Any persons into this position: Aucune personne n'appartient au ménage à cette position. Any persons into this position: Aucune personne n'appartient au ménage à cette position.
Leave household: Quitter le ménage Leave household: Quitter le ménage
Leave: Quitter Leave: Détacher
person:
leave: L'usager quitte le ménage
Join: Rejoindre un ménage Join: Rejoindre un ménage
Change position: Repositionner Change position: Repositionner
Household file: Dossier ménage Household file: Dossier ménage
@ -54,7 +56,7 @@ household:
Expecting for birth on date: Naissance attendue pour le {date} Expecting for birth on date: Naissance attendue pour le {date}
Expecting for birth: Naissance attendue (date inconnue) Expecting for birth: Naissance attendue (date inconnue)
Any expecting birth: Aucune naissance proche n'a été renseignée. Any expecting birth: Aucune naissance proche n'a été renseignée.
Comment and expecting birth: Commentaire et naissance attendue Comment and expecting birth: Mettre à jour le commentaire
Edit member metadata: Données supplémentaires Edit member metadata: Données supplémentaires
comment_membership: Commentaire général sur les membres comment_membership: Commentaire général sur les membres
expecting_birth: Naissance attendue ? expecting_birth: Naissance attendue ?