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

Merge branch 'issue484_link_household' into 'master'

Browse Source 
add current household link to person banner

See merge request Chill-Projet/chill-bundles!369
This commit is contained in:
Julien Fastré 2022-03-06 21:58:37 +00:00
commit f0849eeef5
3 changed files with 66 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -32,6 +32,7 @@ and this project adheres to
* [template] do not list inactive templates (for doc generator) * [template] do not list inactive templates (for doc generator)
* [parcours] location cannot be removed if linked to a user (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/478) * [parcours] location cannot be removed if linked to a user (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/478)
* [person] email added to twig personRenderbox (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/490) * [person] email added to twig personRenderbox (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/490)
* [person] Add link to current household in person banner (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/484)
## Test releases ## Test releases

105
src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss
View File

@ -37,57 +37,68 @@ div.banner {
margin-right: 1em; margin-right: 1em;
} }
} }
.household-link {
border: 1px solid white;
padding: .05rem .3rem;
border-radius: 5px;
color: white;
cursor: pointer;
&:hover {
background-color: white;
color: $chill-person-context
}
}
} }
} }
div.person-view { div.person-view {
figure.person-details { figure.person-details {
h2 { h2 {
font-family: 'Open Sans'; font-family: 'Open Sans';
font-weight: 600; font-weight: 600;
margin-bottom: 0.3em; margin-bottom: 0.3em;
font-variant: small-caps; font-variant: small-caps;
} }
dl { dl {
margin-top: 0.3em; margin-top: 0.3em;
} }
dt { dt {
font-family: 'Open Sans'; font-family: 'Open Sans';
font-weight: 600; font-weight: 600;
} }
dd { dd {
margin-left: 0; margin-left: 0;
} }
/* /*
a.sc-button { background-color: $black; padding-top: 0.2em; padding-bottom: 0.2em; } a.sc-button { background-color: $black; padding-top: 0.2em; padding-bottom: 0.2em; }
*/ */
} }
/* custom fields on the home page */ /* custom fields on the home page */
div.custom-fields { div.custom-fields {
figure.person-details { figure.person-details {
display: flex; display: flex;
flex-flow: row wrap; flex-flow: row wrap;
div.cf_title_box:nth-child(4n+1) h2 { div.cf_title_box:nth-child(4n+1) h2 {
@extend .chill-red !optional; @extend .chill-red !optional;
} }
div.cf_title_box:nth-child(4n+2) h2 { div.cf_title_box:nth-child(4n+2) h2 {
@extend .chill-green !optional; @extend .chill-green !optional;
} }
div.cf_title_box:nth-child(4n+3) h2 { div.cf_title_box:nth-child(4n+3) h2 {
@extend .chill-orange !optional; @extend .chill-orange !optional;
} }
div.cf_title_box:nth-child(4n+4) h2 { div.cf_title_box:nth-child(4n+4) h2 {
@extend .chill-blue !optional; @extend .chill-blue !optional;
} }
div.cf_title_box:nth-child(2n+1) { div.cf_title_box:nth-child(2n+1) {
width: 50%; width: 50%;
margin-right: 40px; margin-right: 40px;
} }
div.cf_title_box:nth-child(2n+2) { div.cf_title_box:nth-child(2n+2) {
width: calc(50% - 40px); width: calc(50% - 40px);
} }
} }
} }
} }
/* /*

7
src/Bundle/ChillPersonBundle/Resources/views/Person/banner.html.twig
View File

@ -58,6 +58,13 @@
}) }} }) }}
</span> </span>
{%- endif -%} {%- endif -%}
{% if person.getCurrentHousehold is not null %}
<span>
<a class="household-link" href="{{ chill_path_add_return_path('chill_person_household_summary', { 'household_id' : person.getCurrentHousehold.id } ) }}">
<i class="fa fa-home"></i>
</a>
</span>
{% endif %}
</div> </div>
</div> </div>