X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/cb87f02642d0097ebc067ca1f9371dde274a41e3..397a03d780f8b5c5824850ae99ffdb4769dcb0c8:/app/views/browse/note.html.erb diff --git a/app/views/browse/note.html.erb b/app/views/browse/note.html.erb index 1bacd27d6..97787b178 100644 --- a/app/views/browse/note.html.erb +++ b/app/views/browse/note.html.erb @@ -1,34 +1,43 @@ -<% 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 %> -

+<%= render "sidebar_header", :title => 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) %> - <% if @note.status == "closed" %> -
- <%= note_event(@note.status, @note.closed_at, @note_comments.last.author) %> - <% end %> +
    +
  • <%= note_event("opened", @note.created_at, @note.author) %>
  • + <% if @note.status == "closed" %> +
  • <%= note_event(@note.status, @note.closed_at, @note.all_comments.last.author) %>
  • + <% end %> +
  • + <%= t "browse.location" %> + <%= link_to(t(".coordinates_html", + :latitude => tag.span(number_with_delimiter(@note.lat), :class => "latitude"), + :longitude => tag.span(number_with_delimiter(@note.lon), :class => "longitude")), + root_path(:anchor => "map=18/#{@note.lat}/#{@note.lon}")) %> +
  • +
<% if @note_comments.find { |comment| comment.author.nil? } -%> -

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

+

<%= 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 %>
-
    - <% @note_comments[1..-1].each do |comment| %> +
      + <% @note_comments.drop(1).each do |comment| %>
    • - <%= note_event(comment.event, comment.created_at, comment.author) %> + <%= note_event(comment.event, comment.created_at, comment.author) %> <%= comment.body.to_html %>
    • <% end %> @@ -37,20 +46,30 @@ <% end %> <% if @note.status == "open" %> -
      - -
      - - - -
      -
      + <% if current_user -%> +
      +
      + +
      +
      + <% if current_user.moderator? -%> + " class="btn btn-light" data-note-id="<%= @note.id %>" data-method="DELETE" data-url="<%= note_url(@note, "json") %>"> + <% end -%> + " class="btn btn-primary" data-note-id="<%= @note.id %>" data-method="POST" data-url="<%= close_note_url(@note, "json") %>"> + " class="btn btn-primary" 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="btn btn-light" data-note-id="<%= @note.id %>" data-method="DELETE" data-url="<%= note_url(@note, "json") %>"> + <% end -%> + <% if current_user -%> + " class="btn btn-primary" data-note-id="<%= @note.id %>" data-method="POST" data-url="<%= reopen_note_url(@note, "json") %>"> + <% end -%>
      <% end %>