X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/c24c2e481cc6d27e76274ed4e32668a4690a7788..aa78da82fe9a30dfa77e2d503701787aafc6cf55:/app/views/browse/note.html.erb diff --git a/app/views/browse/note.html.erb b/app/views/browse/note.html.erb index 1be7d9041..1181e0b03 100644 --- a/app/views/browse/note.html.erb +++ b/app/views/browse/note.html.erb @@ -1,11 +1,8 @@ <% set_title(t(".title", :id => @note.id)) %> -

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

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

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

<%= h(@note_comments.first.body.to_html) %> @@ -19,7 +16,10 @@ <% end %>
  • <%= t "browse.location" %> - <%= link_to(tag.span(number_with_delimiter(@note.lat), :class => "latitude") + ", " + tag.span(number_with_delimiter(@note.lon), :class => "longitude"), root_path(:anchor => "map=18/#{@note.lat}/#{@note.lon}")) %> + <%= 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}")) %>
  • @@ -28,14 +28,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 %>
      - <% @note_comments[1..].each do |comment| %> + <% @note_comments.drop(1).each do |comment| %>
    • <%= note_event(comment.event, comment.created_at, comment.author) %> <%= comment.body.to_html %> @@ -47,28 +43,34 @@ <% 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") %>"> + " class="btn btn-light" 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"> + " class="btn btn-primary" data-method="POST" data-url="<%= close_note_url(@note, "json") %>"> + " class="btn btn-primary" 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") %>"> + + +
      + <% if @note.status != "hidden" and current_user and current_user.moderator? -%> + " class="btn btn-light" 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") %>"> + " class="btn btn-primary" data-method="POST" data-url="<%= reopen_note_url(@note, "json") %>"> <% end -%>
      <% end %> + + <% if current_user && current_user != @note.author %> +

      <%= t "javascripts.notes.show.report_link_html", :link => report_link(t(".report"), @note) %>

      + <% end %>