Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-08-21 15:13:50 +00:00
Code Issues Actions Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Julien Fastré
2021-06-09 16:27:03 +02:00
parent e14205ae1d 8a5650a705
commit e135b98072
111 changed files with 4828 additions and 5415 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/edit.html.twig
View File

@@ -15,5 +15,5 @@
window.accompanyingCourseId = {{ accompanyingCourse.id|e('js') }};
window.vueRootComponent = 'app';
</script>
{{ encore_entry_script_tags('accompanying_course') }}
{{ encore_entry_script_tags('vue_accourse') }}
{% endblock %}

4
src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/layout.html.twig
View File

@@ -16,7 +16,7 @@
{% endblock %}
{% block css %}
{{ encore_entry_link_tags('accompanying_course') }}
{{ encore_entry_link_tags('vue_accourse') }}
{% endblock %}
{% block js %}
@@ -24,5 +24,5 @@
window.accompanyingCourseId = {{ accompanyingCourse.id|e('js') }};
window.vueRootComponent = 'banner';
</script>
{{ encore_entry_script_tags('accompanying_course') }}
{{ encore_entry_script_tags('vue_accourse') }}
{% endblock %}

4
src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig
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 -%}

13
src/Bundle/ChillPersonBundle/Resources/views/Entity/social_action.html.twig Normal file
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>