X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/1a65c279aab2b99d13dbf5909a1a05ad52648b25..8a6c34fa78cf4fa52332d90448dae50087f2b510:/app/views/browse/changeset.html.erb diff --git a/app/views/browse/changeset.html.erb b/app/views/browse/changeset.html.erb index 6aa0f11fb..ec4e0c1c2 100644 --- a/app/views/browse/changeset.html.erb +++ b/app/views/browse/changeset.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) %>

@@ -17,15 +17,11 @@ <% if current_user %>
- + <% if @changeset.subscribers.exists?(current_user.id) %> + + <% else %> + + <% end %>
<% end %>
@@ -38,26 +34,28 @@ <% if comment.visible %>
  • - <%= t(".commented_by_html", - :when => friendly_date_ago(comment.created_at), - :exact_time => l(comment.created_at), + <%= t(".comment_by_html", + :time_ago => friendly_date_ago(comment.created_at), :user => link_to(comment.author.display_name, user_path(comment.author))) %> <% if current_user and current_user.moderator? %> — <%= t("javascripts.changesets.show.hide_comment") %> <% end %> - <%= comment.body.to_html %> +
    + <%= comment.body.to_html %> +
  • <% elsif current_user and current_user.moderator? %>
  • - <%= t(".hidden_commented_by_html", - :when => friendly_date_ago(comment.created_at), - :exact_time => l(comment.created_at), + <%= t(".hidden_comment_by_html", + :time_ago => friendly_date_ago(comment.created_at), :user => link_to(comment.author.display_name, user_path(comment.author))) %> — <%= t("javascripts.changesets.show.unhide_comment") %> - <%= comment.body.to_html %> +
    + <%= comment.body.to_html %> +
  • <% end %> <% end %> @@ -73,11 +71,13 @@ <% end %> <% if current_user %> - <% unless @changeset.is_open? %> + <% unless @changeset.open? %>
    -
    +
    +
    " data-changeset-id="<%= @changeset.id %>" data-method="POST" data-url="<%= changeset_comment_url(@changeset) %>" disabled="1" class="btn btn-sm btn-primary" />