cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve the diary comments view

Browse source 
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.
This commit is contained in:
Tom Hughes 2012-02-28 21:49:41 +00:00
parent 1944372af8
commit c9a4ec5e63
2 changed files with 21 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

34
app/views/diary_entry/comments.html.erb
View file

@ -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 %>
|

4
config/locales/en.yml
View file

@ -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: