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

improve layout of buttons, address, and record_actions

Browse Source
This commit is contained in:
Julien Fastré
2017-08-19 20:13:35 +02:00
parent f5b37f7e40
commit d7a34cf8be
8 changed files with 333 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Resources/views/Address/macro.html.twig
View File

@@ -1,12 +1,16 @@
{%- macro _render(address, options) -%}
{% set options = { 'with_valid_from' : true }|merge(options|default({})) %}
{% if address.streetAddress1 is not empty %}<span class="street street1">{{ address.streetAddress1 }}</span><br/>{% endif %}
{% if address.streetAddress2 is not empty %}<span class="street street2">{{ address.streetAddress2 }}</span><br/>{% endif %}
{% if address.postCode is not empty %}
<span class="postalCode"><span class="code">{{ address.postCode.code }}</span> <span class="name">{{ address.postCode.name }}</span></span><br/>
<span class="country">{{ address.postCode.country.name|localize_translatable_string }}</span><br/>
{% endif %}
{%- set options = { 'with_valid_from' : true }|merge(options|default({})) -%}
<div class="chill_address">
<div class="chill_address_address">
{% if address.streetAddress1 is not empty %}<p class="street street1">{{ address.streetAddress1 }}</p>{% endif %}
{% if address.streetAddress2 is not empty %}<p class="street street2">{{ address.streetAddress2 }}</p>{% endif %}
{% if address.postCode is not empty %}
<p class="postalCode"><span class="code">{{ address.postCode.code }}</span> <span class="name">{{ address.postCode.name }}</span></p>
<p class="country">{{ address.postCode.country.name|localize_translatable_string }}</p>
{% endif %}
</div>
{%- if options['with_valid_from'] == true -%}
<span class="address_since">{{ 'Since %date%'|trans( { '%date%' : address.validFrom|localizeddate('long', 'none') } ) }}</span>
{%- endif -%}
</div>
{%- endmacro -%}

2
Resources/views/Util/confirmation_template.html.twig
View File

@@ -9,7 +9,7 @@
{{ form_start(form) }}
<ul class="record_actions">
<li>
<li class="cancel">
<a href="{{ path(cancel_route, cancel_parameters|default( { } ) ) }}" class="sc-button bt-cancel">
{{ 'Cancel'|trans }}
</a>