Merge branch 'master' into staging

4 files changed, 18 insertions, 5 deletions

diff --git a/app/assets/stylesheets/components/_forms.sass b/app/assets/stylesheets/components/_forms.sass
index 95d699c71..4dcc8842b 100644
--- a/app/assets/stylesheets/components/_forms.sass
+++ b/app/assets/stylesheets/components/_forms.sass
@@ -520,8 +520,13 @@ table, .table
       white-space: nowrap
       overflow: auto
 
+      > .checkbox-wrapper
+        width: 100%
+        height: auto
+        margin: 0
+
       $cbx-size-xs: 14px
-      > .checkbox
+      > .checkbox, > .checkbox-wrapper > .checkbox
         width: 100%
         height: auto
         margin: 0
diff --git a/app/assets/stylesheets/components/_tables.sass b/app/assets/stylesheets/components/_tables.sass
index a18009ba1..246b0c812 100644
--- a/app/assets/stylesheets/components/_tables.sass
+++ b/app/assets/stylesheets/components/_tables.sass
@@ -49,6 +49,14 @@
         padding: 6px 8px
         vertical-align: middle
 
+        > .td-block
+          white-space: nowrap
+
+          > .fa:first-child
+            margin-right: 0.5em
+          > .fa:last-child
+            margin-left: 0.5em
+
         > a
           display: block
           margin: -6px -8px
diff --git a/app/views/workbenches/_filters.html.slim b/app/views/workbenches/_filters.html.slim
index 6b010bc99..2f96dba1e 100644
--- a/app/views/workbenches/_filters.html.slim
+++ b/app/views/workbenches/_filters.html.slim
@@ -13,9 +13,9 @@
 
     .form-group.togglable
       = f.label @wbench_refs.human_attribute_name(:status), required: false, class: 'control-label'
-      .filter_menu
-        = f.input :archived_at_not_null, label: ("<span>Conservé<span class='fa fa-archive'></span></span>").html_safe, as: :boolean, wrapper_html: { class: 'checkbox_list' }, input_html: { class: 'check_boxes' }
-        = f.input :archived_at_null, label: ("<span>En préparation<span class='fa'></span></span>").html_safe, as: :boolean, wrapper_html: { class: 'checkbox_list' }, input_html: { class: 'check_boxes' }
+      .form-group.checkbox_list
+        = f.input :archived_at_not_null, label: ("<span>Conservé<span class='fa fa-archive'></span></span>").html_safe, as: :boolean, wrapper_html: { class: 'checkbox-wrapper' }
+        = f.input :archived_at_null, label: ("<span>En préparation<span class='fa fa-pencil'></span></span>").html_safe, as: :boolean, wrapper_html: { class: 'checkbox-wrapper' }
 
     .form-group.togglable
       = f.label 'Organisation(s)', required: false, class: 'control-label'
diff --git a/app/views/workbenches/show.html.slim b/app/views/workbenches/show.html.slim
index 1c54d61cf..1bd86af16 100644
--- a/app/views/workbenches/show.html.slim
+++ b/app/views/workbenches/show.html.slim
@@ -22,7 +22,7 @@
         .col-lg-12
           = table_builder @wbench_refs,
             { :name => 'name',
-              :status => Proc.new {|w| w.archived? ? ("<span class='fa fa-archive'></span> Conservé").html_safe : '-'},
+              :status => Proc.new {|w| w.archived? ? ("<div class='td-block'><span class='fa fa-archive'></span><span>Conservé</span></div>").html_safe : ("<div class='td-block'><span class='fa fa-pencil'></span><span>En préparation</span></div>").html_safe},
               :organisation => Proc.new {|w| w.organisation.name},
               :validity_period => Proc.new {|w| w.validity_period.nil? ? '-' : t('validity_range', debut: l(w.try(:validity_period).try(:begin), format: :short), end: l(w.try(:validity_period).try(:end), format: :short))},
               :lines => Proc.new {|w| w.lines.count},