diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/concernedGroups.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/concernedGroups.html.twig index 92b1b3ff4..2ee9eeba0 100644 --- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/concernedGroups.html.twig +++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/concernedGroups.html.twig @@ -60,7 +60,10 @@
  • - {{ item|chill_entity_render_box({'render': 'raw'}) }} + {{ item|chill_entity_render_box({ + 'render': 'raw', + 'addAltNames': false + }) }}
  • @@ -72,7 +75,7 @@ {% endfor %} {% endif %} - + {% if (with_display == 'row') %}
    {% for bloc in blocs %} @@ -84,7 +87,10 @@
  • - {{ item|chill_entity_render_box({'only_denomination': true}) }} + {{ item|chill_entity_render_box({ + 'render': 'raw', + 'addAltNames': false + }) }}
  • diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/render_box.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/render_box.scss index dd1dc12c5..c16218fd5 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/render_box.scss +++ b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/render_box.scss @@ -13,12 +13,18 @@ section.chill-entity { } // specific rules +// all render box doesn't use a section tag ! .chill-entity { // used for: entity-person, entity-thirdparty &.entity-person, &.entity-thirdparty { + span.entity-raw { + & > span:not(:first-child):before { + content: " "; + } + } div.entity-label { div.denomination { &.h3 { diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig index 1c75bcac1..6c8d15aff 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig @@ -32,7 +32,6 @@ {% macro label(person, options) %}
    -
    {%- if options['addLink'] and is_granted('CHILL_PERSON_SEE', person) -%} @@ -74,7 +73,9 @@ {%- if render == 'raw' -%} - {{ _self.raw(person, options) }} + + {{ _self.raw(person, options) }} + {%- endif -%} {%- if render == 'label' -%} diff --git a/src/Bundle/ChillPersonBundle/Templating/Entity/PersonRender.php b/src/Bundle/ChillPersonBundle/Templating/Entity/PersonRender.php index b95252fde..7cb2da88a 100644 --- a/src/Bundle/ChillPersonBundle/Templating/Entity/PersonRender.php +++ b/src/Bundle/ChillPersonBundle/Templating/Entity/PersonRender.php @@ -52,7 +52,7 @@ class PersonRender extends AbstractChillEntityRender public function renderBox($person, array $options): string { $params = [ - 'addAltNames' => $this->configAltNamesHelper->hasAltNames(), + 'addAltNames' => $options['addAltNames'] ?? $this->configAltNamesHelper->hasAltNames(), 'addLink' => $options['addLink'] ?? false, 'addEntity' => $options['addEntity'] ?? false, 'addId' => $options['addId'] ?? false, diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/views/Entity/thirdparty.html.twig b/src/Bundle/ChillThirdPartyBundle/Resources/views/Entity/thirdparty.html.twig index ed7bb73bd..1f65abbd6 100644 --- a/src/Bundle/ChillThirdPartyBundle/Resources/views/Entity/thirdparty.html.twig +++ b/src/Bundle/ChillThirdPartyBundle/Resources/views/Entity/thirdparty.html.twig @@ -52,7 +52,9 @@ {% endmacro label %} {%- if render == 'raw' -%} - {{ _self.raw(thirdparty, options) }} + + {{ _self.raw(thirdparty, options) }} + {%- endif -%} {%- if render == 'label' -%}