X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/cbbfdf394880d29c9a6cc2259fcfd474088fa9bb..5dda4196d50774e8a44e9e137d45141d4151764b:/app/views/user/account.html.erb?ds=inline diff --git a/app/views/user/account.html.erb b/app/views/user/account.html.erb index 45a129077..2782fc808 100644 --- a/app/views/user/account.html.erb +++ b/app/views/user/account.html.erb @@ -1,53 +1,152 @@ -

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

+<% content_for :heading do %> +

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

+ +<% end %> + <%= error_messages_for 'user' %> -<% form_for :user, @user do |f| %> +<%= form_for :user, :html => { :multipart => true } do |f| %> - - - - - - - - + + + - + + + + - + + + + - class="nohome" <%end%> > + + + + - - - -
<%= t 'user.new.display name' %><%= f.text_field :display_name %>
<%= t 'user.new.email address' %><%= f.text_field :email, {:size => 50, :maxlength => 255} %> <%= t 'user.account.email never displayed publicly' %>
<%= t 'user.new.password' %><%= f.password_field :pass_crypt, {:value => '', :size => 30, :maxlength => 255} %>
<%= t 'user.new.confirm password' %><%= f.password_field :pass_crypt_confirmation, {:value => '', :size => 30, :maxlength => 255} %>
<%= t 'user.account.public editing.heading' %> -<% 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 %> -
<%= t 'user.new.display name' %><%= f.text_field :display_name %>
<%= t 'user.account.profile description' %><%= f.text_area :description, :rows => '5', :cols => '60' %>
<%= t 'user.account.current email address' %><%= @user.email %> <%= t 'user.account.email never displayed publicly' %>
<%= t 'user.account.preferred languages' %><%= f.text_field :languages %>
<%= t 'user.account.new email address' %><%= f.email_field :new_email, {:size => 50, :maxlength => 255} %> <%= t 'user.account.email never displayed publicly' %>
<%= t 'user.account.home location' %><%= t 'user.account.no home location' %><%= t 'user.account.latitude' %> <%= f.text_field :home_lat, :size => 20, :id => "home_lat" %><%= t 'user.account.longitude' %><%= f.text_field :home_lon, :size => 20, :id => "home_lon" %>
<%= t 'user.new.password' %><%= f.password_field :pass_crypt, {:value => '', :size => 30, :maxlength => 255, :autocomplete => :off} %>
-

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

-
-

<%= submit_tag t('user.account.save changes button') %>
-
+ + <%= t 'user.new.confirm password' %> + <%= f.password_field :pass_crypt_confirmation, {:value => '', :size => 30, :maxlength => 255, :autocomplete => :off} %> + + + + <%= t 'user.account.openid.openid' %> + <%= f.url_field :openid_url, {:id => "openid_url", :class => "openid_url"} %> (<%= t 'user.account.openid.link text' %>) + + + + <%= t 'user.account.public editing.heading' %> + + <% 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 %> + + + + + <%= t 'user.account.contributor terms.heading' %> + + <% 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 %> + + + + + <%= t 'user.account.profile description' %> + <%= richtext_area :user, :description, :rows => '15', :cols => '80' %> + + + + <%= t 'user.account.preferred languages' %> + <%= f.text_field :languages %> + + + + <%= t 'user.account.preferred editor' %> + <%= f.select :preferred_editor, [[t("editor.default", :name => t("editor.#{DEFAULT_EDITOR}.name")), 'default']] + Editors::ALL_EDITORS.collect { |e| [t("editor.#{e}.description"), e] } %> + + + + + <%= t 'user.account.image' %> + + + <%= user_image @user %> + + <% if @user.image.file? %> + + + + + <% end %> + <% if @user.image.file? || @user.image_use_gravatar? %> + + + + + <% end %> + <% if @user.image.file? %> + + + + + <% else %> + + + + + <% end %> + + + + +
<%= radio_button_tag "image_action", "keep", !@user.image_use_gravatar %><%= t 'user.account.keep image' %>
<%= radio_button_tag "image_action", "delete" %><%= t 'user.account.delete image' %>
<%= 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' %>
<%= 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' %>
<%= radio_button_tag "image_action", "gravatar", @user.image_use_gravatar %><%= t 'user.account.gravatar.gravatar' %> (<%= t 'user.account.gravatar.link text' %>)
+ + + + class="nohome" <%end%> > + <%= t 'user.account.home location' %> + <%= t 'user.account.no home location' %><%= t 'user.account.latitude' %> <%= f.text_field :home_lat, :size => 20, :id => "home_lat" %> <%= t 'user.account.longitude' %><%= f.text_field :home_lon, :size => 20, :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 %> + <%= content_tag "div", "", :id => "map", :class => "content_map settings_map set_location" %> + + + + + + <%= submit_tag t('user.account.save changes button') %> + + <% end %> -<%= render :partial => 'friend_map' %> <% unless @user.data_public? %> -

Public editing

- Currently your edits are anonymous and people can't send you messages or see your location. To show what you edited and allow people to contact you through the website, click the button below. - Since the 0.6 API changeover, only public users can edit map data. (find out why).
- Your email address will not be revealed by becoming public.
- This action cannot be reversed and all new users are now public by default.
-

- <%= button_to t('user.account.make all my edits public button'), :action => :go_public %> -<% end %> -
-
-<%= link_to t('user.account.return to profile'), :controller => 'user', :action => @user.display_name %> -
-
+

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

+<%= raw t 'user.account.public editing note.text' %> + <%= button_to t('user.account.make edits public button'), :action => :go_public %> +<% end %> \ No newline at end of file