X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/b30983f02bd1a0963157c14f14e996f258936625..35458c009652645972a9167d80aba1c4fdce82cf:/app/views/browse/note.html.erb diff --git a/app/views/browse/note.html.erb b/app/views/browse/note.html.erb index 90c1f358d..2d2560ef2 100644 --- a/app/views/browse/note.html.erb +++ b/app/views/browse/note.html.erb @@ -1,59 +1,50 @@ -<% content_for :head do %> - <%= stylesheet_link_tag 'browse' %> - <%= javascript_include_tag 'index' %> -<% end %> - -<% 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" %>

+

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

+

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

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

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

-

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

+

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

+

<%= note_event(@note.closed_at, @note.comments.last.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) %>

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

<%= 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.last_modified" %>

+

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

+ <% end %> + +
+

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

+

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

- <% if @note.comments.length > 1 %> -
-

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

-
    - <% @note.comments[1..-1].each do |comment| %> -
  • - <%= comment.body.to_html %> - <%= note_event(comment.created_at, comment.author) %> -
  • - <% end %> -
-
- <% end %> +
+

<%= 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.comments.length > 1 %> +
+

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

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