X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/5a00e23fa3200d95a27177dc5e392993e9dd0195..32c3000af7c2c4016b75abf5a396262e28aabd72:/app/views/browse/_common_details.html.erb?ds=sidebyside diff --git a/app/views/browse/_common_details.html.erb b/app/views/browse/_common_details.html.erb index 95ddafcd5..1100fe97b 100644 --- a/app/views/browse/_common_details.html.erb +++ b/app/views/browse/_common_details.html.erb @@ -1,32 +1,31 @@ -
+

<% if common_details.changeset.tags['comment'].present? %> -
- <%= linkify(h(common_details.changeset.tags['comment'])) %> -
+ <%= linkify(common_details.changeset.tags["comment"]) %> <% else %> -
(no comment)
+ <%= t "browse.no_comment" %> <% end %> -
- <% if common_details.visible? %> - <%= t 'browse.common_details.edited' %> - <% else %> - <%= t 'browse.common_details.deleted' %> - <% end %> - <%= distance_of_time_in_words_to_now(common_details.timestamp) %> ago +

- <% if common_details.changeset.user.data_public? %> - <%= t 'browse.common_details.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.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.version" %> + #<%= common_details.version %> + · + <%= t "browse.in_changeset" %> + #<%= link_to common_details.changeset_id, :action => :changeset, :id => common_details.changeset_id %> +
-
- <%= t 'browse.common_details.version' %> - #<%= h(common_details.version) %> - · - <%= t 'browse.common_details.in_changeset' %> - #<%= link_to common_details.changeset_id, :action => :changeset, :id => common_details.changeset_id %> -
+<% if @type == "node" and common_details.visible? %> +
+ <%= t "browse.location" %> + <%= link_to(tag.span(number_with_delimiter(common_details.lat), :class => "latitude") + ", " + 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 %>