X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/3d7eb387a7c3573f1a1d17df00adcaa1fb9b9fa5..81bafc6dc2074b9cd12a7d70ae7a5e21651e5910:/app/views/user/account.html.erb diff --git a/app/views/user/account.html.erb b/app/views/user/account.html.erb index 2782fc808..759502706 100644 --- a/app/views/user/account.html.erb +++ b/app/views/user/account.html.erb @@ -7,141 +7,153 @@ <% end %> <%= error_messages_for 'user' %> -<%= form_for :user, :html => { :multipart => true } do |f| %> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +

+ - - - - - - - - - - - - - - - - - - - - - - - - - - class="nohome" <%end%> > - - - - - - - - - - - - - -
<%= 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.email_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.url_field :openid_url, {:id => "openid_url", :class => "openid_url"} %> (<%= t 'user.account.openid.link text' %>)
<%= t 'user.account.public editing.heading' %> +<%= form_for :user, :html => { :multipart => true, :id => 'accountForm',:class => 'standard-form' } do |f| %> +
+ + <%= f.text_field :display_name %> +
+ +
+ + +

<%= t 'user.account.email never displayed publicly' %>

+
+ +
+ + <%= f.email_field :new_email %> +

<%= t 'user.account.email never displayed publicly' %>

+
+ +
+ + <%= f.password_field :pass_crypt, {:value => '', :autocomplete => :off} %> +
+ +
+ + <%= f.password_field :pass_crypt_confirmation, {:value => '', :autocomplete => :off} %> +
+ +
+ + <%= f.url_field :openid_url, {:id => "openid_url", :class => "openid_url"} %> +

(<%= t 'user.account.openid.link text' %>)

+
+ +
+ +

<% if @user.data_public? %> - <%= t 'user.account.public editing.enabled' %> (<%= t 'user.account.public editing.enabled link text' %>) + <%= 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' %>) + <%= 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' %>) -
+ (<%= 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' %>
- + <%= 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' %><%= 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' %> - +

+ + +
+ + <%= richtext_area :user, :description, :rows => '15', :cols => '80' %> +
+ +
+ + <%= f.text_field :languages %> +
+ +
+ + <%= f.select :preferred_editor, [[t("editor.default", :name => t("editor.#{DEFAULT_EDITOR}.name")), 'default']] + Editors::ALL_EDITORS.collect { |e| [t("editor.#{e}.description"), e] } %> +
+ +
+ +
<%= user_image @user %> - +
<% if @user.image.file? %> -
- - - +
+ <%= radio_button_tag "image_action", "keep", !@user.image_use_gravatar %> + <%= t 'user.account.keep image' %> +
<% end %> <% if @user.image.file? || @user.image_use_gravatar? %> - - - - +
+ <%= radio_button_tag "image_action", "delete" %> + <%= t 'user.account.delete image' %> +
<% end %> <% if @user.image.file? %> - - - - +
+
+ <%= radio_button_tag "image_action", "new" %> + <%= t 'user.account.replace image' %> +
+
+ <%= f.file_field :image, :onchange => "$('#image_action_new').prop('checked', true)" %> +

<%= t 'user.account.image size hint' %>

+
+
<% else %> - - - - +
+ <%= radio_button_tag "image_action", "new" %> + <%= t 'user.account.new image' %> +
+
+ <%= f.file_field :image, :onchange => "$('#image_action_new').prop('checked', true)" %> +

<%= t 'user.account.image size hint' %>

+
<% end %> - - - - -
<%= radio_button_tag "image_action", "keep", !@user.image_use_gravatar %><%= t 'user.account.keep image' %>
<%= radio_button_tag "image_action", "delete" %><%= t 'user.account.delete image' %>
<%= radio_button_tag "image_action", "new" %><%= t 'user.account.replace image' %>
<%= f.file_field :image, :onchange => "$('#image_action_new').prop('checked', true)" %>
<%= t 'user.account.image size hint' %>
<%= radio_button_tag "image_action", "new" %><%= t 'user.account.new image' %>
<%= f.file_field :image, :onchange => "$('#image_action_new').prop('checked', true)" %>
<%= t 'user.account.image size hint' %>
<%= radio_button_tag "image_action", "gravatar", @user.image_use_gravatar %><%= t 'user.account.gravatar.gravatar' %> (<%= t 'user.account.gravatar.link text' %>)
-
<%= 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" %>
+
+ <%= radio_button_tag "image_action", "gravatar", @user.image_use_gravatar %> + <%= t 'user.account.gravatar.gravatar' %> +

(<%= t 'user.account.gravatar.link text' %>)

+
+ + + + +
class="nohome" <%end%> > +

<%= t 'user.account.home location' %>

+

<%= t 'user.account.no home location' %>

+
+ + <%= f.text_field :home_lat, :id => "home_lat" %> + + <%= f.text_field :home_lon, :id => "home_lon" %> +
+
+ +

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

<% content_for :head do %> <%= javascript_include_tag "user" %> <% end %> <%= content_tag "div", "", :id => "map", :class => "content_map settings_map set_location" %> -
<%= submit_tag t('user.account.save changes button') %>
+ + +
+ <%= submit_tag t('user.account.save changes button') %> +
<% end %> <% unless @user.data_public? %> @@ -149,4 +161,4 @@

<%= t 'user.account.public editing note.heading' %>

<%= raw t 'user.account.public editing note.text' %> <%= button_to t('user.account.make edits public button'), :action => :go_public %> -<% end %> \ No newline at end of file +<% end %>