improve layout and messages for export

This commit is contained in:
2016-11-24 22:48:11 +01:00
parent 6c1c481e1a
commit d33500f764
8 changed files with 53 additions and 30 deletions

View File

@@ -32,9 +32,14 @@
<div style="clear:both; padding-top: 1.5em;">
<h2>{{ 'Filters'| trans }}</h2>
{% for filter_form in form.children.export.children.filters %}
{{ form_label(filter_form) }}
{{ form_row(filter_form.enabled) }}
{{ form_widget(filter_form.form) }}
<p>
{{ form_widget(filter_form.enabled, { 'attr' : { 'style' : 'vertical-align: middle;' } }) }}
<span class="force-inline-label">{{ form_label(filter_form) }}</span>
</p>
<div>
{{ form_widget(filter_form.form) }}
</div>
{% endfor %}
</div>
{% else %}
@@ -46,8 +51,11 @@
<div style="clear:both; padding-top: 1.5em;">
<h2>{{ 'Aggregators'| trans }}</h2>
{% for aggregator_form in form.children.export.children.aggregators %}
{{ form_label(aggregator_form) }}
{{ form_row(aggregator_form.enabled) }}
<p>
{{ form_widget(aggregator_form.enabled, { 'attr' : { 'style' : 'vertical-align: middle;' } }) }}
<span class="force-inline-label">{{ form_label(aggregator_form) }}</span>
</p>
{{ form_widget(aggregator_form.form) }}
{% endfor %}
</div>

View File

@@ -31,9 +31,17 @@
<h2>{{ 'Formatter'| trans }}</h2>
<div style="clear: both;">
{% for input in form.children.formatter.children %}
{{ form_row(input) }}
{% endfor %}
{% if form.children.formatter.children|length == 0 %}
<p>
<span class="chill-no-data-statement">{{ "No options availables. Your report is fully configured."|trans }}</span>
</p>
{{ form_widget(form.children.formatter) }}
{% else %}
{# we always have to render children, to mark as rendered #}
{% for input in form.children.formatter.children %}
{{ form_row(input) }}
{% endfor %}
{% endif %}
</div>
</div>