Merge commit '20cab702f624513bdec6d1ab64535c88ae32ffb5' into develop
This commit is contained in:
commit
511cabf95a
4 changed files with 19 additions and 5 deletions
|
@ -3,9 +3,21 @@ $(document).ready(filters_init);
|
|||
|
||||
|
||||
function filters_init() {
|
||||
$('html').click(function(event) {
|
||||
var visible_filter = $('.filter_framed:visible')
|
||||
if(visible_filter.length) {
|
||||
if (!$(event.target).closest('.filter_framed').is(":visible")) {
|
||||
visible_filter.hide();
|
||||
}
|
||||
}
|
||||
});
|
||||
$(".filter").on('click', function (event) {
|
||||
filter_framed_show(event);
|
||||
filter_framed_close_all_excepted(framed_id(event));
|
||||
event.stopPropagation();
|
||||
});
|
||||
$(".erase-filter").on('click', function (event) {
|
||||
$(this).parent().find(".filter_input").val("");
|
||||
});
|
||||
}
|
||||
|
||||
|
@ -24,4 +36,4 @@ function filter_framed_show(event) {
|
|||
|
||||
dom_object.css('top', (event.pageY + 7) + 'px');
|
||||
dom_object.css('left', (event.pageX + 7) + 'px');
|
||||
}
|
||||
}
|
||||
|
|
|
@ -30,4 +30,4 @@ function pref_list_dossier_close_action() {
|
|||
}
|
||||
)
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
|
@ -3,6 +3,8 @@
|
|||
= preference.libelle
|
||||
|
||||
=form_tag @dossiers_list_facade.filter_url, {class: 'panel-body form-inline', method: :post} do
|
||||
%input.form-control.filter_input{name: "filter_input[#{preference.table_attr}]", style:'width: 84%', value: "#{preference.filter}"}
|
||||
%input.form-control.filter_input{name: "filter_input[#{preference.table_attr}]", style:'width: 69%', value: "#{preference.filter}"}
|
||||
%button.btn.btn-sm.btn-success
|
||||
%i.fa.fa-check
|
||||
%i.fa.fa-check
|
||||
%div.btn.btn-sm.btn-danger.erase-filter
|
||||
%i.fa.fa-remove
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
Env Test
|
||||
= image_tag('marianne_small.png', class: 'logo')
|
||||
%a{href: '/'}
|
||||
= image_tag(image_url(LOGO_NAME), class: 'logo')
|
||||
= image_tag(image_url(LOGO_NAME), class: 'logo') rescue nil
|
||||
|
||||
- if gestionnaire_signed_in? && user_signed_in?
|
||||
%a{href: (current_gestionnaire.procedure_filter.blank? ? backoffice_dossiers_path : backoffice_dossiers_procedure_path(current_gestionnaire.procedure_filter)), class: 'btn btn-md'}
|
||||
|
|
Loading…
Reference in a new issue