X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/86061a881662bba3ba889878c5b51c37275f5f45..8a6c34fa78cf4fa52332d90448dae50087f2b510:/app/views/dashboards/_contact.html.erb diff --git a/app/views/dashboards/_contact.html.erb b/app/views/dashboards/_contact.html.erb index 545557e64..7e78a6895 100644 --- a/app/views/dashboards/_contact.html.erb +++ b/app/views/dashboards/_contact.html.erb @@ -4,12 +4,14 @@ :icon => image_path(type == "friend" ? "marker-blue.png" : "marker-green.png"), :description => render(:partial => "popup", :object => contact, :locals => { :type => type }) } %> -<%= tag.div :class => "contact-activity clearfix", :data => { :user => user_data } do %> - <%= user_thumbnail contact %> -
-

+<%= tag.div :class => "clearfix row", :data => { :user => user_data } do %> +

+ <%= user_thumbnail contact %> +
+
+

<%= link_to contact.display_name, user_path(contact) %> - <% if @user.home_lon and @user.home_lat and contact.home_lon and contact.home_lat %> + <% if @user.home_location? and contact.home_location? %> <% distance = @user.distance(contact) %> <% if distance < 1 %> (<%= t ".m away", :count => (distance * 1000).round %>) @@ -18,10 +20,10 @@ <% end %> <% end %>

-

+

<% changeset = contact.changesets.first %> <% if changeset %> - <%= t("users.show.latest edit", :ago => time_ago_in_words(changeset.created_at, :scope => :"datetime.distance_in_words_ago")) %> + <%= t(".latest_edit_html", :ago => friendly_date_ago(changeset.created_at)) %> <% comment = changeset.tags["comment"].to_s == "" ? t("browse.no_comment") : changeset.tags["comment"] %> <%= link_to(comment, { :controller => "browse", :action => "changeset", :id => changeset.id }, @@ -35,7 +37,7 @@