X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/2e2f2124728ca755b2db8f83f022eaea24b647f0..732e1ab03a3b0f003dd8dc10e505d8d952fa18b9:/app/views/diary_entry/_diary_comment.html.erb

diff --git a/app/views/diary_entry/_diary_comment.html.erb b/app/views/diary_entry/_diary_comment.html.erb
index d4f7af6fc..c741d7734 100644
--- a/app/views/diary_entry/_diary_comment.html.erb
+++ b/app/views/diary_entry/_diary_comment.html.erb
@@ -1,3 +1,11 @@
-<h4 id="comment<%= diary_comment.id %>"><%= t('diary_entry.diary_comment.comment_from', :link_user => (link_to h(diary_comment.user.display_name), :controller => 'user', :action => 'view', :display_name => diary_comment.user.display_name), :comment_created_at => l(diary_comment.created_at)) %></h4>
-<%= htmlize(diary_comment.body) %>
-<hr />
+<div class="clearfix diary-comment">
+  <%= user_thumbnail diary_comment.user %>
+  <p class="deemphasize comment-heading" id="comment<%= diary_comment.id %>"><%= raw(t('diary_entry.diary_comment.comment_from', :link_user => (link_to h(diary_comment.user.display_name), :controller => 'user', :action => 'view', :display_name => diary_comment.user.display_name), :comment_created_at => link_to(l(diary_comment.created_at, :format => :friendly), :anchor => "comment#{diary_comment.id}"))) %></p>
+  <div class="richtext"><%= diary_comment.body.to_html %></div>
+  <%= if_administrator(:span) do %>
+    <%= link_to t('diary_entry.diary_comment.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('diary_entry.diary_comment.confirm') } %> |
+  <% end %>
+  <% if @user and diary_comment.user.id != @user.id %>
+  	<%= link_to t('issues.report'), new_issue_url(reportable_id: diary_comment.id, reportable_type: diary_comment.class.name, reported_user_id: diary_comment.user.id) %>
+  <% end %>
+</div>