diff --git a/app/assets/javascripts/dossiers_list_filter.js b/app/assets/javascripts/dossiers_list_filter.js index e7648faa3..389eb6199 100644 --- a/app/assets/javascripts/dossiers_list_filter.js +++ b/app/assets/javascripts/dossiers_list_filter.js @@ -35,6 +35,11 @@ function framed_id(event) { function filter_framed_show(event) { dom_object = $(framed_id(event)); - dom_object.css('top', (event.pageY + 7) + 'px'); - dom_object.css('left', (event.pageX + 7) + 'px'); + var offset = $('#main-container').offset(); + + var y = event.pageY - offset.top; + var x = event.pageX - offset.left; + + dom_object.css('top', (y + 7) + 'px'); + dom_object.css('left', (x + 7) + 'px'); } diff --git a/app/views/backoffice/dossiers/_list.html.haml b/app/views/backoffice/dossiers/_list.html.haml index a0e85fc21..d39f50987 100644 --- a/app/views/backoffice/dossiers/_list.html.haml +++ b/app/views/backoffice/dossiers/_list.html.haml @@ -7,8 +7,8 @@ -else = smart_listing.sortable preference.libelle, preference.table_attr - if @dossiers_list_facade.active_filter? preference - %i.filter.fa.fa-filter{style: "cursor: pointer; margin-left:3px; font-size: 1.1em; color:#{(preference.filter.blank? ? 'grey' : 'orange')}", id: "filter_"+preference.table_attr.sub('.', '_')} - = render partial: 'backoffice/dossiers/filter_framed', locals:{preference: preference, filter_framed_id: "framed_filter_"+preference.table_attr.sub('.', '_')} + %i.filter.fa.fa-filter{style: "cursor: pointer; margin-left:3px; font-size: 1.1em; color:#{(preference.filter.blank? ? 'grey' : 'orange')}", id: "filter_#{smart_listing.name.to_s}_#{preference.table_attr.sub('.', '_')}"} + = render partial: 'backoffice/dossiers/filter_framed', locals:{preference: preference, filter_framed_id: "framed_filter_#{smart_listing.name.to_s}_#{preference.table_attr.sub('.', '_')}"} %th.col-md-1.col-lg-1.center Actions %th.col-md-1.col-lg-1.center Abonnés