X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/80903324cfabf9330973b06e68b423f38fc13522..d3700e6201b4b78a70bbb2941572edc985b63c2c:/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..53ea0759e 100644 --- a/app/views/browse/note.html.erb +++ b/app/views/browse/note.html.erb @@ -1,67 +1,69 @@ -<% content_for :head do %> -<%= stylesheet_link_tag 'browse' %> -<% end %> +<% set_title(t('.title', :id => @note.id)) %> -<% 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 %> +

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

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

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

+
+

<%= t('.description') %>

+
+ <%= h(@note_comments.first.body.to_html) %>
- <% end -%> - -
-
-

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

-

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

-
+
+ <%= note_event('open', @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) %>

-
+
+ <%= note_event(@note.status, @note.closed_at, @note_comments.last.author) %> <% end %> +
-
-

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

-

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

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

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

+ <% 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 current_user && current_user != @note.author %> +

<%= report_link(t(".report"), @note) %>

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

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

+ <% if @note_comments.length > 1 %> +
    - <% @note.comments[1..-1].each do |comment| %> + <% @note_comments[1..-1].each do |comment| %>
  • + <%= note_event(comment.event, comment.created_at, comment.author) %> <%= comment.body.to_html %> - <%= note_event(comment.created_at, comment.author) %>
  • <% end %>
<% end %> + <% if @note.status == "open" %> +
+ +
+ <% if current_user and current_user.moderator? -%> + + <% end -%> + <% if current_user -%> + + <% end -%> + +
+
+ <% else %> +
+ +
+ <% if current_user and current_user.moderator? -%> + + <% end -%> + <% if current_user -%> + + <% end -%> +
+
+ <% end %>