X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/3e8d8092500a3713e8dfbb4fd61fd8a95d067d20..2fa81de6a95e7f82ac67cda2b6b6cecbfabf694a:/app/views/diary_entry/_diary_comment.html.erb?ds=sidebyside

diff --git a/app/views/diary_entry/_diary_comment.html.erb b/app/views/diary_entry/_diary_comment.html.erb
index 6bc7f73f9..c7700b361 100644
--- a/app/views/diary_entry/_diary_comment.html.erb
+++ b/app/views/diary_entry/_diary_comment.html.erb
@@ -1,7 +1,8 @@
-<%= user_thumbnail diary_comment.user, :style => "float: right" %>
-<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) %>
-<% if @user && @user.administrator? %> 
-<%= link_to t('diary_entry.diary_comment.hide_link'), {:action => 'hidecomment', :display_name => @user.display_name, :id => diary_comment.diary_entry.id, :comment => diary_comment.id}, {:confirm => t('diary_entry.diary_comment.confirm')} %>
-<% end %>
-<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 => l(diary_comment.created_at, :format => :friendly))) %></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 %>
+</div>