diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/_workflow.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/_workflow.html.twig index e9147ed4a..e9f9400ea 100644 --- a/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/_workflow.html.twig +++ b/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/_workflow.html.twig @@ -41,24 +41,28 @@ {% endif %} -
- {{ 'This course is located at a temporarily address. You should locate this course to an user'|trans }}
+ {{ 'This course is located at a temporary address. You should link this course to a user'|trans }} {% if not hasPersonLocation %}- {{ 'Associate at least one member with an household, and set an address to this household'|trans }}
+ {{ 'Associate at least one member with a household, and set an address to this household'|trans }} {% endif %} diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/close.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/close.html.twig index 64c2dd86b..dbc5587e0 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/close.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/close.html.twig @@ -21,9 +21,11 @@ {{ 'Return'|trans }} -{{ 'accompanying_course_work.Any work'|trans }} - + {% if is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_CREATE', accompanyingCourse) %} + + {% endif %}
{% else %} @@ -26,12 +28,14 @@ {{ chill_pagination(paginator) }} diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list.html.twig index 307c462e2..3e8da5671 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list.html.twig @@ -5,17 +5,21 @@ {% macro recordAction(period, contextEntity) %} {# TODO if enable_accompanying_course_with_multiple_persons is true ... #} -{{ 'residential_address_person_explanation'|trans }}
-{{ 'residential_address_person_explanation'|trans }}
+