X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/19b4c1422594ab721e641fe89119758c834e549b..ccbf99cf170a3124decef78a2e4c8bf2575a2d66:/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 f7408dfe5..a0979d5ae 100644 --- a/app/views/user/account.html.erb +++ b/app/views/user/account.html.erb @@ -8,150 +8,164 @@ <%= error_messages_for 'user' %> <%= form_for :user, :html => { :multipart => true, :id => 'accountForm',:class => 'standard-form' } do |f| %> -
- - <%= f.text_field :display_name %> +
+
+ + <%= 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 %> + <%= 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' %>)

+ (<%= 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 @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 @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' %> + <% 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 %> +
-
- - <%= 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 %> -
+
+ + <%= user_image @user %> +
    <% if @user.image.file? %> -
    +
  • <%= radio_button_tag "image_action", "keep", !@user.image_use_gravatar %> - <%= t 'user.account.keep image' %> -
    • + + <% end %> <% if @user.image.file? || @user.image_use_gravatar? %> -
    +
  • <%= radio_button_tag "image_action", "delete" %> - <%= t 'user.account.delete image' %> -
    • + + <% end %> <% if @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' %>

    -
    -
    + <% 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' %>

    -
    + <% end %> -
    +
  • <%= radio_button_tag "image_action", "gravatar", @user.image_use_gravatar %> - <%= t 'user.account.gravatar.gravatar' %> -

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

    -
    • -
+ + +
-
-

<%= 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" />

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