X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/acd72861ed8ad46d759a6e509f3e7c459db1a4f5..f3132f94f8e8ae1a215e4c00a7d1a57e8dafa3b1:/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 92c37056b..d5bcb3821 100644
--- a/app/views/user/account.html.erb
+++ b/app/views/user/account.html.erb
@@ -19,12 +19,12 @@
<%= 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} %> |
@@ -38,6 +38,24 @@
+
+ <%= 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' %> |
@@ -55,9 +73,9 @@
<% 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 %>
-
+
<%= image_tag url_for_file_column(@user, "image"), :class => "user_image" %> |
<%= radio_button_tag "image_action", "keep", true %> |
@@ -69,7 +87,7 @@
<%= 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 %>
@@ -85,7 +103,7 @@
|
<%= t 'user.account.update home location on click' %> checked="checked" <% end %> id="updatehome" />
-
+
|
|