X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/6baccfaddd190d730b626204e9cf81c2504995bf..a549d33fdfdc3c79f549c99b57aa9baf46514926:/app/views/user/view.html.erb diff --git a/app/views/user/view.html.erb b/app/views/user/view.html.erb index 0dbc09dd3..4a8fde862 100644 --- a/app/views/user/view.html.erb +++ b/app/views/user/view.html.erb @@ -1,4 +1,15 @@ -

<%= h(@this_user.display_name) %>

+

<%= h(@this_user.display_name) %> +<% UserRole::ALL_ROLES.each do |role| %> +<% if @user and @user.administrator? %> +<% if @this_user.has_role? role %> +<%= link_to(image_tag("roles/#{role}.png", :size => "20x20", :border => 0, :alt => t("user.view.role.revoke.#{role}"), :title => t("user.view.role.revoke.#{role}")), :controller => 'user_roles', :action => 'revoke', :display_name => @this_user.display_name, :role => role) %> +<% else %> +<%= link_to(image_tag("roles/blank_#{role}.png", :size => "20x20", :border => 0, :alt => t("user.view.role.grant.#{role}"), :title => t("user.view.role.grant.#{role}")), :controller => 'user_roles', :action => 'grant', :display_name => @this_user.display_name, :role => role) %> +<% end %> +<% elsif @this_user.has_role? role %> +<%= image_tag("roles/#{role}.png", :size => "20x20", :border => 0, :alt => t("user.view.role.#{role}"), :title => t("user.view.role.#{role}")) %> +<% end %> +<% end %>

<% if @user and @this_user.id == @user.id %> @@ -7,6 +18,10 @@ | <%= link_to t('user.view.my edits'), :controller => 'changeset', :action => 'list', :display_name => @user.display_name %> | <%= link_to t('user.view.my traces'), :controller => 'trace', :action=>'mine' %> | <%= link_to t('user.view.my settings'), :controller => 'user', :action => 'account', :display_name => @user.display_name %> +| <%= link_to t('user.view.blocks on me'), :controller => 'user_blocks', :action => 'blocks_on', :display_name => @user.display_name %> +<% if @user and @user.moderator? %> +| <%= link_to t('user.view.blocks by me'), :controller => 'user_blocks', :action => 'blocks_by', :display_name => @user.display_name %> +<% end %> <% else %> <%= link_to t('user.view.send message'), :controller => 'message', :action => 'new', :display_name => @this_user.display_name %> @@ -18,12 +33,19 @@ <% else %> <%= link_to t('user.view.add as friend'), :controller => 'user', :action => 'make_friend', :display_name => @this_user.display_name %> <% end %> +| <%= link_to t('user.view.block_history'), :controller => 'user_blocks', :action => 'blocks_on', :display_name => @this_user.display_name %> +<% if @this_user.moderator? %> +| <%= link_to t('user.view.moderator_history'), :controller => 'user_blocks', :action => 'blocks_by', :display_name => @this_user.display_name %> +<% end %> +<% if @user and @user.moderator? %> +| <%= link_to t('user.view.create_block'), :controller => 'user_blocks', :action => 'new', :display_name => @this_user.display_name %> +<% end %> <% end %>
<% if @this_user != nil %>

-<%= t 'user.view.mapper since' %><%= l @this_user.creation_time %> <%= t 'user.view.ago', :time_in_words_ago => time_ago_in_words(@this_user.creation_time) %> +<%= t 'user.view.mapper since' %> <%= l @this_user.creation_time %> <%= t 'user.view.ago', :time_in_words_ago => time_ago_in_words(@this_user.creation_time) %>

<% end %> @@ -71,8 +93,17 @@ <% end %> <%= link_to h(@friend.display_name), :controller => 'user', :action => 'view', :display_name => @friend.display_name %> - <% if @friend.home_lon and @friend.home_lat %><%= t 'user.view.km away', :count => @this_user.distance(@friend).round %><% end %> - (<%= link_to t('user.view.send message'), :controller => 'message', :action => 'new', :user_id => @friend.id %>) + + <% if @friend.home_lon and @friend.home_lat %> + <% distance = @this_user.distance(@friend) %> + <% if distance < 1 %> + <%= t 'user.view.m away', :count => (distance * 1000).round %> + <% else %> + <%= t 'user.view.km away', :count => distance.round %> + <% end %> + <% end %> + + (<%= link_to t('user.view.send message'), :controller => 'message', :action => 'new', :display_name => @friend.display_name %>) <%end%> @@ -93,8 +124,15 @@ <% @this_user.nearby.each do |nearby| %> <%= link_to h(nearby.display_name), :controller => 'user', :action => 'view', :display_name => nearby.display_name %> - <%= t 'user.view.km away', :count => @this_user.distance(nearby).round %> - (<%= link_to t('user.view.send message'), :controller => 'message', :action => 'new', :user_id => nearby.id %>) + + <% distance = @this_user.distance(nearby) %> + <% if distance < 1 %> + <%= t 'user.view.m away', :count => (distance * 1000).round %> + <% else %> + <%= t 'user.view.km away', :count => distance.round %> + <% end %> + + (<%= link_to t('user.view.send message'), :controller => 'message', :action => 'new', :display_name => nearby.display_name %>) <% end %> @@ -106,4 +144,6 @@
<% if @user and @this_user.id == @user.id %> <%= link_to t('user.view.change your settings'), :controller => 'user', :action => 'account', :display_name => @user.display_name %> +

+<%= link_to t('user.view.my_oauth_details'), :controller => 'oauth_clients', :action => 'index' %> <% end %>