diff options
| author | Guillaume | 2017-11-17 17:02:54 +0100 |
|---|---|---|
| committer | Guillaume | 2017-11-17 17:02:54 +0100 |
| commit | 6676460eedb0d45938f67e2f8fe760a8e7001623 (patch) | |
| tree | 13a05f00f44994733170b60fa2c2f335e934d288 /app | |
| parent | 1261698d213964a3391fe1880198da00e7ac9831 (diff) | |
| download | chouette-core-6676460eedb0d45938f67e2f8fe760a8e7001623.tar.bz2 | |
Refs #4986 Add new filer by compliance control set name, add new styles for display input search inside a form-group filter layout4986-compliance_control_sets_fix
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/components/_forms.sass | 6 | ||||
| -rw-r--r-- | app/views/compliance_check_sets/_filters.html.slim | 8 |
2 files changed, 12 insertions, 2 deletions
diff --git a/app/assets/stylesheets/components/_forms.sass b/app/assets/stylesheets/components/_forms.sass index 2b715d669..9a363ab97 100644 --- a/app/assets/stylesheets/components/_forms.sass +++ b/app/assets/stylesheets/components/_forms.sass @@ -531,6 +531,12 @@ table, .table &.open > .control-label + * display: block + &.search + width: 30% + > .search_bar + padding: 0 15px + > .input-group-btn + right: 5% > .filter_menu margin: 0 diff --git a/app/views/compliance_check_sets/_filters.html.slim b/app/views/compliance_check_sets/_filters.html.slim index 3051bda64..bf929bc08 100644 --- a/app/views/compliance_check_sets/_filters.html.slim +++ b/app/views/compliance_check_sets/_filters.html.slim @@ -10,14 +10,18 @@ .form-group.togglable = f.label t('activerecord.attributes.compliance_check_set.assigned_to'), required: false, class: 'control-label' = f.input :parent_type_eq_any, collection: ComplianceCheckSet.order('parent_type'), as: :check_boxes, label: false, label_method: lambda {|w| ("<span>#{w}</span>").html_safe}, required: false, wrapper_html: {class: 'checkbox_list'} - .form-group.togglable = f.label Import.human_attribute_name(:created_at), required: false, class: 'control-label' .filter_menu = f.simple_fields_for :created_at do |p| = p.input :start_date, as: :date, label: false, wrapper_html: {class: 'date smart_date filter_menu-item'}, default: @begin_range, include_blank: @begin_range ? false : true = p.input :end_date, as: :date, label: false, wrapper_html: {class: 'date smart_date filter_menu-item'}, default: @end_range, include_blank: @end_range ? false : true - + .form-group.search + .input-group.search_bar + = f.search_field :compliance_control_set_name_cont, class: 'form-control', placeholder: t('compliance_check_sets.filters.name_compliance_control_set') + span.input-group-btn + button.btn.btn-default type='submit' + span.fa.fa-search .actions = link_to t('actions.erase'), @compliance_checks_sets, class: 'btn btn-link' = f.submit t('actions.filter'), class: 'btn btn-default', id: 'compliance_check_set_filter_btn' |