X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/1ae7872ed89612353cba641a6b77e86f963789d7..206e1309a95b498a220d8de6cf4ed5970ebd6778:/app/views/browse/note.html.erb diff --git a/app/views/browse/note.html.erb b/app/views/browse/note.html.erb index a20de88a0..1bacd27d6 100644 --- a/app/views/browse/note.html.erb +++ b/app/views/browse/note.html.erb @@ -1,68 +1,57 @@ -<% set_title("#{t('browse.note.title')} | #{@note.id}") %> +<% set_title(t('browse.note.title', :id => @note.id)) %>

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

+
- - <%= 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.description') %>

+
+ <%= h(@note_comments.first.body.to_html) %> +
+ +
+ <%= 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 %>