Merge branch 'pull/3112'

diff --git a/app/views/messages/inbox.html.erb b/app/views/messages/inbox.html.erb
index 0fb5107ce606aa0b946b484eb6590e06a5c45e16..a27d7f15c8221d621703da9c5d6ecd4ce2a8d06d 100644 (file)
--- a/app/views/messages/inbox.html.erb
+++ b/app/views/messages/inbox.html.erb
@@ -3,7 +3,14 @@
 <% end %>
 
 <% content_for :heading do %>
-  <h2><%= t ".my_inbox" %>/<%= link_to t(".outbox"), outbox_messages_path %></h2>
+  <ul class="nav nav-pills">
+    <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>

diff --git a/app/views/messages/outbox.html.erb b/app/views/messages/outbox.html.erb
index 5ae9706b7d6dd61f30daec44271d6e56ef5aa2af..562bd9df1123cf27b6ccd72cb54d58b8aa8cd13e 100644 (file)
--- a/app/views/messages/outbox.html.erb
+++ b/app/views/messages/outbox.html.erb
@@ -3,7 +3,14 @@
 <% end %>
 
 <% content_for :heading do %>
-  <h2><%= t(".my_inbox_html", :inbox_link => link_to(t(".inbox"), inbox_messages_path)) %>/<%= t ".outbox" %></h2>
+  <ul class="nav nav-pills">
+    <li class="nav-item">
+      <%= link_to t(".my_inbox"), inbox_messages_path, :class => "nav-link" %>
+    </li>
+    <li class="nav-item">
+      <a class="nav-link active"><%= t ".my_outbox" %></a>
+    </li>
+  </ul>
 <% end %>
 
 <h4><%= t ".messages", :count => current_user.sent_messages.size %></h4>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index f7ee6d04a5822234ed598383e0d835056ff50766..a2b8ab4426985c796ba12bac29efd6d92e134a1b 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1519,7 +1519,7 @@ en:
     inbox:
       title: "Inbox"
       my_inbox: "My Inbox"
-      outbox: "outbox"
+      my_outbox: "My Outbox"
       messages: "You have %{new_messages} and %{old_messages}"
       new_messages:
         one: "%{count} new message"
@@ -1552,9 +1552,8 @@ en:
       body: "Sorry there is no message with that id."
     outbox:
       title: "Outbox"
-      my_inbox_html: "My %{inbox_link}"
-      inbox: "inbox"
-      outbox: "outbox"
+      my_inbox: "My Inbox"
+      my_outbox: "My Outbox"
       messages:
         one: "You have %{count} sent message"
         other: "You have %{count} sent messages"