Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reorder Sections and Separate Active Mounts/Pets

Browse Source
This commit is contained in:
MathWhiz
2016-07-20 16:37:58 -04:00
parent 0208c75f66
commit 8a2482e7d8
4 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/locales/en/pets.json
+1
View File
@@ -1,6 +1,7 @@
{
"pets": "Pets",
"activePet": "Active Pet",
"noActivePet": "No Active Pet",
"petsFound": "Pets Found",
"magicPets": "Magic Potion Pets",
"rarePets": "Rare Pets",
website/views/shared/profiles/stats.jade
+4 -2
View File
@@ -13,7 +13,9 @@ mixin statList(calculatedStat, popover, text, useOneTimeBinding)
=': {{' + binding + calculatedStat + '}}'
include ./stats/basic-stats
include ./stats/equipment
include ./stats/costume
include ./stats/attributes
include ./stats/equipment
include ./stats/pets-and-mounts
hr
include ./stats/costume
include ./stats/active-pet-and-mount
website/views/shared/profiles/stats/active-pet-and-mount.jade
+5
View File
@@ -0,0 +1,5 @@
div(ng-show='user._id != profile._id')
h4
table.table.table-striped
+basicRow('activePet', '{{::profile.items.currentPet ? (isBasicAnimal(profile.items.currentPet, \'pet\') ? env.t(\'petName\', {potion: Content.hatchingPotions[petPotion].text(), egg: Content.eggs[petEgg].text()}) : env.t(Content.specialPets[profile.items.currentPet])) : env.t(\'noActivePet\')}}')
+basicRow('activeMount', '{{::profile.items.currentMount ? (isBasicAnimal(profile.items.currentMount, \'mount\') ? env.t(\'mountName\', {potion: Content.hatchingPotions[mountPotion].text(), mount: Content.eggs[mountEgg].text()}) : env.t(Content.specialMounts[profile.items.currentMount])) : env.t(\'noActiveMount\')}}')
website/views/shared/profiles/stats/costume.jade
+6 -7
View File
@@ -1,7 +1,6 @@
h4(ng-show='profile.preferences.costume')=env.t('costume')
table.table.table-striped(ng-show='profile.preferences.costume')
tr(ng-repeat='(itemType,costume) in profile.items.gear.costume', ng-init='piece=Content.gear.flat[costume]', ng-show='piece')
td
strong {{piece.text()}}
+basicRow('activePet', '{{::isBasicAnimal(profile.items.currentPet, \'pet\') ? env.t(\'petName\', {potion: Content.hatchingPotions[petPotion].text(), egg: Content.eggs[petEgg].text()}) : env.t(Content.specialPets[profile.items.currentPet])}}')(ng-if='user._id != profile._id && profile.items.currentPet')
+basicRow('activeMount', '{{::isBasicAnimal(profile.items.currentMount, \'mount\') ? env.t(\'mountName\', {potion: Content.hatchingPotions[mountPotion].text(), mount: Content.eggs[mountEgg].text()}) : env.t(Content.specialMounts[profile.items.currentMount])}}')(ng-if='user._id != profile._id && profile.items.currentMount')
div(ng-show='profile.preferences.costume')
h4=env.t('costume')
table.table.table-striped
tr(ng-repeat='(itemType,costume) in profile.items.gear.costume', ng-init='piece=Content.gear.flat[costume]', ng-show='piece')
td
strong {{piece.text()}}