X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/6ded8b55c87f32579b9f42ecb8a58567f4dfe30d..0df788d74232330eea5c2d4854ba0d10796053eb:/app/views/user/account.html.erb?ds=sidebyside diff --git a/app/views/user/account.html.erb b/app/views/user/account.html.erb index b5f93dcfb..169e5662a 100644 --- a/app/views/user/account.html.erb +++ b/app/views/user/account.html.erb @@ -1,162 +1,178 @@ +<% content_for :head do %> + <%= javascript_include_tag "user" %> +<% end %> + <% content_for :heading do %> -

<%= t 'user.account.my settings' %>

+

<%= t 'user.account.my settings' %>

<% end %> -<%= error_messages_for 'user' %> -<%= form_for :user, :html => { :multipart => true, :id => 'accountForm',:class => 'standard-form' } do |f| %> -
- - <%= f.text_field :display_name %> +<%= 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 'user.account.email never displayed publicly' %>

-
+
+
+ + + <%= t 'user.account.email never displayed publicly' %> +
-
- - <%= f.email_field :new_email %> -

<%= t 'user.account.email never displayed publicly' %>

+
+ + <%= f.email_field :new_email, :autocomplete => :off %> + <%= t 'user.account.email never displayed publicly' %> +
-
- - <%= f.password_field :pass_crypt, {:value => '', :autocomplete => :off} %> -
+
+
+ + <%= f.password_field :pass_crypt, {:value => '', :autocomplete => :off} %> +
-
- - <%= f.password_field :pass_crypt_confirmation, {:value => '', :autocomplete => :off} %> +
+ + <%= f.password_field :pass_crypt_confirmation, {:value => '', :autocomplete => :off} %> +
-
- - <%= f.url_field :openid_url, {:id => "openid_url", :class => "openid_url"} %> -

(<%= t 'user.account.openid.link text' %>)

+
+
+ + <%= f.select :auth_provider, Auth::PROVIDERS %> + <%= f.text_field :auth_uid %> + (<%= t 'user.account.openid.link text' %>) +
-
- -

- <% if @user.data_public? %> - <%= t 'user.account.public editing.enabled' %> - (<%= t 'user.account.public editing.enabled link text' %>) - <% else %> - <%= t 'user.account.public editing.disabled' %> - (<%= t 'user.account.public editing.disabled link text' %>) - <% end %> -

-
- -
- -

- <% if @user.terms_agreed? %> - <%= t 'user.account.contributor terms.agreed' %> - (<%= t 'user.account.contributor terms.link text' %>) - <% if @user.consider_pd? %> - <%= t 'user.account.contributor terms.agreed_with_pd' %> +

+
+ + + <% if current_user.data_public? %> + <%= t 'user.account.public editing.enabled' %> + (<%= t 'user.account.public editing.enabled link text' %>) + <% else %> + <%= t 'user.account.public editing.disabled' %> + (<%= t 'user.account.public editing.disabled link text' %>) <% end %> - <% else %> - <%= t 'user.account.contributor terms.not yet agreed' %> - <%= link_to t('user.account.contributor terms.review link text'), :controller => 'user', :action => 'terms' %> - <% end %> -

-
+ + -
- - <%= richtext_area :user, :description, :rows => '15', :cols => '80' %> +
+ + + <% if current_user.terms_agreed? %> + <%= t 'user.account.contributor terms.agreed' %> + (<%= t 'user.account.contributor terms.link text' %>) + <% if current_user.consider_pd? %> + <%= t 'user.account.contributor terms.agreed_with_pd' %> + <% end %> + <% else %> + <%= t 'user.account.contributor terms.not yet agreed' %> + <%= link_to t('user.account.contributor terms.review link text'), :controller => 'user', :action => 'terms' %> + <% end %> + +
+
+ + <%= f.select :preferred_editor, [[t("editor.default", :name => t("editor.#{DEFAULT_EDITOR}.name")), 'default']] + Editors::ALL_EDITORS.collect { |e| [t("editor.#{e}.description"), e] } %> +
-
- - <%= f.text_field :languages %> -
+
+
+ + <%= richtext_area :user, :description, :object => current_user, :cols => 80, :rows => 20 %> +
-
- - <%= f.select :preferred_editor, [[t("editor.default", :name => t("editor.#{DEFAULT_EDITOR}.name")), 'default']] + Editors::ALL_EDITORS.collect { |e| [t("editor.#{e}.description"), e] } %> -
+
+ + <%= f.text_field :languages %> +
-
- -
- <%= user_image @user %> -
- <% if @user.image.file? %> -
- <%= radio_button_tag "image_action", "keep", !@user.image_use_gravatar %> - <%= t 'user.account.keep image' %> -
+
+ + <%= user_image current_user %> +
    + <% if current_user.image.file? %> +
  • + <%= radio_button_tag "image_action", "keep", !current_user.image_use_gravatar %> + +
    • <% end %> - <% if @user.image.file? || @user.image_use_gravatar? %> -
    + <% if current_user.image.file? || current_user.image_use_gravatar? %> +
  • <%= radio_button_tag "image_action", "delete" %> - <%= t 'user.account.delete image' %> -
    • + + <% end %> - <% if @user.image.file? %> -
    -
    + <% if current_user.image.file? %> +
  • <%= radio_button_tag "image_action", "new" %> - <%= t 'user.account.replace image' %> -
    • -
    - <%= f.file_field :image, :onchange => "$('#image_action_new').prop('checked', true)" %> -

    <%= t 'user.account.image size hint' %>

    -
    -
    + + <%= f.file_field :image %> + <% else %> -
    +
  • <%= radio_button_tag "image_action", "new" %> - <%= t 'user.account.new image' %> -
    • -
    - <%= f.file_field :image, :onchange => "$('#image_action_new').prop('checked', true)" %> -

    <%= t 'user.account.image size hint' %>

    -
    + + <%= f.file_field :image %> + <% end %> -
    - <%= radio_button_tag "image_action", "gravatar", @user.image_use_gravatar %> - <%= t 'user.account.gravatar.gravatar' %> -

    (<%= t 'user.account.gravatar.link text' %>)

    -
    -
+
  • + <%= radio_button_tag "image_action", "gravatar", current_user.image_use_gravatar %> + +
    • +
    -
    -

    <%= t 'user.account.home location' %>

    -
    class="nohome"<%end%> > -

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

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

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

    +
    + + <%= f.text_field :home_lat, :id => "home_lat" %> +
    +
    + + <%= f.text_field :home_lon, :id => "home_lon" %> +
    +
    -
    -
    -

    <%= t 'user.account.update home location on click' %> checked="checked" <% end %> id="updatehome" />

    - <% content_for :head do %> - <%= javascript_include_tag "user" %> - <% end %> +
    + checked="checked" <% end %> id="updatehome" /> + +
    <%= content_tag "div", "", :id => "map", :class => "content_map settings_map set_location" %> -
    -
    +
    <%= submit_tag t('user.account.save changes button') %> <% end %> -<% unless @user.data_public? %> +<% unless current_user.data_public? %>

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

    <%= raw t 'user.account.public editing note.text' %>