Refs #4257: Updating layout for imports#new

4 files changed, 36 insertions, 10 deletions

diff --git a/app/views/imports/_form.html.slim b/app/views/imports/_form.html.slim
index b795e908f..3ec22415f 100644
--- a/app/views/imports/_form.html.slim
+++ b/app/views/imports/_form.html.slim
@@ -1,6 +1,22 @@
-= simple_form_for import, as: :import, url: workbench_imports_path(workbench) do |f|
-  = f.input :name
-  = f.input :file
-  = f.association :referential, collection: workbench.referentials
-  = f.input :type, as: :hidden
-  = f.button :submit
+= simple_form_for import, as: :import, url: workbench_imports_path(workbench), html: {class: 'form-horizontal', id: 'wb_import_form'}, wrapper: :horizontal_form do |form|
+
+  .row
+    .col-lg-12
+      = form.input :name
+      
+  .row
+    .col-lg-12
+      .form-group
+        = form.label :file, t('activerecord.attributes.import.resources'), class: 'control-label col-sm-4 col-xs-5'
+        .col-sm-8.col-xs-7
+          = form.input_field :file, label: false, class: 'form-control'
+
+  .separator
+
+  .row
+    .col-lg-12
+      = form.association :referential, collection: workbench.referentials, input_html: { 'data-select2ed': 'true', 'data-select2ed-placeholder': t('imports.filters.referential') }, label: t('activerecord.attributes.import.references_type'), label_method: :name, wrapper_html: { class: 'select2ed'}
+      = form.input :type, as: :hidden
+
+
+  = form.button :submit, t('actions.submit'), class: 'btn btn-default formSubmitr', form: 'wb_import_form'
diff --git a/app/views/imports/new.html.slim b/app/views/imports/new.html.slim
index 55b655a85..2a18c41f2 100644
--- a/app/views/imports/new.html.slim
+++ b/app/views/imports/new.html.slim
@@ -1,4 +1,10 @@
-= title_tag t('.title')
-.row
-  .col-lg-8.col-lg-offset-2.col-md-8.col-md-offset-2.col-sm-8.col-sm-offset-2
-    = render 'form', import: @import, workbench: @workbench
+/ PageHeader
+= pageheader 'map-marker',
+              t('.title')
+
+/ PageContent
+.page_content
+  .container-fluid
+    .row
+      .col-lg-8.col-lg-offset-2.col-md-8.col-md-offset-2.col-sm-10.col-sm-offset-1
+        = render 'form', import: @import, workbench: @workbench
diff --git a/config/locales/imports.en.yml b/config/locales/imports.en.yml
index beba9d437..3f0e3d42e 100644
--- a/config/locales/imports.en.yml
+++ b/config/locales/imports.en.yml
@@ -1,6 +1,8 @@
 en:
   imports:
     search_no_results: "No import matching your query"
+    filters:
+      referential: "Select data space..."
     actions:
       new: "New import"
       show: "Import report"
diff --git a/config/locales/imports.fr.yml b/config/locales/imports.fr.yml
index 6c209f990..5629509bc 100644
--- a/config/locales/imports.fr.yml
+++ b/config/locales/imports.fr.yml
@@ -1,6 +1,8 @@
 fr:
   imports:
     search_no_results: "Aucun import ne correspond à votre recherche"
+    filters:
+      referential: "Sélectionnez un jeu de données..."
     actions:
       new: "Nouvel import"
       show: "Rapport d'import"