X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/300cd884ec5a8bd76be912f7d745e0ced7761175..2145480a00739c3add27eb4569fb03ac8b8cd6f1:/app/views/browse/changeset.html.erb diff --git a/app/views/browse/changeset.html.erb b/app/views/browse/changeset.html.erb index 523cb84d6..3c5ba7de0 100644 --- a/app/views/browse/changeset.html.erb +++ b/app/views/browse/changeset.html.erb @@ -3,28 +3,32 @@ <%= render "sidebar_header", :title => t(".title", :id => @changeset.id) %>
-

+

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

<%= changeset_details(@changeset) %>

<%= render :partial => "tag_details", :object => @changeset.tags.except("comment") %> -

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

- - <% if current_user %> -
-
- <% if @changeset.subscribers.exists?(current_user.id) %> - " data-method="POST" data-url="<%= changeset_unsubscribe_url(@changeset) %>" /> - <% else %> - " data-method="POST" data-url="<%= changeset_subscribe_url(@changeset) %>" /> - <% end %> -
+
+
+

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

- <% end %> -
+ <% if current_user %> +
+ +
+ <% end %> +
<% if @comments.length > 0 %>
@@ -34,9 +38,9 @@ <% 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 => tag.abbr(friendly_date_ago(comment.created_at), + :title => l(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") %> @@ -47,9 +51,9 @@ <% 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 => tag.abbr(friendly_date_ago(comment.created_at), + :title => l(comment.created_at)), :user => link_to(comment.author.display_name, user_path(comment.author))) %> — <%= t("javascripts.changesets.show.unhide_comment") %> @@ -69,12 +73,12 @@ <% 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" />