X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/0c8ad2f86edefed72052b402742cadedb0d674d9..d66ad4a4555c6ae9cb7257f53e2df375e5c4c73f:/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 7c8165c67..3748f2f65 100644 --- a/app/views/browse/_common_details.html.erb +++ b/app/views/browse/_common_details.html.erb @@ -1,39 +1,34 @@ -
-
- <% if common_details.visible? %> -

<%= t 'browse.common_details.edited_at' %>

- <% else %> -

<%= t 'browse.common_details.deleted_at' %>

- <% end %> -

<%= l common_details.timestamp %>

-
+

+ <%= t "browse.version" %> + #<%= common_details.version %> +

- <% 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 %>

-
+

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

-
-

<%= 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 %>

-
+
+ <%= 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.in_changeset" %> + #<%= link_to common_details.changeset_id, :action => :changeset, :id => common_details.changeset_id %> +
- <% if common_details.changeset.tags['comment'].present? %> -
-

<%= t 'browse.common_details.changeset_comment' %>

-

<%= linkify(h(common_details.changeset.tags['comment'])) %>

-
- <% end %> +<% if @type == "node" and common_details.visible? %> +
+ <%= t "browse.location" %> + <%= link_to(t(".coordinates_html", + :latitude => tag.span(number_with_delimiter(common_details.lat), :class => "latitude"), + :longitude => tag.span(number_with_delimiter(common_details.lon), :class => "longitude")), + root_path(:anchor => "map=18/#{common_details.lat}/#{common_details.lon}")) %>
-<%= render :partial => "tag_details", :object => common_details %> +<% end %> + +<%= render :partial => "tag_details", :object => common_details.tags %>