diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss index e7f613bc8..a570b645a 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss +++ b/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss @@ -25,6 +25,8 @@ // Chill flex responsive table/block presentation @import './scss/flex_table'; +// Specific templates +@import './scss/notification'; /* * BASE LAYOUT POSITION diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/notification.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/notification.scss new file mode 100644 index 000000000..b243fbd0b --- /dev/null +++ b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/notification.scss @@ -0,0 +1,37 @@ +/* + * Notifications List +*/ + +div.notification-list { + div.item-bloc { + div.item-row.header { + + div.item-col { + &:first-child { + flex-grow: 1; + + /// 3 + div.wrap-list { + div.wl-col.list { + width: 90%; + } + } + + } + &:last-child { + flex-grow: 0; + } + } + + ul.small_in_title { + list-style-type: circle; + li { + span.item-key { + display: inline-block; + width: 3em; + } + } + } + } + } +} diff --git a/src/Bundle/ChillMainBundle/Resources/views/Notification/list.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Notification/list.html.twig index f6017eb03..0b0949db9 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Notification/list.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Notification/list.html.twig @@ -51,14 +51,16 @@ {% for data in datas %} {% set notification = data.notification %}
-
+ -
+
+ + {# 1
{% if step == 'inbox' %} @@ -88,6 +90,91 @@
{{ notification.date|format_datetime('long', 'short') }}
+ #} + + {# 2 + #} +
+
    + {% if 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') }} +
+ + {# 3 +
+
+ {% if 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 %}