X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/684e7db45afda7f26074343a111196aa7b51a093..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 8e277d25f..1a792e873 100644 --- a/app/views/browse/note.html.erb +++ b/app/views/browse/note.html.erb @@ -1,63 +1,76 @@ -
<%= t "javascripts.notes.show.anonymous_warning" %>
-<%= note_event(@note.closed_at, @note.comments.last.author) %>
-<%= note_event(@note.updated_at, @note.comments.last.author) %>
-<%= 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"} %>
+
<%= t "browse.note.comments" %>
-- <% @note.comments[1..-1].each do |comment| %> --
- <%= comment.body.to_html %>
- <%= note_event(comment.created_at, comment.author) %>
-
+
+
-<% end %>
+
+ <% if @note_comments.find { |comment| comment.author.nil? } -%>
+
+
+ <% end %>
+
+ <% if @note.status == "open" %>
+ <% if current_user -%>
+
+ <% end -%> + <% else %> + + <% end %> ++- <%= 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 "javascripts.notes.show.anonymous_warning" %>
+ <% end -%> + + <% if current_user && current_user != @note.author %> +<%= report_link(t(".report"), @note) %>
+ <% end %> + + <% if @note_comments.length > 1 %> ++ <% @note_comments.drop(1).each do |comment| %> +-
+ <%= note_event(comment.event, comment.created_at, comment.author) %>
+ <%= comment.body.to_html %>
+
+ <% end %>
+
+