X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/996e60614d9d5a2e43b0ca246d9786d569fb7be2..e338d1140884bb2bf3ed1b8fc85c890d0937ef8c:/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 ba5b652ac..cdd3160e8 100644 --- a/app/views/user/account.html.erb +++ b/app/views/user/account.html.erb @@ -1,6 +1,10 @@
<%= t 'user.new.display name' %> | @@ -14,7 +18,7 @@||||||||
<%= t 'user.account.new email address' %> | -<%= f.text_field :new_email, {:size => 50, :maxlength => 255} %> <%= t 'user.account.email never displayed publicly' %> | +<%= f.email_field :new_email, {:size => 50, :maxlength => 255} %> <%= t 'user.account.email never displayed publicly' %> | ||||||
<%= t 'user.account.openid.openid' %> | -<%= f.text_field :openid_url, {:class => "openid_url"} %> (<%= t 'user.account.openid.link text' %>) | +<%= f.url_field :openid_url, {:id => "openid_url", :class => "openid_url"} %> (<%= t 'user.account.openid.link text' %>) | ||||||
<%= t 'user.account.public editing.heading' %> | +<%= t 'user.account.public editing.heading' %> | <% if @user.data_public? %> <%= t 'user.account.public editing.enabled' %> (<%= t 'user.account.public editing.enabled link text' %>) @@ -44,27 +48,47 @@ | ||||||
<%= t 'user.account.profile description' %> | -<%= f.text_area :description, :rows => '5', :cols => '60' %> | +<%= 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.preferred languages' %> | +<%= t 'user.account.profile description' %> | +<%= richtext_area :user, :description, :rows => '15', :cols => '80' %> | +||||||
<%= 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 %> + <% if @user.image.file? %>
<%= f.file_field :image %> <%= 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.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') %> |
+ <%= submit_tag t('user.account.save changes button') %> |