X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/7a435df917edbad034db908b7a00d14d31b7396b..8192c0bd17fe036561f6531524d16cbaca4bac33:/app/views/browse/note.html.erb diff --git a/app/views/browse/note.html.erb b/app/views/browse/note.html.erb index f6db9f154..ffc198b0a 100644 --- a/app/views/browse/note.html.erb +++ b/app/views/browse/note.html.erb @@ -1,29 +1,36 @@ -<% set_title("#{t('browse.note.title')} | #{@note.id}") %> +<% set_title(t(".title", :id => @note.id)) %>

- <%= h(@note.comments.first.body.to_html) %> + <%= t ".#{@note.status}_title", :note_name => @note.id %>

-
- <%= t "browse.note.#{@note.status}_title", :note_name => @note.id %> -
- <%= note_event('open', @note.created_at, @note.author) %> +

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

+
+ <%= h(@note_comments.first.body.to_html) %> +
+ +
+ <%= note_event("opened", @note.created_at, @note.author) %> <% if @note.status == "closed" %> -
- <%= note_event(@note.status, @note.closed_at, @note.comments.last.author) %> +
+ <%= note_event(@note.status, @note.closed_at, @note.all_comments.last.author) %> <% end %>
- <% if @note.comments.find { |comment| comment.author.nil? } -%> + <% if @note_comments.find { |comment| comment.author.nil? } -%>

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

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

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

+ <% end %> + + <% 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 %> @@ -34,20 +41,28 @@ <% end %> <% if @note.status == "open" %> -
      - -
      - - - -
      -
      + <% if current_user -%> +
      + +
      + <% if current_user.moderator? -%> + " class="deemphasize" data-note-id="<%= @note.id %>" data-method="DELETE" data-url="<%= note_url(@note, "json") %>"> + <% end -%> + " data-note-id="<%= @note.id %>" data-method="POST" data-url="<%= close_note_url(@note, "json") %>"> + " data-note-id="<%= @note.id %>" data-method="POST" data-url="<%= comment_note_url(@note, "json") %>" disabled="1"> +
      +
      + <% end -%> <% 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 %>