X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/56db9ca2b7e2475cd8025630049fb4a4b824f2d9..4bb1bccd9c1c8d90bf21f997a1021de74df5444d:/app/views/browse/note.html.erb diff --git a/app/views/browse/note.html.erb b/app/views/browse/note.html.erb index ec4f8d3ae..fa587104e 100644 --- a/app/views/browse/note.html.erb +++ b/app/views/browse/note.html.erb @@ -15,21 +15,27 @@
+ <% if @note.comments.find { |comment| comment.author.nil? } -%> +
+

<%= t "javascripts.notes.show.anonymous_warning" %>

+
+ <% end -%> +

<%= t "browse.note.opened" %>

-

<%= t "browse.note.at_by_html", :when => friendly_date(@note.created_at), :user => note_author(@note) %>

+

<%= note_event(@note.created_at, @note.author) %>

<% if @note.status == "closed" %>

<%= t "browse.note.closed" %>

-

<%= t "browse.note.at_by_html", :when => friendly_date(@note.closed_at), :user => note_author(@note.comments.last) %>

+

<%= note_event(@note.closed_at, @note.comments.last.author) %>

<% elsif @note.comments.length > 1 %>

<%= t "browse.note.last_modified" %>

-

<%= t "browse.note.at_by_html", :when => friendly_date(@note.updated_at), :user => note_author(@note.comments.last) %>

+

<%= note_event(@note.updated_at, @note.comments.last.author) %>

<% end %> @@ -40,7 +46,7 @@

<%= t "browse.node_details.coordinates" %>

-

<%= link_to ("#{number_with_delimiter(@note.lat)}, #{number_with_delimiter(@note.lon)}".html_safe), {:controller => 'site', :action => 'index', :lat => h(@note.lat), :lon => h(@note.lon), :zoom => "18"} %>

+

<%= link_to ("#{number_with_delimiter(@note.lat)}, #{number_with_delimiter(@note.lon)}".html_safe), {:controller => 'site', :action => 'index', :lat => h(@note.lat), :lon => h(@note.lon), :zoom => "18"} %>

@@ -51,7 +57,7 @@ <% @note.comments[1..-1].each do |comment| %>
  • <%= comment.body.to_html %> - <%= t "browse.note.at_by_html", :when => friendly_date(comment.created_at), :user => note_author(comment) %> + <%= note_event(comment.created_at, comment.author) %>
  • <% end %>