diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 1721c53869ef92a27226ff6c84d6b3399c2af374..e670b14f936a420a1919d04382877ea582c02915 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -3,3 +3,4 @@ //= require jquery3 //= require jquery_ujs //= require simple_form_password_with_hints +//= require simple_form_image_fields diff --git a/app/assets/stylesheets/application.sass b/app/assets/stylesheets/application.sass index 7a34d970b827cd180c92a73f7ea223b45eaed9bd..3a8a5e8e45c83528c846835eee821353bfb85eac 100644 --- a/app/assets/stylesheets/application.sass +++ b/app/assets/stylesheets/application.sass @@ -1,5 +1,6 @@ @import 'bootstrap' @import 'appstack/light' @import 'simple_form_password_with_hints' +@import 'simple_form_image_fields' @import 'commons/*' @import 'application/*' diff --git a/app/views/devise/registrations/edit.html.erb b/app/views/devise/registrations/edit.html.erb index b6da316412ad7e065cf5350ada71b76ef7a79077..0dbafc50c0b346e157e125669245f3567e4ce55e 100644 --- a/app/views/devise/registrations/edit.html.erb +++ b/app/views/devise/registrations/edit.html.erb @@ -18,17 +18,21 @@ <% end %> <%= f.input :mobile_phone %> - <%= f.association :language, include_blank: false %> + + <%= f.association :language, + required: true, + label_method: lambda { |l| I18nData.languages(I18n.locale.to_s.upcase)[l.iso_code.to_s.upcase].capitalize }, + include_blank: 'Sélectionnez une langue' %> <%= f.input :picture, as: :single_deletable_file, - input_html: { accept: '.png' } %> + input_html: { accept: '.png,.jpg' } %> <%= f.input :password, hint: t(".leave_blank_if_you_don_t_want_to_change_it"), required: false, input_html: { autocomplete: "new-password" } %> - + </div>