X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/4d91fe3dd95c1058cb8d24fd4c900223e30b9059..e6db73f8d320bfd0b9c679ab1648e62d35cdf0bf:/app/views/browse/note.html.erb?ds=inline
diff --git a/app/views/browse/note.html.erb b/app/views/browse/note.html.erb
index 59c96c4aa..1a792e873 100644
--- a/app/views/browse/note.html.erb
+++ b/app/views/browse/note.html.erb
@@ -1,58 +1,76 @@
-<%= render :partial => "navigation" %>
+<% set_title(t(".title", :id => @note.id)) %>
-
+
<%= t(".description") %>
+
+ <%= h(@note_comments.first.body.to_html) %>
+
-
+
+
+ - <%= 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 "browse.location" %>
+ <%= link_to(t(".coordinates_html",
+ :latitude => tag.span(number_with_delimiter(@note.lat), :class => "latitude"),
+ :longitude => tag.span(number_with_delimiter(@note.lon), :class => "longitude")),
+ root_path(:anchor => "map=18/#{@note.lat}/#{@note.lon}")) %>
+
+
+
-
- <%= t "browse.note.opened" %> |
- <%= t "browse.note.at_by", :when => friendly_date(@note.created_at), :user => note_author(@note) %> |
-
+ <% if @note_comments.find { |comment| comment.author.nil? } -%>
+ <%= t "javascripts.notes.show.anonymous_warning" %>
+ <% end -%>
- <% if @note.status == "closed" %>
-
- <%= t "browse.note.closed" %> |
- <%= t "browse.note.at_by", :when => friendly_date(@note.closed_at), :user => note_author(@note.comments.last) %> |
-
- <% elsif @note.comments.length > 1 %>
-
- <%= t "browse.note.last_modified" %> |
- <%= t "browse.note.at_by", :when => friendly_date(@note.updated_at), :user => note_author(@note.comments.last) %> |
-
+ <% if current_user && current_user != @note.author %>
+ <%= report_link(t(".report"), @note) %>
<% 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"} %> |
-
-
- <% if @note.comments.length > 1 %>
-
- <%= t "browse.note.comments" %> |
-
-
+ <% if @note_comments.length > 1 %>
+
<% end %>
-
+ <% if @note.status == "open" %>
+ <% if current_user -%>
+
+ <% end -%>
+ <% else %>
+
+ <% end %>
+
+ <% @note_comments.drop(1).each do |comment| %> +-
+ <%= note_event(comment.event, comment.created_at, comment.author) %>
+ <%= comment.body.to_html %>
+
+ <% end %>
+
+