X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/379bf785bea575c6519226ed5bbbe53e540bd795..3b56c005ebac1e5aaef8890057767e1955bb4948:/app/views/browse/changeset.html.erb diff --git a/app/views/browse/changeset.html.erb b/app/views/browse/changeset.html.erb index 76112e41e..1217c03be 100644 --- a/app/views/browse/changeset.html.erb +++ b/app/views/browse/changeset.html.erb @@ -6,7 +6,9 @@
-
<%= linkify(h(@changeset.tags["comment"].to_s.presence || t("browse.no_comment"))) %>
+

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

<%= changeset_details(@changeset) %>
<%= render :partial => "tag_details", :object => @changeset.tags.except("comment") %> @@ -15,7 +17,7 @@ <% if current_user %>
-
+ <% if @changeset.subscribers.exists?(current_user.id) %> " data-method="POST" data-url="<%= changeset_unsubscribe_url(@changeset) %>" /> <% else %> @@ -29,16 +31,16 @@ <% if @comments.length > 0 %>
- -
    + +
      <% @comments.each do |comment| %> <% if comment.visible %>
    • - + <%= t(".commented_by", :when => friendly_date_ago(comment.created_at), :exact_time => l(comment.created_at), - :user => link_to(h(comment.author.display_name), user_path(comment.author))).html_safe %> + :user => link_to(comment.author.display_name, user_path(comment.author))).html_safe %> <% if current_user and current_user.moderator? %> — <%= t("javascripts.changesets.show.hide_comment") %> <% end %> @@ -47,11 +49,11 @@
    • <% elsif current_user and current_user.moderator? %>
    • - + <%= t(".hidden_commented_by", :when => friendly_date_ago(comment.created_at), :exact_time => l(comment.created_at), - :user => link_to(h(comment.author.display_name), user_path(comment.author))).html_safe %> + :user => link_to(comment.author.display_name, user_path(comment.author))).html_safe %> — <%= t("javascripts.changesets.show.unhide_comment") %> <%= comment.body.to_html %> @@ -71,7 +73,7 @@ <% if current_user %> <% unless @changeset.is_open? %> - +
      " data-changeset-id="<%= @changeset.id %>" data-method="POST" data-url="<%= changeset_comment_url(@changeset) %>" disabled="1" /> @@ -128,7 +130,7 @@ · <% end %> <%= user = (@prev_by_user || @next_by_user).user.display_name - link_to content_tag(:bdi, user), :controller => "changesets", :action => "index", :display_name => user %> + link_to tag.bdi(user), :controller => "changesets", :action => "index", :display_name => user %> <% if @next_by_user %> · <%= link_to "#{@next_by_user.id} >>", :id => @next_by_user.id %>