X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/80903324cfabf9330973b06e68b423f38fc13522..d414ffc61a0f6505f1d06e89e8668fa5b49d607e:/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 31fd00f01..8ccd525a3 100644 --- a/app/views/browse/note.html.erb +++ b/app/views/browse/note.html.erb @@ -1,19 +1,9 @@ <% 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? } -%>
@@ -22,29 +12,29 @@ <% end -%>
-
+

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

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

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

-
+
<% end %> -
+

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

@@ -63,5 +53,6 @@
<% end %> +<% end %> -
+<%= render :template => 'layouts/map' %>