Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-08-20 22:53:49 +00:00
Code Issues Actions Projects Releases Wiki Activity

Merge branch 'improve_address' into person_renderbox_thirdparty_onthefly

Browse Source
This commit is contained in:
Mathieu Jaumotte
2021-09-22 14:07:09 +02:00
parent 019a66c915 dfc6ed9bf3
commit 851fa663ca
16 changed files with 85 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Bundle/ChillMainBundle/Resources/views/Address/_insert_vue_address.html.twig
View File

@@ -18,7 +18,7 @@
* stickyActions bool (default: false)
* useValidFrom bool (default: false)
* useValidTo bool (default: false)
* forceRedirect bool (default: false)
* hideAddress bool (default: false)
#}
<div class="address-container"
@@ -69,8 +69,8 @@
data-use-valid-to="true"
{% endif %}
{% if forceRedirect is defined and forceRedirect == 1 %}
data-force-redirect="true"
{% if hideAddress is defined and hideAddress == 1 %}
data-hide-address="true"
{% endif %}
></div>

18
src/Bundle/ChillMainBundle/Resources/views/Entity/address.html.twig
View File

@@ -34,25 +34,25 @@
{% macro extended(address, options) %}
{% if address.floor is not empty %}
<span class="floor">{{ address.floor }}</span>
<span class="floor">{{ 'address more.floor'|trans }} {{ address.floor }}</span>
{% endif %}
{% if address.corridor is not empty %}
<span class="corridor">{{ address.corridor }}</span>
<span class="corridor">{{ 'address more.corridor'|trans }} {{ address.corridor }}</span>
{% endif %}
{% if address.steps is not empty %}
<span class="steps">{{ address.steps }}</span>
<span class="steps">{{ 'address more.steps'|trans }} {{ address.steps }}</span>
{% endif %}
{% if address.buildingName is not empty %}
<span class="buildingName">{{ address.buildingName }}</span>
<span class="buildingName">{{ 'address more.buildingName'|trans }} {{ address.buildingName }}</span>
{% endif %}
{% if address.flat is not empty %}
<span class="flat">{{ address.flat }}</span>
{% endif %}
{% if address.distribution is not empty %}
<span class="distribution">{{ address.distribution }}</span>
<span class="flat">{{ 'address more.flat'|trans }} {{ address.flat }}</span>
{% endif %}
{% if address.extra is not empty %}
<span class="extra">{{ address.extra }}</span>
<span class="extra">{{ 'address more.extra'|trans }} {{ address.extra }}</span>
{% endif %}
{% if address.distribution is not empty %}
<span class="distribution">{{ 'address more.distribution'|trans }} {{ address.distribution }}</span>
{% endif %}
{% endmacro %}