aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorjpl2017-08-22 12:38:30 +0200
committerjpl2017-08-22 12:38:30 +0200
commit857ff70a1fead6e29fb372f830710655d44cb3cc (patch)
tree2fafa9f017ea767284bae0b6f9f53c36771e1d47 /app
parent808d5a8284abc0d7cd9734389df8ef28c31d0d70 (diff)
downloadchouette-core-857ff70a1fead6e29fb372f830710655d44cb3cc.tar.bz2
Refs #4256: adding started_at filter
Diffstat (limited to 'app')
-rw-r--r--app/views/imports/_filters.html.slim7
-rw-r--r--app/views/imports/index.html.slim2
-rw-r--r--app/views/networks/index.html.slim2
3 files changed, 8 insertions, 3 deletions
diff --git a/app/views/imports/_filters.html.slim b/app/views/imports/_filters.html.slim
index 8df326010..99fcb0232 100644
--- a/app/views/imports/_filters.html.slim
+++ b/app/views/imports/_filters.html.slim
@@ -1,7 +1,7 @@
= search_form_for @q, url: workbench_imports_path(@workbench), html: { method: :get, class: 'form form-filter' } do |f|
.ffg-row
.input-group.search_bar
- = f.search_field :name_or_creator_cont, class: 'form-control', placeholder: "Indiquez un nom d'importation..."
+ = f.search_field :name_or_creator_cont, class: 'form-control', placeholder: t('imports.filters.name_or_creator_cont')
span.input-group-btn
button.btn.btn-default#search_btn type='submit'
span.fa.fa-search
@@ -11,6 +11,11 @@
= f.label Import.human_attribute_name(:status), required: false, class: 'control-label'
= f.input :status_eq_any, collection: @imports.map(&:status).uniq.compact, as: :check_boxes, label: false, label_method: lambda{|l| ("<span>" + l + "</span>").html_safe}, required: false, wrapper_html: { class: 'checkbox_list'}
+ .form-group.togglable
+ = f.label Import.human_attribute_name(:started_at), required: false, class: 'control-label'
+ .filter_menu
+ = f.input :started_at_eq, as: :date, label: false, wrapper_html: { class: 'date smart_date filter_menu-item' }, include_blank: true
+
.actions
= link_to t('actions.erase'), workbench_imports_path(@workbench), class: 'btn btn-link'
= f.submit t('actions.filter'), class: 'btn btn-default'
diff --git a/app/views/imports/index.html.slim b/app/views/imports/index.html.slim
index dfbefb66c..79e464490 100644
--- a/app/views/imports/index.html.slim
+++ b/app/views/imports/index.html.slim
@@ -41,6 +41,6 @@
= new_pagination @imports, 'pull-right'
- unless @imports.any?
- .row
+ .row.mt-xs
.col-lg-12
= replacement_msg t('imports.search_no_results')
diff --git a/app/views/networks/index.html.slim b/app/views/networks/index.html.slim
index 4c1f9783c..1478c3e09 100644
--- a/app/views/networks/index.html.slim
+++ b/app/views/networks/index.html.slim
@@ -40,6 +40,6 @@
= new_pagination @networks, 'pull-right'
- unless @networks.any?
- .row
+ .row.mt-xs
.col-lg-12
= replacement_msg t('networks.search_no_results')