105 worflow

src/Bundle/ChillMainBundle/Resources/views/Notification/_list_item.html.twig

@@ -2,7 +2,7 @@
     <div class="item-row title">
         <h2 class="notification-title">
             <a href="{{ chill_path_add_return_path('chill_main_notification_show', {'id': c.notification.id}) }}">
-                {{ 'notification.object_prefix'|trans ~ c.notification.title }}
+                {{ c.notification.title }}
             </a>
         </h2>
     </div>
@@ -58,7 +58,7 @@
     </div>
     <div class="item-row">
         <div class="notification-content">
-            {% if c.full_content is defined and c.full_content == 'true' %}
+            {% if c.full_content is defined and c.full_content == true %}
                 {{ c.notification.message|chill_markdown_to_html }}
             {% else %}
                 {{ c.notification.message|u.truncate(250, '…', false)|chill_markdown_to_html }}
@@ -66,7 +66,7 @@
             {% endif %}
         </div>
     </div>
-    {% if c.action_button is not defined or c.action_button != 'false' %}
+    {% if c.action_button is not defined or c.action_button != false %}
         <div class="item-row separator">
             <ul class="record_actions">
                 <li>
@@ -102,7 +102,7 @@
 
 <div class="item-bloc notification-status {% if notification.isReadBy(app.user) %}read{% else %}unread{% endif %}">
 
-    {% if fold_item is defined and fold_item != 'false' %}
+    {% if fold_item is defined and fold_item != false %}
         <div class="accordion-header" id="flush-heading-{{ notification.id }}">
             <button type="button" class="accordion-button collapsed"
                 data-bs-toggle="collapse" data-bs-target="#flush-collapse-{{ notification.id }}"

src/Bundle/ChillMainBundle/Resources/views/Notification/extension_counter_notifications_for.html.twig

@@ -1,2 +1,12 @@
-{% if counter.total > 0 %}<span class="badge rounded-pill bg-primary">{{ 'notification.counter total notifications'|trans({'total': counter.total }) }}</span>{% endif %}
-{% if counter.unread > 0 %}<span class="badge rounded-pill bg-danger">{{ 'notification.counter unread notifications'|trans({'unread': counter.unread })}}</span>{% endif %}
+<div class="notification-counter">
+    {% if counter.total > 0 %}
+        <span>
+            {{ 'notification.counter total notifications'|trans({'total': counter.total }) }}
+        </span>
+    {% endif %}
+    {% if counter.unread > 0 %}
+        <span>
+            {{ 'notification.counter unread notifications'|trans({'unread': counter.unread }) }}
+        </span>
+    {% endif %}
+</div>

src/Bundle/ChillMainBundle/Resources/views/Notification/list.html.twig

@@ -50,7 +50,7 @@
             {% for data in datas %}
                 {% set notification = data.notification %}
                 {% include 'ChillMainBundle:Notification:_list_item.html.twig' with {
-                    'fold_item': 'true'
+                    'fold_item': true
                 } %}
             {% endfor %}
         </div>

src/Bundle/ChillMainBundle/Resources/views/Notification/show.html.twig

@@ -40,8 +40,8 @@
                  'template': handler.getTemplate(notification),
                  'template_data': handler.getTemplateData(notification)
             },
-            'action_button': 'false',
-            'full_content': 'true'
+            'action_button': false,
+            'full_content': true
         } %}
     </div>