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 aab584b63..a939b17f8 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss +++ b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss @@ -163,7 +163,7 @@ div.wrap-list { width: 75%; margin: auto 0 0 auto; - p.wl-item { + .wl-item { margin: 0.1em; padding: 0em; display: inline-block; diff --git a/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/render_box.scss b/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/render_box.scss index 041a70dd9..5a4a51de8 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/render_box.scss +++ b/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/render_box.scss @@ -27,5 +27,15 @@ } } - +// specific chill badge for persons +span.badge-person { + padding: 0 0.5em !important; + background-color: $white; + border: 1px solid $chill-ll-gray; + border-bottom: 2px solid $chill-green; + border-radius: 6px; + a { + text-decoration: none; + } +} diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list.html.twig index 16234ea61..9eb115e6b 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list.html.twig @@ -60,37 +60,38 @@
- {% if accompanying_period.participations.count > 0 %} -
-

{{ 'Participants'|trans }}

-
- {% for p in accompanying_period.participations %} -

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

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

{{ 'Requestor'|trans }}

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

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

+ {{ accompanying_period.requestorPerson|chill_entity_render_string }} {% endif %} {% if accompanying_period.requestorThirdParty is not null %} -

- {{ accompanying_period.requestorThirdParty.name }} -

+ {{ accompanying_period.requestorThirdParty|chill_entity_render_string }} {% endif %}
{% endif %} + + {% if accompanying_period.participations.count > 0 %} +
+

{{ 'Participants'|trans }}

+
+ {% for p in accompanying_period.participations %} + + + {{ p.person|chill_entity_render_string }} + + {# or in renderbox mode + {{ p.person|chill_entity_render_box({'render': 'label', 'addAltNames': false, 'addLink': true, 'hLevel': 5 }) }} + #} + + {% endfor %} +
+
+ {% endif %} + {% if accompanying_period.socialIssues.count > 0 %}

{{ 'Social issues'|trans }}

diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/list_with_period.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/list_with_period.html.twig index ce26e5b54..10be1fde0 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/Person/list_with_period.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/list_with_period.html.twig @@ -71,26 +71,31 @@ {% for app in apps %}
+
{{ 'Since %date%'|trans({'%date%': app.startDate|format_date('medium') }) }}
+ {% if app.accompanyingPeriod.user is not null %}
ref: {{ app.accompanyingPeriod.user|chill_entity_render_box }}
{% endif %} +
+ {% for issue in app.accompanyingPeriod.socialIssues %} {{ issue|chill_entity_render_box }} {% endfor %} - {# ^^ display all socialIssues + {# ^^ display all socialIssues, or slice vv |slice(0,2) {% if app.accompanyingPeriod.socialIssues|length > 2 %} {{ 'and %number% other'|transchoice(app.accompanyingPeriod.socialIssues|length-2) }} {% endif %} #} + +
{% endfor %}