X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/0c79686f3cef86330d0ab6bbef2a9e2275ac93ac..e8e4aa53d49c1f16aa11961cdc7a14e834a4a541:/app/views/users/account.html.erb diff --git a/app/views/users/account.html.erb b/app/views/users/account.html.erb index b0839ad56..394e81cd1 100644 --- a/app/views/users/account.html.erb +++ b/app/views/users/account.html.erb @@ -13,20 +13,20 @@ <%= error_messages_for current_user %> <%= form_for current_user, :url => { :action => :account }, :method => :post, :html => { :multipart => true, :id => "accountForm", :class => "standard-form", :autocomplete => :off } do |f| %>
-
+
<%= f.text_field :display_name %>
-
+
<%= t ".email never displayed publicly" %>
-
+
<%= f.email_field :new_email, :autocomplete => :off %> <%= t ".email never displayed publicly" %> @@ -34,28 +34,28 @@
-
+
<%= f.password_field :pass_crypt, :value => "", :autocomplete => :off %>
-
+
<%= f.password_field :pass_crypt_confirmation, :value => "", :autocomplete => :off %>
-
+
- <%= f.select :auth_provider, Auth::PROVIDERS %> + <%= f.select :auth_provider, Auth.providers %> <%= f.text_field :auth_uid %> (" target="_new"><%= t ".openid.link text" %>)
-
+
<% if current_user.data_public? %> @@ -68,7 +68,7 @@
-
+
<% if current_user.terms_agreed? %> @@ -83,61 +83,61 @@ <% end %>
-
+
- <%= f.select :preferred_editor, [[t("editor.default", :name => t("editor.#{Settings.default_editor}.name")), "default"]] + Editors::ALL_EDITORS.collect { |e| [t("editor.#{e}.description"), e] } %> + <%= f.select :preferred_editor, [[t("editor.default", :name => t("editor.#{Settings.default_editor}.name")), "default"]] + Editors::AVAILABLE_EDITORS.collect { |e| [t("editor.#{e}.description"), e] } %>
-
+
<%= richtext_area :user, :description, :object => current_user, :cols => 80, :rows => 20 %>
-
+
<%= f.text_field :languages %>
-
+
<%= user_image current_user %>
    - <% if current_user.image.file? %> + <% if current_user.avatar.attached? %>
  • - <%= radio_button_tag "image_action", "keep", !current_user.image_use_gravatar %> - + <%= radio_button_tag "avatar_action", "keep", !current_user.image_use_gravatar %> +
  • <% end %> - <% if current_user.image.file? || current_user.image_use_gravatar? %> + <% if current_user.avatar.attached? || current_user.image_use_gravatar? %>
  • - <%= radio_button_tag "image_action", "delete" %> - + <%= radio_button_tag "avatar_action", "delete" %> +
  • <% end %> - <% if current_user.image.file? %> + <% if current_user.avatar.attached? %>
  • - <%= radio_button_tag "image_action", "new" %> -
  • <% else %>
  • - <%= radio_button_tag "image_action", "new" %> -
  • <% end %>
  • - <%= radio_button_tag "image_action", "gravatar", current_user.image_use_gravatar %> -
-
+
class="nohome"<% end %>>

<%= t ".no home location" %>

@@ -162,11 +162,11 @@
-
+
checked="checked" <% end %> id="updatehome" />
- <%= content_tag "div", "", :id => "map", :class => "content_map settings_map set_location" %> + <%= tag.div "", :id => "map", :class => "content_map set_location" %>
<%= submit_tag t(".save changes button") %> @@ -175,6 +175,6 @@ <% unless current_user.data_public? %>

<%= t ".public editing note.heading" %>

-<%= raw t ".public editing note.text" %> +<%= t ".public editing note.html" %> <%= button_to t(".make edits public button"), :action => :go_public %> <% end %>