From 72e306b583df186129e370021b09b3c0b45f89d1 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Fri, 28 Jan 2022 12:46:58 +0100
Subject: [PATCH] change add notification button color

---
 .../Resources/views/Activity/show.html.twig   |  5 +-
 ...extension_list_notifications_for.html.twig | 56 +------------------
 .../translations/messages.fr.yml              |  1 +
 3 files changed, 6 insertions(+), 56 deletions(-)

diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
index aca133d46..d133041a0 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
@@ -188,7 +188,6 @@
     {% endif %}
 </div>
 
-
 {% set person_id = null %}
 {% if person %}
     {% set person_id = person.id %}
@@ -206,7 +205,7 @@
         </a>
     </li>
     <li>
-        <a class="btn btn-primary" href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\ActivityBundle\\Entity\\Activity', 'entityId': entity.id}) }}">
+        <a class="btn btn-misc" href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\ActivityBundle\\Entity\\Activity', 'entityId': entity.id}) }}">
             <i class="fa fa-paper-plane fa-fw"></i>
             {{ 'notification.Notify'|trans }}
         </a>
@@ -214,7 +213,7 @@
     {% if is_granted('CHILL_ACTIVITY_UPDATE', entity) %}
         <li>
             <a href="{{ path('chill_activity_activity_edit', { 'id': entity.id, 'person_id': person_id, 'accompanying_period_id': accompanying_course_id }) }}"
-               class="btn btn-update" title="{{ 'Edit'|trans }}"></a>
+               class="btn btn-update">{{ 'Edit'|trans }}</a>
         </li>
     {% endif %}
     {% if is_granted('CHILL_ACTIVITY_DELETE', entity) %}
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 a7156c5dd..748061891 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,63 +1,13 @@
-<h2>{{ 'notification.Notification'|trans }}</h2>
+<h1 class="mt-5">{{ 'notification.Notifications'|trans }}</h1>
 
 <div class="flex-table accordion accordion-flush" id="notification-fold">
     {% for notification in notifications %}
         {% include 'ChillMainBundle:Notification:_list_item.html.twig' with {
-            'action_button': false,
             'full_content': true,
             'fold_item': true,
+            'action_button': true,
+            'with_folded_comments': false
         } %}{#
-            DISABLED
-            'with_folded_comments': true
     #}
     {% endfor %}
 </div>
-
-{#
-<div class="list-group my-2 notification notification-box">
-    <div class="list-group-item">
-        <h4>{{ 'notification.Sent'|trans }}</h4>
-    </div>
-    
-    {% for notification in notifications %}
-        <div class="list-group-item notification-status {% if notification.isReadBy(app.user) %}read{% else %}unread{% endif %}">
-
-            {% if not notification.isSystem %}
-                {% if notification.sender == app.user %}
-
-                    <h6 class="notification-title">
-                        <abbr title="{{ 'Le ' ~ notification.date|format_date('long') ~ '\n' ~ notification.title }}">
-                            {{ notification.date|format_datetime('short','short') }}
-                        </abbr>
-                        
-                        <span class="notification_toggle_read_status"
-                            data-notification-id="{{ notification.id }}"
-                            data-notification-current-is-read="{{ notification.isReadBy(app.user) }}"
-                            data-container="notification-status"
-                            data-show-button-url="{{ chill_path_add_return_path('chill_main_notification_show', {'id': notification.id}, false) }}"
-                            data-button-class="btn-outline-primary"
-                            data-button-text="false"
-                        ></span>
-                    </h6>
-
-                    {% if notification.addressees|length > 0 %}
-                        <abbr title="{{ 'notification.sent_to'|trans }}">{{ 'notification.to'|trans }}:</abbr>
-                    {% endif %}
-
-                    {% for a in notification.addressees %}
-                        <span class="badge-user">
-                            {{ a|chill_entity_render_string }}
-                        </span>
-                    {% endfor %}
-
-                {% else %}
-                    <div>{{ 'notification.you were notified by %sender%'|trans({'%sender%': notification.sender|chill_entity_render_string }) }}</div>
-                {% endif %}
-            {% else %}
-                <div>{{ 'notification.you were notified by system'|trans }}</div>
-            {% endif %}
-
-        </div>
-    {% endfor %}
-</div>
-#}
diff --git a/src/Bundle/ChillMainBundle/translations/messages.fr.yml b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
index 3083a6f53..0e093b35f 100644
--- a/src/Bundle/ChillMainBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
@@ -396,6 +396,7 @@ Subscribe all steps: Recevoir une notification à chaque étape
 
 notification:
     Notification: Notification
+    Notifications: Notifications
     My own notifications: Mes notifications
     Notify: Envoyer une notification
     Send: Envoyer