X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/0d3a9ed9cb47ce3b89ea9eaffbb589f9a9ff6d22..054f934f27e79ab0f7a25a89b6b719cc2cb0cb06:/app/views/browse/note.html.erb diff --git a/app/views/browse/note.html.erb b/app/views/browse/note.html.erb index 59c96c4aa..2d2560ef2 100644 --- a/app/views/browse/note.html.erb +++ b/app/views/browse/note.html.erb @@ -1,58 +1,50 @@ -<%= render :partial => "navigation" %> +

<%= t "browse.note.#{@note.status}_title", :note_name => @note.id %>

-

- <%= image_tag "#{@note.status}_note_marker.png", :alt => @note.status %> - <%= 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 -%> -<%= render :partial => "map", :object => @note %> - - - - - - - +
+
+

<%= t "browse.note.opened" %>

+

<%= note_event(@note.created_at, @note.author) %>

+
<% if @note.status == "closed" %> -
- - - +
+

<%= t "browse.note.closed" %>

+

<%= note_event(@note.closed_at, @note.comments.last.author) %>

+
<% elsif @note.comments.length > 1 %> - - - - - <% end %> - - - - - - - - - - - - <% if @note.comments.length > 1 %> - - - - +
+

<%= t "browse.note.last_modified" %>

+

<%= note_event(@note.updated_at, @note.comments.last.author) %>

+
<% end %> -
<%= t "browse.note.opened" %><%= t "browse.note.at_by", :when => friendly_date(@note.created_at), :user => note_author(@note) %>
<%= t "browse.note.closed" %><%= t "browse.note.at_by", :when => friendly_date(@note.closed_at), :user => note_author(@note.comments.last) %>
<%= t "browse.note.last_modified" %><%= t "browse.note.at_by", :when => friendly_date(@note.updated_at), :user => note_author(@note.comments.last) %>
<%= 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.comments" %> - - <% @note.comments[1..-1].each do |comment| %> - - - - <% end %> -
- <%= h(comment.body) %> -
- <%= t "browse.note.at_by", :when => friendly_date(comment.created_at), :user => note_author(comment) %> -
-
+
+

<%= t "browse.note.description" %>

+

<%= h(@note.comments.first.body.to_html) %>

+
+ +
+

<%= 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" %>

+ +
+<% end %>