X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/bbf30e76e4bfcd70e62fc84ecd32c5e494506e9e..f85681c5cee9406aacc1745a3fb3bd0331d3c0e4:/app/views/user/account.html.erb diff --git a/app/views/user/account.html.erb b/app/views/user/account.html.erb index c20f3526c..83065c683 100644 --- a/app/views/user/account.html.erb +++ b/app/views/user/account.html.erb @@ -6,6 +6,7 @@ <%= 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' %> @@ -18,17 +19,17 @@ <%= t 'user.new.password' %> - <%= f.password_field :pass_crypt, {:value => '', :size => 30, :maxlength => 255} %> + <%= 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} %> + <%= f.password_field :pass_crypt_confirmation, {:value => '', :size => 30, :maxlength => 255, :autocomplete => :off} %> <%= t 'user.account.openid.openid' %> - <%= f.text_field :openid_url %> (<%= t 'user.account.openid.link text' %>) - + <%= f.text_field :openid_url, {:class => "openid_url"} %> (<%= t 'user.account.openid.link text' %>) + <%= t 'user.account.public editing.heading' %> @@ -58,11 +59,11 @@ <% 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 %> - +
- + @@ -72,7 +73,7 @@ - +
<%= image_tag url_for_file_column(@user, "image") %><%= 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", "new" %><%= t 'user.account.replace image' %>
<%= file_column_field "user", "image", :onchange => "$('image_action_new').checked = true" %>
<%= t 'user.account.replace image' %>
<%= file_column_field "user", "image", :onchange => "$('image_action_new').checked = true" %>
<%= t 'user.account.image size hint' %>
<% end %> @@ -88,7 +89,7 @@

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

-
+
@@ -99,7 +100,7 @@ <% end %> -<%= render :partial => 'friend_map' %> +<%= render :partial => 'map' %> <% unless @user.data_public? %>