Merge remote-tracking branch 'upstream/pull/4159'

[rails.git] / app / views / messages / inbox.html.erb

diff --git a/app/views/messages/inbox.html.erb b/app/views/messages/inbox.html.erb
index 03e01915eae205067a106787e63a3fbd43dd6b1a..54089c34a65ba6cea80c625b0ed7b362b0e7cdcd 100644 (file)
--- a/app/views/messages/inbox.html.erb
+++ b/app/views/messages/inbox.html.erb
@@ -2,21 +2,29 @@
   <%= javascript_include_tag "messages" %>
 <% end %>
 
   <%= javascript_include_tag "messages" %>
 <% end %>
 

+<% content_for :heading_class, "pb-0" %>
+

 <% content_for :heading do %>
 <% content_for :heading do %>

-  <h2><%= t '.my_inbox'%>/<%= link_to t('.outbox'), outbox_messages_path %></h2>
+  <h1><%= t("users.show.my messages") %></h1>
+  <ul class="nav nav-tabs">
+    <li class="nav-item">
+      <a class="nav-link active"><%= t ".my_inbox" %></a>
+    </li>
+    <li class="nav-item">
+      <%= link_to t(".my_outbox"), outbox_messages_path, :class => "nav-link" %>
+    </li>
+  </ul>

 <% end %>
 
   <h4><%= render :partial => "message_count" %></h4>
 
 <% if current_user.messages.size > 0 %>
 <% end %>
 
   <h4><%= render :partial => "message_count" %></h4>
 
 <% if current_user.messages.size > 0 %>

-  <table class="messages">
+  <table class="table table-sm align-middle">

     <thead>
       <tr>
     <thead>
       <tr>

-        <th><%= t '.from' %></th>
-        <th><%= t '.subject' %></th>
-        <th><%= t '.date' %></th>
-        <th></th>
-        <th></th>
+        <th><%= t ".from" %></th>
+        <th><%= t ".subject" %></th>
+        <th><%= t ".date" %></th>

       </tr>
     </thead>
     <tbody>
       </tr>
     </thead>
     <tbody>


@@ -24,5 +32,5 @@
     </tbody>
   </table>
 <% else %>
     </tbody>
   </table>
 <% else %>

-  <div><%= raw(t '.no_messages_yet', :people_mapping_nearby_link => link_to(t('.people_mapping_nearby'), user_path(current_user))) %></div>
+  <div><%= t(".no_messages_yet_html", :people_mapping_nearby_link => link_to(t(".people_mapping_nearby"), user_path(current_user))) %></div>

 <% end %>
 <% end %>