X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/c819bec8b7b81fb2766a67247440375e4a837d10..aebfbdcfbdb772914ca55c1b5f957f62c1c9cf24:/app/views/user/view.html.erb?ds=sidebyside diff --git a/app/views/user/view.html.erb b/app/views/user/view.html.erb index 137a390ba..fedbad80e 100644 --- a/app/views/user/view.html.erb +++ b/app/views/user/view.html.erb @@ -1,9 +1,9 @@ <% content_for :heading do %>
- <%= user_image @this_user %> + <%= user_image @user %>
-

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

- <% if current_user and @this_user.id == current_user.id %> +

<%= @user.display_name %><%= role_icons(@user) %>

+ <% if current_user and @user.id == current_user.id %>
-
<%= @this_user.description.to_html %>
+
<%= @user.description.to_html %>
<% if current_user and current_user.administrator? -%>
- <%= t 'user.view.email address' %> <%= @this_user.email %> - <% unless @this_user.creation_ip.nil? -%> - <%= t 'user.view.created from' %> <%= @this_user.creation_ip %> + <%= t 'user.view.email address' %> <%= @user.email %> + <% unless @user.creation_ip.nil? -%> + <%= t 'user.view.created from' %> <%= @user.creation_ip %> <% end -%> - <%= t 'user.view.status' %> <%= @this_user.status.capitalize %> - <%= t 'user.view.spam score' %> <%= @this_user.spam_score %> + <%= t 'user.view.status' %> <%= @user.status.capitalize %> + <%= t 'user.view.spam score' %> <%= @user.spam_score %>
<% end -%> <% end %> - <% if current_user and @this_user.id == current_user.id %> - <% if @this_user.home_lat.nil? or @this_user.home_lon.nil? %> + <% if current_user and @user.id == current_user.id %> + <% if @user.home_lat.nil? or @user.home_lon.nil? %>

<%= raw(t 'user.view.if set location', :settings_link => (link_to t('user.view.settings_link_text'), :controller => 'user', :action => 'account', :display_name => current_user.display_name)) %>

@@ -191,11 +191,11 @@ <%= content_tag "div", "", :id => "map", :class => "content_map", :data => {:user => user_data} %> <% end %> - <% friends = @this_user.friends.collect { |f| f.befriendee } %> - <% nearby = @this_user.nearby - friends %> + <% friends = @user.friends.collect { |f| f.befriendee } %> + <% nearby = @user.nearby - friends %>
-

<%= t 'user.view.your friends' %>

+

<%= t 'user.view.my friends' %>

<% if friends.empty? %> <%= t 'user.view.no friends' %>