X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/8980da4381923d8099a11a1334baf3c3e625a484..9477d7a65e03b895a8d30a4586449e76c1ea4758:/app/views/user/_contact.html.erb diff --git a/app/views/user/_contact.html.erb b/app/views/user/_contact.html.erb index d720353ee..1a28c21bd 100644 --- a/app/views/user/_contact.html.erb +++ b/app/views/user/_contact.html.erb @@ -1,7 +1,15 @@ - + <% + user_data = { + :lon => contact.home_lon, + :lat => contact.home_lat, + :icon => image_path(type == "friend" ? "marker-blue.png" : "marker-green.png"), + :description => render(:partial => "popup", :object => contact, :locals => {:type => type}) + } + %> + <%= content_tag "td", :rowspan => 3, :data => {:user => user_data} do %> <%= user_thumbnail contact %> - + <% end %> <%= link_to h(contact.display_name), :controller => 'user', :action => 'view', :display_name => contact.display_name %> <% if @this_user.home_lon and @this_user.home_lat and contact.home_lon and contact.home_lat %> @@ -28,14 +36,15 @@ <%= t'changeset.changeset.no_edits' %> <% end %> + <%= link_to t('user.view.send message'), :controller => 'message', :action => 'new', :display_name => contact.display_name %> | <% if @user.is_friends_with?(contact) %> - <%= link_to t('user.view.remove as friend'), :controller => 'user', :action => 'remove_friend', :display_name => contact.display_name, :referer => request.request_uri %> + <%= link_to t('user.view.remove as friend'), remove_friend_path(:display_name => contact.display_name, :referer => request.fullpath), :method => :post %> <% else %> - <%= link_to t('user.view.add as friend'), :controller => 'user', :action => 'make_friend', :display_name => contact.display_name, :referer => request.request_uri %> + <%= link_to t('user.view.add as friend'), make_friend_path(:display_name => contact.display_name, :referer => request.fullpath), :method => :post %> <% end %>