X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/383b408fa7641e1d9def6db2630007c27d216f5b..6ded8b55c87f32579b9f42ecb8a58567f4dfe30d:/app/views/user/account.html.erb diff --git a/app/views/user/account.html.erb b/app/views/user/account.html.erb index a4dbf81a3..b5f93dcfb 100644 --- a/app/views/user/account.html.erb +++ b/app/views/user/account.html.erb @@ -9,40 +9,40 @@ <%= error_messages_for 'user' %> <%= 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' %> @@ -55,7 +55,7 @@

- +

<% if @user.terms_agreed? %> <%= t 'user.account.contributor terms.agreed' %> @@ -71,78 +71,89 @@

- + <%= 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' %> -
+
+
+ <%= 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' %> -
+ <%= 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", "gravatar", @user.image_use_gravatar %> - <%= t 'user.account.gravatar.gravatar' %> (<%= t 'user.account.gravatar.link text' %>) -
-
+ <%= t 'user.account.gravatar.gravatar' %> +

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

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

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

+
+

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

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

<%= 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" %> -
+
+

<%= 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? %>