X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/56db9ca2b7e2475cd8025630049fb4a4b824f2d9..d414ffc61a0f6505f1d06e89e8668fa5b49d607e:/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 ec4f8d3ae..8ccd525a3 100644 --- a/app/views/browse/note.html.erb +++ b/app/views/browse/note.html.erb @@ -1,46 +1,42 @@ <% content_for :head do %> -<%= stylesheet_link_tag 'browse' %> + <%= stylesheet_link_tag 'browse' %> <% end %> -<% content_for :heading do %> -

- <%= image_tag "#{@note.status}_note_marker.png", :alt => @note.status %> - <%= t "browse.note.#{@note.status}_title", :note_name => @note.id %> -

-<% end %> - -<%= render :partial => "navigation" %> - -<%= render :partial => "map", :object => @note %> +<% content_for :sidebar do %> +

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

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

-

<%= t "browse.note.at_by_html", :when => friendly_date(@note.created_at), :user => note_author(@note) %>

+

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

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

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

-

<%= t "browse.note.at_by_html", :when => friendly_date(@note.closed_at), :user => note_author(@note.comments.last) %>

-
+

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

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

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

-

<%= t "browse.note.at_by_html", :when => friendly_date(@note.updated_at), :user => note_author(@note.comments.last) %>

-
+

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

+
<% end %> -
+

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

-

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

+

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

+

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

@@ -49,13 +45,14 @@

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

    <% @note.comments[1..-1].each do |comment| %> -
  • +
  • <%= comment.body.to_html %> - <%= t "browse.note.at_by_html", :when => friendly_date(comment.created_at), :user => note_author(comment) %> + <%= note_event(comment.created_at, comment.author) %>
  • <% end %>
<% end %> +<% end %> -
+<%= render :template => 'layouts/map' %>