diff --git a/src/Bundle/ChillActivityBundle/Resources/public/scss/chillactivity.scss b/src/Bundle/ChillActivityBundle/Resources/public/scss/chillactivity.scss index a18037cbd..64fd1cb18 100644 --- a/src/Bundle/ChillActivityBundle/Resources/public/scss/chillactivity.scss +++ b/src/Bundle/ChillActivityBundle/Resources/public/scss/chillactivity.scss @@ -71,6 +71,24 @@ div.flex-table.list-records { &:nth-child(2) { flex-grow: 0; flex-shrink: 1; flex-basis: 70%; } + + &:only-child { + flex-grow: 0; flex-shrink: 0; flex-basis: 100%; + & > div.concerned-groups { + flex-grow: 0; flex-shrink: 0; flex-basis: 100%; + display: flex; + flex-direction: column; // TODO pas fini + div.group { + flex-grow: 1; flex-shrink: 0; flex-basis: 30%; + h4 {} + ul.list-content { + li { + display: inline; + } + } + } + } + } } div.concerned-groups { font-size: 85%; diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/concernedGroups.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/concernedGroups.html.twig index a7acc7491..0e0f8695a 100644 --- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/concernedGroups.html.twig +++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/concernedGroups.html.twig @@ -46,27 +46,15 @@ ] %} {% endif %} -{% set level1 = (with_display == 'bloc') ? context ~ ' flex-bloc ' : '' %} -{% set level2 = (with_display == 'bloc') ? 'item-bloc ' : '' %} -{% set level3 = (with_display == 'bloc') ? 'item-row ' : '' %} -{% set level4 = (with_display == 'bloc') ? 'item-col ' : '' %} - -
- +{% if (with_display == 'bloc') %} +
{% for bloc in blocs %} -
-
-
- - {% if with_display == 'bloc' or bloc.items|length > 0 %} -

{{ bloc.title }}

- {% endif %} - - {% if with_display == 'bloc' %} +
+
+
+

{{ bloc.title }}

-
- {% endif %} - +
    {% for item in bloc.items %}
  • @@ -82,5 +70,28 @@
{% endfor %} -
+{% endif %} + +{% if (with_display == 'row') %} +
+ {% for bloc in blocs %} +
+ {% if bloc.items|length > 0 %} +

{{ bloc.title }}

+ + {% endif %} +
+ {% endfor %} +
+{% endif %}