X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/4df0fe72e28246f81573b98fbf30f13fee16a6b6..4eba549b5c0c2d01d0476ceaff894db6723177ee:/app/views/messages/inbox.html.erb diff --git a/app/views/messages/inbox.html.erb b/app/views/messages/inbox.html.erb index 03e01915e..4d6be787b 100644 --- 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 %> -

<%= t '.my_inbox'%>/<%= link_to t('.outbox'), outbox_messages_path %>

-<% end %> +<%= render :partial => "heading", :locals => { :active_link_path => inbox_messages_path } %> -

<%= render :partial => "message_count" %>

+<%= render :partial => "inbox_count" %> <% if current_user.messages.size > 0 %> - - - - - - - - - - - - <%= render :partial => "message_summary", :collection => current_user.messages %> - -
<%= t '.from' %><%= t '.subject' %><%= t '.date' %>
+ <%= render :partial => "messages_table", :locals => { :columns => %w[from subject date], :messages => current_user.messages, :inner_partial => "message_summary" } %> <% else %> -
<%= raw(t '.no_messages_yet', :people_mapping_nearby_link => link_to(t('.people_mapping_nearby'), user_path(current_user))) %>
+
<%= t(".no_messages_yet_html", :people_mapping_nearby_link => link_to(t(".people_mapping_nearby"), user_path(current_user))) %>
<% end %>