diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss
index 7ed607535..673d5129a 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss
+++ b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss
@@ -99,11 +99,14 @@ div.flex-table {
div.item-bloc {
flex-direction: column;
- &:nth-child(even) {
- background-color: $gray-200;
+ &:not(.no-altern) { // class to avoid even/odd
- .chill-user-quote {
- background-color: shade-color($gray-200, 5%)
+ &:nth-child(even) {
+ background-color: $gray-200;
+
+ .chill-user-quote {
+ background-color: shade-color($gray-200, 5%)
+ }
}
}
diff --git a/src/Bundle/ChillMainBundle/Resources/public/page/export/index.js b/src/Bundle/ChillMainBundle/Resources/public/page/export/index.js
index 30ae5bc34..d540e5ae5 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/page/export/index.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/page/export/index.js
@@ -1,5 +1,6 @@
-import { ShowHide } from 'ShowHide';
-
-console.log('coucou');
-
+// old method to show/hide filters when checking checkbox
+import { chill } from 'ChillMainAssets/chill/js/chill';
+window.addEventListener("DOMContentLoaded", chill.listenerDisplayCheckbox);
+// TODO should be replaced by more recent showHide library
+//import { ShowHide } from 'ShowHide';
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Export/new.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Export/new.html.twig
index b5eebac5a..53a73d480 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Export/new.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Export/new.html.twig
@@ -16,96 +16,119 @@
* along with this program. If not, see
{{ export.description|trans }}
+{% block content %} - {{ form_start(form) }} +- {{ form_widget(filter_form.enabled, { 'attr' : { 'style' : 'vertical-align: middle;', 'data-display-target': filter_form.vars.id } }) }} - {{ form_label(filter_form) }} -
- -{{ export.description|trans }}
+ + {{ form_start(form) }} + + {% if form.children.export.children.filters is defined %} + {% if form.children.export.children.filters is not empty%} + +- {{ form_widget(aggregator_form.enabled, { 'attr' : { 'style' : 'vertical-align: middle;', 'data-display-target': aggregator_form.vars.id } }) }} - {{ form_label(aggregator_form) }} -
- -{{ 'Choose the formatter'|trans }}
- + {% endif %} + + {% if form.children.export.children.pick_formatter is defined %} ++ {{ 'Choose the formatter'|trans }} +
{{ form_row(form.children.export.children.pick_formatter.children.alias, { 'label' : 'Formatter' }) }} -{{ form_widget(form.submit, { 'attr' : { 'class' : 'btn btn-create' }, 'label' : 'Go to formatter options' } ) }}
- {{ form_end(form) }} - -{% endblock layout_wvm_content %} + + {% endif %} + +{{ form_widget(form.submit, { 'attr' : { 'class' : 'btn btn-create' }, 'label' : 'Go to formatter options' } ) }}
+ {{ form_end(form) }} + +