aboutsummaryrefslogtreecommitdiffstats
path: root/app/views
diff options
context:
space:
mode:
authorVlatka Pavisic2017-01-02 16:22:30 +0100
committerVlatka Pavisic2017-01-02 16:22:30 +0100
commitc246e91169a0acea798fba01bfb2d9a360ac3cb0 (patch)
treeedaa8b88b4d0ee1c13a8add5c1efc55b2c32408e /app/views
parent7657a10c7c4b126cdaabb779657e9a5270fc729d (diff)
downloadchouette-core-c246e91169a0acea798fba01bfb2d9a360ac3cb0.tar.bz2
Refs #2265 : Calendar search by date
Diffstat (limited to 'app/views')
-rw-r--r--app/views/calendars/_form.html.slim4
-rw-r--r--app/views/calendars/index.html.slim2
2 files changed, 3 insertions, 3 deletions
diff --git a/app/views/calendars/_form.html.slim b/app/views/calendars/_form.html.slim
index ea2e0b30b..2d36d7d9e 100644
--- a/app/views/calendars/_form.html.slim
+++ b/app/views/calendars/_form.html.slim
@@ -9,8 +9,8 @@
/ = render 'date_fields', f: date
/ .links
/ = link_to_add_association '+', f, :dates
- /= f.label :date_ranges
- /= f.simple_fields_for :periods do |period|
+ = f.label :date_ranges
+ = f.simple_fields_for :periods do |period|
= render 'period_fields', f: period
.links
/= link_to_add_association '+', f, :periods
diff --git a/app/views/calendars/index.html.slim b/app/views/calendars/index.html.slim
index 57f30eaef..a857078a1 100644
--- a/app/views/calendars/index.html.slim
+++ b/app/views/calendars/index.html.slim
@@ -13,7 +13,7 @@
= f.select :shared_eq, [[t('.shared'), true], [t('.not_shared'), false]], { include_blank: '' }, { class: 'form-control', style: 'width: 100%', 'data-select2ed': 'true', 'data-select2ed-placeholder': t('.all') }
.col-md-3
= f.label t('.date')
- = f.date_field :dates_or_date_ranges_cont, class: 'form-control'
+ = f.date_field :contains_date, class: 'form-control'
.col-md-3
button.btn.btn-primary#search-btn type='submit'