From 518f200a8fc7373b44ed7d7b5f016d921b0746bd Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Wed, 15 Jan 2014 22:15:11 -0700 Subject: [PATCH] fix(#2375) merge in @SabreCat's stats.jade changes "More elegant show/hide setup for attribute bonuses" --- views/shared/profiles/stats.jade | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/views/shared/profiles/stats.jade b/views/shared/profiles/stats.jade index be1c1d653b..ea9a921c01 100644 --- a/views/shared/profiles/stats.jade +++ b/views/shared/profiles/stats.jade @@ -36,27 +36,27 @@ table.table.table-striped strong {{v}}: {{profile._statsComputed[k]}} td ul(style='list-style-type:none') - li + li(ng-show='profile.stats.lvl > 1') i.icon-question-sign(popover-title=env.t('levelBonus'), popover-trigger='mouseenter', popover-placement='top', popover=env.t('levelBonusText')) | =env.t('level') |: {{(profile.stats.lvl - 1) / 2}}  - li(ng-show='user.flags.itemsEnabled') + li(ng-show='Content.gear.flat[profile.items.gear.equipped.weapon][k] + Content.gear.flat[profile.items.gear.equipped.armor][k] + Content.gear.flat[profile.items.gear.equipped.head][k] + Content.gear.flat[profile.items.gear.equipped.shield][k] > 0') i.icon-question-sign(popover-title=env.t('equipment'), popover-trigger='mouseenter', popover-placement='top', popover=env.t('equipmentBonusText')) | =env.t('equipment') |: {{Content.gear.flat[profile.items.gear.equipped.weapon][k] + Content.gear.flat[profile.items.gear.equipped.armor][k] + Content.gear.flat[profile.items.gear.equipped.head][k] + Content.gear.flat[profile.items.gear.equipped.shield][k] || 0}}  - li(ng-show='user.flags.itemsEnabled') + li(ng-show='profile._statsComputed[k] - profile.stats.buffs[k] - ((profile.stats.lvl - 1) / 2) - Content.gear.flat[profile.items.gear.equipped.weapon][k] - Content.gear.flat[profile.items.gear.equipped.armor][k] - Content.gear.flat[profile.items.gear.equipped.head][k] - Content.gear.flat[profile.items.gear.equipped.shield][k] - profile.stats[k] > 0') i.icon-question-sign(popover-title=env.t('classBonus'), popover-trigger='mouseenter', popover-placement='top', popover=env.t('classBonusText')) | =env.t('classEquipBonus') |: {{profile._statsComputed[k] - profile.stats.buffs[k] - ((profile.stats.lvl - 1) / 2) - Content.gear.flat[profile.items.gear.equipped.weapon][k] - Content.gear.flat[profile.items.gear.equipped.armor][k] - Content.gear.flat[profile.items.gear.equipped.head][k] - Content.gear.flat[profile.items.gear.equipped.shield][k] - profile.stats[k]}}  - li(ng-show='user.flags.classSelected && !user.preferences.disableClasses') + li(ng-show='profile.stats[k] > 0') i.icon-question-sign(popover-title=env.t('allocatedPoints'), popover-trigger='mouseenter', popover-placement='top', popover=env.t('allocatedPointsText')) | =env.t('allocated') |: {{profile.stats[k] || 0}}  - li + li(ng-show='profile.stats.buffs[k] > 0') i.icon-question-sign(popover-title=env.t('buffs'), popover-trigger='mouseenter', popover-placement='top', popover=env.t('buffsText')) | =env.t('buffs') @@ -84,4 +84,4 @@ table.table.table-striped(ng-show='user.flags.dropsEnabled') // tr td strong=env.t('mountsTamed') - | : {{profile.mountCount}} // \ No newline at end of file + | : {{profile.mountCount}} //