diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss index 455b7a590..5c125f4c0 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss +++ b/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss @@ -21,7 +21,13 @@ // styles communs pour tous les bandeaux div.banner { - + .id-number { + font-weight: lighter; + font-size: 50%; + margin-left: 0.5em; + &:before { content: '(n°'; } + &:after { content: ')'; } + } a.phone, a.email { color: white; 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 b2b15447b..f95896beb 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/render_box.scss +++ b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/render_box.scss @@ -31,10 +31,13 @@ section.chill-entity { span.badge { margin-left: 0.3em; } + span.altnames, span.id-number { font-weight: lighter; font-size: 50%; margin-left: 0.5em; + } + span.id-number { &:before { content: '(n°'; } &:after { content: ')'; } } diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig index 4bda7db4d..47f15f07b 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig @@ -1,7 +1,7 @@ {# Template to render a person - * render string ['raw'|'label'|'bloc'] OPTIONS + * render string ['raw'|'label'|'bloc'] * addAltNames bool * addLink bool * addEntity bool @@ -19,13 +19,13 @@ {{ person.firstName }} {{ person.lastName }} {%- if options['addAltNames'] -%} + {%- for n in person.altNames -%} - {%- if loop.first -%}({% else %} {%- endif -%} - - {{- n.label -}} - - {%- if loop.last -%}){%- endif -%} + + {{- n.label -}} + {%- endfor -%} + {%- endif -%} {% endmacro raw %} @@ -44,8 +44,8 @@ {{ 'Person'|trans }} {%- endif -%} {%- if options['addId'] -%} - - {{ person.id|upper }} + + {{ person.id|upper }} {%- endif -%} diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/views/Entity/thirdparty.html.twig b/src/Bundle/ChillThirdPartyBundle/Resources/views/Entity/thirdparty.html.twig index 3ec20aba9..057be85c8 100644 --- a/src/Bundle/ChillThirdPartyBundle/Resources/views/Entity/thirdparty.html.twig +++ b/src/Bundle/ChillThirdPartyBundle/Resources/views/Entity/thirdparty.html.twig @@ -1,7 +1,7 @@ {# Template to render a thirdparty - * render string ['raw'|'label'|'bloc'] OPTIONS + * render string ['raw'|'label'|'bloc'] * with_valid_from bool * addLink bool * addEntity bool @@ -34,8 +34,8 @@ {{ 'Third party'|trans }} {%- endif -%} {%- if options['addId'] -%} - - {{ person.id|upper }} + + {{ thirdparty.id|upper }} {%- endif -%}