X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/7ccd11ebf3c8e119a04119a2e89ce6a879560578..2443e7dd650a3d3aaae9ab14d14d2fde6a582755:/app/views/users/account.html.erb diff --git a/app/views/users/account.html.erb b/app/views/users/account.html.erb index 233f2629f..dc31de97a 100644 --- a/app/views/users/account.html.erb +++ b/app/views/users/account.html.erb @@ -3,178 +3,118 @@ <% end %> <% content_for :heading do %> -

<%= t '.my settings' %>

+

<%= 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' %> -
-
+<%= bootstrap_form_for current_user, :url => { :action => :account }, :method => :post, :html => { :multipart => true, :id => "accountForm", :autocomplete => :off } do |f| %> -
-
- - <%= f.password_field :pass_crypt, {:value => '', :autocomplete => :off} %> -
+ <%= 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" %> +
+
- - <%= f.password_field :pass_crypt_confirmation, {:value => '', :autocomplete => :off} %> + <%= 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" %>)
-
-
- - <%= f.select :auth_provider, Auth::PROVIDERS %> - <%= f.text_field :auth_uid %> - (<%= t '.openid.link text' %>) -
-
- -
-
- - - <% if current_user.data_public? %> - <%= t '.public editing.enabled' %> - (<%= 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' %> - (<%= 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' %> +
+ + + <% 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 %> - -
-
- - <%= 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] } %> -
-
- -
-
- - <%= richtext_area :user, :description, :object => current_user, :cols => 80, :rows => 20 %> -
- + <% 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::AVAILABLE_EDITORS.collect { |e| [t("editor.#{e}.description"), e] } %> + <%= f.richtext_field :description, :cols => 80, :rows => 20 %> + <%= f.text_field :languages %> + +
+ <%= f.label t(".image") %>
- - <%= f.text_field :languages %> -
- -
- +
<%= user_image current_user %> -
    - <% if current_user.image.file? %> -
  • - <%= radio_button_tag "image_action", "keep", !current_user.image_use_gravatar %> - -
    • +
+
+ <% if current_user.avatar.attached? %> + <%= f.radio_button "avatar_action", "keep", :name => "avatar_action", :label => t(".keep image"), :checked => !current_user.image_use_gravatar %> <% end %> - <% if current_user.image.file? || current_user.image_use_gravatar? %> -
  • - <%= radio_button_tag "image_action", "delete" %> - -
    • + <% if current_user.avatar.attached? || current_user.image_use_gravatar? %> + <%= f.radio_button "avatar_action", "delete", :name => "avatar_action", :label => t(".delete image"), :checked => false %> <% end %> - <% if current_user.image.file? %> -
  • - <%= radio_button_tag "image_action", "new" %> - - <%= f.file_field :image %> -
    • + <% if current_user.avatar.attached? %> + <%= f.form_group :help => t(".image size hint"), :class => "mb-0" do %> + <%= f.radio_button "avatar_action", "new", :name => "avatar_action", :label => t(".replace image"), :checked => false %> + <%= f.file_field :avatar, :hide_label => true, :wrapper => { :class => "mb-0" } %> + <% end %> <% else %> -
  • - <%= radio_button_tag "image_action", "new" %> - - <%= f.file_field :image %> -
    • + <%= f.form_group :help => t(".image size hint"), :class => "mb-0" do %> + <%= f.radio_button "avatar_action", "new", :name => "avatar_action", :label => t(".new image"), :checked => false %> + <%= f.file_field :avatar, :hide_label => true, :wrapper => { :class => "mb-0" } %> + <% end %> <% end %> -
  • - <%= radio_button_tag "image_action", "gravatar", current_user.image_use_gravatar %> - -
    • - + <%= f.form_group :help => link_to(t(".gravatar.what_is_gravatar"), t(".gravatar.link")) do %> + <%= f.radio_button "avatar_action", "gravatar", :name => "avatar_action", :label => t(".gravatar.gravatar"), :checked => current_user.image_use_gravatar %> + <% end %> +
    -
    -
    - -
    class="nohome"<%end%> > -

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

    -
    - - <%= f.text_field :home_lat, :id => "home_lat" %> -
    -
    - - <%= f.text_field :home_lon, :id => "home_lon" %> -
    +
    + <%= t ".home location" -%> +
    class="nohome"<% end %>> +

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

    +
    + <%= f.text_field :home_lat, :wrapper_class => "col-sm-4", :id => "home_lat" %> + <%= f.text_field :home_lon, :wrapper_class => "col-sm-4", :id => "home_lon" %>
    - -
    - checked="checked" <% end %> id="updatehome" /> - +
    + checked="checked" <% end %> id="updatehome" /> +
    - <%= content_tag "div", "", :id => "map", :class => "content_map settings_map set_location" %> + <%= tag.div "", :id => "map", :class => "content_map set_location" %>
    - <%= submit_tag t('.save changes button') %> + <%= f.primary t(".save changes button") %> <% end %> <% unless current_user.data_public? %> -

    <%= t '.public editing note.heading' %>

    -<%= raw t '.public editing note.text' %> - <%= button_to t('.make edits public button'), :action => :go_public %> +

    <%= t ".public editing note.heading" %>

    +<%= t ".public editing note.html" %> + <%= button_to t(".make edits public button"), :action => :go_public %> <% end %>