Merge branch 'master' into moderation

[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 50c15cd9d3f1678cc150b8e1702fcb032d2bc631..666c7dc8f94c6af01bad70d4f32d2b54969949f6 100644 (file)
--- a/app/views/notes/mine.html.erb
+++ b/app/views/notes/mine.html.erb
@@ -1,35 +1,33 @@
-<h1><%= @heading %></h1>
-<p><%= raw @description %></p>
+<% content_for :heading do %>
+  <h2><%= @heading %></h2>
+  <p><%= raw @description %></p>
+<% end %>

 
 <%= render :partial => 'notes_paging_nav' %>
 
 
 <%= render :partial => 'notes_paging_nav' %>
 

-<table id="note_list" cellpadding="3">
+<table class="note_list">

   <tr>
     <th></th>
     <th><%= t'note.mine.id' %></th>
   <tr>
     <th></th>
     <th><%= t'note.mine.id' %></th>

-    <th><%= t'changeset.changesets.user' %></th>
-    <th><%= t'changeset.changesets.comment' %></th>
-    <th><%= t'changeset.changesets.saved_at' %></th>
+    <th><%= t'note.mine.creator' %></th>
+    <th><%= t'note.mine.description' %></th>
+    <th><%= t'note.mine.created_at' %></th>

     <th><%= t'note.mine.last_changed' %></th>
   </tr>
 <% @notes.each do |note| -%>
     <th><%= t'note.mine.last_changed' %></th>
   </tr>
 <% @notes.each do |note| -%>

-  <tr<% if note.author != @user2 %> bgcolor="#EEEEEE"<% end %>>
+  <tr<% if note.author != @user2 %> class="creator"<% end %>>

     <td>
     <td>

-      <% if note.status == "closed" %>
+      <% if note.closed? %>

         <%= image_tag("closed_note_marker.png", :alt => 'closed') %>
       <% else %>
         <%= image_tag("open_note_marker.png", :alt => 'open') %>
       <% end %>
     </td>
     <td><%= link_to note.id.to_s, :controller => "browse", :action => "note", :id => note.id %></td>
         <%= image_tag("closed_note_marker.png", :alt => 'closed') %>
       <% else %>
         <%= image_tag("open_note_marker.png", :alt => 'open') %>
       <% end %>
     </td>
     <td><%= link_to note.id.to_s, :controller => "browse", :action => "note", :id => note.id %></td>

-    <% if note.author.nil? %> 
-      <td> <%= note.author_name %> </td> 
-    <% else %> 
-      <td><%= link_to h(note.author_name), :controller => "user", :action => "view", :display_name => note.author_name %></td>
-    <% end %>
-    <td> <%= htmlize note.comments.first.body  %> </td>        
-    <td><%= l note.created_at %></td>
-    <td><%= l note.updated_at %></td>
+    <td><%= note_author(note.author) %></td>
+    <td><%= note.comments.first.body.to_html %></td>   
+    <td><%= t 'note.mine.ago_html', :when => friendly_date(note.created_at) %></td>
+    <td><%= t 'note.mine.ago_html', :when => friendly_date(note.updated_at) %></td>

   </tr>
 <% end -%>
 </table>
   </tr>
 <% end -%>
 </table>