X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/fee3a0836842d32fbeeb8b7e96c5ec77eb356d20..6094a97ce6297d390e5bbf733f5c2b4cc6b2076c:/app/views/changesets/show.html.erb?ds=sidebyside diff --git a/app/views/changesets/show.html.erb b/app/views/changesets/show.html.erb index 110caab03..a47049e99 100644 --- a/app/views/changesets/show.html.erb +++ b/app/views/changesets/show.html.erb @@ -3,7 +3,7 @@ <%= render "sidebar_header", :title => t(".title", :id => @changeset.id) %>
-

+

<%= linkify(@changeset.tags["comment"].to_s.presence || t("browse.no_comment")) %>

<%= changeset_details(@changeset) %>

@@ -18,9 +18,17 @@ <% if current_user %>
<% if @changeset.subscribers.exists?(current_user.id) %> - + <%= tag.button t(".unsubscribe"), + :class => "btn btn-sm btn-primary", + :name => "unsubscribe", + :data => { :method => "POST", + :url => api_changeset_unsubscribe_url(@changeset) } %> <% else %> - + <%= tag.button t(".subscribe"), + :class => "btn btn-sm btn-primary", + :name => "subscribe", + :data => { :method => "POST", + :url => api_changeset_subscribe_url(@changeset) } %> <% end %>
<% end %> @@ -32,12 +40,12 @@ <% next unless comment.visible || current_user&.moderator? %>
  • - <%= t comment.visible ? ".comment_by_html" : ".hidden_comment_by_html", - :time_ago => friendly_date_ago(comment.created_at), - :user => link_to(comment.author.display_name, comment.author) %> + <%= comment_by_options = { :time_ago => friendly_date_ago(comment.created_at), + :user => link_to(comment.author.display_name, comment.author) } + comment.visible ? t(".comment_by_html", **comment_by_options) : t(".hidden_comment_by_html", **comment_by_options) %> <% if current_user&.moderator? %> — - <%= tag.button t("javascripts.changesets.show.#{comment.visible ? 'hide' : 'unhide'}_comment"), + <%= tag.button t(".#{comment.visible ? 'hide' : 'unhide'}_comment"), :class => "btn btn-sm small btn-link link-secondary p-0 align-baseline", :data => { :method => "POST", :url => comment.visible ? changeset_comment_hide_url(comment) : changeset_comment_unhide_url(comment) } %> @@ -66,7 +74,12 @@
    - + <%= tag.button t(".comment"), + :class => "btn btn-primary", + :name => "comment", + :disabled => true, + :data => { :method => "POST", + :url => changeset_comment_url(@changeset) } %>
    <% else %>