X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/3d7eb387a7c3573f1a1d17df00adcaa1fb9b9fa5..e4504399ae55525f22a7fb47e0c47434cef8cf0a:/app/views/browse/note.html.erb diff --git a/app/views/browse/note.html.erb b/app/views/browse/note.html.erb index 12de1114f..12842f87c 100644 --- a/app/views/browse/note.html.erb +++ b/app/views/browse/note.html.erb @@ -1,57 +1,66 @@ -<%= render :partial => "navigation" %> +<% set_title("#{t('browse.note.title')} | #{@note.id}") %>

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

+
+

+ <%= note_event('open', @note.created_at, @note.author) %> + <% if @note.status == "closed" %> +
+ <%= note_event(@note.status, @note.closed_at, @note.comments.last.author) %> + <% end %> +

+
-<%= render :partial => "map", :object => @note %> +<% if @note.comments.find { |comment| comment.author.nil? } -%> +
+

<%= t "javascripts.notes.show.anonymous_warning" %>

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

+
+ - <% if @note.status == "closed" %> - - - - - <% elsif @note.comments.length > 1 %> - - - - +<% if @note.comments.length > 1 %> +
+ +
+<% end %> +
+ <% if @note.status == "open" %> +
+ +
+ + + +
+ + <% else %> +
+ +
+ + +
+ <% end %> - -
- - - - - - - - - - <% if @note.comments.length > 1 %> - - - - - <% end %> - -
<%= t "browse.note.opened" %><%= t "browse.note.at_by_html", :when => friendly_date(@note.created_at), :user => note_author(@note) %>
<%= t "browse.note.closed" %><%= t "browse.note.at_by_html", :when => friendly_date(@note.closed_at), :user => note_author(@note.comments.last) %>
<%= t "browse.note.last_modified" %><%= t "browse.note.at_by_html", :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)}".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| %> - - - - <% end %> -
- <%= comment.body.to_html %> - <%= t "browse.note.at_by_html", :when => friendly_date(comment.created_at), :user => note_author(comment) %> -
-
+