X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/d5efa4c357c1f39181f9af96024eaacbb6bd328b..156c526c22fd9f96ffc8667fafaaf10e206a70e4:/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 d355d3e5f..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) %>
@@ -28,12 +28,38 @@

<%= 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 %>
    <% @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 +75,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 +101,18 @@ <% 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 -%>
    @@ -86,7 +120,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) %> @@ -98,7 +132,7 @@ <% end %> <% if @note.freshly_closed? %> - + <%= t ".disappear_date_html", :disappear_in => friendly_date(@note.freshly_closed_until) %> <% end %>