X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/b56fb250680e95146256161e8adb5f1a327859fd..c71fd544e0b33246dfcc677ec830efc2031d419e:/app/views/browse/note.html.erb
diff --git a/app/views/browse/note.html.erb b/app/views/browse/note.html.erb
index ed13f97c7..fa9e88628 100644
--- a/app/views/browse/note.html.erb
+++ b/app/views/browse/note.html.erb
@@ -1,48 +1,61 @@
-<% set_title("#{t('browse.note.title')} | #{@note.id}") %>
+<% set_title(t('browse.note.title', :id => @note.id)) %>
<%= t "browse.note.#{@note.status}_title", :note_name => @note.id %>
+
-
- <%= @note.author %>
- <%= note_event(@note.status, @note.created_at, @note.author) %>
+ <%= t('browse.note.description') %>
+
+ <%= h(@note_comments.first.body.to_html) %>
+
+
+
+ <%= note_event('open', @note.created_at, @note.author) %>
<% if @note.status == "closed" %>
- <%= note_event(@note.status, @note.closed_at, @note.comments.last.author) %>
+ <%= note_event(@note.status, @note.closed_at, @note_comments.last.author) %>
<% end %>
-
-
+
-<% if @note.comments.find { |comment| comment.author.nil? } -%>
-
-
<%= t "javascripts.notes.show.anonymous_warning" %>
-
-<% end -%>
+ <% if @note_comments.find { |comment| comment.author.nil? } -%>
+ <%= t "javascripts.notes.show.anonymous_warning" %>
+ <% end -%>
-
-
+ <% if current_user && current_user != @note.author %>
+
<%= report_link(t(".report"), @note) %>
+ <% end %>
-
-
<%= 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"} %>
-
-
+ <% if @note_comments.length > 1 %>
+
+ <% end %>
-<% if @note.comments.length > 1 %>
-
-<% end %>
+ <% if @note.status == "open" %>
+
+ <% else %>
+
+ <% end %>
+
+ <% @note_comments[1..-1].each do |comment| %> +-
+ <%= note_event(comment.event, comment.created_at, comment.author) %>
+ <%= comment.body.to_html %>
+
+ <% end %>
+
+