X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/7c98b41cc89068d049a18f8738276f19cd47095e..657ed03d8b2e262bc965cc38e8af190624c3295b:/app/views/browse/note.html.erb diff --git a/app/views/browse/note.html.erb b/app/views/browse/note.html.erb index 5c42fddd6..c7989d789 100644 --- a/app/views/browse/note.html.erb +++ b/app/views/browse/note.html.erb @@ -1,83 +1,69 @@ - - - - - - - + + + <% if @note_comments.find { |comment| comment.author.nil? } -%> +

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

+ <% end -%> + + <% if current_user && current_user != @note.author %> +

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

+ <% end %> + + <% if @note_comments.length > 1 %> +
+ +
+ <% end %> - <%= render :partial => "map", :object => @note %> - -
-

- <% if @note.status == "closed" %> - <%= image_tag("closed_note_marker.png", :alt => 'closed') %> - <%= t 'browse.note.closed_title', :note_name => @note.id %> - <% else %> - <%= image_tag("open_note_marker.png", :alt => 'open') %> - <%= t 'browse.note.open_title', :note_name => @note.id %> - <% end %> -

-
- <%= render :partial => "navigation" %> -
- - - - - - - - - - <% if @note.status == "closed" %> - - - - - <% end %> - - - <% if @note.author.nil? %> - - <% else %> - - <% end %> - - - - - - - - - -
<%= t 'browse.note.created_at' %><%= l @note.created_at %>
<%= t 'browse.note.edited_at' %><%= l @note.updated_at %>
<%= t 'browse.note.closed_at' %><%= l @note.closed_at %>
<%= t 'browse.note.opened_by' %> <%= @note.author_name %> <%= link_to h(@note.author_name), :controller => "user", :action => "view", :display_name => @note.author_name %>
<%= 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)}"), {:controller => 'site', :action => 'index', :lat => h(@note.lat), :lon => h(@note.lon), :zoom => "18"} %>
+<% set_title(t(".title", :id => @note.id)) %> -
+

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

- <% if @note.comments.length > 1 %> - - - - - - - <% @note.comments[1..-1].each do |comment| %> - - - - - - <% end %> -
<%= t 'browse.note.comment_by' %> <%= t 'browse.note.comment' %> <%= t 'browse.note.date' %>
- <% if comment.author.nil? %> - <%= comment.author_name %> - <% else %> - <%= link_to h(comment.author.display_name), :controller => "user", :action => "view", :display_name => comment.author.display_name %> - <% end %> - <%= h(comment.body) %> <%= l comment.created_at %>
+
+

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

+
+ <%= h(@note_comments.first.body.to_html) %> +
+ +
+ <%= note_event("open", @note.created_at, @note.author) %> + <% if @note.status == "closed" %> +
+ <%= note_event(@note.status, @note.closed_at, @note_comments.last.author) %> <% end %> - -
-
+ <% if @note.status == "open" %> +
+ +
+ <% if current_user and current_user.moderator? -%> + " class="deemphasize" data-note-id="<%= @note.id %>" data-method="DELETE" data-url="<%= note_url(@note, "json") %>"> + <% end -%> + <% if current_user -%> + " data-note-id="<%= @note.id %>" data-method="POST" data-url="<%= close_note_url(@note, "json") %>"> + <% end -%> + " data-note-id="<%= @note.id %>" data-method="POST" data-url="<%= comment_note_url(@note, "json") %>" disabled="1"> +
+
+ <% else %> +
+ +
+ <% if current_user and current_user.moderator? -%> + " class="deemphasize" data-note-id="<%= @note.id %>" data-method="DELETE" data-url="<%= note_url(@note, "json") %>"> + <% end -%> + <% if current_user -%> + " data-note-id="<%= @note.id %>" data-method="POST" data-url="<%= reopen_note_url(@note, "json") %>"> + <% end -%> +
+
+ <% end %> +