X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/7b384f03ab1d34fd3ebcc5ae3add25b3b5591e2e..7c89e7c0b418c5c4d9692b5e153946571a6ea994:/app/views/browse/_common_details.html.erb diff --git a/app/views/browse/_common_details.html.erb b/app/views/browse/_common_details.html.erb index 0c486e0a7..1c8f1c5da 100644 --- a/app/views/browse/_common_details.html.erb +++ b/app/views/browse/_common_details.html.erb @@ -1,30 +1,31 @@ - - <%= t 'browse.common_details.edited_at' %> - <%= l common_details.timestamp %> - +

+ <% if common_details.changeset.tags['comment'].present? %> + <%= linkify(h(common_details.changeset.tags["comment"])) %> + <% else %> + <%= t "browse.no_comment" %> + <% end %> +

-<% if common_details.changeset.user.data_public? %> - - <%= t 'browse.common_details.edited_by' %> - <%= link_to h(common_details.changeset.user.display_name), :controller => "user", :action => "view", :display_name => common_details.changeset.user.display_name %> - -<% end %> - - - <%= t 'browse.common_details.version' %> - <%= h(common_details.version) %> - +
+ <%= t "browse.#{common_details.visible? ? :edited : :deleted}_by_html", + :time => time_ago_in_words(common_details.timestamp, :scope => :'datetime.distance_in_words_ago'), + :user => changeset_user_link(common_details.changeset), + :title => l(common_details.timestamp) %> +
- - <%= t 'browse.common_details.in_changeset' %> - <%= link_to common_details.changeset_id, :action => :changeset, :id => common_details.changeset_id %> - +
+ <%= t "browse.version" %> + #<%= h(common_details.version) %> + · + <%= t "browse.in_changeset" %> + #<%= link_to common_details.changeset_id, :action => :changeset, :id => common_details.changeset_id %> +
-<% if common_details.changeset.tags['comment'] %> - - <%= t 'browse.common_details.changeset_comment' %> - <%= auto_link(h(common_details.changeset.tags['comment'])) %> - +<% if @type == "node" and common_details.visible? %> +
+ <%= t "browse.location" %> + <%= link_to(content_tag(:span, number_with_delimiter(common_details.lat), :class => "latitude") + ", " + content_tag(:span, number_with_delimiter(common_details.lon), :class => "longitude"), :controller => "site", :action => "index", :anchor => "map=18/#{common_details.lat}/#{common_details.lon}") %> +
<% end %> -<%= render :partial => "tag_details", :object => common_details %> +<%= render :partial => "tag_details", :object => common_details.tags %>