X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/5ff9f2d21c82a9ebe06be748a37de764d0861514..1cded7d151f6af733c3760815a00b0a259d9ba17:/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 5c42fddd6..2d2560ef2 100644
--- a/app/views/browse/note.html.erb
+++ b/app/views/browse/note.html.erb
@@ -1,83 +1,50 @@
-
-
-
-
- <% if @note.status == "closed" %>
- <%= image_tag("closed_note_marker.png", :alt => 'closed') %>
- <%= t 'browse.note.closed_title', :note_name => @note.id %>
- <% else %>
- <%= image_tag("open_note_marker.png", :alt => 'open') %>
- <%= t 'browse.note.open_title', :note_name => @note.id %>
- <% end %>
-
- |
-
- <%= render :partial => "navigation" %>
- |
-
-
-
-
-
- <%= t 'browse.note.created_at' %> |
- <%= l @note.created_at %> |
-
-
- <%= t 'browse.note.edited_at' %> |
- <%= l @note.updated_at %> |
-
- <% if @note.status == "closed" %>
-
- <%= t 'browse.note.closed_at' %> |
- <%= l @note.closed_at %> |
-
- <% end %>
-
- <%= t 'browse.note.opened_by' %> |
- <% if @note.author.nil? %>
- <%= @note.author_name %> |
- <% else %>
- <%= link_to h(@note.author_name), :controller => "user", :action => "view", :display_name => @note.author_name %> |
- <% end %>
-
-
- <%= t 'browse.note.description' %> |
- <%= h(@note.comments.first.body) %> |
-
-
- <%= t 'browse.node_details.coordinates' %> |
- <%= link_to ("#{number_with_delimiter(@note.lat)}, #{number_with_delimiter(@note.lon)}"), {:controller => 'site', :action => 'index', :lat => h(@note.lat), :lon => h(@note.lon), :zoom => "18"} %> |
-
-
+<%= t "browse.note.#{@note.status}_title", :note_name => @note.id %>
-
+<% if @note.comments.find { |comment| comment.author.nil? } -%>
+
+ <%= t "javascripts.notes.show.anonymous_warning" %>
+
+<% end -%>
- <% if @note.comments.length > 1 %>
-
-
- <%= t 'browse.note.comment_by' %> |
- <%= t 'browse.note.comment' %> |
- <%= t 'browse.note.date' %> |
-
- <% @note.comments[1..-1].each do |comment| %>
-
-
- <% if comment.author.nil? %>
- <%= comment.author_name %>
- <% else %>
- <%= link_to h(comment.author.display_name), :controller => "user", :action => "view", :display_name => comment.author.display_name %>
- <% end %>
- |
- <%= h(comment.body) %> |
- <%= l comment.created_at %> |
-
- <% end %>
-
- <% end %>
-
-
- |
+
+
+
<%= t "browse.note.opened" %>
+
<%= note_event(@note.created_at, @note.author) %>
+
- <%= render :partial => "map", :object => @note %>
-
-
+ <% if @note.status == "closed" %>
+
+
<%= t "browse.note.closed" %>
+
<%= note_event(@note.closed_at, @note.comments.last.author) %>
+
+ <% elsif @note.comments.length > 1 %>
+
+
<%= t "browse.note.last_modified" %>
+
<%= note_event(@note.updated_at, @note.comments.last.author) %>
+
+ <% 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 %>
+
+
<%= t "browse.note.comments" %>
+
+ <% @note.comments[1..-1].each do |comment| %>
+
+ <% end %>
+
+
+<% end %>