X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/e7d200c4a6d0904ab1e027518eca7200b0ca9a08..e670da54cbc4a7b00525b8decb506a23deddd918:/app/views/browse/note.html.erb diff --git a/app/views/browse/note.html.erb b/app/views/browse/note.html.erb index 061a86b06..f6db9f154 100644 --- a/app/views/browse/note.html.erb +++ b/app/views/browse/note.html.erb @@ -1,65 +1,54 @@ -

<%= t "browse.note.#{@note.status}_title", :note_name => @note.id %> +<% set_title("#{t('browse.note.title')} | #{@note.id}") %> + +

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

+
- - <%= t "browse.note.opened" %>: - <%= note_event(@note.created_at, @note.author) %> by - <% if @note.author.nil? %> - <%= t "browse.note.anonymous" %> - <% else %> - <%= note_author(@note.author) %> - <% end %> +
+ <%= t "browse.note.#{@note.status}_title", :note_name => @note.id %> +
+ <%= note_event('open', @note.created_at, @note.author) %> <% if @note.status == "closed" %> - - <%= t "browse.note.closed" %>: - <%= note_event(@note.closed_at, @note.author) %> by - <%= @note.comments.last.author %> +
+ <%= note_event(@note.status, @note.closed_at, @note.comments.last.author) %> <% end %> -
-
+
-<% if @note.comments.find { |comment| comment.author.nil? } -%> -
-

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

-
-<% end -%> + <% if @note.comments.find { |comment| comment.author.nil? } -%> +

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

+ <% end -%> -
- <% 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) %>

+ <% if @note.comments.length > 1 %> +
+
    + <% @note.comments[1..-1].each do |comment| %> +
  • + <%= note_event(comment.event, comment.created_at, comment.author) %> + <%= comment.body.to_html %> +
  • + <% end %> +
<% 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 == "open" %> +
+ +
+ + + +
+
+ <% else %> +
+ +
+ + +
+
+ <% end %>
- -<% if @note.comments.length > 1 %> -
-

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

- -
-<% end %>