X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/47362f432a9bd10196b27aa1667e6166b76f4b66..a11c02122d3d9e17cdf4b9852254501e62767b59:/app/views/notes/show.html.erb?ds=sidebyside diff --git a/app/views/notes/show.html.erb b/app/views/notes/show.html.erb index 2378d8c2e..4aa2e7fd3 100644 --- a/app/views/notes/show.html.erb +++ b/app/views/notes/show.html.erb @@ -4,7 +4,7 @@

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

-
+
<%= h(@note_comments.first.body.to_html) %>
@@ -33,8 +33,10 @@ @@ -47,32 +49,44 @@
-
+ +
<% 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") } %>
+ <% else -%> +

+ <%= link_to t(".log_in_to_comment"), login_path(:referer => request.fullpath) %> +

<% end -%> <% else %>
-
+ +
<% if @note.status != "hidden" and current_user and current_user.moderator? -%> - " class="btn btn-light" data-method="DELETE" data-url="<%= api_note_url(@note, "json") %>"> + <%= button_tag t(".hide"), :name => "hide", :class => "btn btn-light", + :data => { :method => "DELETE", + :url => api_note_url(@note, "json") } %> <% end -%> <% if current_user -%> - " class="btn btn-primary" data-method="POST" data-url="<%= reopen_api_note_url(@note, "json") %>"> + <%= button_tag t(".reactivate"), :name => "reopen", :class => "btn btn-primary", + :data => { :method => "POST", + :url => reopen_api_note_url(@note, "json") } %> <% end -%>
@@ -80,7 +94,7 @@ <% if current_user && current_user != @note.author %>

- + <%= t ".report_link_html", :link => report_link(t(".report"), @note) %> <% if @note.status == "open" %> <%= t ".other_problems_resolve", :link => report_link(t(".report"), @note) %> @@ -92,8 +106,8 @@ <% end %> <% if @note.freshly_closed? %> - - <%= t ".disappear_date_html", :disappear_in => disappear_in(@note) %> + + <%= t ".disappear_date_html", :disappear_in => friendly_date(@note.freshly_closed_until) %> <% end %>