X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/5966acc207874f3196a43700cb9306411c77fe47..326d4ecec0ca0817567912f5d45b904df4c5b054:/app/views/dashboards/_contact.html.erb?ds=sidebyside diff --git a/app/views/dashboards/_contact.html.erb b/app/views/dashboards/_contact.html.erb index 7614c0c4d..759faab8f 100644 --- a/app/views/dashboards/_contact.html.erb +++ b/app/views/dashboards/_contact.html.erb @@ -4,14 +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 row", :data => { :user => user_data } do %> +<%= tag.div :class => "clearfix row", :data => { :user => user_data } do %>
- <%= link_to contact.display_name, user_path(contact) %> - <% if @user.home_lon and @user.home_lat and contact.home_lon and contact.home_lat %> +
+ <%= link_to contact.display_name, contact %> + <% if @user.home_location? and contact.home_location? %> <% distance = @user.distance(contact) %> <% if distance < 1 %> (<%= t ".m away", :count => (distance * 1000).round %>) @@ -23,21 +23,19 @@
<% 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 },
- { :title => t("changesets.changeset.view_changeset_details") }) %>
+ <%= link_to comment, changeset, :title => t("changesets.changeset.view_changeset_details") %>
<% else %>
<%= t "changesets.changeset.no_edits" %>
<% end %>