From: Tom Hughes <tom@compton.nu>
Date: Tue, 28 Feb 2012 21:49:41 +0000 (+0000)
Subject: Improve the diary comments view
X-Git-Tag: live~5775
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/c9a4ec5e63cb07ff9254ee98eef2f85cd16c4275

Improve the diary comments view

Make sure all strings are translatable; replace a manually constructed
link with link_to; improve date formatting; and use cycle to alternate
colours for the table rows.
---

diff --git a/app/views/diary_entry/comments.html.erb b/app/views/diary_entry/comments.html.erb
index fbad59d47..1404847b3 100644
--- a/app/views/diary_entry/comments.html.erb
+++ b/app/views/diary_entry/comments.html.erb
@@ -1,21 +1,21 @@
-<h1><%= @title%>
- <%= t('diary_entry.comments.has_commented_on',:display_name => @this_user.display_name) %>
-</h1>
-<p>
-<br>
-<table id="comment-list-container">
-<tr><th>Title</th><th>Date</th><th>Comment</th></tr>
-<% for comment in @comments %>
-<tr id="comment-row">
-<td><a href="/user/<%= comment.diary_entry.user.display_name %>/diary/<%= comment.diary_entry.id %>"><%= comment.diary_entry.title %></a> 
-</td>
-<td>
-<span class="date"><%= comment.created_at %></span>
-</td>
-<td>
-<%= htmlize(comment.body) %></td></tr>
-<% end %>
+<h1><%= t('diary_entry.comments.has_commented_on', :display_name => @this_user.display_name) %></h1>
+
+<table width="100%">
+  <tr>
+    <th><%= t 'diary_entry.comments.post' %></th>
+    <th><%= t 'diary_entry.comments.when' %></th>
+    <th><%= t 'diary_entry.comments.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>
+  </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 %>
 |
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 49b9d1d34..bc8bb05ac 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -394,6 +394,10 @@ en:
         description: "Recent diary entries from users of OpenStreetMap"
     comments:
       has_commented_on: "%{display_name} has commented on the following diary entries"
+      post: Post
+      when: When
+      comment: Comment
+      ago: %{ago} ago
       newer_comments: "Newer Comments"
       older_comments: "Older Comments"
   export: