X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/c36f09b28db7244066df53b9e52c7ab32a1693da..7e7ede890e8e948236d3dbc48e24aca00cd01f62:/app/views/notes/show.html.erb
diff --git a/app/views/notes/show.html.erb b/app/views/notes/show.html.erb
index a04cbf9d9..d17612e29 100644
--- a/app/views/notes/show.html.erb
+++ b/app/views/notes/show.html.erb
@@ -9,25 +9,49 @@
-
- - <%= 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}")) %>
-
-
+
<%= 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}") %>
+
<% if @note_comments.find { |comment| comment.author.nil? } -%>
<%= 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 %>
<% 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") } %>
@@ -79,10 +103,14 @@
<% 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 -%>
@@ -53,16 +77,16 @@