X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/11aff90f63d79406e9efa1343c965a19dcf5dbba..44b08cc35d5b5488919059016a427feae62acb05:/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 161f8f4f9..47a84e99b 100644 --- a/app/views/user/account.html.erb +++ b/app/views/user/account.html.erb @@ -1,139 +1,180 @@ -
<%= 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, :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.text_field :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' %> +<%= form_for :user, :html => { :multipart => true, :id => 'accountForm', :class => 'standard-form', :autocomplete => :off } do |f| %> + + + + + + + + + |
- |||||||
<%= 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 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.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.update home location on click' %> checked="checked" <% end %> id="updatehome" /> - - |
- |||||||
- | <%= submit_tag t('user.account.save changes button') %> |
-