Merge branch 'master' into staging

5 files changed, 21 insertions, 13 deletions

diff --git a/app/assets/stylesheets/components/_forms.sass b/app/assets/stylesheets/components/_forms.sass
index 8e65f42f3..d2ab686f0 100644
--- a/app/assets/stylesheets/components/_forms.sass
+++ b/app/assets/stylesheets/components/_forms.sass
@@ -138,9 +138,7 @@ $cbx-size: 20px
   background-color: lighten($blue, 58%)
   padding-right: 167px
   min-height: 42px
-
-  + .select_table, + .table > thead > tr > th
-    border-top: 2px solid
+  border-bottom: 2px solid $darkgrey
 
   > *
     display: inline-block
@@ -381,6 +379,7 @@ $cbx-size: 20px
 
     > div
       display: table-cell
+      vertical-align: top
       padding: 10px
 
       &:last-child
@@ -415,6 +414,7 @@ $cbx-size: 20px
 
     > div
       display: table-cell
+      vertical-align: top
       padding: 0 10px 10px 10px
 
       &:last-child
diff --git a/app/views/lines/index.html.slim b/app/views/lines/index.html.slim
index 6e32d9ac1..056733a55 100644
--- a/app/views/lines/index.html.slim
+++ b/app/views/lines/index.html.slim
@@ -22,11 +22,13 @@
         .col-lg-7.col-md-6.col-sm-6.col-xs-4.text-right
           = new_pagination @lines
 
-    - if @lines.any?
       .row
         .col-lg-12
           = render 'filters'
 
+    - if @lines.any?
+      .row
+        .col-lg-12
           = table_builder @lines,
             { 'Oid' => Proc.new { |n| n.objectid.local_id },
             @lines.human_attribute_name(:name) => 'name', @lines.human_attribute_name(:network) => Proc.new { |n| n.try(:network).try(:name) },
@@ -40,6 +42,6 @@
           = new_pagination @lines, 'pull-right'
 
     - unless @lines.any?
-      .row
+      .row.mt-xs
         .col-lg-12
           = replacement_msg t('referential_lines.search_no_results')
diff --git a/app/views/referentials/show.html.slim b/app/views/referentials/show.html.slim
index af8e6b8cd..ff4d3e64b 100644
--- a/app/views/referentials/show.html.slim
+++ b/app/views/referentials/show.html.slim
@@ -47,11 +47,13 @@
         .col-lg-7.col-md-6.col-sm-6.col-xs-4.text-right
           = new_pagination @reflines
 
-    - if @reflines.any?
-      .row.mt-sm
+      .row
         .col-lg-12
           = render 'filters'
 
+    - if @reflines.any?
+      .row
+        .col-lg-12
           / ID Codif, nom court, nom de la ligne, réseau, mode, transporteur principal, actions = [show, edit_notes]
           = table_builder @reflines,
             { 'ID Codif' => Proc.new { |n| n.objectid.local_id }, @reflines.human_attribute_name(:registration_number) => 'registration_number',
@@ -66,7 +68,7 @@
           = new_pagination @reflines, 'pull-right'
 
     - unless @reflines.any?
-      .row
+      .row.mt-xs
         .col-lg-12
           = replacement_msg t('referential_lines.search_no_results')
 
diff --git a/app/views/stop_areas/index.html.slim b/app/views/stop_areas/index.html.slim
index 7ce6b61b1..8baa81ab0 100644
--- a/app/views/stop_areas/index.html.slim
+++ b/app/views/stop_areas/index.html.slim
@@ -22,14 +22,16 @@
         .col-lg-7.col-md-6.col-sm-6.col-xs-4.text-right
           = new_pagination @stop_areas
 
-    - if @stop_areas.any?
       .row
         .col-lg-12
           = render 'filters'
 
+    - if @stop_areas.any?
+      .row
+        .col-lg-12
           = table_builder @stop_areas,
             { 'Oid' => Proc.new { |n| n.try(:objectid).try(:local_id) }, @stop_areas.human_attribute_name(:name) => 'name', @stop_areas.human_attribute_name(:registration_number) => 'registration_number', @stop_areas.human_attribute_name(:zip_code) => 'zip_code',
-            @stop_areas.human_attribute_name(:city_name) => 'city_name', @stop_areas.human_attribute_name(:area_type) => Proc.new{|s| t("enumerize.stop_area.area_type.#{s.try(:area_type)}")} },
+            @stop_areas.human_attribute_name(:city_name) => 'city_name', @stop_areas.human_attribute_name(:area_type) => Proc.new{|s| (s.area_type.nil? ? '-' : t("enumerize.stop_area.area_type.#{s.try(:area_type)}"))} },
             [:show, :edit, :delete],
             [],
             'table'
@@ -37,6 +39,6 @@
           = new_pagination @stop_areas, 'pull-right'
 
     - unless @stop_areas.any?
-      .row
+      .row.mt-xs
         .col-lg-12
           = replacement_msg t('stop_areas.search_no_results')
diff --git a/app/views/workbenches/show.html.slim b/app/views/workbenches/show.html.slim
index 50589075a..d6b7a5b4e 100644
--- a/app/views/workbenches/show.html.slim
+++ b/app/views/workbenches/show.html.slim
@@ -24,11 +24,13 @@
         .col-lg-7.col-md-6.col-sm-6.col-xs-4.text-right
           = new_pagination @wbench_refs
 
-    - if @wbench_refs.any?
       .row
         .col-lg-12
           = render 'filters'
 
+    - if @wbench_refs.any?
+      .row
+        .col-lg-12
           / actions for table: controler+integrer, consulter, modifier, controler, dupliquer, conserver, purger, supprimer
           = table_builder @wbench_refs,
             { @wbench_refs.human_attribute_name(:name) => 'name', @wbench_refs.human_attribute_name(:status) => Proc.new {|w| w.archived? ? ("<span class='fa fa-archive'></span> Conservé").html_safe : '-'},
@@ -44,6 +46,6 @@
           = new_pagination @wbench_refs, 'pull-right'
 
     - unless @wbench_refs.any?
-      .row
+      .row.mt-xs
         .col-lg-12
           = replacement_msg t('referentials.search_no_results')