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

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

diff --git a/app/views/messages/inbox.html.erb b/app/views/messages/inbox.html.erb
index 0fb5107ce606aa0b946b484eb6590e06a5c45e16..835d70a74cd8ee1f7d4c4af4c0ddf381b156f89b 100644 (file)
--- a/app/views/messages/inbox.html.erb
+++ b/app/views/messages/inbox.html.erb
@@ -2,27 +2,12 @@
   <%= javascript_include_tag "messages" %>
 <% end %>
 
-<% content_for :heading do %>
-  <h2><%= t ".my_inbox" %>/<%= link_to t(".outbox"), outbox_messages_path %></h2>
-<% end %>
+<%= render :partial => "heading", :locals => { :active_link_path => inbox_messages_path } %>
 
-  <h4><%= render :partial => "message_count" %></h4>
+<h4><%= t "messages.inbox.messages", :new_messages => t(".new_messages", :count => current_user.new_messages.size), :old_messages => t(".old_messages", :count => current_user.messages.size - current_user.new_messages.size) %></h4>
 
 <% if current_user.messages.size > 0 %>
-  <table class="table table-sm">
-    <thead>
-      <tr>
-        <th><%= t ".from" %></th>
-        <th><%= t ".subject" %></th>
-        <th><%= t ".date" %></th>
-        <th></th>
-        <th></th>
-      </tr>
-    </thead>
-    <tbody>
-        <%= render :partial => "message_summary", :collection => current_user.messages %>
-    </tbody>
-  </table>
+  <%= render :partial => "messages_table", :locals => { :columns => %w[from subject date], :messages => current_user.messages, :inner_partial => "message_summary" } %>
 <% else %>
-  <div><%= t(".no_messages_yet_html", :people_mapping_nearby_link => link_to(t(".people_mapping_nearby"), user_path(current_user))) %></div>
+  <div><%= t(".no_messages_yet_html", :people_mapping_nearby_link => link_to(t(".people_mapping_nearby"), dashboard_path)) %></div>
 <% end %>