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 fd0e2916562369a73cfd4c9915115b063be3b675..266349b30ab9f5d8c916f0993746529b12bd59e4 100644 (file)
--- a/app/views/notes/mine.html.erb
+++ b/app/views/notes/mine.html.erb
@@ -1,35 +1,37 @@
 <% content_for :heading do %>
 <% content_for :heading do %>

-  <h2><%= @heading %></h2>
-  <p><%= raw @description %></p>
+  <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 %>
 
 <% end %>
 

-<%= render :partial => 'notes_paging_nav' %>
+<%= render :partial => "notes_paging_nav" %>

 
 <table class="note_list">
 
 <table class="note_list">

-  <tr>
-    <th></th>
-    <th><%= t'note.mine.id' %></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>
+  <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| -%>
 <% @notes.each do |note| -%>

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

     <td>
     <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 %>
       <% else %>

-        <%= image_tag("open_note_marker.png", :alt => 'open') %>
+        <%= image_tag("open_note_marker.png", :alt => "open", :size => "25x40") %>

       <% end %>
     </td>
       <% end %>
     </td>

-    <td><%= link_to note.id.to_s, :controller => "browse", :action => "note", :id => note.id %></td>
+    <td><%= link_to note.id, browse_note_path(note) %></td>

     <td><%= note_author(note.author) %></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>
+    <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>
 
   </tr>
 <% end -%>
 </table>
 

-<%= render :partial => 'notes_paging_nav' %>
+<%= render :partial => "notes_paging_nav" %>