render_box: adding option addId + styles more generic, less specific

src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss

@@ -21,12 +21,7 @@
 
 // styles communs pour tous les bandeaux
 div.banner {
-   .id-number {
+
-      font-weight: lighter;
-      font-size: 50%;
-      &:before { content: '(n°'; }
-      &:after { content: ')'; }
-   }
    a.phone,
    a.email {
       color: white;

src/Bundle/ChillMainBundle/Resources/public/chill/scss/render_box.scss

@@ -2,7 +2,7 @@
 section.chill-entity {
 
     // display inline for render raw
-    // have no effect for render label, row, bloc !
+    // have no effect for render label, bloc !
     display: inline;
 
     // don't break flex cascade with section tag
@@ -13,8 +13,38 @@ section.chill-entity {
 }
 
 // specific rules
+.chill-entity {
+
+    // used for: entity-person, entity-thirdparty
+    &.entity-person,
+    &.entity-thirdparty {
+
+        div.entity-label {
+            div.denomination {
+                &.h3 {
+                    font-size: 1.3em;
+                    font-weight: 700;
+                }
+                a {
+                    text-decoration: none;
+                }
+                span.badge {
+                    margin-left: 0.3em;
+                }
+                span.id-number {
+                    font-weight: lighter;
+                    font-size: 50%;
+                    margin-left: 0.5em;
+                    &:before { content: '(n°'; }
+                    &:after { content: ')'; }
+                }
+            }
+            p.moreinfo {}
+        }
+        div.entity-bloc {}
+    }
+
     // address render_box
-div.chill-entity {
     &.entity-address {
         div.noaddress {}
         div.address {

src/Bundle/ChillPersonBundle/Resources/public/chill/scss/render_box.scss

@@ -1,22 +1,8 @@
-
+section.chill-entity {
-section.chill-entity.entity-person {
+    &.entity-person {
-    div.entity-label {
+        span.firstname,
-        div.denomination {
+        span.lastname,
-            &.h3 {
+        span.altname {}
-                font-size: 1.3em;
-                font-weight: 700;
     }
-            a {
-                text-decoration: none;
-            }
-            span.firstname, span.lastname, span.altname {}
-            span.badge {
-                margin-left: 0.3em;
-            }
-        }
-        p.moreinfo {}
-    }
-    div.entity-row {}
-    div.entity-bloc {}
 }
 

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

@@ -5,6 +5,7 @@
     * addAltNames   bool
     * addLink       bool
     * addEntity     bool
+    * addId         bool
     * addInfo       bool
     * hLevel        integer
     * customButtons [
@@ -42,6 +43,11 @@
             {%- if options['addEntity'] -%}
                 <span class="badge rounded-pill bg-secondary">{{ 'Person'|trans }}</span>
             {%- endif -%}
+            {%- if options['addId'] -%}
+                <span class="id-number" title="{{ 'Person'|trans ~ ' ' ~ person.id }}">
+                    {{  person.id|upper }}
+                </span>
+            {%- endif -%}
         </div>
         {%- if options['addInfo'] -%}
             {% set gender = (person.gender == 'woman') ? 'fa-venus' :

src/Bundle/ChillPersonBundle/Resources/views/Person/banner.html.twig

@@ -4,19 +4,10 @@
             <div class="row">
 
                 <div class="col-md-6">
-                    <h1>
+                    {{ person|chill_entity_render_box({
-                        {% set gender = 
+                        'render': 'label', 'addInfo': true, 'addId': true, 'hLevel': 1
-                            (person.gender == "woman") ? 'female' : 
+                    }) }}
-                            (person.gender == "both") ? 'neuter' : 'male' 
-                        %}
-                        <i class="fa fa-fw fa-{{ gender }}" title="{{ gender|capitalize|trans }}"></i>
 
-                        {{ person|chill_entity_render_string }}
-                        
-                        <span class="id-number" title="{{ 'Person'|trans ~ ' ' ~ person.id }}">
-                            {{  person.id|upper }}
-                        </span> 
-                    </h1>
                 </div>
 
                 <div class="col-md-auto ps-4 ps-md-2">

src/Bundle/ChillPersonBundle/Templating/Entity/PersonRender.php

@@ -55,6 +55,7 @@ class PersonRender extends AbstractChillEntityRender
             'addAltNames' => $this->configAltNamesHelper->hasAltNames(),
             'addLink' => $options['addLink'] ?? false,
             'addEntity' => $options['addEntity'] ?? false,
+            'addId' => $options['addId'] ?? false,
             'addInfo' => $options['addInfo'] ?? false,
             'hLevel' => $options['hLevel'] ?? 3,
             'customButtons' => $options['customButtons'] ?? [],

src/Bundle/ChillThirdPartyBundle/Resources/public/chill/chillthirdparty.scss

@@ -1,27 +1,10 @@
 
 /// render_box
-section.chill-entity.entity-thirdparty {
+section.chill-entity {
-    div.entity-label {
+    .entity-thirdparty {
-        div.denomination {
-            &.h3 {
-                font-size: 1.3em;
-                font-weight: 700;
-            }
-            a {
-                text-decoration: none;
-            }
         span.name {}
-            span.badge {
-                margin-left: 0.3em;
     }
 }
-        p.moreinfo {
-            span.company, span.acronym {}
-        }
-    }
-    div.entity-row {}
-    div.entity-bloc {}
-}
 
 /* AVANT
         border: 1px solid black;

src/Bundle/ChillThirdPartyBundle/Resources/public/chill/index.js

@@ -1,2 +1,2 @@
-require('./thirdparty.scss');
+require('./chillthirdparty.scss');
 

src/Bundle/ChillThirdPartyBundle/Resources/views/Entity/thirdparty.html.twig

@@ -5,6 +5,7 @@
     * with_valid_from bool
     * addLink       bool
     * addEntity     bool
+    * addId         bool
     * addInfo       bool
     * hLevel        integer
     * customButtons [
@@ -32,6 +33,11 @@
             {%- if options['addEntity'] -%}
                 <span class="badge rounded-pill bg-secondary">{{ 'Third party'|trans }}</span>
             {%- endif -%}
+            {%- if options['addId'] -%}
+                <span class="id-number" title="{{ 'Third party'|trans ~ ' ' ~ thirdparty.id }}">
+                    {{  person.id|upper }}
+                </span>
+            {%- endif -%}
         </div>
         {%- if options['addInfo'] -%}
             <p class="moreinfo">{#

src/Bundle/ChillThirdPartyBundle/Templating/Entity/ThirdPartyRender.php

@@ -50,6 +50,7 @@ class ThirdPartyRender extends AbstractChillEntityRender
             'with_valid_from' => $options['with_valid_from'] ?? true,
             'addLink' => $options['addLink'] ?? false,
             'addEntity' => $options['addEntity'] ?? false,
+            'addId' => $options['addId'] ?? false,
             'addInfo' => $options['addInfo'] ?? false,
             'hLevel' => $options['hLevel'] ?? 3,
             'customButtons' => $options['customButtons'] ?? [],