X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/2e2f2124728ca755b2db8f83f022eaea24b647f0..2c9c427587a7cb42136315d6c1d533d3eb058545:/app/views/message/inbox.html.erb
diff --git a/app/views/message/inbox.html.erb b/app/views/message/inbox.html.erb
index 38fe8495b..919a3e402 100644
--- a/app/views/message/inbox.html.erb
+++ b/app/views/message/inbox.html.erb
@@ -1,10 +1,12 @@
-
<%= t'message.inbox.my_inbox'%>/<%= link_to t('message.inbox.outbox'), url_for(:controller => "user", :action => "outbox", :id => @user.display_name) %>
+<% content_for :heading do %>
+ <%= t'message.inbox.my_inbox'%>/<%= link_to t('message.inbox.outbox'), outbox_path(current_user.display_name) %>
+<% end %>
-<%= t'message.inbox.you_have', :new_count => @user.new_messages.size, :old_count => (@user.messages.size - @user.new_messages.size) %>
+ <%= render :partial => "message_count" %>
-<% if @user.messages.size > 0 %>
-
-
+<% if current_user.messages.size > 0 %>
+
+
<%= t'message.inbox.from' %> |
<%= t'message.inbox.subject' %> |
@@ -12,9 +14,11 @@
|
|
- <%= render :partial => "message_summary", :collection => @user.messages %>
-
-
+
+
+ <%= render :partial => "message_summary", :collection => current_user.messages %>
+
+
<% else %>
-
<%= 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) %>
+
<%= 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 => current_user.display_name)) %>
<% end %>