Merge remote-tracking branch 'upstream/pull/1986'

[rails.git] / app / views / diary_entry / comments.html.erb

diff --git a/app/views/diary_entry/comments.html.erb b/app/views/diary_entry/comments.html.erb
index 1404847b37ece29f2b1dc3e8198f1ccd2cb9f659..3960df3023758bb5f91cf5dfd1cdf7f429c0a205 100644 (file)
--- a/app/views/diary_entry/comments.html.erb
+++ b/app/views/diary_entry/comments.html.erb
@@ -1,23 +1,24 @@
-<h1><%= t('diary_entry.comments.has_commented_on', :display_name => @this_user.display_name) %></h1>
+<% content_for :heading do %>
+  <h1><%= t('.has_commented_on', :display_name => @user.display_name) %></h1>
+<% end %>
 
-<table width="100%">
+<table class="messages" width="100%">
   <tr>
-    <th><%= t 'diary_entry.comments.post' %></th>
-    <th><%= t 'diary_entry.comments.when' %></th>
-    <th><%= t 'diary_entry.comments.comment' %></th>
+    <th width="25%"><%= t '.post' %></th>
+    <th width="25%"><%= t '.when' %></th>
+    <th width="50%"><%= t '.comment' %></th>
   </tr>
   <% @comments.each do |comment| -%>
   <% cl = cycle('table0', 'table1') %>
   <tr class="<%= cl %>">
-    <td><%= link_to comment.diary_entry.title, :action => :view, :display_name => comment.diary_entry.user, :id => comment.diary_entry.id %></td>
-    <td><span title="<%= l comment.created_at, :format => :friendly %>"><%= t 'diary_entry.comments.ago', :ago => time_ago_in_words(comment.created_at) %></span></td>
-    <td><%= htmlize(comment.body) %></td>
+    <td width="25%"><%= link_to comment.diary_entry.title, diary_entry_path(comment.diary_entry.user, comment.diary_entry) %></td>
+    <td width="25%"><span title="<%= l comment.created_at, :format => :friendly %>"><%= t '.ago', :ago => time_ago_in_words(comment.created_at) %></span></td>
+    <td width="50%" class="richtext"><%= comment.body.to_html %></td>
   </tr>
   <% end -%>
 </table>
 
-<%= link_to t('diary_entry.comments.older_comments') , { :page => @comment_pages.current.next} if @comment_pages.current.next %>
-<% if @comment_pages.current.next and @comment_pages.current.previous %>
-|
-<% end %>
-<%= link_to t('diary_entry.comments.newer_comments'), { :page => @comment_pages.current.previous } if @comment_pages.current.previous %>
+<div class='secondary-actions clearfix'>
+  <span><%= link_to t('.older_comments') , { :page => @comment_pages.current.next} if @comment_pages.current.next %>
+  <%= link_to t('.newer_comments'), { :page => @comment_pages.current.previous } if @comment_pages.current.previous %></span>
+</div>