diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig index 9fba77a7b..9faacd430 100644 --- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig +++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig @@ -3,15 +3,9 @@

{{ "Activity"|trans }}

-{% set notifications = chill_list_notifications('Chill\\ActivityBundle\\Entity\\Activity', entity.id) %} -{% if notifications is not empty %} - {{ notifications|raw }} -{% endif %} -
-
{% endblock content %} + +{% block block_post_menu %} +
+ + + + {% set notifications = chill_list_notifications('Chill\\ActivityBundle\\Entity\\Activity', entity.id) %} + {% if notifications is not empty %} + {{ notifications|raw }} + {% endif %} + +
+{% endblock %} diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/showInNotification.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/showInNotification.html.twig index af1b5d884..fc39696bf 100644 --- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/showInNotification.html.twig +++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/showInNotification.html.twig @@ -1,10 +1,20 @@ {# available variables: notification, activity #} {% if activity is not null %} - {% if is_granted('CHILL_ACTIVITY_SEE', activity) %} - Go to Activity - {% else %} - you are not allowed to see it details. This is the minimal data: {{ activity.id }} - {% endif %} +
+ {% if is_granted('CHILL_ACTIVITY_SEE', activity) %} + + Go to Activity + + + {% else %} +
+ {{ 'This is the minimal activity data'|trans ~ ': ' ~ activity.id }}
+ {{ 'you are not allowed to see it details'|trans }} +
+ {% endif %} +
{% else %} - You get notified of an activity which does not exists any more. +
+ {{ 'You get notified of an activity which does not exists any more'|trans }} +
{% endif %} diff --git a/src/Bundle/ChillActivityBundle/translations/messages.fr.yml b/src/Bundle/ChillActivityBundle/translations/messages.fr.yml index 00715d283..4a21603ca 100644 --- a/src/Bundle/ChillActivityBundle/translations/messages.fr.yml +++ b/src/Bundle/ChillActivityBundle/translations/messages.fr.yml @@ -224,3 +224,7 @@ Aggregate by activity reason: Aggréger par sujet de l'activité Last activities: Les dernières activités See activity in accompanying course context: Voir l'activité dans le contexte du parcours d'accompagnement + +You get notified of an activity which does not exists any more: Cette notification ne correspond pas à une activité valide. +you are not allowed to see it details: La notification fait référence à une activité à laquelle vous n'avez pas accès. +This is the minimal activity data: Activité n° diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/showInNotification.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/showInNotification.html.twig index 62220c44e..630dcf100 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/showInNotification.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/showInNotification.html.twig @@ -14,8 +14,8 @@ } %} {% else %}
- {{ 'This is the minimal details'|trans ~ ': ' ~ period.id }}
- {{ 'You are getting a notification for a period you are not allowed to see.'|trans }} + {{ 'This is the minimal period details'|trans ~ ': ' ~ period.id }}
+ {{ 'You are getting a notification for a period you are not allowed to see'|trans }}
{% endif %}
diff --git a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml index c1bc89f50..3ee212ea2 100644 --- a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml +++ b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml @@ -485,6 +485,6 @@ period_notification: Social issues are: Les problématiques sociales renseignées sont les suivantes See it online: Visualisez le parcours en ligne -You are getting a notification for a period which does not exists any more: Cette notification ne correspond pas à une période d'accompagnement valide -You are getting a notification for a period you are not allowed to see.: La notification fait référence à une période d'accompagnement à laquelle vous n'avez pas accès. -This is the minimal details: Dossier n° +You are getting a notification for a period which does not exists any more: Cette notification ne correspond pas à une période d'accompagnement valide. +You are getting a notification for a period you are not allowed to see: La notification fait référence à une période d'accompagnement à laquelle vous n'avez pas accès. +This is the minimal period details: Période d'accompagnement n°