Merge branch 'master' into 4981_last_editor

4 files changed, 24 insertions, 17 deletions

diff --git a/app/views/networks/_form.html.slim b/app/views/networks/_form.html.slim
index 7b048edc9..362584f97 100644
--- a/app/views/networks/_form.html.slim
+++ b/app/views/networks/_form.html.slim
@@ -1,15 +1,14 @@
-= semantic_form_for [@line_referential, @network] do |form|
-  = form.inputs do
-    = form.input :name, :input_html => { :title => t("formtastic.titles#{format_restriction_for_locales(@line_referential)}.network.name")}
-    = form.input :registration_number, :input_html => { :title => t("formtastic.titles#{format_restriction_for_locales(@line_referential)}.network.registration_number")}
-    = form.input :comment
-    = form.input :version_date, as: :date_picker
-    = form.input :description
-    = form.input :source_name
-    = form.input :source_type_name, as: :select, :collection => source_type_name_label_pairs, :include_blank => true
-    = form.input :source_identifier
-    = form.input :objectid, :required => !@network.new_record?, :input_html => { :title => t("formtastic.titles#{format_restriction_for_locales(@referential)}.network.objectid")}
+= simple_form_for [@line_referential, @network], html: {class: 'form-horizontal', id: 'network_form'}, wrapper: :horizontal_form do |f|
+  .row
+    .col-lg-12
+      = f.input :name, :input_html => { :title => t("formtastic.titles#{format_restriction_for_locales(@line_referential)}.network.name")}
+      = f.input :registration_number, :input_html => { :title => t("formtastic.titles#{format_restriction_for_locales(@line_referential)}.network.registration_number")}
+      = f.input :comment
+      = f.input :version_date, :label_html => { :class => 'string optional col-sm-4 col-xs-5 control-label' }, :wrapper => :multi_select_inline
+      = f.input :description
+      = f.input :source_name
+      = f.input :source_type_name, as: :select, :collection => Chouette::Network.source_type_name.options, :include_blank => true
+      = f.input :source_identifier
+  .separator
 
-  = form.actions do
-    = form.action :submit, as: :button
-    = form.action :cancel, as: :link
+    = f.button :submit, t('actions.submit'), class: 'btn btn-default formSubmitr', form: 'network_form'
diff --git a/app/views/networks/edit.html.slim b/app/views/networks/edit.html.slim
index 0a396361f..64513d250 100644
--- a/app/views/networks/edit.html.slim
+++ b/app/views/networks/edit.html.slim
@@ -1,3 +1,7 @@
 - breadcrumb :network, @network
 - page_header_content_for @network
-= render 'form'
+.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'
\ No newline at end of file
diff --git a/app/views/networks/index.html.slim b/app/views/networks/index.html.slim
index 3a804bad0..b13c73e9e 100644
--- a/app/views/networks/index.html.slim
+++ b/app/views/networks/index.html.slim
@@ -23,7 +23,7 @@
             [ \
               TableBuilderHelper::Column.new( \
                 name: 'Oid', \
-                attribute: Proc.new { |n| n.get_objectid.try(:short_id) }, \
+                attribute: Proc.new { |n| n.try(:get_objectid).try(:short_id) }, \
                 sortable: false \
               ),
               TableBuilderHelper::Column.new( \
diff --git a/app/views/networks/new.html.slim b/app/views/networks/new.html.slim
index de5dd9121..590d2b409 100644
--- a/app/views/networks/new.html.slim
+++ b/app/views/networks/new.html.slim
@@ -1,2 +1,6 @@
 - breadcrumb :networks, @line_referential
-= render 'form'
+.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'
\ No newline at end of file