X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/684e7db45afda7f26074343a111196aa7b51a093..e6db73f8d320bfd0b9c679ab1648e62d35cdf0bf:/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 8e277d25f..1a792e873 100644 --- a/app/views/browse/note.html.erb +++ b/app/views/browse/note.html.erb @@ -1,63 +1,76 @@ -
-

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

- - <%= t "browse.note.opened" %>: - <%= note_event(@note.created_at, @note.author) %> by - <% if @note.author.nil? %> - <%= t "browse.note.anonymous" %> - <% else %> - <%= note_author(@note.author) %> - <% end %> - <% if @note.status == "closed" %> - - <%= t "browse.note.closed" %>: - <%= note_event(@note.closed_at, @note.author) %> by - <%= @note.comments.last.author %> - <% end %> - -
+<% set_title(t(".title", :id => @note.id)) %> -<% if @note.comments.find { |comment| comment.author.nil? } -%> -
-

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

-
-<% end -%> +<%= render "sidebar_header", :title => t(".#{@note.status}_title", :note_name => @note.id) %> -
- <% 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) %>

-
- <% end %> - -
-

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

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

<%= 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"} %>

+
+

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

+
+ <%= h(@note_comments.first.body.to_html) %>
-
-<% if @note.comments.length > 1 %> -
-

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

-
    - <% @note.comments[1..-1].each do |comment| %> -
  • - <%= comment.body.to_html %> - <%= note_event(comment.created_at, comment.author) %> -
  • +
    +
      +
    • <%= 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}")) %> +
    -<% end %> + + <% 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 %> +
    +
      + <% @note_comments.drop(1).each do |comment| %> +
    • + <%= note_event(comment.event, comment.created_at, comment.author) %> + <%= comment.body.to_html %> +
    • + <% end %> +
    +
    + <% 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 %> +