X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/b598979374985b8c62fac14588d685e29eac20a4..499a60c330faabcb8bf185307621165d32cc2c5b:/app/views/browse/note.html.erb?ds=sidebyside diff --git a/app/views/browse/note.html.erb b/app/views/browse/note.html.erb index 2c7de0331..74d1223c7 100644 --- a/app/views/browse/note.html.erb +++ b/app/views/browse/note.html.erb @@ -1,39 +1,37 @@ -<% set_title(t('browse.note.title', :id => @note.id)) %> +<% set_title(t(".title", :id => @note.id)) %>
<%= note_event("opened", @note.created_at, @note.author) %>
<% if @note.status == "closed" %> -<%= note_event(@note.status, @note.closed_at, @note.all_comments.last.author) %>
<% end %><%= t "javascripts.notes.show.anonymous_warning" %>
+<%= t "javascripts.notes.show.anonymous_warning" %>
<% end -%> + <% if current_user && current_user != @note.author %> +<%= report_link(t(".report"), @note) %>
+ <% end %> + <% if @note_comments.length > 1 %>
+
+ <% if current_user -%> + + <% end -%> <% else %> <% end %><% @note_comments[1..-1].each do |comment| %>-
- <%= note_event(comment.event, comment.created_at, comment.author) %>
+ <%= note_event(comment.event, comment.created_at, comment.author) %>
<%= comment.body.to_html %>
<% end %>
@@ -42,20 +40,28 @@
<% end %>
<% if @note.status == "open" %>
-