diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/buttons.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/buttons.scss index 6b54172c7..14c22685b 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/buttons.scss +++ b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/buttons.scss @@ -19,7 +19,8 @@ $chill-theme-buttons: ( "view": $chill-blue, "misc": $gray-300, "cancel": $gray-300, - "choose": $gray-300 + "choose": $gray-300, + "unlink": $chill-red, ); @each $button, $color in $chill-theme-buttons { @@ -45,6 +46,7 @@ $chill-theme-buttons: ( &.btn-delete, &.btn-danger, &.btn-remove, + &.btn-unlink, &.btn-action, &.btn-edit, &.btn-update { @@ -67,6 +69,7 @@ $chill-theme-buttons: ( // &.btn-submit::before, // &.btn-reset::before, // &.btn-action::before, + &.btn-unlink::before, &.btn-delete::before, &.btn-remove::before, &.btn-choose::before, @@ -94,6 +97,7 @@ $chill-theme-buttons: ( &.btn-remove::before { content: "\f00d"; } // fa-times &.btn-cancel::before { content: "\f060"; } // fa-arrow-left &.btn-choose::before { content: "\f00c"; } // fa-check // f046 fa-check-square-o + &.btn-unlink::before { content: "\f127"; } // fa-chain-broken } diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig index 89bb4da14..1568b6bed 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig @@ -88,14 +88,13 @@ {% macro customButtons(member, household) %}
  • - - {{ 'household.Change position'|trans }} + + {{ 'household.Leave'|trans }}
  • - - {{ 'household.Leave'|trans }} +
  • {% endmacro %} diff --git a/src/Bundle/ChillPersonBundle/translations/messages+intl-icu.fr.yaml b/src/Bundle/ChillPersonBundle/translations/messages+intl-icu.fr.yaml index cdaf55cc8..f1362e7ae 100644 --- a/src/Bundle/ChillPersonBundle/translations/messages+intl-icu.fr.yaml +++ b/src/Bundle/ChillPersonBundle/translations/messages+intl-icu.fr.yaml @@ -23,7 +23,9 @@ household: 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. Leave household: Quitter le ménage - Leave: Quitter + Leave: Détacher + person: + leave: L'usager quitte le ménage Join: Rejoindre un ménage Change position: Repositionner Household file: Dossier ménage @@ -54,7 +56,7 @@ household: Expecting for birth on date: Naissance attendue pour le {date} Expecting for birth: Naissance attendue (date inconnue) 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 comment_membership: Commentaire général sur les membres expecting_birth: Naissance attendue ?