Refs #2482: updating workbench#show & refs#show

7 files changed, 106 insertions, 105 deletions

diff --git a/app/assets/stylesheets/_layout.sass b/app/assets/stylesheets/_layout.sass
index 6186d5ca1..38294174c 100644
--- a/app/assets/stylesheets/_layout.sass
+++ b/app/assets/stylesheets/_layout.sass
@@ -20,4 +20,4 @@ body
   padding: 40px 35px 0 35px
 
 .page_content
-  padding: 20px 35px 20px 35px
+  padding: 35px
diff --git a/app/assets/stylesheets/components/_forms.sass b/app/assets/stylesheets/components/_forms.sass
index 2b0c2ae58..85c77ffa2 100644
--- a/app/assets/stylesheets/components/_forms.sass
+++ b/app/assets/stylesheets/components/_forms.sass
@@ -2,11 +2,19 @@
 // FORMS //
 //-------//
 
-.page_content
-  > .container-fluid > .row > [class*='col']
-    > form
-      margin-top: 15px
-      margin-bottom: 15px
+input
+  &::-moz-placeholder
+    color: rgba($grey, 0.65)
+    font-style: italic
+  &::-webkit-input-placeholder
+    color: rgba($grey, 0.65)
+    font-style: italic
+  &:-ms-input-placeholder
+    color: rgba($grey, 0.65)
+    font-style: italic
+  &::-ms-input-placeholder
+    color: rgba($grey, 0.65)
+    font-style: italic
 
 .control-label.required
   abbr[title], abbr[data-original-title]
@@ -41,51 +49,32 @@
       box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px #5cb85c
 
 // Search bar
-.page_header
-  .search_bar
-    position: relative
-    width: 100%
+.search_bar
+  position: relative
+  width: 100%
 
+  > .form-control
+    border-radius: 4px
+    padding-right: 31px
 
