X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/80a241f7985fec6ec853e48a25823446b59b7682..ecd81eadbec57582749bb246d74e32ecab74d1d6:/app/views/browse/note.html.erb diff --git a/app/views/browse/note.html.erb b/app/views/browse/note.html.erb index 723f9d197..75d85ae04 100644 --- a/app/views/browse/note.html.erb +++ b/app/views/browse/note.html.erb @@ -1,23 +1,18 @@ -<% set_title(t('browse.note.title', :id => @note.id)) %> +<% set_title(t(".title", :id => @note.id)) %>

- <%= t "browse.note.#{@note.status}_title", :note_name => @note.id %> - <% if current_user && current_user != @note.author %> - <%= link_to new_report_url(reportable_id: @note.id, reportable_type: @note.class.name), :title => t('browse.note.report') do %> -  ⚐ - <% end %> - <% end %> + <%= t ".#{@note.status}_title", :note_name => @note.id %>

-

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

+

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

<%= h(@note_comments.first.body.to_html) %>
- <%= note_event('open', @note.created_at, @note.author) %> + <%= note_event("open", @note.created_at, @note.author) %> <% if @note.status == "closed" %>
<%= note_event(@note.status, @note.closed_at, @note_comments.last.author) %> @@ -28,6 +23,10 @@

<%= 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 %>
    @@ -43,19 +42,27 @@ <% 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 %>