From b2f0ee58c8ad0e1a66d311e8fdf9d454163f026a Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Mon, 25 Mar 2013 17:01:16 -0700
Subject: [PATCH] pets: move market into inventory as sub-tab

---
 views/app/avatar.html | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/views/app/avatar.html b/views/app/avatar.html
index 42d64a8300..91dfbbfffe 100644
--- a/views/app/avatar.html
+++ b/views/app/avatar.html
@@ -8,7 +8,6 @@
                     {#if _user.flags.dropsEnabled}
                         <li><a data-toggle='tab' href="#profileInventory">Inventory</a></li>
                         <li><a data-toggle='tab' href="#profileStable">Stable</a></li>
-                        <li><a data-toggle='tab' href="#profileMarket">Market</a></li>
                     {/if}
                 </ul>
 
@@ -22,14 +21,26 @@
                     </div>
 
                     <div class="tab-pane" id="profileInventory">
-                        <app:avatar:inventory user="{_user}" main="true" />
+
+                        <ul class="nav nav-tabs">
+                            <li class="active"><a data-toggle='tab' data-target="#profileInventoryInventory">Inventory</a></li>
+                            <li><a data-toggle='tab' data-target="#profileInventoryMarket">Market</a></li>
+                        </ul>
+
+                        <div class='tab-content'>
+                            <div class='tab-pane active' id='profileInventoryInventory'>
+                                <app:avatar:inventory />
+                            </div>
+                            <div class='tab-pane' id='profileInventoryMarket'>
+                                <app:avatar:market />
+                            </div>
+                        </div>
+
                     </div>
+
                     <div class="tab-pane" id="profileStable">
                         <app:pets:stable />
                     </div>
-                    <div class='tab-pane' id='profileMarket'>
-                        <app:avatar:market />
-                    </div>
                 </div>
              {/}
         {else}