105 worflow

src/Bundle/ChillActivityBundle/Resources/views/Activity/_list_item.html.twig

@@ -143,9 +143,17 @@
     </div>
 
     <div class="item-row separator">
-        <ul class="record_actions">
-            {{ recordAction }}
-        </ul>
+        <div class="item-col item-meta">
+            {% set notif_counter = chill_count_notifications('Chill\\ActivityBundle\\Entity\\Activity', activity.id) %}
+            {% if notif_counter.total > 0 %}
+                {{ chill_counter_notifications('Chill\\ActivityBundle\\Entity\\Activity', activity.id) }}
+            {% endif %}
+        </div>
+        <div class="item-col">
+            <ul class="record_actions">
+                {{ recordAction }}
+            </ul>
+        </div>
     </div>
 
 </div>

src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig

@@ -1,10 +1,6 @@
 {% macro recordAction(activity, context = null, person_id = null, accompanying_course_id = null) %}
     {% if is_granted('CHILL_ACTIVITY_SEE_DETAILS', activity) %}
         {% if no_action is not defined or no_action == false %}
-            {% set notif_counter = chill_count_notifications('Chill\\ActivityBundle\\Entity\\Activity', activity.id) %}
-            {% if notif_counter.total > 0 %}
-                <li>{{ chill_counter_notifications('Chill\\ActivityBundle\\Entity\\Activity', activity.id) }}</li>
-            {% endif %}
             <li>
                 <a class="btn btn-notify" href="{{ chill_path_add_return_path('chill_main_notification_create', {
                     'entityClass': 'Chill\\ActivityBundle\\Entity\\Activity',

src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig

@@ -86,7 +86,7 @@
 {% include 'ChillActivityBundle:Activity:concernedGroups.html.twig' with {
     'context': context,
     'render': 'bloc',
-    'badge_person': 'true'
+    'badge_person': true
 } %}
 
 <h2 class="chill-blue">{{ 'Activity data'|trans }}</h2>