diff options
| author | jpl | 2017-02-17 11:52:21 +0100 |
|---|---|---|
| committer | jpl | 2017-02-17 11:52:21 +0100 |
| commit | 89629faa94c436430fe2c2910a53956db7ffd261 (patch) | |
| tree | ea486c2c8c54c40898feabf01ee37a56f300a5a0 | |
| parent | 7d6609313bf0a00d6e9f1ce80852b72bb7a46c42 (diff) | |
| download | chouette-core-89629faa94c436430fe2c2910a53956db7ffd261.tar.bz2 | |
Refs #2615: fix layouts on empty filter results, for workbenches#show & referentials#show
| -rw-r--r-- | app/assets/stylesheets/components/_forms.sass | 4 | ||||
| -rw-r--r-- | app/views/referentials/show.html.slim | 8 | ||||
| -rw-r--r-- | app/views/workbenches/show.html.slim | 6 |
3 files changed, 10 insertions, 8 deletions
diff --git a/app/assets/stylesheets/components/_forms.sass b/app/assets/stylesheets/components/_forms.sass index 1b52cfe53..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 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/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') |