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

[rails.git] / app / views / message / outbox.html.erb

diff --git a/app/views/message/outbox.html.erb b/app/views/message/outbox.html.erb
index 30d55e1aa17b993fe170668d0ab013732feadcb8..a3a0dbbdfad925071686e5922038f6ed56339e4f 100644 (file)
--- a/app/views/message/outbox.html.erb
+++ b/app/views/message/outbox.html.erb
@@ -1,8 +1,10 @@
-<h2><%= raw(t'message.outbox.my_inbox', :inbox_link => link_to(t('message.outbox.inbox'), inbox_path(@user.display_name))) %>/<%= t'message.outbox.outbox' %></h2>
+<% content_for :heading do %>
+  <h2><%= raw(t'message.outbox.my_inbox', :inbox_link => link_to(t('message.outbox.inbox'), inbox_path(current_user.display_name))) %>/<%= t'message.outbox.outbox' %></h2>
+<% end %>

 
 

-<p><%= t'message.outbox.messages', :count => @user.sent_messages.size %></p>
+<h4><%= t'message.outbox.messages', :count => current_user.sent_messages.size %></h4>

 
 

-<% if @user.sent_messages.size > 0 %>
+<% if current_user.sent_messages.size > 0 %>

   <table class="messages">
     <thead>
       <tr>
   <table class="messages">
     <thead>
       <tr>


@@ -13,9 +15,9 @@
       </tr>
     </thead>
     <tbody>
       </tr>
     </thead>
     <tbody>

-      <%= render :partial => "sent_message_summary", :collection => @user.sent_messages %>
+      <%= render :partial => "sent_message_summary", :collection => current_user.sent_messages %>

     </tbody>
   </table>
 <% else %>
     </tbody>
   </table>
 <% else %>

-  <div class="messages"><%= raw(t'message.outbox.no_sent_messages', :people_mapping_nearby_link => link_to(t('message.outbox.people_mapping_nearby'), :controller => 'user', :action => 'view', :display_name => @user.display_name)) %></div>
+  <div class="messages"><%= raw(t'message.outbox.no_sent_messages', :people_mapping_nearby_link => link_to(t('message.outbox.people_mapping_nearby'), user_path(current_user))) %></div>

 <% end %>
 <% end %>