Fix merge

6 files changed, 77 insertions, 39 deletions

diff --git a/app/views/referentials/_form.html.slim b/app/views/referentials/_form.html.slim
index a4342bc8e..2f1550d66 100644
--- a/app/views/referentials/_form.html.slim
+++ b/app/views/referentials/_form.html.slim
@@ -1,43 +1,63 @@
-= semantic_form_for @referential, class: 'form-horizontal' do |form|
-  = form.inputs do
-    = form.input :name
+= simple_form_for @referential, class: 'form' do |form|
+  .row
+    .col-lg-8.col-md-8.col-sm-8.col-xs-8
+      = form.input :name
+      
     - if @referential.new_record?
       - if @referential.created_from
         = form.input :created_from
 
       = form.input :slug, :input_html => { title: t("formtastic.titles.referential.slug") }
     - else
-      li.input
-        label.label = @referential.human_attribute_name('slug')
-        = @referential.slug
-
       - if @referential.created_from
-        li.input
-          label.label = @referential.human_attribute_name('created_from')
+        .col-lg-2.col-md-2.col-sm-2.col-xs-2
+          label.control-label = @referential.human_attribute_name('slug')
+          br
+          = @referential.slug
+        .col-lg-2.col-md-2.col-sm-2.col-xs-2
+          label.control-label = @referential.human_attribute_name('created_from')
           = @referential.created_from.name
-
-    = form.input :prefix, input_html: { title: t("formtastic.titles.referential.prefix") }
-    = form.input :projection_type, as: :select, :collection => Referential.available_srids
-    = form.input :time_zone
-    = form.input :upper_corner, input_html: { title: t("formtastic.titles.referential.upper_corner") }
-    = form.input :lower_corner, input_html: { title: t("formtastic.titles.referential.lower_corner") }
-    / = form.input :data_format, label: true, include_blank: false
-
-
-    - if @referential.errors.has_key? :metadatas
-      ul.errors
-        - @referential.errors[:metadatas].each do |message|
-          li = message
-
-    = form.semantic_fields_for :metadatas do |subform|
-      = subform.input :first_period_begin, as: :date_select
-      = subform.input :first_period_end, as: :date_select
-
-      = subform.input :lines, as: :check_boxes, collection: @referential.workbench.lines.first(5)
-      / = form.select( [], @referential.workbench.lines, { include_blank: '' }, { class: 'form-control', style: 'width: 100%', 'data-select2ed': 'true', 'data-select2ed-placeholder': "Sélection de lignes" })
-
-    = form.input :workbench_id, as: :hidden
-
-  = form.actions do
-    = form.action :submit, as: :button
-    = form.action :cancel, as: :link
+      - else
+        .col-lg-4.col-md-4.col-sm-4.col-xs-4
+          label.control-label = @referential.human_attribute_name('slug')
+          br
+          = @referential.slug
+          
+  .row
+    .col-lg-5.col-md-5.col-sm-5.col-xs-5
+      = form.input :prefix, input_html: { title: t("formtastic.titles.referential.prefix") }
+    .col-lg-7.col-md-7.col-sm-7.col-xs-7
+      = form.input :projection_type, as: :select, :collection => Referential.available_srids
+  
+  .row
+    .col-lg-4.col-md-4.col-sm-4.col-xs-4
+      = form.input :time_zone
+  
+  .row
+    .col-lg-6.col-md-6.col-sm-6.col-xs-6
+      = form.input :upper_corner, input_html: {title: t("formtastic.titles.referential.upper_corner")}
+    .col-lg-6.col-md-6.col-sm-6.col-xs-6
+      = form.input :lower_corner, input_html: {title: t("formtastic.titles.referential.lower_corner")}
+
+  - if @referential.errors.has_key? :metadatas
+    ul.errors
+      - @referential.errors[:metadatas].each do |message|
+        li = message
+
+  = form.simple_fields_for :metadatas do |subform|
+    .row
+      .col-lg-6.col-md-6.col-sm-6.col-xs-6
+        = subform.input :first_period_begin, as: :date, html5: true, input_html: { style: 'width: 100%' }
+      .col-lg-6.col-md-6.col-sm-6.col-xs-6
+        = subform.input :first_period_end, as: :date, html5: true, input_html: { style: 'width: 100%' }
+    .row
+      .col-lg-8.col-md-12.col-sm-12.col-xs-12
+        = subform.input :lines, as: :select, collection: @referential.workbench.lines, input_html: { 'data-select2ed': 'true', 'data-select2ed-placeholder': 'Sélection de lignes', 'multiple': 'multiple', style: 'width: 100%' }
+
+  = form.input :workbench_id, as: :hidden
+
+  / Actions
+  .row
+    .col-lg-12.text-center
+      = link_to 'Annuler', @referential,  class: 'btn btn-link'
+      = form.button :submit, class: 'btn btn-danger'
diff --git a/app/views/referentials/edit.html.slim b/app/views/referentials/edit.html.slim
index cc5637bb6..12b5e23c9 100644
--- a/app/views/referentials/edit.html.slim
+++ b/app/views/referentials/edit.html.slim
@@ -1,3 +1,5 @@
 = title_tag t('.title')
 
