X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/52e5fa6ad78f375cec5a207a123a4aa3939c8ddf..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 59c96c4aa..1a792e873 100644 --- a/app/views/browse/note.html.erb +++ b/app/views/browse/note.html.erb @@ -1,58 +1,76 @@ -<%= render :partial => "navigation" %> +<% set_title(t(".title", :id => @note.id)) %> -

- <%= image_tag "#{@note.status}_note_marker.png", :alt => @note.status %> - <%= t "browse.note.#{@note.status}_title", :note_name => @note.id %> -

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

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

+
+ <%= h(@note_comments.first.body.to_html) %> +
- +
+ +
- - - - + <% if @note_comments.find { |comment| comment.author.nil? } -%> +

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

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

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

<% end %> - - - - - - - - - - - <% if @note.comments.length > 1 %> - - - - + <% if @note_comments.length > 1 %> +
+ +
<% end %> -
<%= t "browse.note.opened" %><%= t "browse.note.at_by", :when => friendly_date(@note.created_at), :user => note_author(@note) %>
<%= t "browse.note.closed" %><%= t "browse.note.at_by", :when => friendly_date(@note.closed_at), :user => note_author(@note.comments.last) %>
<%= t "browse.note.last_modified" %><%= t "browse.note.at_by", :when => friendly_date(@note.updated_at), :user => note_author(@note.comments.last) %>
<%= t "browse.note.description" %><%= h(@note.comments.first.body) %>
<%= t "browse.node_details.coordinates" %>
<%= link_to ("#{number_with_delimiter(@note.lat)}, #{number_with_delimiter(@note.lon)}"), {:controller => 'site', :action => 'index', :lat => h(@note.lat), :lon => h(@note.lon), :zoom => "18"} %>
<%= t "browse.note.comments" %> - - <% @note.comments[1..-1].each do |comment| %> - - - - <% end %> -
- <%= h(comment.body) %> -
- <%= t "browse.note.at_by", :when => friendly_date(comment.created_at), :user => note_author(comment) %> -
-
+ <% 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 %> +