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

new choose button, improve household renderbox

Browse Source
This commit is contained in:
Mathieu Jaumotte 2021-08-31 16:02:18 +02:00
parent b69fdd459a
commit 3927fd738c
4 changed files with 10 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,6 +19,7 @@ $chill-theme-buttons: (
"view": $chill-blue, "view": $chill-blue,
"misc": $gray-300, "misc": $gray-300,
"cancel": $gray-300, "cancel": $gray-300,
"choose": $gray-300
); );
@each $button, $color in $chill-theme-buttons { @each $button, $color in $chill-theme-buttons {
@ -68,6 +69,7 @@ $chill-theme-buttons: (
// &.btn-action::before, // &.btn-action::before,
&.btn-delete::before, &.btn-delete::before,
&.btn-remove::before, &.btn-remove::before,
&.btn-choose::before,
&.btn-cancel::before { &.btn-cancel::before {
font: normal normal normal 14px/1 ForkAwesome; font: normal normal normal 14px/1 ForkAwesome;
margin-right: 0.5em; margin-right: 0.5em;
@ -91,6 +93,7 @@ $chill-theme-buttons: (
&.btn-delete::before { content: "\f1f8"; } // fa-trash &.btn-delete::before { content: "\f1f8"; } // fa-trash
&.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
} }

2
src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue
View File

@ -110,7 +110,7 @@
<household-render-box :household="h"></household-render-box> <household-render-box :household="h"></household-render-box>
<ul class="record_actions"> <ul class="record_actions">
<li> <li>
<button class="btn btn-sm btn-misc" @click="selectHousehold(h)"> <button class="btn btn-sm btn-choose" @click="selectHousehold(h)">
{{ $t('household_members_editor.select_household') }} {{ $t('household_members_editor.select_household') }}
</button> </button>
</li> </li>

2
src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/js/i18n.js
View File

@ -37,7 +37,7 @@ const appMessages = {
hide_household_suggestion: "Masquer les suggestions", hide_household_suggestion: "Masquer les suggestions",
show_household_suggestion: 'Aucune suggestion | Afficher une suggestion | Afficher {count} suggestions', show_household_suggestion: 'Aucune suggestion | Afficher une suggestion | Afficher {count} suggestions',
household_for_participants_accompanying_period: "Ces ménages partagent le même parcours", household_for_participants_accompanying_period: "Ces ménages partagent le même parcours",
select_household: "Choisir ce ménage", select_household: "Sélectionner",
dates_title: "Période de validité", dates_title: "Période de validité",
dates: { dates: {
start_date: "Début de validité", start_date: "Début de validité",

36
src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/HouseholdRenderBox.vue
View File

@ -15,11 +15,10 @@
</div> </div>
<div class="item-col"> <div class="item-col">
<ul class="list-content fa-ul"> <ul class="list-content">
<!-- member part --> <!-- member part -->
<li v-if="hasCurrentMembers" class="members"> <li v-if="hasCurrentMembers" class="members" :title="$t('current_members')">
<i class="fa fa-li fa-hop" :title="$t('current_members')"></i>
<template v-for="m in currentMembers()" :key="m.id"> <template v-for="m in currentMembers()" :key="m.id">
<person-render-box render="badge" <person-render-box render="badge"
:person="m.person" :person="m.person"
@ -30,18 +29,15 @@
</person-render-box> </person-render-box>
</template> </template>
</li> </li>
<li v-else class="members"> <li v-else class="members" :title="$t('current_members')">
<i class="fa fa-li fa-hop" :title="$t('current_members')"></i>
<p class="chill-no-data-statement">{{ $t('no_members_yet') }}</p> <p class="chill-no-data-statement">{{ $t('no_members_yet') }}</p>
</li> </li>
<!-- address part --> <!-- address part -->
<li v-if="hasAddress()"> <li v-if="hasAddress()">
<i class="fa fa-li fa-map-marker"></i>
<show-address :address="household.current_address" :isMultiline="isMultiline"></show-address> <show-address :address="household.current_address" :isMultiline="isMultiline"></show-address>
</li> </li>
<li v-else> <li v-else>
<i class="fa fa-li fa-map-marker"></i>
<span class="chill-no-data-statement">{{ $t('no_current_address') }}</span> <span class="chill-no-data-statement">{{ $t('no_current_address') }}</span>
</li> </li>
@ -121,32 +117,10 @@ export default {
section.chill-entity { section.chill-entity {
&.entity-household { &.entity-household {
.fa-hop::marker { ul.list-content li::marker {
content: '::'; content: '';
} }
/*
.identifier {
//grid-area: iden;
font-size: 1.3em;
font-weight: 700;
color: var(--chill-blue);
}
display: grid;
grid-template-columns: auto auto 30%;
grid-template-areas:
"iden iden where"
"who who where";
.members {
//grid-area: who;
.current-members {
font-weight: 700;
}
}
.where {
//grid-area: where
}
*/
} }
} }
</style> </style>