X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/a36f3558dd43dd5a598e36dd21fd5f7d2b4a94f5..c40ad9de0296b28140f13a01a055108b23cb2e7d:/app/views/user/view.html.erb?ds=inline diff --git a/app/views/user/view.html.erb b/app/views/user/view.html.erb index de2e93f94..68f27ca38 100644 --- a/app/views/user/view.html.erb +++ b/app/views/user/view.html.erb @@ -2,53 +2,59 @@
<%= user_image @this_user %>
-

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

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

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

+ <% if current_user and @this_user.id == current_user.id %> + <% else %> - +
-
<%= @this_user.description.to_html %>
+ <% if current_user and @this_user.id != current_user.id %> +
+ <%= link_to new_issue_url(reportable_id: @this_user.id, reportable_type: @this_user.class.name, referer: request.fullpath), :title => t('user.view.report') do%> +  ⚐ + <% end %> +
+ <% end %> + +
<%= @this_user.description.to_html %>
- <% if @user and @user.administrator? -%> + <% if current_user and current_user.administrator? -%>
<%= t 'user.view.email address' %> <%= @this_user.email %> <% unless @this_user.creation_ip.nil? -%> @@ -163,10 +179,10 @@ <% end %> - <% if @user and @this_user.id == @user.id %> + <% if current_user and @this_user.id == current_user.id %> <% if @this_user.home_lat.nil? or @this_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 => @user.display_name)) %>

+

<%= 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)) %>

<% else %> <% content_for :head do %> @@ -174,10 +190,10 @@ <% end %> <% user_data = { - :lon => @user.home_lon, - :lat => @user.home_lat, + :lon => current_user.home_lon, + :lat => current_user.home_lat, :icon => image_path("marker-red.png"), - :description => render(:partial => "popup", :object => @user, :locals => {:type => "your location"}) + :description => render(:partial => "popup", :object => current_user, :locals => {:type => "your location"}) } %> <%= content_tag "div", "", :id => "map", :class => "content_map", :data => {:user => user_data} %>