Merge branch 'master' into 102_activites_annexes

src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig

@@ -8,7 +8,9 @@
     * addId         bool
     * addInfo       bool
     * addAge        bool
+    * addCenter     bool
     * hLevel        integer
+    * address_multiline     bool
     * customButtons [
         'before'    Twig\Markup, (injected with macro)
         'replace'   Twig\Markup,
@@ -32,7 +34,6 @@
 
 {% macro label(person, options) %}
     <div class="entity-label">
-
         <div class="denomination {{ 'h' ~ options['hLevel'] }}">
             {%- if options['addLink'] and is_granted('CHILL_PERSON_SEE', person) -%}
                 <a href="{{ chill_path_add_return_path('chill_person_view', { 'person_id': person.id }) }}">
@@ -85,7 +86,9 @@
 
 
 {%- if render == 'raw' -%}
-    {{ _self.raw(person, options) }}
+    <span class="entity-raw">
+        {{ _self.raw(person, options) }}
+    </span>
 {%- endif -%}
 
 {%- if render == 'label' -%}
@@ -97,12 +100,13 @@
     <div class="item-col">
         {{ _self.label(person, options) }}
     </div>
-    <div class="item-col">
+    <div class="item-col separator">
         <ul class="list-content fa-ul">
+            {% set multiline = (options['address_multiline']) ? true : false %}
             {{ person.getLastAddress|chill_entity_render_box({
                 'render': 'list',
                 'with_picto': true,
-                'multiline': false,
+                'multiline': multiline,
                 'with_valid_from': false
             }) }}
             <li>
@@ -121,6 +125,12 @@
                     {% endif %}
                 {% endif %}
             </li>
+            {% if options['addCenter'] %}
+                <li>
+                    <i class="fa fa-li fa-long-arrow-right"></i>
+                    {{ person.center }}
+                </li>
+            {% endif %}
         </ul>
         <ul class="record_actions">
             {% if options['customButtons']['before'] is defined %}
@@ -129,7 +139,7 @@
 
             {%- if options['customButtons']['replace'] is not defined and is_granted('CHILL_PERSON_SEE', person) -%}
                 <li>
-                    <a class="btn btn-show" target="_blank" title="{{ 'Show person'|trans }}"
+                    <a class="btn btn-sm btn-show" target="_blank" title="{{ 'Show person'|trans }}"
                     href="{{ path('chill_person_view', { person_id: person.id }) }}"></a>
                 </li>
             {%- else -%}