diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss index 259a23055..3353749db 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss +++ b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss @@ -1,4 +1,5 @@ /* +* __FLEX-TABLE_________ * FLEX RESPONSIVE TABLE/BLOCK PRESENTATION */ @@ -40,7 +41,7 @@ div.flex-table { } /* -* Bloc appearance +* BLOC appearance */ div.flex-bloc { @@ -87,7 +88,7 @@ div.flex-bloc { } /* -* Table appearance +* TABLE appearance */ div.flex-table { @@ -107,6 +108,10 @@ div.flex-table { div.item-row { flex-direction: row; + &:first-child { + align-items: baseline; // + } + &.separator { margin-top: 0.5em; border-top: 1px dotted $gray-900; @@ -130,7 +135,7 @@ div.flex-table { } } - @media only screen and (max-width: 900px) { + @include media-breakpoint-down(md) { flex-direction: column; div.item-col { &:last-child { @@ -143,3 +148,58 @@ div.flex-table { } } } + +/* +* __WRAP-LIST-INLINE_________ +* FLEX RESPONSIVE INLINE DEFINITION LIST +*/ + +div.wraplist { + padding: 0; + width: 100%; + + div.wl-row { + display: flex; + flex-direction: row; + flex-wrap: wrap; + justify-content: space-between; + + div.wl-col.title { + width: auto; + + @include media-breakpoint-up(md) { + margin-left: 1.5em; + } + + & > * { + padding-right: 1em; + } + } + + div.wl-col.list { + width: 75%; + margin: auto 0 0 auto; + + p.wl-item { + margin: 0.1em; + padding: 0em; + display: inline-block; + } + } + } + + &.debug .wl-row { + border: 1px solid $black; + + div.wl-col.title { + background-color: $yellow; + } + div.wl-col.list { + background-color: $green; + + p.wl-item { + background-color: $orange; + } + } + } +} diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list.html.twig index 8ad71196e..90a1462bf 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list.html.twig @@ -9,19 +9,20 @@ {{ accompanying_period.id }} + {% if accompanying_period.emergency %} + {{- 'Emergency'|trans|upper -}} + {% endif %} + {% if accompanying_period.confidential %} + {{- 'Confidential'|trans|upper -}} + {% endif %} + +
{% if accompanying_period.step == 'DRAFT' %} {{- 'Draft'|trans|upper -}} {% else %} {{- 'Confirmed'|trans|upper -}} {% endif %} - {% if accompanying_period.emergency %} - {{- 'Emergency'|trans|upper -}} - {% endif %} - {% if accompanying_period.confidential %} - {{- 'Confidential'|trans|upper -}} - {% endif %}
-
@@ -52,49 +53,65 @@
-

{{ 'Participants'|trans }}

-
- {% if accompanying_period.participations.count > 0 %} - {% for p in accompanying_period.participations %} -

- - {{ p.person.firstname ~ ' ' ~ p.person.lastname }} - -

- {% endfor %} - {% else %} - {{ 'No data given'|trans }} - {% endif %} +
+
+

{{ 'Participants'|trans }}

+
+ {% if accompanying_period.participations.count > 0 %} + {% for p in accompanying_period.participations %} +

+ + {{ p.person.firstname ~ ' ' ~ p.person.lastname }} + +

+ {% endfor %} + {% else %} + {{ 'No data given'|trans }} + {% endif %} +
+
-

{{ 'Requestor'|trans }}

-
- {% if accompanying_period.requestorPerson is not null or accompanying_period.requestorThirdParty is not null %} - {% if accompanying_period.requestorPerson is not null %} -

- {{ accompanying_period.requestorPerson.firstname ~ ' ' ~ accompanying_period.requestorPerson.lastname }} -

- {% endif %} - {% if accompanying_period.requestorThirdParty is not null %} -

- {{ accompanying_period.requestorThirdParty.name }} -

- {% endif %} - {% else %} - {{ 'No data given'|trans }} - {% endif %} +
+
+

{{ 'Requestor'|trans }}

+
+ {% if accompanying_period.requestorPerson is not null or accompanying_period.requestorThirdParty is not null %} + {% if accompanying_period.requestorPerson is not null %} +

+ {{ accompanying_period.requestorPerson.firstname ~ ' ' ~ accompanying_period.requestorPerson.lastname }} +

+ {% endif %} + {% if accompanying_period.requestorThirdParty is not null %} +

+ {{ accompanying_period.requestorThirdParty.name }} +

+ {% endif %} + {% else %} + {{ 'No data given'|trans }} + {% endif %} +
+
-

{{ 'Social issues'|trans }}

- {% if accompanying_period.socialIssues.count > 0 %} - {% for si in accompanying_period.socialIssues %} -

{{ si.title|localize_translatable_string }}

- {% endfor %} - {% else %} - {{ 'No data given'|trans }} - {% endif %} +
+
+

{{ 'Social issues'|trans }}

+
+ {% if accompanying_period.socialIssues.count > 0 %} + {% for si in accompanying_period.socialIssues %} +

+ {{ si.title|localize_translatable_string }} +

+ {% endfor %} + {% else %} + {{ 'No data given'|trans }} + {% endif %} +
+
+