Fix stubbing of hostip requests

[rails.git] / 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 ef5c601e8f883ab543468c4b89a7066953a18855..4ac9a0f967f1950dbe6e86f98b8a9d2c1f7e5a42 100644 (file)
--- a/app/views/diary_entry/_diary_comment.html.erb
+++ b/app/views/diary_entry/_diary_comment.html.erb
@@ -1,7 +1,15 @@
-<%= user_thumbnail diary_comment.user %>
-<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, :format => :friendly)) %></h4>
-<%= htmlize(diary_comment.body) %>
-<% if_administrator(:span) do %> 
-  <%= link_to t('diary_entry.diary_comment.hide_link'), {:action => 'hidecomment', :display_name => diary_comment.diary_entry.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('.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}"))) %>
+    <% if current_user and diary_comment.user.id != current_user.id %>
+      | <%= report_link(t(".report"), diary_comment) %>
+    <% end %>
+  </p>
+
+  <div class="richtext"><%= diary_comment.body.to_html %></div>
+  <% if current_user && current_user.administrator? %>
+    <span>
+      <%= 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') } %>
+    </span>
+  <% end %>
+</div>