X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/63ca466f24c08d396f323f3d209509e10a8f185c..bd8713f42b4a5196cf89e8270c57322742ba1f5e:/app/views/user/account.html.erb diff --git a/app/views/user/account.html.erb b/app/views/user/account.html.erb index fbc1487bb..179e1b2f6 100644 --- a/app/views/user/account.html.erb +++ b/app/views/user/account.html.erb @@ -1,4 +1,8 @@

<%= 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' %> + <%= error_messages_for 'user' %> <%= form_for :user, :html => { :multipart => true } do |f| %> @@ -63,7 +67,7 @@ - + @@ -80,27 +84,37 @@ - @@ -113,10 +127,13 @@ - + @@ -124,16 +141,9 @@
<%= t 'user.account.profile description' %><%= f.text_area :description, :rows => '5', :cols => '60' %><%= richtext_area :user, :description, :rows => '15', :cols => '80' %>
<%= t 'user.account.image' %> - <% if @user.image.nil? %> - <%= hidden_field_tag "image_action", "new" %> - <%= t 'user.account.new image' %>
<%= file_column_field "user", "image" %>
<%= t 'user.account.image size hint' %> - <% else %> - - - - - - - - - - - - - - -
<%= image_tag url_for_file_column(@user, "image"), :class => "user_image" %><%= 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' %>
<%= file_column_field "user", "image", :onchange => "$('#image_action_new').prop('checked', true)" %>
<%= 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' %>)

<%= 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 => "user_map set_location" %>
<%= submit_tag t('user.account.save changes button') %>
<% end %> -<%= render :partial => 'map', :locals => { :setting_location => true, :show_other_users => false } %> - <% unless @user.data_public? %>

<%= 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 %> -
-
-<%= link_to t('user.account.return to profile'), :controller => 'user', :action => @user.display_name %> -
-