Merge branch 'master' of github.com:AF83/stif-boiv

7 files changed, 25 insertions, 18 deletions

diff --git a/app/views/referential_lines/show.html.slim b/app/views/referential_lines/show.html.slim
index a479cd580..9b19982ff 100644
--- a/app/views/referential_lines/show.html.slim
+++ b/app/views/referential_lines/show.html.slim
@@ -47,19 +47,25 @@ h2
 
     p
       label = "#{@line.human_attribute_name('transport_mode')} : "
-      = t("transport_modes.label.#{@line.transport_mode}")
+      - if @line.transport_mode
+        = " " + t("transport_modes.label.#{@line.transport_mode}")
+      - else
+        = " -"
     
     p
       label = "#{@line.human_attribute_name('transport_submode')} : "
-      = t("enumerize.linereferential.transport_submode.#{@line.transport_submode}")
+      - if @line.transport_submode
+        = " " + t("enumerize.linereferential.transport_submode.#{@line.transport_submode}")
+      - else
+        = " -"
 
     p
       label = "#{@line.human_attribute_name('stable_id')} : "
-      = @line.stable_id
+      = " #{@line.stable_id}"
 
     p
       label = "#{@line.human_attribute_name('url')} : "
-      = @line.url
+      = " #{@line.url}"
 
     / p
     /   label = "#{@line.human_attribute_name('mobility_restricted_suitability')} : "
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'
diff --git a/config/locales/directions.en.yml b/config/locales/directions.en.yml
index 05bc29da3..575ffe90d 100644
--- a/config/locales/directions.en.yml
+++ b/config/locales/directions.en.yml
@@ -3,7 +3,7 @@ en:
     label:
       straight_forward: "straight forward"
       backward: "backward"
-      clockwise: "clockwise"
+      clock_wise: "clockwise"
       counter_clock_wise: "counterclockwise"
       north: "north"
       north_west: "north west"
diff --git a/config/locales/lines.en.yml b/config/locales/lines.en.yml
index 1ed57d79f..aeaac7ee4 100644
--- a/config/locales/lines.en.yml
+++ b/config/locales/lines.en.yml
@@ -27,7 +27,7 @@ en:
       no_networks: "No networks"
       no_companies: "No companies"
       no_group_of_lines: "No group of lines"
-      no_transport_mode: No transport mode
+      no_transport_modes: No transport mode
       all_networks: "All networks"
       all_companies: "All companies"
       all_group_of_lines: "All group of lines"
diff --git a/config/locales/stop_area_referential_syncs.en.yml b/config/locales/stop_area_referential_syncs.en.yml
index 76197d5a6..8b3a5e8c3 100644
--- a/config/locales/stop_area_referential_syncs.en.yml
+++ b/config/locales/stop_area_referential_syncs.en.yml
@@ -7,13 +7,11 @@ en:
             base:
               multiple_process: 'There is already an synchronisation in progress'
   stop_area_referential_sync:
-    synchronization:
-      message:
-        new: "New synchronisation added"
-        pending: "Synchronization pending"
-        successful: "Synchronization successful after %{processing_time} with %{imported} objects created, %{updated} objects updated. %{deleted} objects were deleted.."
-        failed: "Synchronization failed after %{processing_time} with error: %{error}."
+    message:
+      new: "New synchronisation added"
+      pending: "Synchronization pending"
+      successful: "Synchronization successful after %{processing_time} with %{imported} objects created, %{updated} objects updated. %{deleted} objects were deleted.."
+      failed: "Synchronization failed after %{processing_time} with error: %{error}."
   notice:
     stop_area_referential_sync:
       created: 'Your synchronisation request has been created'
-