X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/d4c8c3ad1829756f80f25e3b22a4a6df2615af2d..e7ef10d4289501a04045e01ecf7fe9202c09eb4f:/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 07b44a94a..17a5f1f40 100644 --- a/app/views/browse/_common_details.html.erb +++ b/app/views/browse/_common_details.html.erb @@ -1,38 +1,33 @@ - - <% if common_details.visible? %> - <%= t 'browse.common_details.edited_at' %> +

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

-<% if common_details.changeset.user.data_public? %> - - <% if common_details.visible? %> - <%= t 'browse.common_details.edited_by' %> - <% else %> - <%= t 'browse.common_details.deleted_by' %> - <% end %> - <%= 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 => distance_of_time_in_words_to_now(common_details.timestamp), + :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' %> - <%= linkify(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 %>