X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/c55490d24ed176eebfa88a0a655462cd0b3b0d85..c29bcca57b9a05a3ca1e55d5b3a089c7ef0b1a03:/app/views/user/account.html.erb diff --git a/app/views/user/account.html.erb b/app/views/user/account.html.erb index 6f5191fbe..988cd9121 100644 --- a/app/views/user/account.html.erb +++ b/app/views/user/account.html.erb @@ -1,40 +1,93 @@
<%= t 'user.new.display name' %> | <%= f.text_field :display_name %> | ||||||||||||||||||||
<%= 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} %> | ||||||||||||||||||||
<%= 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.email_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.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' %> | <%= f.text_area :description, :rows => '5', :cols => '60' %> | ||||||||||||||||||||
<%= 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.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' %> |
<% if @user.image.nil? %>
<%= hidden_field_tag "image_action", "new" %>
- <%= t 'user.account.new image' %> <%= file_column_field "user", "image" %> + <%= t 'user.account.new image' %> <%= file_column_field "user", "image" %> <%= t 'user.account.image size hint' %> <% else %> -
<%= 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? %> <%= t 'user.account.public editing note.heading' %>-<%= t 'user.account.public editing note.text' %> +<%= raw t 'user.account.public editing note.text' %> <%= button_to t('user.account.make edits public button'), :action => :go_public %> <% end %> |