diff --git a/src/Bundle/ChillMainBundle/Resources/views/Notification/extension_list_notifications_for.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Notification/extension_list_notifications_for.html.twig index 748061891..de25fb236 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Notification/extension_list_notifications_for.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Notification/extension_list_notifications_for.html.twig @@ -1,4 +1,4 @@ -

{{ 'notification.Notifications'|trans }}

+

{{ 'notification.Notifications'|trans }}

{% for notification in notifications %} diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig index 1aed45550..488179951 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig @@ -184,7 +184,26 @@
{% endif %} - + +
+
+

{{ 'notification.Notifications'|trans }}

+ {% set notif_counter = chill_count_notifications('Chill\\PersonBundle\\Entity\\AccompanyingPeriod', accompanyingCourse.id) %} + {% if notif_counter.total > 0 %} + + {% endif %} + +
+
@@ -210,18 +229,16 @@ {% include 'ChillActivityBundle:Activity:list_recent.html.twig' with { 'context': 'accompanyingCourse', 'no_action': true } %}
{% endblock %} - + +
+ {% set notifications = chill_list_notifications('Chill\\PersonBundle\\Entity\\AccompanyingPeriod', accompanyingCourse.id) %} + {% if notifications is not empty %} + {{ notifications|raw }} + {% endif %} +
{% endblock %} {% block block_post_menu %} -
-
- - - {{ 'notification.Notify'|trans }} - -
- {{ chill_list_notifications('Chill\\PersonBundle\\Entity\\AccompanyingPeriod', accompanyingCourse.id) }} -
+
{% endblock %}