X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/63186dc161324a123724f666910b58db4c3a235e..f064a18a16de7d5001107116c7916796e0b15a26:/app/views/diary_entries/_diary_comment.html.erb?ds=sidebyside diff --git a/app/views/diary_entries/_diary_comment.html.erb b/app/views/diary_entries/_diary_comment.html.erb index 301739eef..a7cdf21d7 100644 --- a/app/views/diary_entries/_diary_comment.html.erb +++ b/app/views/diary_entries/_diary_comment.html.erb @@ -1,13 +1,13 @@ -
"> +
"> <%= user_thumbnail diary_comment.user %> -

<%= raw(t(".comment_from", :link_user => (link_to h(diary_comment.user.display_name), user_path(diary_comment.user)), :comment_created_at => link_to(l(diary_comment.created_at, :format => :friendly), :anchor => "comment#{diary_comment.id}"))) %> +

<%= t(".comment_from_html", :link_user => (link_to diary_comment.user.display_name, user_path(diary_comment.user)), :comment_created_at => link_to(l(diary_comment.created_at, :format => :friendly), :anchor => "comment#{diary_comment.id}")) %> <% if current_user and diary_comment.user.id != current_user.id %> | <%= report_link(t(".report"), diary_comment) %> <% end %>

-
<%= diary_comment.body.to_html %>
- <% if current_user && current_user.administrator? %> +
<%= diary_comment.body.to_html %>
+ <% if can? :hidecomment, DiaryEntry %> <% if diary_comment.visible? %> <%= link_to t(".hide_link"), hide_diary_comment_path(:display_name => diary_comment.diary_entry.user.display_name, :id => diary_comment.diary_entry.id, :comment => diary_comment.id), :method => :post, :data => { :confirm => t(".confirm") } %>