diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/notification.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/notification.scss index af0f058d5..93e9bd152 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/notification.scss +++ b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/notification.scss @@ -66,3 +66,15 @@ div.notification-show { } } } + +// Override bootstrap accordion +div#notification-fold { + .accordion-button { + padding: 0; + background-color: unset; + &:not(.collapsed) { + background-color: unset; + box-shadow: unset; + } + } +} diff --git a/src/Bundle/ChillMainBundle/Resources/views/Notification/_list_item.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Notification/_list_item.html.twig index 836993924..62b593725 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Notification/_list_item.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Notification/_list_item.html.twig @@ -1,91 +1,118 @@
-
-

- - {{ 'notification.object_prefix'|trans ~ notification.title }} - -

-
-
-
-
    - {% if step is not defined or step == 'inbox' %} -
  • - - - {{ 'notification.from'|trans }} : - - - {% if not notification.isSystem %} - - {{ notification.sender|chill_entity_render_string }} - - {% else %} - {{ 'notification.is_system'|trans }} - {% endif %} -
  • - {% endif %} - {% if notification.addressees|length > 0 %} -
  • - - - {{ 'notification.to'|trans }} : - - - {% for a in notification.addressees %} - - {{ a|chill_entity_render_string }} - - {% endfor %} -
  • - {% endif %} -
-
- -
- {{ notification.date|format_datetime('long', 'short') }} -
- -
-
-
- {% include data.template with data.template_data %} -
-
-
-
- {% if full_content is defined and full_content == 'true' %} - {{ notification.message|chill_markdown_to_html }} - {% else %} - {{ notification.message|u.truncate(250, '…', false)|chill_markdown_to_html }} - {% endif %} -
-
- {% if action_button is not defined or action_button != 'false' %} -
- -
+ {% if fold_item is defined and fold_item != 'false' %} +
+ + {% endif %} + +
+
+
    + {% if step is not defined or step == 'inbox' %} +
  • + + + {{ 'notification.from'|trans }} : + + + {% if not notification.isSystem %} + + {{ notification.sender|chill_entity_render_string }} + + {% else %} + {{ 'notification.is_system'|trans }} + {% endif %} +
  • + {% endif %} + {% if notification.addressees|length > 0 %} +
  • + + + {{ 'notification.to'|trans }} : + + + {% for a in notification.addressees %} + + {{ a|chill_entity_render_string }} + + {% endfor %} +
  • + {% endif %} +
+
+
+ {{ notification.date|format_datetime('long', 'short') }} +
+
+ + {% if fold_item is defined and fold_item != 'false' %} +
+
+ {% endif %} + +
+
+ {% include data.template with data.template_data %} +
+
+
+
+ {% if full_content is defined and full_content == 'true' %} + {{ notification.message|chill_markdown_to_html }} + {% else %} + {{ notification.message|u.truncate(250, '…', false)|chill_markdown_to_html }} + {% endif %} +
+
+ {% if action_button is not defined or action_button != 'false' %} +
+
    +
  • + {# Vue component #} + +
  • + {% if is_granted('CHILL_MAIN_NOTIFICATION_UPDATE', notification) %} +
  • + +
  • + {% endif %} + {% if is_granted('CHILL_MAIN_NOTIFICATION_SEE', notification) %} +
  • + +
  • + {% endif %} +
+
+ {% endif %} + + {% if fold_item is defined and fold_item != 'false' %} +
+ {% endif %} +
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Notification/list.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Notification/list.html.twig index cd0cc5b67..a8a3eb7e8 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Notification/list.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Notification/list.html.twig @@ -46,10 +46,12 @@

{{ 'notification.Any notification sent'|trans }}

{% endif %} {% else %} -
+
{% for data in datas %} {% set notification = data.notification %} - {% include 'ChillMainBundle:Notification:_list_item.html.twig' %} + {% include 'ChillMainBundle:Notification:_list_item.html.twig' with { + 'fold_item': 'true' + } %} {% endfor %}
{% endif %}