X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/b8f6dbd403507edd14f04f3151c285e232607360..85e99d3127e5febcf4698c9d2576f653775af787:/app/views/user/account.html.erb diff --git a/app/views/user/account.html.erb b/app/views/user/account.html.erb index 1cc6b4a29..abece879f 100644 --- a/app/views/user/account.html.erb +++ b/app/views/user/account.html.erb @@ -1,83 +1,131 @@

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

<%= error_messages_for 'user' %> -<% form_for :user, @user do |f| %> +<% form_for :user, :html => { :multipart => true } do |f| %> - - - - + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + - + + + + - class="nohome" <%end%> > + 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.new.display name' %><%= f.text_field :display_name %>
<%= 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.current email address' %><%= @user.email %> <%= t 'user.account.email never displayed publicly' %>
<%= t 'user.account.new email address' %><%= f.text_field :new_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, :autocomplete => :off} %>
<%= t 'user.new.confirm password' %><%= f.password_field :pass_crypt_confirmation, {:value => '', :size => 30, :maxlength => 255, :autocomplete => :off} %>
<%= 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' %><%= f.text_area :description, :rows => '5', :cols => '60' %>
<%= t 'user.account.preferred languages' %><%= f.text_field :languages %>
<%= t 'user.account.profile description' %><%= f.text_area :description, :rows => '5', :cols => '60' %>
<%= 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.preferred languages' %><%= f.text_field :languages %>
+ <%= t 'user.account.image' %> + + <% if @user.image.nil? %> + <%= hidden_field_tag "image_action", "new" %> + <%= t 'user.account.new image' %>
<%= file_column_field "user", "image" %>
<%= t 'user.account.image size hint' %> + <% else %> + + + + + + + + + + + + + + +
<%= image_tag url_for_file_column(@user, "image"), :class => "user_image" %><%= radio_button_tag "image_action", "keep", true %><%= 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' %>
<%= file_column_field "user", "image", :onchange => "$('image_action_new').checked = true" %>
<%= t 'user.account.image size hint' %>
+ <% 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.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" />

-
-
+

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

+
+

<%= submit_tag t('user.account.save changes button') %>

<%= submit_tag t('user.account.save changes button') %>
-
- <% end %> -<%= render :partial => 'friend_map' %> +<%= render :partial => 'map', :locals => { :setting_location => true, :show_other_users => false } %> + <% 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 %> -

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

-<% if @tokens.empty? %> -

<%= t 'oauth.token.none' %>

-<% else %> - - - <% @tokens.each do |token|%> - <% content_tag_for :tr, token do %> - - - - <% end %> - <% end %> -
<%= t 'oauth.token.application' %><%= t 'oauth.token.issued' %> 
<%= link_to token.client_application.name, token.client_application.url %><%= token.authorized_at %> - <% form_tag :controller => 'oauth', :action => 'revoke' do %> - <%= hidden_field_tag 'token', token.token %> - <%= submit_tag t('oauth.token.revoke') %> - <% end %> -
-<% end %> -

<%= t 'user.account.developers' %>

-<% if @user.client_applications.empty? %> -

<%= t 'user.account.dev_intro', :link => "OAuth" %>

-

<%= link_to t('user.account.register_app'), :controller => 'oauth_clients', :action => :new %>

-<% else %> -

<%= t 'user.account.apps_registered' %>

- -

<%= link_to t('user.account.register_another_app'), :controller => 'oauth_clients', :action => :new %>

+

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

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