From 89daaedbe4a9a113fc7e43e62beaebff7d5419f0 Mon Sep 17 00:00:00 2001 From: pengfei Date: Wed, 7 Nov 2018 15:48:03 +0100 Subject: [PATCH 1/2] [fix #2719] tronquer les textes dans le filtre, max=50 --- app/views/new_gestionnaire/procedures/show.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/new_gestionnaire/procedures/show.html.haml b/app/views/new_gestionnaire/procedures/show.html.haml index b80686f94..5874a1177 100644 --- a/app/views/new_gestionnaire/procedures/show.html.haml +++ b/app/views/new_gestionnaire/procedures/show.html.haml @@ -59,7 +59,7 @@ - @current_filters.each do |filter| %span.filter - = "#{filter['label']} : #{filter['value']}" + = "#{truncate(filter['label']+' : '+filter['value'], length: 50)}" = link_to remove_filter_gestionnaire_procedure_path(@procedure, statut: @statut, table: filter['table'], column: filter['column']) do %img.close-icon{ src: image_url("close.svg") } From 0593299deffb13f4622280db13c24214b0031d83 Mon Sep 17 00:00:00 2001 From: pengfei Date: Wed, 7 Nov 2018 17:31:11 +0100 Subject: [PATCH 2/2] tronquer uniquement label et mettre close-icon avant le text --- app/assets/stylesheets/new_design/procedure_show.scss | 2 +- app/views/new_gestionnaire/procedures/show.html.haml | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/assets/stylesheets/new_design/procedure_show.scss b/app/assets/stylesheets/new_design/procedure_show.scss index 52798b0d5..15a89047e 100644 --- a/app/assets/stylesheets/new_design/procedure_show.scss +++ b/app/assets/stylesheets/new_design/procedure_show.scss @@ -37,7 +37,7 @@ .close-icon { vertical-align: top; margin-top: 12px; - margin-left: 6px; + margin-right: 6px; display: inline-block; } } diff --git a/app/views/new_gestionnaire/procedures/show.html.haml b/app/views/new_gestionnaire/procedures/show.html.haml index 5874a1177..ca1a06a13 100644 --- a/app/views/new_gestionnaire/procedures/show.html.haml +++ b/app/views/new_gestionnaire/procedures/show.html.haml @@ -59,10 +59,9 @@ - @current_filters.each do |filter| %span.filter - = "#{truncate(filter['label']+' : '+filter['value'], length: 50)}" = link_to remove_filter_gestionnaire_procedure_path(@procedure, statut: @statut, table: filter['table'], column: filter['column']) do %img.close-icon{ src: image_url("close.svg") } - + = "#{filter['label'].truncate(50)} : #{filter['value']}" %table.table.dossiers-table.hoverable %thead %tr