add translations for all steps and clean layout

Controller/ExportController.php

@@ -245,11 +245,9 @@ class ExportController extends Controller
             ));
         }
         
-        //if (strpos($step, 'generate_') !== false) {
+        $builder->add('submit', 'submit', array(
-            $builder->add('submit', 'submit', array(
+            'label' => 'Generate'
-                'label' => 'Generate'
+        ));
-            ));
-        //}
         
         return $builder->getForm();
     }

Resources/translations/messages.fr.yml

@@ -17,6 +17,8 @@ Welcome: Bienvenue
 Export Menu: Export
 Admin Menu: Menu d'administration
 Details: Détails
+yes: oui
+no: non
 
 Edit: Modifier
 Update: Mettre à jour
@@ -108,6 +110,27 @@ Create a new circle: Créer un nouveau cercle
 
 #export
 
+# export creation step 0 : list of exports
+Exports list: Liste des exports
+Create an export: Créer un export
+#export creation step 'center' : pick a center
+Pick centers: Choisir les centres
+The export will contains only data from the picked centers.: L'export ne contiendra que les données des centres choisis.
+This will eventually restrict your possibilities in filtering the data.: Les possibilités de filtrages seront adaptées aux droits de consultation pour les centres choisis.
+Go to export options: Vers la préparation de l'export
+# export creation step 'export' : choose aggregators, filtering and formatter
+Formatter: Formatteur
+Choose the formatter: Choisissez le format d'export voulu.
+Export parameters: Paramètres d'export
+Filters: Filtres
+Aggregators: Aggrégateurs
+Go to formatter options: Vers les options du formatteur
+#export creation step 'formatter' : choose formatter option
+Generate the report: Générer le rapport
+
+
 #CSV List Formatter
 Add a number on first column: La première colonne est un numéro
-Number: Numéro
+Number: Numéro
+# the label which appears in the UI
+CSV List: Liste au format CSV

Resources/views/Export/new.html.twig

@@ -37,6 +37,9 @@
             {{ form_widget(filter_form.form) }}
         {% endfor %}
     </div>
+    {% else %}
+        {# render the children, to mark the widget as 'rendered' #}
+        {{ form_widget(form.children.export.children.filters) }}
     {% endif %}
     
     {% if form.children.export.children.aggregators is not empty %} 
@@ -48,16 +51,15 @@
             {{ form_widget(aggregator_form.form) }}
         {% endfor %}
     </div>
+    {% else %}
+        {# render the children, to mark the widget as 'rendered' #}
+        {{ form_widget(form.children.export.children.aggregators) }}
     {% endif %} 
     
-    <div>
-        <h2>{{ 'Formatter'| trans }}</h2>
-            {{ form_row(form.children.export.children.pick_formatter.children.alias) }}
-    </div>
     
     {% if form.children.export.children.export.children|length > 0 %}
     <div>
-        <h2>{{ 'Export'|trans }}</h2>
+        <h2>{{ 'Export parameters'|trans }}</h2>
             {{ form_widget(form.children.export.children.export) }}
     </div>
     {% else %}
@@ -65,7 +67,15 @@
         {{ form_widget(form.children.export.children.export) }}#}
     {% endif %}
     
-    <p>{{ form_widget(form.submit, { 'attr' : { 'class' : 'sc-button btn-action' } } ) }}</p>
+    <div style="clear: both;">
+        <h2>{{ 'Formatter'| trans }}</h2>
+                
+        <p> {{ 'Choose the formatter'|trans }}</p>
+        
+            {{ form_row(form.children.export.children.pick_formatter.children.alias, { 'label' : 'Formatter' }) }}
+    </div>
+    
+    <p>{{ form_widget(form.submit, { 'attr' : { 'class' : 'sc-button btn-create' }, 'label' : 'Go to formatter options' } ) }}</p>
     {{ form_end(form) }}
     
 {% endblock layout_wvm_content  %}

Resources/views/Export/new_centers_step.html.twig

@@ -29,10 +29,13 @@
     {{ form_start(form) }}
     
     <h2>{{ 'Pick centers'|trans }}</h2>
+    
+    <p>{{ 'The export will contains only data from the picked centers.'|trans }} 
+        {{ 'This will eventually restrict your possibilities in filtering the data.'|trans }}</p>
 
     {{ form_widget(form.centers.c) }}
     
-    <p>{{ form_widget(form.submit, { 'attr' : { 'class' : 'sc-button btn-action' } } ) }}</p>
+    <p>{{ form_widget(form.submit, { 'attr' : { 'class' : 'sc-button btn-action bt-create' }, 'label' : 'Go to export options' } ) }}</p>
     {{ form_end(form) }}
     
 {% endblock layout_wvm_content  %}

Resources/views/Export/new_formatter_step.html.twig

@@ -27,12 +27,20 @@
     <p>{{ export.description|trans }}</p>
 
     {{ form_start(form) }}
-    <div>
+    <div style="">
         <h2>{{ 'Formatter'| trans }}</h2>
-        {{ form_widget(form.children.formatter) }}
+        
+        <div style="clear: both;">
+        {% for input in form.children.formatter.children %}
+        {{ form_row(input) }}
+        {% endfor %}
+        </div>
+    </div>
+    
+    <div style=clear:both;">
+    <p>{{ form_widget(form.submit, { 'attr' : { 'class' : 'sc-button btn-action' }, 'label': 'Generate the report' } ) }}</p>
     </div>
     
-    <p>{{ form_widget(form.submit, { 'attr' : { 'class' : 'sc-button btn-action' } } ) }}</p>
     {{ form_end(form) }}
     
 {% endblock layout_wvm_content  %}