X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/e290df896ecfd7c93dedab50adb27f3d146daf9c..ca4ee6faa9378e7610356e36cbd4931a2657eeed:/app/views/messages/inbox.html.erb?ds=inline diff --git a/app/views/messages/inbox.html.erb b/app/views/messages/inbox.html.erb index 7eba93b76..835d70a74 100644 --- a/app/views/messages/inbox.html.erb +++ b/app/views/messages/inbox.html.erb @@ -2,35 +2,12 @@ <%= javascript_include_tag "messages" %> <% end %> -<% content_for :heading_class, "pb-0" %> +<%= render :partial => "heading", :locals => { :active_link_path => inbox_messages_path } %> -<% content_for :heading do %> -

<%= t("users.show.my messages") %>

- -<% end %> - -

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

+

<%= t "messages.inbox.messages", :new_messages => t(".new_messages", :count => current_user.new_messages.size), :old_messages => t(".old_messages", :count => current_user.messages.size - current_user.new_messages.size) %>

<% 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 %> -
<%= t(".no_messages_yet_html", :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"), dashboard_path)) %>
<% end %>