-    > .form-control
-      background-color: rgba(#fff, 0.15)
-      color: #fff
-      border: none
+    &:first-child, &:last-child
       border-radius: 4px
-      padding-right: 31px
-
-      &::-moz-placeholder
-        color: rgba(#fff, 0.65)
-        font-style: italic
-      &::-webkit-input-placeholder
-        color: rgba(#fff, 0.65)
-        font-style: italic
-      &:-ms-input-placeholder
-        color: rgba(#fff, 0.65)
-        font-style: italic
-      &::-ms-input-placeholder
-        color: rgba(#fff, 0.65)
-        font-style: italic
-
-      &:focus, &:active
-        box-shadow: none
-
-    .input-group-btn
-      position: absolute
-      top: 0
-      bottom: 0
-      right: 0
-      z-index: 2
-      width: auto
 
-      > .btn
-        margin: 0
-        padding: 6px 9px
-        border: none
-        border-radius: 0
-        background-color: transparent
-        color: #fff
-        height: 100%
+  .input-group-btn
+    position: absolute
+    top: 0
+    bottom: 0
+    right: 0
+    z-index: 2
+    width: auto
+
+    > .btn
+      margin: 0
+      padding: 6px 9px
+      border: none
+      border-radius: 0
+      background-color: transparent
+      height: 100%
 
 // Checkbox
 $cbx-size: 20px
@@ -146,24 +135,26 @@ $cbx-size: 20px
 .form.form-filter
   display: block
   position: relative
-  border-top: 1px solid rgba(#fff, 0.6)
-  border-left: 1px solid rgba(#fff, 0.6)
-  border-right: 1px solid rgba(#fff, 0.6)
+  background-color: lighten($blue, 55%)
   padding-right: 167px
   min-height: 40px
 
+  + .select_table, + .table > thead > tr > th
+    border-top: 2px solid
+
   > *
     display: inline-block
     vertical-align: top
     padding: 7px 15px
 
   > .form-group
-    border-right: 1px solid rgba(#fff, 0.6)
+    border-right: 1px solid #fff
     margin: 0
     min-height: 40px
 
     .control-label
       font-weight: 700
+      color: $blue
       line-height: 40px - 14px
       margin: 0
 
@@ -176,7 +167,7 @@ $cbx-size: 20px
     z-index: 1
 
     .btn
-      color: #fff
+      color: $blue
       font-weight: 700
       background-color: transparent
       padding: 2px 20px
@@ -189,11 +180,11 @@ $cbx-size: 20px
           text-decoration: none
 
       &.btn-default
-        border: 1px solid #fff
+        border: 1px solid $blue
 
         &:hover, &:focus, &.focus, &.active
-          background-color: #fff
-          color: $blue
+          background-color: $blue
+          color: #fff
           transition: 0.2s
 
   > .form-group
@@ -203,8 +194,15 @@ $cbx-size: 20px
       padding-right: 44px
       cursor: pointer
 
+      > .control-label
+        cursor: pointer
+
       &:hover, &.open
-        background-color: rgba(#fff, 0.5)
+        background-color: rgba($blue, 0.4)
+        color: #fff
+
+        > .control-label, &:before
+          color: #fff
 
       &:before
         content: '\f078'
@@ -217,12 +215,13 @@ $cbx-size: 20px
         top: 0
         height: 40px
         width: 15px
-        color: #fff
+        color: $blue
         text-align: center
         line-height: 40px
 
       &.open:before
         content: '\f077'
+        color: #fff
 
       > .control-label + *
         display: none
@@ -241,7 +240,7 @@ $cbx-size: 20px
       max-height: 300px
       background-color: #fff
       color: $darkgrey
-      box-shadow: 0 0 3px $darkgrey
+      box-shadow: 0 0 3px rgba($darkgrey, 0.25)
       white-space: nowrap
       overflow: auto
 
diff --git a/app/assets/stylesheets/components/_page_header.sass b/app/assets/stylesheets/components/_page_header.sass
index 33fc1ed7c..562b33664 100644
--- a/app/assets/stylesheets/components/_page_header.sass
+++ b/app/assets/stylesheets/components/_page_header.sass
@@ -51,11 +51,14 @@
       display: inline-block
       vertical-align: top
       min-width: 150px
+      padding-right: 15px
+      margin-right: 15px
+      border-right: 1px solid rgba(#fff, 0.5)
 
-      + .pm-col
-        margin-left: 15px
-        padding-left: 15px
-        border-left: 1px solid rgba(#fff, 0.5)
+      &:last-child
+        margin-right: 0
+        padding-right: 0
+        border-right: none
 
     .pm-item
       margin-top: 0.5em
diff --git a/app/assets/stylesheets/components/_pagination.sass b/app/assets/stylesheets/components/_pagination.sass
index 905cd6154..bb53cf693 100644
--- a/app/assets/stylesheets/components/_pagination.sass
+++ b/app/assets/stylesheets/components/_pagination.sass
@@ -3,11 +3,13 @@
 //--------------//
 
 .pagination
-  margin: 0 0 20px 0
-  border-radius: none
+  margin: 0
+  border-radius: 0
+  line-height: 34px
 
   .page_links
     display: inline-block
+    vertical-align: top
     margin-left: 15px
     // To avoid white spaces between childrend inline-block
     letter-spacing: -0.31em
diff --git a/app/assets/stylesheets/components/_tables.sass b/app/assets/stylesheets/components/_tables.sass
index 80e695a6f..ce510decc 100644
--- a/app/assets/stylesheets/components/_tables.sass
+++ b/app/assets/stylesheets/components/_tables.sass
@@ -45,7 +45,7 @@
       > tr > td
         border-top: none
         border-bottom: 1px solid $grey
-        padding: 4px 8px
+        padding: 6px 8px
         vertical-align: middle
 
         > a
diff --git a/app/views/referentials/show.html.slim b/app/views/referentials/show.html.slim
index e5d31e3ce..bd65b470b 100644
--- a/app/views/referentials/show.html.slim
+++ b/app/views/referentials/show.html.slim
@@ -32,7 +32,7 @@
             strong = "#{@referential.human_attribute_name(:published_at)} : "
             = ""
 
-  .row
+  .row.mb-sm
     .col-lg-12.text-right
       / Actions are: controler, rapport de controle, dupliquer, purger, conserver, supprimer
       = link_to t('actions.clone'), new_referential_path(from: @referential.id), class: 'btn btn-primary'
@@ -46,27 +46,25 @@
 
       = link_to t('actions.destroy'), referential_path(@referential), method: :delete, data: {confirm: t('referentials.actions.destroy_confirm')}, class: 'btn btn-primary'
 
-  .row.mt-xs
-    .col-lg-5.col-md-6.col-sm-6.col-xs-8
-      = search_form_for @q, url: referential_path(@referential.id) do |f|
-        .input-group.search_bar
-          = f.search_field :name_cont, class: 'form-control', placeholder: 'Indiquez un nom de ligne'
-
-          span.input-group-btn
-            button.btn.btn-default type='submit'
-              span.fa.fa-search
-
-  .row.mt-xs
-    .col-lg-12
-      = render 'filters'
-
 / PageContent
 .page_content
   .container-fluid
-    .row
-      .col-lg-12
-        - if @reflines.any?
-          = new_pagination @reflines, 'pull-right'
+    - if @reflines.any?
+      .row
+        .col-lg-5.col-md-6.col-sm-6.col-xs-8
+          = search_form_for @q, url: referential_path(@referential.id) do |f|
+            .input-group.search_bar
+              = f.search_field :name_cont, class: 'form-control', placeholder: 'Indiquez un nom de ligne'
+
+              span.input-group-btn
+                button.btn.btn-default type='submit'
+                  span.fa.fa-search
+        .col-lg-7.col-md-6.col-sm-6.col-xs-4.text-right
+          = new_pagination @reflines
+
+      .row.mt-sm
+        .col-lg-12
+          = render 'filters'
 
           / ID Codif, nom court, nom de la ligne, réseau, mode, transporteur principal, actions = [show, edit_notes]
           = table_builder @reflines,
@@ -80,8 +78,9 @@
 
           = new_pagination @reflines, 'pull-right'
 
-        - else
-          = replacement_msg t('referential_lines.search_no_results')
+    - else
+      = replacement_msg t('referential_lines.search_no_results')
+
 
 / Modal(s)
 = modalbox 'purgeModal' do
diff --git a/app/views/workbenches/show.html.slim b/app/views/workbenches/show.html.slim
index 57de20bb1..50675e364 100644
--- a/app/views/workbenches/show.html.slim
+++ b/app/views/workbenches/show.html.slim
@@ -8,27 +8,25 @@
   .row
     .col-lg-12.text-right
       = link_to t('referentials.actions.new'), new_referential_path(workbench_id: @workbench), class: 'btn btn-primary'
-      
-  .row.mt-xs
-    .col-lg-5.col-md-6.col-sm-6.col-xs-8
-      = search_form_for @q, url: workbench_path(@workbench.id), builder: SimpleForm::FormBuilder do |f|
-        .input-group.search_bar
-          = f.search_field :name_cont, class: 'form-control', placeholder: 'Indiquez un nom de référentiel'
-          span.input-group-btn
-            button.btn.btn-default type='submit'
-              span.fa.fa-search
-
-  .row.mt-xs
-    .col-lg-12
-      = render 'filters'
 
 / PageContent
 .page_content
   .container-fluid
-    .row
-      .col-lg-12
-        - if @wbench_refs.any?
-          = new_pagination @wbench_refs, 'pull-right'
+    - if @wbench_refs.any?
+      .row
+        .col-lg-5.col-md-6.col-sm-6.col-xs-8
+          = search_form_for @q, url: workbench_path(@workbench.id), builder: SimpleForm::FormBuilder do |f|
+            .input-group.search_bar
+              = f.search_field :name_cont, class: 'form-control', placeholder: 'Indiquez un nom de référentiel'
+              span.input-group-btn
+                button.btn.btn-default type='submit'
+                  span.fa.fa-search
+        .col-lg-7.col-md-6.col-sm-6.col-xs-4.text-right
+          = new_pagination @wbench_refs
+
+      .row.mt-sm
+        .col-lg-12
+          = render 'filters'
 
           / actions for table: controler+integrer, consulter, modifier, controler, dupliquer, conserver, purger, supprimer
           = table_builder @wbench_refs,
@@ -44,5 +42,5 @@
 
           = new_pagination @wbench_refs, 'pull-right'
 
-        - else
-          = replacement_msg t('referentials.search_no_results')
+    - else
+      = replacement_msg t('referentials.search_no_results')