Merge branch 'master' of gitlab.com:Chill-Projet/chill-bundles

This commit is contained in:
2021-08-22 14:46:20 +02:00
6 changed files with 212 additions and 227 deletions

View File

@@ -116,6 +116,7 @@
class="btn btn-show" title="{{ 'See accompanying period'|trans }}">{# {{ 'See this period'|trans }} #}</a>
</li>
<!-- if new accompanying course, this is not necessary
{% if person is defined %}
<li>
<a href="{{ path('chill_person_accompanying_period_update', {'person_id' : person.id, 'period_id' : accompanying_period.id } ) }}"
@@ -142,6 +143,7 @@
{% elseif household is defined %}
{# TODO buttons specific for household ? #}
{% endif %}
-->
</ul>
</div>

View File

@@ -18,8 +18,8 @@
</a>
</li>
<li class="dropdown">
<a class="btn btn-create change-icon dropdown-toggle"
href="#" role="button" id="newAccompanyingPeriod" data-bs-toggle="dropdown" aria-expanded="false">
<a class="btn btn-create change-icon"
href="{{ path ('chill_person_accompanying_course_new', {'person_id' : [ person.id ] } ) }}" role="button" id="newAccompanyingPeriod">
{{ 'Create an accompanying period'|trans }}
</a>
<ul class="dropdown-menu" aria-labelledby="newAccompanyingPeriod">