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

[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..266349b30ab9f5d8c916f0993746529b12bd59e4 100644 (file)
--- a/app/views/notes/mine.html.erb
+++ b/app/views/notes/mine.html.erb
@@ -1,37 +1,37 @@
-<h1><%= @heading %></h1>
-<p><%= raw @description %></p>
+<% content_for :heading do %>
+  <h2><%= t "notes.mine.heading", :user => @user.display_name %></h2>
+  <p><%= t "notes.mine.subheading_html", :user => link_to(@user.display_name, user_path(@user)) %></p>
+<% end %>
 
-<%= render :partial => 'notes_paging_nav' %>
+<%= render :partial => "notes_paging_nav" %>
 
-<table id="note_list" cellpadding="3">
-  <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.last_changed' %></th>
-  </tr>
+<table class="note_list">
+  <thead>
+    <tr>
+      <th></th>
+      <th><%= t ".id" %></th>
+      <th><%= t ".creator" %></th>
+      <th><%= t ".description" %></th>
+      <th><%= t ".created_at" %></th>
+      <th><%= t ".last_changed" %></th>
+    </tr>
+  </thead>
 <% @notes.each do |note| -%>
-  <tr<% if note.author != @user2 %> bgcolor="#EEEEEE"<% end %>>
+  <tr<% if note.author == @user %> class="creator"<% end %>>
     <td>
-      <% if note.status == "closed" %>
-        <%= image_tag("closed_note_marker.png", :alt => 'closed') %>
+      <% if note.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.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><%= link_to note.id, browse_note_path(note) %></td>
+    <td><%= note_author(note.author) %></td>
+    <td><%= note.comments.first.body.to_html %></td>
+    <td><%= friendly_date_ago(note.created_at) %></td>
+    <td><%= friendly_date_ago(note.updated_at) %></td>
   </tr>
 <% end -%>
 </table>
 
-<%= render :partial => 'notes_paging_nav' %>
+<%= render :partial => "notes_paging_nav" %>