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

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

diff --git a/app/views/messages/outbox.html.erb b/app/views/messages/outbox.html.erb
index 806f1207ae014e5426aa56516354da6f6425b39f..65fbaf3261c818aa79613e6b6a3c6b546b69a9b3 100644 (file)
--- a/app/views/messages/outbox.html.erb
+++ b/app/views/messages/outbox.html.erb
@@ -2,26 +2,12 @@
   <%= javascript_include_tag "messages" %>
 <% end %>
 
   <%= javascript_include_tag "messages" %>
 <% end %>
 

-<% content_for :heading do %>
-  <h2><%= t(".my_inbox_html", :inbox_link => link_to(t(".inbox"), inbox_messages_path)) %>/<%= t ".outbox" %></h2>
-<% end %>
+<%= render :partial => "heading", :locals => { :active_link_path => outbox_messages_path } %>

 
 

-<h4><%= t ".messages", :count => current_user.sent_messages.size %></h4>
+<%= render :partial => "outbox_count" %>

 
 <% if current_user.sent_messages.size > 0 %>
 
 <% if current_user.sent_messages.size > 0 %>

-  <table class="messages">
-    <thead>
-      <tr>
-        <th><%= t ".to" %></th>
-        <th><%= t ".subject" %></th>
-        <th><%= t ".date" %></th>
-        <th></th>
-      </tr>
-    </thead>
-    <tbody>
-      <%= render :partial => "sent_message_summary", :collection => current_user.sent_messages %>
-    </tbody>
-  </table>
+  <%= render :partial => "messages_table", :locals => { :columns => %w[to subject date], :messages => current_user.sent_messages, :inner_partial => "sent_message_summary" } %>

 <% else %>
   <div class="messages"><%= t(".no_sent_messages_html", :people_mapping_nearby_link => link_to(t(".people_mapping_nearby"), user_path(current_user))) %></div>
 <% end %>
 <% else %>
   <div class="messages"><%= t(".no_sent_messages_html", :people_mapping_nearby_link => link_to(t(".people_mapping_nearby"), user_path(current_user))) %></div>
 <% end %>