Merge branch 'master' into tag-colour-preview-rebase

[rails.git] / app / views / notes / mine.html.erb

diff --git a/app/views/notes/mine.html.erb b/app/views/notes/mine.html.erb
index 2966b81bbe305953eb372acb4293ecea8acb1d8f..c7015578b24ed575ba913cfad7cd4567f990c755 100644 (file)
--- a/app/views/notes/mine.html.erb
+++ b/app/views/notes/mine.html.erb
@@ -18,16 +18,16 @@
   <tr<% if note.author == @user %> class="creator"<% end %>>
     <td>
       <% if note.closed? %>
-        <%= image_tag("closed_note_marker.png", :alt => "closed") %>
+        <%= image_tag("closed_note_marker.png", :alt => "closed", :size => "25x40") %>
       <% else %>
-        <%= image_tag("open_note_marker.png", :alt => "open") %>
+        <%= image_tag("open_note_marker.png", :alt => "open", :size => "25x40") %>
       <% end %>
     </td>
     <td><%= link_to note.id, browse_note_path(note) %></td>
     <td><%= note_author(note.author) %></td>
     <td><%= note.comments.first.body.to_html %></td>
-    <td><%= t ".ago_html", :when => friendly_date(note.created_at) %></td>
-    <td><%= t ".ago_html", :when => friendly_date(note.updated_at) %></td>
+    <td><%= friendly_date_ago(note.created_at) %></td>
+    <td><%= friendly_date_ago(note.updated_at) %></td>
   </tr>
 <% end -%>
 </table>