Adding select2 to stopareas#index

3 files changed, 8 insertions, 5 deletions

diff --git a/app/views/referential_stop_areas/index.html.slim b/app/views/referential_stop_areas/index.html.slim
index 1b634b09c..42ac267aa 100644
--- a/app/views/referential_stop_areas/index.html.slim
+++ b/app/views/referential_stop_areas/index.html.slim
@@ -6,7 +6,7 @@
 = search_form_for @q, :url => referential_stop_areas_path(@referential), remote: true, :html => {:method => :get, class: "form-inline", :id => "search", role: "form"} do |f|
   .panel.panel-default
     .panel-heading
-      .input-group.col-md-9
+      .input-group.col-md-9.col-sm-9
         = f.text_field :name_cont, :placeholder => "#{t('.name')}", class: 'form-control'
         .input-group-btn
           button.btn.btn-default type="submit"
@@ -18,8 +18,11 @@
 
     #advanced_search.panel-collapse.collapse
       .panel-body
-        = f.text_field :zip_code_cont, :placeholder => "#{t('.zip_code')}", class: 'form-control typeahead'
-        = f.select(:area_type_cont, options_from_collection_for_select(Chouette::StopArea.stop_area_types, 'name', Proc.new { |stop_area_type| t("area_types.label.#{stop_area_type}") } ), { :include_blank => "#{t('.area_type')}" }, { :class => 'form-control' })
+        .row
+          .col-sm-3
+            = f.text_field :zip_code_cont, placeholder: "#{t('.zip_code')}", class: 'form-control typeahead', style: 'width: 100%'
+          .col-sm-3
+            = f.select(:area_type_cont, options_from_collection_for_select(Chouette::StopArea.stop_area_types, 'name', Proc.new { |stop_area_type| t("area_types.label.#{stop_area_type}") } ), { include_blank: '' }, { class: 'form-control', style: 'width: 100%', 'data-select2ed': 'true', 'data-select2ed-placeholder': t(".area_type") })
 
 #stop_areas
   = render 'stop_areas'
diff --git a/app/views/shared/_lines_search_form.html.slim b/app/views/shared/_lines_search_form.html.slim
index f7c3dc4ee..8cab8caf4 100644
--- a/app/views/shared/_lines_search_form.html.slim
+++ b/app/views/shared/_lines_search_form.html.slim
@@ -2,7 +2,7 @@
 = search_form_for @q, url: eval("#{referential_type}_lines_path(referential)"), remote: true, html: { method: :get, class: 'form-inline', id: 'search', role: 'form' } do |f|
   .panel.panel-default
     .panel-heading
-      .input-group.col-md-9
+      .input-group.col-md-9.col-sm-9
         = f.search_field :name_or_number_or_objectid_or_comment_cont, placeholder: t('lines.index.name_or_number_or_objectid_or_comment'), class: 'form-control'
         .input-group-btn
           button.btn.btn-primary type='submit'
diff --git a/app/views/stop_areas/index.html.slim b/app/views/stop_areas/index.html.slim
index 7f7e1fa74..7701fb268 100644
--- a/app/views/stop_areas/index.html.slim
+++ b/app/views/stop_areas/index.html.slim
@@ -23,7 +23,7 @@
             = f.select(:area_type_cont, options_from_collection_for_select(Chouette::StopArea.stop_area_types, 'name', Proc.new { |stop_area_type| t("area_types.label.#{stop_area_type}") } ), { include_blank: t('.area_type') }, { class: 'form-control' })
             
       .col-md-2.col-sm-3
-        button.btn.btn-primary.btn-block type="submit" Filtrer        
+        button.btn.btn-primary.btn-block type="submit" Filtrer
 
 #stop_areas
   = render 'stop_areas'