X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/502dc65e95593287647c426e733efa06750dd322..67a03d44a171a05fc637e1b9ecfc8d3b7769dc85:/app/views/message/inbox.html.erb diff --git a/app/views/message/inbox.html.erb b/app/views/message/inbox.html.erb index e75d6c1ec..ec1460745 100644 --- a/app/views/message/inbox.html.erb +++ b/app/views/message/inbox.html.erb @@ -1,10 +1,11 @@ -

<%= t'message.inbox.my_inbox'%>/<%= link_to t('message.inbox.outbox'), url_for(:controller => "user", :action => "outbox", :id => @user.display_name) %>

+
+

<%= t'message.inbox.my_inbox'%>/<%= link_to t('message.inbox.outbox'), outbox_path(@user.display_name) %>

-

<%= 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 %> -
- +
+ @@ -12,9 +13,12 @@ - <%= render :partial => "message_summary", :collection => @user.messages %> -
<%= t'message.inbox.from' %> <%= t'message.inbox.subject' %>
-
+ + + <%= render :partial => "message_summary", :collection => @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 => @user.display_name)) %>
<% end %> +