-== render 'form'
\ No newline at end of file
+.row
+  .col-lg-8.col-lg-offset-2.col-md-8.col-md-offset-2.col-sm-8.col-sm-offset-2
+    == render 'form'
diff --git a/app/views/referentials/new.html.slim b/app/views/referentials/new.html.slim
index cc5637bb6..12b5e23c9 100644
--- a/app/views/referentials/new.html.slim
+++ b/app/views/referentials/new.html.slim
@@ -1,3 +1,5 @@
 = title_tag t('.title')
 
-== render 'form'
\ No newline at end of file
+.row
+  .col-lg-8.col-lg-offset-2.col-md-8.col-md-offset-2.col-sm-8.col-sm-offset-2
+    == render 'form'
diff --git a/app/views/routes/_form.html.slim b/app/views/routes/_form.html.slim
index b69b3faf2..22a759b5f 100644
--- a/app/views/routes/_form.html.slim
+++ b/app/views/routes/_form.html.slim
@@ -1,5 +1,3 @@
-= params[:controller]
-
 = simple_form_for [@referential, @line, @route] do |f|
   .row
     .col-lg-6.col-md-6.col-sm-12.col-xs-12
diff --git a/config/locales/referentials.en.yml b/config/locales/referentials.en.yml
index 09ddc7131..3af12e7f4 100644
--- a/config/locales/referentials.en.yml
+++ b/config/locales/referentials.en.yml
@@ -79,6 +79,14 @@ en:
         upper_corner: "latitude,longitude in WGS84 referential, dot for decimal separator"
         lower_corner: "latitude,longitude in WGS84 referential, dot for decimal separator"
 
+  simple_form:
+    labels:
+      referential:
+        metadatas:
+          first_period_begin: 'First period begin'
+          first_period_end: 'First period end'
+          lines: Lines
+
   notice:
     referential:
       archived: "The data space has been successfully archived"
diff --git a/config/locales/referentials.fr.yml b/config/locales/referentials.fr.yml
index dc3d796b8..8c512a676 100644
--- a/config/locales/referentials.fr.yml
+++ b/config/locales/referentials.fr.yml
@@ -80,6 +80,14 @@ fr:
         upper_corner: "latitude,longitude dans le référentiel WGS84, le séparateur de décimales est 'point'"
         lower_corner: "latitude,longitude dans le référentiel WGS84, le séparateur de décimales est 'point'"
 
+  simple_form:
+    labels:
+      referential:
+        metadatas:
+          first_period_begin: 'Première période de départ'
+          first_period_end: 'Première période de fin'
+          lines: Lignes
+
   notice:
     referential:
       archived: "L'espace de données a été correctement archivé"