X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/cfb2f2988c0a396f2d2b167d3c75461b7e811e1c..cb68450ac7b7a8dec6d0d721b9a7314bf1c7e95f:/app/views/users/account.html.erb?ds=sidebyside diff --git a/app/views/users/account.html.erb b/app/views/users/account.html.erb index ad6614c76..f647cc84f 100644 --- a/app/views/users/account.html.erb +++ b/app/views/users/account.html.erb @@ -4,172 +4,57 @@ <% content_for :heading do %>

<%= t ".my settings" %>

- <% end %> -<%= error_messages_for current_user %> -<%= form_for current_user, :url => { :action => :account }, :method => :post, :html => { :multipart => true, :id => "accountForm", :class => "standard-form", :autocomplete => :off } do |f| %> -
-
- - <%= f.text_field :display_name %> -
-
- -
-
- - - <%= t ".email never displayed publicly" %> -
- -
- - <%= f.email_field :new_email, :autocomplete => :off %> - <%= t ".email never displayed publicly" %> -
-
- -
-
- - <%= f.password_field :pass_crypt, :value => "", :autocomplete => :off %> -
- -
- - <%= f.password_field :pass_crypt_confirmation, :value => "", :autocomplete => :off %> -
-
+<%= render :partial => "settings_menu", :locals => { :selected => "account" } %> -
-
- - <%= f.select :auth_provider, Auth.providers %> - <%= f.text_field :auth_uid %> - (" target="_new"><%= t ".openid.link text" %>) -
-
+<%= bootstrap_form_for current_user, :url => { :action => :account }, :method => :post, :html => { :multipart => true, :id => "accountForm", :autocomplete => :off } do |f| %> -
-
- - - <% if current_user.data_public? %> - <%= t ".public editing.enabled" %> - (" target="_new"><%= t ".public editing.enabled link text" %>) - <% else %> - <%= t ".public editing.disabled" %> - (<%= t ".public editing.disabled link text" %>) - <% end %> - -
+ <%= f.text_field :display_name %> + <%= f.email_field :email, :disabled => true, :label => t(".current email address") %> + <%= f.email_field :new_email, :autocomplete => "email" %> + <%= f.password_field :pass_crypt, :value => "", :autocomplete => "new-password" %> + <%= f.password_field :pass_crypt_confirmation, :value => "", :autocomplete => "new-password" %> -
- - - <% if current_user.terms_agreed? %> - <%= t ".contributor terms.agreed" %> - (" target="_new"><%= t ".contributor terms.link text" %>) - <% if current_user.consider_pd? %> - <%= t ".contributor terms.agreed_with_pd" %> - <% end %> - <% else %> - <%= t ".contributor terms.not yet agreed" %> - <%= link_to t(".contributor terms.review link text"), :controller => "users", :action => "terms" %> - <% end %> - -
-
- - <%= f.select :preferred_editor, [[t("editor.default", :name => t("editor.#{Settings.default_editor}.name")), "default"]] + Editors::ALL_EDITORS.collect { |e| [t("editor.#{e}.description"), e] } %> +
+ +
+ <%= f.select(:auth_provider, Auth.providers, :hide_label => true, :wrapper => { :class => "col-auto mb-0" }) %> + <%= f.text_field(:auth_uid, :hide_label => true, :wrapper => { :class => "col mb-0" }) %>
+ (" target="_new"><%= t ".openid.link text" %>)
-
-
- - <%= richtext_area :user, :description, :object => current_user, :cols => 80, :rows => 20 %> -
- -
- - <%= f.text_field :languages %> -
- -
- - <%= user_image current_user %> -
    - <% if current_user.avatar.attached? %> -
  • - <%= radio_button_tag "avatar_action", "keep", !current_user.image_use_gravatar %> - -
    • - <% end %> - <% if current_user.avatar.attached? || current_user.image_use_gravatar? %> -
  • - <%= radio_button_tag "avatar_action", "delete" %> - -
    • - <% end %> - <% if current_user.avatar.attached? %> -
  • - <%= radio_button_tag "avatar_action", "new" %> - - <%= f.file_field :avatar %> -
    • - <% else %> -
  • - <%= radio_button_tag "avatar_action", "new" %> - - <%= f.file_field :avatar %> -
    • +
    + + + <% if current_user.data_public? %> + <%= t ".public editing.enabled" %> + (" target="_new"><%= t ".public editing.enabled link text" %>) + <% else %> + <%= t ".public editing.disabled" %> + (<%= t ".public editing.disabled link text" %>) + <% end %> + +
    + +
    + + + <% if current_user.terms_agreed? %> + <%= t ".contributor terms.agreed" %> + (" target="_new"><%= t ".contributor terms.link text" %>) + <% if current_user.consider_pd? %> + <%= t ".contributor terms.agreed_with_pd" %> <% end %> -
  • - <%= radio_button_tag "avatar_action", "gravatar", current_user.image_use_gravatar %> - -
    • -
-
-
- -
-
- -
class="nohome"<% end %>> -

<%= t ".no home location" %>

-
- - <%= f.text_field :home_lat, :id => "home_lat" %> -
-
- - <%= f.text_field :home_lon, :id => "home_lon" %> -
-
-
- -
- checked="checked" <% end %> id="updatehome" /> - -
- <%= tag.div "", :id => "map", :class => "content_map set_location" %> -
- - <%= submit_tag t(".save changes button") %> + <% else %> + <%= t ".contributor terms.not yet agreed" %> + <%= link_to t(".contributor terms.review link text"), :controller => "users", :action => "terms" %> + <% end %> + +
+ + <%= f.primary t(".save changes button") %> <% end %> <% unless current_user.data_public? %>