X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/dd302f4f2c56d1e9f1a2e39a54670f6f5a9bbd34..49da87fb6d2a9fe8c033a41cd935ee34a8767293:/app/views/users/_contact.html.erb diff --git a/app/views/users/_contact.html.erb b/app/views/users/_contact.html.erb index 5c3afaa89..9950da0f8 100644 --- a/app/views/users/_contact.html.erb +++ b/app/views/users/_contact.html.erb @@ -1,12 +1,10 @@ -<% - user_data = { +<% 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 %> + :description => render(:partial => "popup", :object => contact, :locals => { :type => type }) + } %> +<%= content_tag :div, :class => "contact-activity clearfix", :data => { :user => user_data } do %> <%= user_thumbnail contact %>

@@ -14,33 +12,32 @@ <% if @user.home_lon and @user.home_lat and contact.home_lon and contact.home_lat %> <% distance = @user.distance(contact) %> <% if distance < 1 %> - (<%= t 'users.show.m away', :count => (distance * 1000).round %>) + (<%= t "users.show.m away", :count => (distance * 1000).round %>) <% else %> - (<%= t 'users.show.km away', :count => distance.round %>) + (<%= t "users.show.km away", :count => distance.round %>) <% end %> <% end %>

<% changeset = contact.changesets.first %> <% if changeset %> - <%= t('users.show.latest edit', :ago => t('users.show.ago', :time_in_words_ago => time_ago_in_words(changeset.created_at))) %> - <% comment = changeset.tags['comment'].to_s != '' ? changeset.tags['comment'] : t('browse.no_comment') %> + <%= t("users.show.latest edit", :ago => t("users.show.ago", :time_in_words_ago => time_ago_in_words(changeset.created_at))) %> + <% 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('changesets.changeset.view_changeset_details')}) - %>" + { :controller => "browse", :action => "changeset", :id => changeset.id }, + { :title => t("changesets.changeset.view_changeset_details") }) %>" <% else %> - <%= t'changesets.changeset.no_edits' %> + <%= t "changesets.changeset.no_edits" %> <% end %>