diff --git a/Gemfile b/Gemfile index bf657d345..5352a8052 100644 --- a/Gemfile +++ b/Gemfile @@ -15,6 +15,7 @@ gem 'coffee-rails', '~> 4.1.0' # Use jquery as the JavaScript library gem 'jquery-rails' +gem 'jquery-ui-rails' # Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks gem 'turbolinks' diff --git a/Gemfile.lock b/Gemfile.lock index fafb13808..b5f4e866d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -203,6 +203,8 @@ GEM rails-dom-testing (~> 1.0) railties (>= 4.2.0) thor (>= 0.14, < 2.0) + jquery-ui-rails (5.0.5) + railties (>= 3.2.16) json (1.8.3) jwt (1.5.2) kaminari (0.16.3) @@ -475,6 +477,7 @@ DEPENDENCIES i18n-tasks initialjs-rails (= 0.2.0.1) jquery-rails + jquery-ui-rails kaminari launchy letter_opener_web (~> 1.3.0) diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 24f164bb2..52d176c41 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -12,6 +12,8 @@ // //= require jquery //= require jquery_ujs +//= require jquery-ui/datepicker +//= require jquery-ui/datepicker-es //= require foundation //= require turbolinks //= require ckeditor/init diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 0dedc20b6..415c23f9e 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -9,4 +9,5 @@ @import "participation"; @import "c3"; @import "annotator.min"; -@import "annotator_overrides"; \ No newline at end of file +@import "annotator_overrides"; +@import "jquery-ui/datepicker"; \ No newline at end of file