X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/a36f3558dd43dd5a598e36dd21fd5f7d2b4a94f5..970e1a99d7dce64f0631e88c5b9f060fb48d75fe:/app/views/user/_contact.html.erb diff --git a/app/views/user/_contact.html.erb b/app/views/user/_contact.html.erb index e723af9e7..4811389f1 100644 --- a/app/views/user/_contact.html.erb +++ b/app/views/user/_contact.html.erb @@ -1,15 +1,13 @@ -
- <% - 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 %> +<% + 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 :div, :class => "contact-activity clearfix", :data => {:user => user_data} do %> + <%= user_thumbnail contact %>

<%= link_to h(contact.display_name), :controller => 'user', :action => 'view', :display_name => contact.display_name %> @@ -26,7 +24,7 @@ <% changeset = contact.changesets.first %> <% if changeset %> <%= t('user.view.latest edit', :ago => t('user.view.ago', :time_in_words_ago => time_ago_in_words(changeset.created_at))) %> - <% comment = changeset.tags['comment'].to_s != '' ? changeset.tags['comment'] : t('changeset.changeset.no_comment') %> + <% comment = changeset.tags['comment'].to_s != '' ? changeset.tags['comment'] : t('browse.no_comment') %> "<%= link_to(comment, {:controller => 'browse', :action => 'changeset', :id => changeset.id}, {:title => t('changeset.changeset.view_changeset_details')}) @@ -47,4 +45,4 @@

-
+<% end %>