diff --git a/Gemfile b/Gemfile index 3b1aa7926..20bc62a0a 100644 --- a/Gemfile +++ b/Gemfile @@ -102,6 +102,8 @@ gem 'simple_form' gem 'newrelic_rpm' +gem 'select2-rails' + group :test do gem 'capybara' gem 'launchy' diff --git a/Gemfile.lock b/Gemfile.lock index f0e40cf8e..353b2160a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -543,6 +543,8 @@ GEM json (~> 1.7, >= 1.7.7) rdoc (~> 4.0) securecompare (1.0.0) + select2-rails (4.0.3) + thor (~> 0.14) selenium-webdriver (3.0.3) childprocess (~> 0.5) rubyzip (~> 1.0) @@ -709,6 +711,7 @@ DEPENDENCIES sass-rails (~> 5.0) scenic sdoc (~> 0.4.0) + select2-rails selenium-webdriver sentry-raven shoulda-matchers diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 567658f93..a7827dfc8 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -31,6 +31,7 @@ //= require bootstrap-wysihtml5/locales/fr-FR //= require handlebars //= require typeahead.bundle +//= require select2 $(document).on('page:load', application_init); $(document).ready(application_init); diff --git a/app/assets/javascripts/user/description.js b/app/assets/javascripts/user/description.js new file mode 100644 index 000000000..cdae9a4c1 --- /dev/null +++ b/app/assets/javascripts/user/description.js @@ -0,0 +1,6 @@ +$(document).on('page:load', activeSelect2); +$(document).ready(activeSelect2); + +function activeSelect2() { + $('select.select2').select2({ theme: "bootstrap", width: '100%' }); +} diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 5e30ef194..6d4168935 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -19,6 +19,8 @@ *= require font-awesome *= require franceconnect *= require bootstrap-wysihtml5 + *= require select2 + *= require select2-bootstrap */ @import "variables"; @import "bootstrap-sprockets";