From 79e8b2f4a574fad5ed91077c1c2bdbf2f4ef5530 Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Thu, 14 Nov 2013 13:02:34 -0800 Subject: [PATCH] Revert "mounts: temporarily remove mounts code from views. merging to master so" This reverts commit d245c87f295e347f79162aa9a125e9539eb6b69f. --- views/options/inventory/inventory.jade | 4 ++-- views/options/inventory/stable.jade | 28 ++++++++++++-------------- 2 files changed, 15 insertions(+), 17 deletions(-) diff --git a/views/options/inventory/inventory.jade b/views/options/inventory/inventory.jade index 4f56dd6671..2371858929 100644 --- a/views/options/inventory/inventory.jade +++ b/views/options/inventory/inventory.jade @@ -22,7 +22,7 @@ script(type='text/ng-template', id='partials/options.inventory.inventory.html') .badge.badge-info.stack-count {{points}} //-p {{pot}} - //-li.customize-menu + li.customize-menu menu.pets-menu(label='Food ({{foodCount}})') p(ng-show='foodCount < 1') You don't have any food. div(ng-repeat='(food,points) in ownedItems(user.items.food)') @@ -70,7 +70,7 @@ script(type='text/ng-template', id='partials/options.inventory.inventory.html') | {{pot.value}} span.Pet_Currency_Gem1x.inline-gems - //-li.customize-menu + li.customize-menu menu.pets-menu(label='Food') div(ng-repeat='food in Items.food') button.customize-option(popover='{{food.notes}}', popover-title='{{food.text}}', popover-trigger='mouseenter', popover-placement='left', ng-click='buy("food", food)', class='Pet_Food_{{food.name}}') diff --git a/views/options/inventory/stable.jade b/views/options/inventory/stable.jade index 82f719e6d5..765412a16c 100644 --- a/views/options/inventory/stable.jade +++ b/views/options/inventory/stable.jade @@ -1,16 +1,14 @@ script(type='text/ng-template', id='partials/options.inventory.stable.html') - div(ui-view) - //- - ul.nav.nav-tabs - li(ng-class="{ active: $state.includes('options.inventory.stable.pets') }") - a(ui-sref='options.inventory.stable.pets') - | Pets - li(ng-class="{ active: $state.includes('options.inventory.stable.mounts') }") - a(ui-sref='options.inventory.stable.mounts') - | Mounts - .tab-content - .tab-pane.active - div(ui-view) + ul.nav.nav-tabs + li(ng-class="{ active: $state.includes('options.inventory.stable.pets') }") + a(ui-sref='options.inventory.stable.pets') + | Pets + li(ng-class="{ active: $state.includes('options.inventory.stable.mounts') }") + a(ui-sref='options.inventory.stable.mounts') + | Mounts + .tab-content + .tab-pane.active + div(ui-view) script(type='text/ng-template', id='partials/options.inventory.stable.mounts.html') .stable @@ -49,7 +47,7 @@ script(type='text/ng-template', id='partials/options.inventory.stable.pets.html' a(target='_blank', href='http://www.kickstarter.com/profile/mattboch') Matt Boch .popover-content p. - Welcome to the Stable! I'm Matt, the beast master. Choose a pet here to venture at your side. Have a look-see at all the pets you can collect. + Welcome to the Stable! I'm Matt, the beast master. Choose a pet here to venture at your side. Feed them and they'll grow into powerful steeds. Have a look-see at all the pets you can collect. h4 {{petCount}} / {{totalPets}} Pets Found menu.pets(type='list') @@ -57,7 +55,7 @@ script(type='text/ng-template', id='partials/options.inventory.stable.pets.html' menu div(ng-repeat='potion in Items.hatchingPotions', popover-trigger='mouseenter', popover='{{potion.text}} {{egg.text}}', popover-placement='bottom', ng-init='pet = egg.name+"-"+potion.name') button(class="pet-button Pet-{{pet}}", ng-if='user.items.pets[pet]>0', ng-class='{active: user.items.currentPet == pet, selectableInventory: selectedFood}', ng-click='choosePet(egg.name, potion.name)') - //-.progress(ng-class='{"progress-success": user.items.pets[pet]<50}') + .progress(ng-class='{"progress-success": user.items.pets[pet]<50}') .bar(style="width: {{user.items.pets[pet]/.5}}%;") button(class="pet-button pet-not-owned", ng-if='!user.items.pets[pet]') img(src='/bower_components/habitrpg-shared/img/PixelPaw.png') @@ -73,7 +71,7 @@ script(type='text/ng-template', id='partials/options.inventory.stable.pets.html' button(ng-if='!user.items.pets["Dragon-Hydra"]', class="pet-button pet-not-owned", popover-trigger='mouseenter', popover-placement='right', popover="Click the gold paw to learn more about how you can obtain this rare pet through contributing to HabitRPG!", popover-title='How to Get this Pet!') img(src='/bower_components/habitrpg-shared/img/PixelPaw-Gold.png') - //-.well.food-tray + .well.food-tray p(ng-show='foodCount < 1') You don't have any food yet. menu.inventory-list(type='list', ng-if='foodCount > 0') li.customize-menu