X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/a36f3558dd43dd5a598e36dd21fd5f7d2b4a94f5..c71fd544e0b33246dfcc677ec830efc2031d419e:/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 574242f77..17a5f1f40 100644 --- a/app/views/browse/_common_details.html.erb +++ b/app/views/browse/_common_details.html.erb @@ -1,39 +1,33 @@ -
-
- <% if common_details.visible? %> -

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

- <% else %> -

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

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

-
+

+ <% if common_details.changeset.tags['comment'].present? %> + <%= linkify(h(common_details.changeset.tags['comment'])) %> + <% else %> + <%= t 'browse.no_comment' %> <% 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'])) %>

-
- <% end %> +<% 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}"}) %>
-<%= render :partial => "tag_details", :object => common_details %> +<% end %> + +<%= render :partial => "tag_details", :object => common_details.tags %>