diff options
| author | Guillaume | 2017-10-03 17:36:29 +0200 |
|---|---|---|
| committer | Guillaume | 2017-10-03 17:36:29 +0200 |
| commit | 35f35bab668e2ae23a490df799ee2cbc7cd651d4 (patch) | |
| tree | 013caa7d7ba06556949b459651b36f75e4574792 /app/views | |
| parent | 3a666be069195e9fc63a12d5f6001098dfd26c34 (diff) | |
| parent | 9ea95b98c52f99494a13befa54cfd8cd298ab0c4 (diff) | |
| download | chouette-core-35f35bab668e2ae23a490df799ee2cbc7cd651d4.tar.bz2 | |
Merge branch 'master' of https://github.com/af83/stif-boiv
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/compliance_control_sets/_filters.html.slim | 2 | ||||
| -rw-r--r-- | app/views/compliance_control_sets/index.html.slim | 1 | ||||
| -rw-r--r-- | app/views/time_tables/_filter.html.slim | 4 |
3 files changed, 4 insertions, 3 deletions
diff --git a/app/views/compliance_control_sets/_filters.html.slim b/app/views/compliance_control_sets/_filters.html.slim index f70a997f5..6a5d3ac44 100644 --- a/app/views/compliance_control_sets/_filters.html.slim +++ b/app/views/compliance_control_sets/_filters.html.slim @@ -19,4 +19,4 @@ .actions = link_to t('actions.erase'), @compliance_control_set, class: 'btn btn-link' - = f.submit t('actions.filter'), class: 'btn btn-default', id: 'referential_filter_btn'
\ No newline at end of file + = f.submit t('actions.filter'), class: 'btn btn-default', id: 'compliance_control_set_filter_btn'
\ No newline at end of file diff --git a/app/views/compliance_control_sets/index.html.slim b/app/views/compliance_control_sets/index.html.slim index ecb4eb75b..22c65dabc 100644 --- a/app/views/compliance_control_sets/index.html.slim +++ b/app/views/compliance_control_sets/index.html.slim @@ -53,3 +53,4 @@ = replacement_msg t('compliance_control_sets.search_no_results') += javascript_include_tag 'filters/compliance_control_set.js'
\ No newline at end of file diff --git a/app/views/time_tables/_filter.html.slim b/app/views/time_tables/_filter.html.slim index a4d90d1cc..2672f7dfc 100644 --- a/app/views/time_tables/_filter.html.slim +++ b/app/views/time_tables/_filter.html.slim @@ -15,8 +15,8 @@ = f.label Chouette::TimeTable.human_attribute_name(:bounding_dates), required: false, class: 'control-label' .filter_menu = f.simple_fields_for :bounding_dates do |p| - = f.input :start_date, as: :date, label: t('simple_form.from'), wrapper_html: { class: 'date smart_date filter_menu-item' }, default: @begin_range, include_blank: @begin_range ? false : true - = f.input :end_date, as: :date, label: t('simple_form.to'), wrapper_html: { class: 'date smart_date filter_menu-item' }, default: @end_range, include_blank: @end_range ? false : true + = p.input :start_date, as: :date, label: t('simple_form.from'), 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: t('simple_form.to'), wrapper_html: { class: 'date smart_date filter_menu-item' }, default: @end_range, include_blank: @end_range ? false : true .actions |