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 ec1460745578eba1057cff6d57c1073d7bbed192..f9fc31149d5aaeccfd231740063362130e27445d 100644 (file)
--- a/app/views/message/inbox.html.erb
+++ b/app/views/message/inbox.html.erb
@@ -1,9 +1,10 @@
-<div class='text-content'>
-<h2><%= t'message.inbox.my_inbox'%>/<%= link_to t('message.inbox.outbox'), outbox_path(@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 %>

 
 

-<%= render :partial => "message_count" %>
+  <h4><%= render :partial => "message_count" %></h4>

 
 

-<% if @user.messages.size > 0 %>
+<% if current_user.messages.size > 0 %>

   <table class="messages">
     <thead>
       <tr>
   <table class="messages">
     <thead>
       <tr>


@@ -15,10 +16,9 @@
       </tr>
     </thead>
     <tbody>
       </tr>
     </thead>
     <tbody>

-        <%= render :partial => "message_summary", :collection => @user.messages %>
+        <%= render :partial => "message_summary", :collection => current_user.messages %>

     </tbody>
   </table>
 <% else %>
     </tbody>
   </table>
 <% else %>

-  <div><%= raw(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 %>
 <% end %>

-</div>