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

[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 3e6346c9ab90398ba5485ad1ac550d14f460d07a..288c235ebd3c5718d588595e8e6b0717c70eca6d 100644 (file)
--- a/app/views/message/outbox.html.erb
+++ b/app/views/message/outbox.html.erb
@@ -1,18 +1,23 @@
-<h2><%= t'message.outbox.my_inbox', :inbox_link => link_to(t('message.outbox.inbox'), url_for(:controller => "user", :action => "inbox", :id => @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.you_have_sent_messages', :sent_count => @user.sent_messages.size %>
+<h4><%= t'message.outbox.messages', :count => current_user.sent_messages.size %></h4>
 
-<% if @user.sent_messages.size > 0 %>
-  <div id="messages">
-    <table class="messages">
+<% if current_user.sent_messages.size > 0 %>
+  <table class="messages">
+    <thead>
       <tr>
         <th><%= t'message.outbox.to' %></th>
         <th><%= t'message.outbox.subject' %></th>
         <th><%= t'message.outbox.date' %></th>
+        <th></th>
       </tr>
-      <%= render :partial => "sent_message_summary", :collection => @user.sent_messages %>
-    </table>
-  </div>
+    </thead>
+    <tbody>
+      <%= render :partial => "sent_message_summary", :collection => current_user.sent_messages %>
+    </tbody>
+  </table>
 <% else %>
-         <div id="messages"><%= 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'), :controller => 'user', :action => 'view', :display_name => current_user.display_name)) %></div>
 <% end %>