X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/9bb8dd739a4342441e97254bbf5073f9df022672..8a020b3ec727b8c9fa4d819855469dd348e58ee7:/app/views/notes/show.html.erb diff --git a/app/views/notes/show.html.erb b/app/views/notes/show.html.erb index 980b5062c..8dda65c25 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) %>
@@ -25,16 +25,44 @@
<% if @note_comments.find { |comment| comment.author.nil? } -%> -

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

+

<%= t ".anonymous_warning" %>

<% end -%> +
+
+

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

+
+ + <% if current_user %> +
+ <% if @note.subscribers.exists?(current_user.id) %> + <%= tag.button t(".unsubscribe"), + :type => "button", + :class => "btn btn-sm btn-primary", + :name => "unsubscribe", + :data => { :method => "DELETE", + :url => api_note_subscription_path(@note) } %> + <% else %> + <%= tag.button t(".subscribe"), + :type => "button", + :class => "btn btn-sm btn-primary", + :name => "subscribe", + :data => { :method => "POST", + :url => api_note_subscription_path(@note) } %> + <% end %> +
+ <% end %> +
+ <% if @note_comments.length > 1 %>
@@ -47,27 +75,44 @@
-
+ +
<% if 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 -%> - " class="btn btn-primary" - data-method="POST" data-url="<%= close_api_note_url(@note, "json") %>" - data-default-action-text="<%= t("javascripts.notes.show.resolve") %>" - data-comment-action-text="<%= t("javascripts.notes.show.comment_and_resolve") %>"> - " class="btn btn-primary" data-method="POST" data-url="<%= comment_api_note_url(@note, "json") %>" disabled="1"> + <%= 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") } %> + <%= 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 -%>
@@ -75,20 +120,20 @@ <% if current_user && current_user != @note.author %>

- - <%= t "javascripts.notes.show.report_link_html", :link => report_link(t(".report"), @note) %> + + <%= t ".report_link_html", :link => report_link(t(".report"), @note) %> <% if @note.status == "open" %> - <%= t "javascripts.notes.show.other_problems_resolve", :link => report_link(t(".report"), @note) %> + <%= t ".other_problems_resolve", :link => report_link(t(".report"), @note) %> <% elsif @note.status == "closed" %> - <%= t "javascripts.notes.show.other_problems_resolved" %> + <%= t ".other_problems_resolved" %> <% end %>

<% end %> <% if @note.freshly_closed? %> - - <%= t "javascripts.notes.show.disappear_date_html", :disappear_in => disappear_in(@note) %> + + <%= t ".disappear_date_html", :disappear_in => friendly_date(@note.freshly_closed_until) %> <% end %>