X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/6ba75a3bb02dfa7ccb4ba8ec093e850969f953bb..49a45b1c52b9cc8bbfcd6f4e6c93adac912d95a1:/app/views/user/account.html.erb?ds=inline diff --git a/app/views/user/account.html.erb b/app/views/user/account.html.erb index ba5b652ac..606e8c358 100644 --- a/app/views/user/account.html.erb +++ b/app/views/user/account.html.erb @@ -1,6 +1,6 @@
<%= t 'user.new.display name' %> | @@ -29,11 +29,11 @@||
<%= t 'user.account.openid.openid' %> | -<%= f.text_field :openid_url, {:class => "openid_url"} %> (<%= t 'user.account.openid.link text' %>) | +<%= f.text_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,17 +44,40 @@ |
<%= t 'user.account.profile description' %> | +<%= 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.preferred 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' %> | @@ -83,25 +106,25 @@ | |
<%= 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') %> |