Merge remote-tracking branch 'origin/master' into features/household-members-list

This commit is contained in:
2021-06-10 10:29:57 +02:00
115 changed files with 4871 additions and 5460 deletions

View File

@@ -1,8 +1,8 @@
<span class="chill-entity chill-entity__person">
{%- if addLink and is_granted('CHILL_PERSON_SEE', person) -%}
{%- set showLink = true -%}<a href="{{ chill_path_add_return_path('chill_person_view', { 'person_id': person.id }) }}">{%- endif -%}
<span class="chill-entity__person__first-name">{{ person.firstName }}</span>
<span class="chill-entity__person__last-name">{{ person.lastName }}</span>
<span class="chill_denomination">{{ person.firstName }}</span>
<span class="chill_denomination">{{ person.lastName }}</span>
{%- if addAltNames -%}
{%- for n in person.altNames -%}
{%- if loop.first -%}({% else %} {%- endif -%}

View File

@@ -0,0 +1,13 @@
{% set reversed_parents = parents|reverse %}
<span class="chill-entity chill-entity__social-action">
<span class="badge badge-primary">
{%- for p in reversed_parents %}
<span class="chill-entity__social-action__parent--{{ loop.revindex0 }}">
{{ p.title|localize_translatable_string }}{{ options['default.separator'] }}
</span>
{%- endfor -%}
<span class="chill-entity__social-action__child">
{{ socialAction.title|localize_translatable_string }}
</span>
</span>
</span>