sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-07-22 11:38:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

mounts: temporarily remove mounts code from views. merging to master so

Browse source 
we can run schema migration and start with item translations. This commit will be reverted
when mounts is fully merged
This commit is contained in:
Tyler Renelle 2013-11-14 12:59:00 -08:00
parent dda3670d03
commit d245c87f29
2 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
views/options/inventory/inventory.jade
View file

@ -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 yet.
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}}')

28
views/options/inventory/stable.jade
View file

@ -1,14 +1,16 @@
script(type='text/ng-template', id='partials/options.inventory.stable.html')
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)
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
@ -47,7 +49,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. Feed them and they'll grow into powerful steeds. <a target='_blank' href='https://f.cloud.github.com/assets/2374703/164631/3ed5fa6c-78cd-11e2-8743-f65ac477b55e.png'>Have a look-see</a> 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. <a target='_blank' href='https://f.cloud.github.com/assets/2374703/164631/3ed5fa6c-78cd-11e2-8743-f65ac477b55e.png'>Have a look-see</a> at all the pets you can collect.
h4 {{petCount}} / {{totalPets}} Pets Found
menu.pets(type='list')
@ -55,7 +57,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}}', 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')
@ -70,7 +72,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