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

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

diff --git a/app/views/message/inbox.html.erb b/app/views/message/inbox.html.erb
index 2a97b7bbd2d1f9d6ea782a61a646d7e4417b66da..f9fc31149d5aaeccfd231740063362130e27445d 100644 (file)
--- a/app/views/message/inbox.html.erb
+++ b/app/views/message/inbox.html.erb
@@ -1,21 +1,24 @@
-<h2><%= t'message.inbox.my_inbox'%>/<%= link_to t('message.inbox.outbox'), url_for(:controller => "user", :action => "outbox", :id => @user.display_name) %></h2>
+<% content_for :heading do %>
+  <h2><%= t'message.inbox.my_inbox'%>/<%= link_to t('message.inbox.outbox'), outbox_path(current_user.display_name) %></h2>
+<% end %>
 
-<p><%= t'message.inbox.you_have', :new_count => @user.new_messages.size, :old_count => (@user.messages.size -  @user.new_messages.size) %></p> 
+  <h4><%= render :partial => "message_count" %></h4>
 
-<% if @user.messages.size > 0 %>
-  <div id="messages">
-    <table class="messages">
+<% if current_user.messages.size > 0 %>
+  <table class="messages">
+    <thead>
       <tr>
         <th><%= t'message.inbox.from' %></th>
         <th><%= t'message.inbox.subject' %></th>
         <th><%= t'message.inbox.date' %></th>
         <th></th>
         <th></th>
-        <th></th>
       </tr>
-      <%= render :partial => "message_summary", :collection => @user.messages %>
-    </table>
-  </div>
+    </thead>
+    <tbody>
+        <%= render :partial => "message_summary", :collection => current_user.messages %>
+    </tbody>
+  </table>
 <% else %>
-  <div id="messages"><%= t'message.inbox.no_messages_yet', :people_mapping_nearby_link => link_to(t('message.inbox.people_mapping_nearby'), :controller => 'user', :action => 'view', :display_name => @user.display_name) %></div>
+  <div><%= raw(t'message.inbox.no_messages_yet', :people_mapping_nearby_link => link_to(t('message.inbox.people_mapping_nearby'), user_path(current_user))) %></div>
 <% end %>