X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/f73b7205f42ac690ee659f4a92d86a56138a7ea2..83043d6f1cd85729a3f91e5c73d78a39b8ae7d04:/app/views/notes/show.html.erb?ds=inline diff --git a/app/views/notes/show.html.erb b/app/views/notes/show.html.erb index d355d3e5f..d17612e29 100644 --- a/app/views/notes/show.html.erb +++ b/app/views/notes/show.html.erb @@ -4,36 +4,60 @@
<%= 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}") %> +
<%= t ".anonymous_warning" %>
<% end -%> +
<% @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 %>
@@ -49,18 +73,20 @@
-
+
+
+
<% if current_user.moderator? -%>
- <%= submit_tag t(".hide"), :name => "hide", :class => "btn btn-light",
+ <%= button_tag t(".hide"), :name => "hide", :class => "btn btn-light",
:data => { :method => "DELETE",
:url => api_note_url(@note, "json") } %>
<% end -%>
- <%= submit_tag t(".resolve"), :name => "close", :class => "btn btn-primary",
+ <%= button_tag t(".resolve"), :name => "close", :class => "btn btn-primary",
:data => { :method => "POST",
:url => close_api_note_url(@note, "json"),
:default_action_text => t(".resolve"),
:comment_action_text => t(".comment_and_resolve") } %>
- <%= submit_tag t(".comment"), :name => "comment", :class => "btn btn-primary", :disabled => true,
+ <%= button_tag t(".comment"), :name => "comment", :class => "btn btn-primary", :disabled => true,
:data => { :method => "POST",
:url => comment_api_note_url(@note, "json") } %>
@@ -73,12 +99,18 @@
<% else %>