X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/e7d200c4a6d0904ab1e027518eca7200b0ca9a08..7c89e7c0b418c5c4d9692b5e153946571a6ea994:/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 061a86b06..f68dfbe2e 100644 --- a/app/views/browse/note.html.erb +++ b/app/views/browse/note.html.erb @@ -1,65 +1,69 @@ -

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

+ <%= t ".#{@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 %> +

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

+
+ <%= h(@note_comments.first.body.to_html) %> +
+ +
+ <%= note_event("open", @note.created_at, @note.author) %> <% if @note.status == "closed" %> - - <%= t "browse.note.closed" %>: - <%= note_event(@note.closed_at, @note.author) %> by - <%= @note.comments.last.author %> +
+ <%= note_event(@note.status, @note.closed_at, @note_comments.last.author) %> <% end %> -
-
+
-<% if @note.comments.find { |comment| comment.author.nil? } -%> -
-

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

-
-<% end -%> + <% if @note_comments.find { |comment| comment.author.nil? } -%> +

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

+ <% end -%> -
- <% 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) %>

-
+ <% if current_user && current_user != @note.author %> +

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

<% end %> -
-

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

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

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

-
+ <% 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") %>"> + <% 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"> +
+
+ <% 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") %>"> + <% end -%> + <% if current_user -%> + " data-note-id="<%= @note.id %>" data-method="POST" data-url="<%= reopen_note_url(@note, "json") %>"> + <% end -%> +
+
+ <% end %>
- -<% if @note.comments.length > 1 %> -
-

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

- -
-<% end %>