X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/d9d515bf18e85f02c0d11571e298586a90003d77..5dda4196d50774e8a44e9e137d45141d4151764b:/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 80c8c0e49..2782fc808 100644 --- a/app/views/user/account.html.erb +++ b/app/views/user/account.html.erb @@ -1,7 +1,10 @@ -

<%= t 'user.account.my settings' %>

- -<%= link_to t('user.account.return to profile'), :controller => 'user', :action => 'view', :display_name => @user.display_name %> | -<%= link_to t('user.view.oauth settings'), :controller => 'oauth_clients', :action => 'index' %> +<% content_for :heading do %> +

<%= t 'user.account.my settings' %>

+ +<% end %> <%= error_messages_for 'user' %> <%= form_for :user, :html => { :multipart => true } do |f| %> @@ -84,27 +87,37 @@ <%= t 'user.account.image' %> - - <% if @user.image.file? %> - - - - - - - - - - - - - - -
<%= user_image @user %><%= radio_button_tag "image_action", "keep", true %><%= 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' %>
- <% else %> - <%= hidden_field_tag "image_action", "new" %> - <%= t 'user.account.new image' %>
<%= f.file_field :image %>
<%= t 'user.account.image size hint' %> - <% end %> + + <%= user_image @user %> + + <% if @user.image.file? %> + + + + + <% end %> + <% if @user.image.file? || @user.image_use_gravatar? %> + + + + + <% end %> + <% if @user.image.file? %> + + + + + <% else %> + + + + + <% 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' %>)
@@ -120,19 +133,10 @@ <% content_for :head do %> <%= javascript_include_tag "user" %> <% end %> - <% - home = @user.home_lat && @user.home_lon - data = { - :lon => @user.home_lon || 0, - :lat => @user.home_lat || 20, - :zoom => home ? 12 : 1, - :marker => !!home - } - %> - <%= content_tag "div", "", :id => "map", :class => "user_map set_location", :data => data %> + <%= content_tag "div", "", :id => "map", :class => "content_map settings_map set_location" %> - + <%= submit_tag t('user.account.save changes button') %> @@ -145,4 +149,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 %> +<% end %> \ No newline at end of file