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

[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 38639cd9919fda2413a800c8ddc1137eb9ba7a15..5cb357f6fa19c899e88eb4970ca7caeb0844816e 100644 (file)
--- a/app/views/messages/outbox.html.erb
+++ b/app/views/messages/outbox.html.erb
@@ -1,23 +1,13 @@
-<% content_for :heading do %>
-  <h2><%= raw(t '.my_inbox', :inbox_link => link_to(t('.inbox'), inbox_path(current_user.display_name))) %>/<%= t'.outbox' %></h2>
+<% content_for :head do %>
+  <%= javascript_include_tag "messages" %>

 <% end %>
 
 <% end %>
 

-<h4><%= t '.messages', :count => current_user.sent_messages.size %></h4>
+<%= render :partial => "heading", :locals => { :active_link_path => outbox_messages_path } %>
+
+<h4><%= t ".messages", :count => current_user.sent_messages.size %></h4>

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

-  <div class="messages"><%= raw(t '.no_sent_messages', :people_mapping_nearby_link => link_to(t('.people_mapping_nearby'), user_path(current_user))) %></div>
+  <div class="messages"><%= t(".no_sent_messages_html", :people_mapping_nearby_link => link_to(t(".people_mapping_nearby"), dashboard_path)) %></div>

 <% end %>
 <% end %>