From 8188f173bcab58d77b8519ce99f9765ac366afdb Mon Sep 17 00:00:00 2001 From: Marcelo Sizer Date: Sat, 11 Jan 2014 16:11:45 -0200 Subject: [PATCH 1/8] Replace hard-coded strings for env.t on views/shared/profiles folder. --- views/shared/profiles/achievements.jade | 71 +++++++++------- views/shared/profiles/stats.jade | 108 +++++++++++++----------- 2 files changed, 98 insertions(+), 81 deletions(-) diff --git a/views/shared/profiles/achievements.jade b/views/shared/profiles/achievements.jade index 0be4d10dcc..b92433d268 100644 --- a/views/shared/profiles/achievements.jade +++ b/views/shared/profiles/achievements.jade @@ -15,8 +15,9 @@ div(ng-if='profile.backer.npc') .achievement.achievement-helm h5 - span.label.label-npc {{profile.backer.npc}} NPC - small Backed the Kickstarter project at the maximum level! + span.label.label-npc {{profile.backer.npc}} + =env.t('npc') + small=env.t('npcText') hr div(ng-if='profile.contributor.level || user._id == profile._id') @@ -24,70 +25,78 @@ div(ng-class='{muted: !profile.contributor.level}') h5 span.label(ng-if='profile.contributor.level', class='label-contributor-{{profile.contributor.level}}') {{contribText(profile.contributor, profile.backer)}} - span.label(ng-if='!profile.contributor.level') Contributor - small. - Has contributed to HabitRPG (code, design, pixel art, legal advice, docs, etc). Want this badge? Read more. + span.label(ng-if='!profile.contributor.level')=env.t('contribName') + small=env.t('contribText') + a(href='http://habitrpg.wikia.com/wiki/Contributing_to_HabitRPG', target='_blank')=env.t('readMore') + | . hr div(ng-if='profile.backer.tier') .achievement.achievement-heart - h5 Kickstarter Backer - ${{profile.backer.tier}} Tier - small Backed the Kickstarter Project + h5=env.t('kickstartName1') + ${{profile.backer.tier}} + =env.t('kickstartName2') + small=env.t('kickstarterText') hr div(ng-if='profile.achievements.streak || user._id == profile._id') .achievement.achievement-thermometer(ng-show='profile.achievements.streak') div(ng-class='{muted: !profile.achievements.streak}') - h5 {{profile.achievements.streak || 0 }} Streak Achievement(s) - small Has performed {{profile.achievements.streak || 0 }} 21-day streaks on Dailies + h5 {{profile.achievements.streak || 0 }} + =env.t('streakName') + small=env.t('streakText1') + {{profile.achievements.streak || 0 }} + =env.t('streakText2') hr div(ng-if='profile.achievements.ultimateGear || user._id == profile._id') .achievement.achievement-armor(ng-show='profile.achievements.ultimateGear') div(ng-class='{muted: !profile.achievements.ultimateGear}') - h5 Ultimate Gear - small Has upgraded to the maximum weapon and armor set + h5=env.t('ultimateGearName') + small=env.t('ultimateGearText') hr div(ng-if='profile.achievements.beastMaster || user._id == profile._id') .achievement.achievement-rat(ng-show='profile.achievements.beastMaster') div(ng-class='{muted: !profile.achievements.beastMaster}') - h5 Beast Master - small Has found all 90 pets (insanely difficult, give this user props!) + h5=env.t('beastMastName') + small=env.t('beastMastText') hr div(ng-if='profile.achievements.rebirths') .achievement.achievement-sun - h5(ng-if='profile.achievements.rebirths == 1') Began a New Adventure - h5(ng-if='profile.achievements.rebirths > 1') Began {{profile.achievements.rebirths}} New Adventures - small. - Used an Orb of Rebirth to start over after attaining Level {{profile.achievements.rebirthLevel}}. + h5(ng-if='profile.achievements.rebirths == 1')=env.t('rebirthBegan') + h5(ng-if='profile.achievements.rebirths > 1')=env.t('rebirthText1') + {{profile.achievements.rebirths}} + =env.t('rebirthText2') + small=env.t('rebirthOrb') + {{profile.achievements.rebirthLevel}}. hr div(ng-if='profile.achievements.helpedHabit') .achievement.achievement-tree - h5 Helped Habit Grow - small. - Helped HabitRPG grow by filling out this survey. + h5=env.t('helpedHabit') + small=env.t('helpedText1') + a(href='http://community.habitrpg.com/node/290', target='_blank')=env.t('helpedText2') hr div(ng-if='profile.achievements.originalUser || profile.achievements.veteran') .achievement.achievement-cake div(ng-if='profile.achievements.veteran') - h5 Veteran - small - | Has weathered Habit The Grey (our pre Angular website), and has gained many battle-scars from its bugs. + h5=env.t('veteran') + small=env.t('veteranText') div(ng-if='profile.achievements.originalUser') - h5 Original User! - small - | One of the very original early adopters, Talk about alpha tester! + h5=env.t('originalUser') + small=env.t('originaUserText1') + em=env.t('originaUserText2') + =env.t('originaUserText3') hr div(ng-if='profile.achievements.challenges || user._id == profile._id') // This is a very strange icon to use. revisit .achievement.achievement-karaoke(ng-show='profile.achievements.challenges') div(ng-class='{muted: !profile.achievements.challenges}') - h5 Was the winner in the following challenges + h5=env.t('challengeWinner') table.table.table-striped tr(ng-repeat='chal in profile.achievements.challenges') td {{chal}} @@ -96,7 +105,7 @@ div(ng-if='profile.achievements.quests || user._id == profile._id') .achievement.achievement-alien(ng-show='profile.achievements.quests') div(ng-class='{muted: !profile.achievements.quests}') - h5 Completed the following quests + h5=env.t('completedQuests') table.table.table-striped tr(ng-repeat='(k,v) in profile.achievements.quests') td {{Content.quests[k].text}} @@ -105,6 +114,8 @@ div(ng-if='profile.achievements.snowball') .achievement.achievement-snowball - h5 Annoying Friends - small Got snowballed {{profile.achievements.snowball}} times by party members. + h5=env.t('annoyingFriends') + small=env.t('annoyingFriends1') + {{profile.achievements.snowball}} + =env.t('annoyingFriends2') hr diff --git a/views/shared/profiles/stats.jade b/views/shared/profiles/stats.jade index b64ebfbdcc..81adab20c5 100644 --- a/views/shared/profiles/stats.jade +++ b/views/shared/profiles/stats.jade @@ -1,75 +1,81 @@ -h4 Stats +h4.stats-equipment=env.t('equipment') table.table.table-striped - tr - td - strong Health - | : {{profile.stats.hp | number:0}} / 50 - tr - td - strong Gold - | : {{profile.stats.gp | number:0}} - tr - td - strong Level - | : {{profile.stats.lvl}} - tr - td - strong Experience - | : {{profile.stats.exp | number:0}} / {{Shared.tnl(profile.stats.lvl)}} - -h4.stats-equipment(ng-show='user.flags.itemsEnabled') Equipment -table.table.table-striped(ng-show='user.flags.itemsEnabled') - // FIXME this isn't refreshing properly. On first party modal, correct. Second party modal click gives the previous gear. It's always one behind. - tr(ng-repeat='(k,v) in profile.items.gear.equipped', ng-init='piece=Content.gear.flat[v]', ng-show='piece') + tr(ng-repeat='(k,v) in user.items.gear.equipped', ng-init='piece=Content.gear.flat[v]', ng-show='piece') td strong {{piece.text}}:  span(ng-repeat='stat in ["str","con","per","int"]', ng-show='piece[stat]') {{piece[stat]}} {{stat.toUpperCase()}}  -h4 Attributes +h4=env.t('stats') table.table.table-striped - tr(ng-repeat='(k,v) in {str:"Strength (STR)",int:"Intelligence (INT)",con:"Constitution (CON)",per:"Perception (PER)"}') + tr + td + strong=env.t('health') + | : {{profile.stats.hp | number:0}} / 50 + tr + td + strong=env.t('gold') + | : {{profile.stats.gp | number:0}} + tr + td + strong=env.t('level') + | : {{profile.stats.lvl}} + tr + td + strong=env.t('experience') + | : {{profile.stats.exp | number:0}} / {{Shared.tnl(profile.stats.lvl)}} + +h4=env.t('attributes') +table.table.table-striped + tr(ng-repeat='(k,v) in {str:"Strength",int:"Intelligence",con:"Constitution",per:"Perception"}') td - i.icon-question-sign(ng-show='k=="str"', popover-title='Strength', popover-placement='right', popover='Strength reduces task threat (redness), increases the Gold and Experience boost from random "critical hits," and helps deal damage to boss monsters.', popover-trigger='mouseenter', style='margin-right:3px') - i.icon-question-sign(ng-show='k=="con"', popover-title='Constitution', popover-placement='right', popover='Constitution reduces the damage you take, whether from negative Habits, missed Dailies, or the attacks of boss monsters.', popover-trigger='mouseenter', style='margin-right:3px') - i.icon-question-sign(ng-show='k=="per"', popover-title='Perception', popover-placement='right', popover='Perception increases how much Gold you earn, and starting at level 4, increases the chance of finding items when scoring tasks.', popover-trigger='mouseenter', style='margin-right:3px') - i.icon-question-sign(ng-show='k=="int"', popover-title='Intelligence', popover-placement='right', popover='Intelligence increases how much Experience you earn, and once you\'ve unlocked Classes, determines your maximum Mana available for class abilities.', popover-trigger='mouseenter', style='margin-right:3px') strong {{v}}: {{profile._statsComputed[k]}} td ul(style='list-style-type:none') li - i.icon-question-sign(popover-title='Level Bonus', popover-trigger='mouseenter', popover-placement='top', popover="Each attribute gets a bonus equal to half of (your Level minus 1).") - | Level: {{(profile.stats.lvl - 1) / 2}}  - li(ng-show='user.flags.itemsEnabled') - i.icon-question-sign(popover-title='Equipment', popover-trigger='mouseenter', popover-placement='top', popover="Attribute bonuses provided by your equipped battle gear. See the Equipment tab under Inventory to select your battle gear.") - | 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') - i.icon-question-sign(popover-title='Class Equipment Bonus', popover-trigger='mouseenter', popover-placement='top', popover="Your class (Warrior, if you haven't unlocked or selected another class) uses its own equipment more effectively than gear from other classes. Equipped gear from your current class gets a 50% boost to the attribute bonus it grants.") - | Class Equip Bonus: {{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') - i.icon-question-sign(popover-title='Allocated Points', popover-trigger='mouseenter', popover-placement='top', popover="Attribute points you've earned and assigned. Assign points using the Character Build column.") - | Allocated: {{profile.stats[k] || 0}}  + 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 - i.icon-question-sign(popover-title='Buffs', popover-trigger='mouseenter', popover-placement='top', popover="Attribute bonuses provided by abilities you or your party members have used. Starting at level 11, the abilities you can use are found in the Rewards column on your Tasks page.") - | Buffs: {{profile.stats.buffs[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 + 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 + 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 + i.icon-question-sign(popover-title=env.t('buffs'), popover-trigger='mouseenter', popover-placement='top', popover=env.t('buffsText')) + | + =env.t('buffs') + |: {{profile.stats.buffs[k] || 0}}  tr(ng-if='profile.stats.buffs.stealth') td - strong Stealth: {{profile.stats.buffs.stealth}}  - i.icon-question-sign(popover-title='Stealth', popover-trigger='mouseenter', popover-placement='right', popover="When a new day begins, you will avoid damage from this many missed Dailies.") + strong=env.t('stealth') + |: {{profile.stats.buffs.stealth}}  + i.icon-question-sign(popover-title=env.t('stealth'), popover-trigger='mouseenter', popover-placement='right', popover=env.t('stealthNewDay')) td tr(ng-if='profile.stats.buffs.streaks') td - strong Streaks Frozen  - i.icon-question-sign(popover-title='Streaks Frozen', popover-trigger='mouseenter', popover-placement='right', popover="Streaks on missed Dailies will not reset at the end of the day.") + strong=env.t('streaksFrozen') + | + i.icon-question-sign(popover-title=env.t('streaksFrozen'), popover-trigger='mouseenter', popover-placement='right', popover=env.t('streaksFrozenText')) td -h4(ng-show='user.flags.dropsEnabled') Pets -table.table.table-striped(ng-show='user.flags.dropsEnabled') +h4=env.t('pets') +table.table.table-striped tr td - strong Pets Found + strong=env.t('petsFound') | : {{profile.petCount}} -// Dunno why this doesn't work // // tr td - strong Mounts Tamed - | : {{profile.mountCount}} // + strong=env.t('mountsTamed') + | : {{mountCount}} // From 8a8d3f17ca217bbbe559e5f258e786ceb74147fd Mon Sep 17 00:00:00 2001 From: Marcelo Sizer Date: Sat, 11 Jan 2014 16:16:02 -0200 Subject: [PATCH 2/8] Fix typo --- views/shared/profiles/stats.jade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/shared/profiles/stats.jade b/views/shared/profiles/stats.jade index 81adab20c5..e6cb958174 100644 --- a/views/shared/profiles/stats.jade +++ b/views/shared/profiles/stats.jade @@ -78,4 +78,4 @@ table.table.table-striped // tr td strong=env.t('mountsTamed') - | : {{mountCount}} // + | : {{profile.mountCount}} // From 556118c1f00e724e17fd9a96cc07aa852a117f6f Mon Sep 17 00:00:00 2001 From: Marcelo Sizer Date: Tue, 14 Jan 2014 15:57:55 -0200 Subject: [PATCH 3/8] Add @paglias suggested fixes --- views/shared/profiles/achievements.jade | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/views/shared/profiles/achievements.jade b/views/shared/profiles/achievements.jade index b92433d268..7cf2c1dd0c 100644 --- a/views/shared/profiles/achievements.jade +++ b/views/shared/profiles/achievements.jade @@ -15,8 +15,9 @@ div(ng-if='profile.backer.npc') .achievement.achievement-helm h5 - span.label.label-npc {{profile.backer.npc}} - =env.t('npc') + span.label.label-npc + {{profile.backer.npc}} + =env.t('npc') small=env.t('npcText') hr @@ -26,16 +27,18 @@ h5 span.label(ng-if='profile.contributor.level', class='label-contributor-{{profile.contributor.level}}') {{contribText(profile.contributor, profile.backer)}} span.label(ng-if='!profile.contributor.level')=env.t('contribName') - small=env.t('contribText') + small + =env.t('contribText') a(href='http://habitrpg.wikia.com/wiki/Contributing_to_HabitRPG', target='_blank')=env.t('readMore') | . hr div(ng-if='profile.backer.tier') .achievement.achievement-heart - h5=env.t('kickstartName1') - ${{profile.backer.tier}} - =env.t('kickstartName2') + h5 + =env.t('kickstartName1') + ${{profile.backer.tier}} + =env.t('kickstartName2') small=env.t('kickstarterText') hr From f40b8c6e643f804458d51505b20dfc72dc41e0b6 Mon Sep 17 00:00:00 2001 From: Marcelo Sizer Date: Tue, 14 Jan 2014 16:01:53 -0200 Subject: [PATCH 4/8] Fix indentation --- views/shared/profiles/achievements.jade | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/views/shared/profiles/achievements.jade b/views/shared/profiles/achievements.jade index 7cf2c1dd0c..a572e53d2e 100644 --- a/views/shared/profiles/achievements.jade +++ b/views/shared/profiles/achievements.jade @@ -47,7 +47,8 @@ div(ng-class='{muted: !profile.achievements.streak}') h5 {{profile.achievements.streak || 0 }} =env.t('streakName') - small=env.t('streakText1') + small + =env.t('streakText1') {{profile.achievements.streak || 0 }} =env.t('streakText2') hr @@ -69,17 +70,20 @@ div(ng-if='profile.achievements.rebirths') .achievement.achievement-sun h5(ng-if='profile.achievements.rebirths == 1')=env.t('rebirthBegan') - h5(ng-if='profile.achievements.rebirths > 1')=env.t('rebirthText1') + h5(ng-if='profile.achievements.rebirths > 1') + =env.t('rebirthText1') {{profile.achievements.rebirths}} =env.t('rebirthText2') - small=env.t('rebirthOrb') + small + =env.t('rebirthOrb') {{profile.achievements.rebirthLevel}}. hr div(ng-if='profile.achievements.helpedHabit') .achievement.achievement-tree h5=env.t('helpedHabit') - small=env.t('helpedText1') + small + =env.t('helpedText1') a(href='http://community.habitrpg.com/node/290', target='_blank')=env.t('helpedText2') hr @@ -118,7 +122,8 @@ div(ng-if='profile.achievements.snowball') .achievement.achievement-snowball h5=env.t('annoyingFriends') - small=env.t('annoyingFriends1') + small + =env.t('annoyingFriends1') {{profile.achievements.snowball}} =env.t('annoyingFriends2') hr From 20277e623ea5dae659c472adeb1f9bfac7151072 Mon Sep 17 00:00:00 2001 From: Marcelo Sizer Date: Tue, 14 Jan 2014 16:16:40 -0200 Subject: [PATCH 5/8] Add @paglias suggested fixes --- views/shared/profiles/achievements.jade | 12 ++++++------ views/shared/profiles/stats.jade | 14 +++++++------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/views/shared/profiles/achievements.jade b/views/shared/profiles/achievements.jade index a572e53d2e..f36351f546 100644 --- a/views/shared/profiles/achievements.jade +++ b/views/shared/profiles/achievements.jade @@ -16,7 +16,7 @@ .achievement.achievement-helm h5 span.label.label-npc - {{profile.backer.npc}} + | {{profile.backer.npc}} =env.t('npc') small=env.t('npcText') hr @@ -37,7 +37,7 @@ .achievement.achievement-heart h5 =env.t('kickstartName1') - ${{profile.backer.tier}} + | ${{profile.backer.tier}} =env.t('kickstartName2') small=env.t('kickstarterText') hr @@ -49,7 +49,7 @@ =env.t('streakName') small =env.t('streakText1') - {{profile.achievements.streak || 0 }} + | {{profile.achievements.streak || 0 }} =env.t('streakText2') hr @@ -72,11 +72,11 @@ h5(ng-if='profile.achievements.rebirths == 1')=env.t('rebirthBegan') h5(ng-if='profile.achievements.rebirths > 1') =env.t('rebirthText1') - {{profile.achievements.rebirths}} + | {{profile.achievements.rebirths}} =env.t('rebirthText2') small =env.t('rebirthOrb') - {{profile.achievements.rebirthLevel}}. + | {{profile.achievements.rebirthLevel}}. hr div(ng-if='profile.achievements.helpedHabit') @@ -124,6 +124,6 @@ h5=env.t('annoyingFriends') small =env.t('annoyingFriends1') - {{profile.achievements.snowball}} + | {{profile.achievements.snowball}} =env.t('annoyingFriends2') hr diff --git a/views/shared/profiles/stats.jade b/views/shared/profiles/stats.jade index e6cb958174..83a78ef8bc 100644 --- a/views/shared/profiles/stats.jade +++ b/views/shared/profiles/stats.jade @@ -1,10 +1,3 @@ -h4.stats-equipment=env.t('equipment') -table.table.table-striped - tr(ng-repeat='(k,v) in user.items.gear.equipped', ng-init='piece=Content.gear.flat[v]', ng-show='piece') - td - strong {{piece.text}}:  - span(ng-repeat='stat in ["str","con","per","int"]', ng-show='piece[stat]') {{piece[stat]}} {{stat.toUpperCase()}}  - h4=env.t('stats') table.table.table-striped tr @@ -24,6 +17,13 @@ table.table.table-striped strong=env.t('experience') | : {{profile.stats.exp | number:0}} / {{Shared.tnl(profile.stats.lvl)}} +h4.stats-equipment=env.t('equipment') +table.table.table-striped + tr(ng-repeat='(k,v) in user.items.gear.equipped', ng-init='piece=Content.gear.flat[v]', ng-show='piece') + td + strong {{piece.text}}:  + span(ng-repeat='stat in ["str","con","per","int"]', ng-show='piece[stat]') {{piece[stat]}} {{stat.toUpperCase()}}  + h4=env.t('attributes') table.table.table-striped tr(ng-repeat='(k,v) in {str:"Strength",int:"Intelligence",con:"Constitution",per:"Perception"}') From e7307681d3b6da86bf43245638e135d4b7a48f8f Mon Sep 17 00:00:00 2001 From: Marcelo Sizer Date: Tue, 14 Jan 2014 16:19:37 -0200 Subject: [PATCH 6/8] Replace old code --- views/shared/profiles/stats.jade | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/views/shared/profiles/stats.jade b/views/shared/profiles/stats.jade index 83a78ef8bc..cd787cf93d 100644 --- a/views/shared/profiles/stats.jade +++ b/views/shared/profiles/stats.jade @@ -17,9 +17,10 @@ table.table.table-striped strong=env.t('experience') | : {{profile.stats.exp | number:0}} / {{Shared.tnl(profile.stats.lvl)}} -h4.stats-equipment=env.t('equipment') -table.table.table-striped - tr(ng-repeat='(k,v) in user.items.gear.equipped', ng-init='piece=Content.gear.flat[v]', ng-show='piece') +h4.stats-equipment(ng-show='user.flags.itemsEnabled')=env.t('equipment') +table.table.table-striped(ng-show='user.flags.itemsEnabled') + // FIXME this isn't refreshing properly. On first party modal, correct. Second party modal click gives the previous gear. It's always one behind. + tr(ng-repeat='(k,v) in profile.items.gear.equipped', ng-init='piece=Content.gear.flat[v]', ng-show='piece') td strong {{piece.text}}:  span(ng-repeat='stat in ["str","con","per","int"]', ng-show='piece[stat]') {{piece[stat]}} {{stat.toUpperCase()}}  From 1b1c646e24d68adcca904e1a65e46ea3eeee55e2 Mon Sep 17 00:00:00 2001 From: Marcelo Sizer Date: Tue, 14 Jan 2014 16:22:14 -0200 Subject: [PATCH 7/8] Replace old code --- views/shared/profiles/stats.jade | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/views/shared/profiles/stats.jade b/views/shared/profiles/stats.jade index cd787cf93d..fc091ad15a 100644 --- a/views/shared/profiles/stats.jade +++ b/views/shared/profiles/stats.jade @@ -27,7 +27,7 @@ table.table.table-striped(ng-show='user.flags.itemsEnabled') h4=env.t('attributes') table.table.table-striped - tr(ng-repeat='(k,v) in {str:"Strength",int:"Intelligence",con:"Constitution",per:"Perception"}') + tr(ng-repeat='(k,v) in {str:"Strength (STR)",int:"Intelligence (INT)",con:"Constitution (CON)",per:"Perception (PER)"}') td strong {{v}}: {{profile._statsComputed[k]}} td @@ -70,12 +70,13 @@ table.table.table-striped i.icon-question-sign(popover-title=env.t('streaksFrozen'), popover-trigger='mouseenter', popover-placement='right', popover=env.t('streaksFrozenText')) td -h4=env.t('pets') -table.table.table-striped +h4(ng-show='user.flags.dropsEnabled')=env.t('pets') +table.table.table-striped(ng-show='user.flags.dropsEnabled') tr td strong=env.t('petsFound') | : {{profile.petCount}} +// Dunno why this doesn't work // // tr td strong=env.t('mountsTamed') From 6cc7d7368354e98fed1f1063aa3bd45251348d44 Mon Sep 17 00:00:00 2001 From: Marcelo Sizer Date: Tue, 14 Jan 2014 17:06:16 -0200 Subject: [PATCH 8/8] Replace old stats.jade file --- views/shared/profiles/stats.jade | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/views/shared/profiles/stats.jade b/views/shared/profiles/stats.jade index fc091ad15a..be1c1d653b 100644 --- a/views/shared/profiles/stats.jade +++ b/views/shared/profiles/stats.jade @@ -29,6 +29,10 @@ h4=env.t('attributes') table.table.table-striped tr(ng-repeat='(k,v) in {str:"Strength (STR)",int:"Intelligence (INT)",con:"Constitution (CON)",per:"Perception (PER)"}') td + i.icon-question-sign(ng-show='k=="str"', popover-title=env.t('strength'), popover-placement='right', popover=env.t('strengthText'), popover-trigger='mouseenter', style='margin-right:3px') + i.icon-question-sign(ng-show='k=="con"', popover-title=env.t('constitution'), popover-placement='right', popover=env.t('conText') popover-trigger='mouseenter', style='margin-right:3px') + i.icon-question-sign(ng-show='k=="per"', popover-title=env.t('perception'), popover-placement='right', popover=env.t('perText'), popover-trigger='mouseenter', style='margin-right:3px') + i.icon-question-sign(ng-show='k=="int"', popover-title=env.t('intelligence'), popover-placement='right', popover=env.t('intText'), popover-trigger='mouseenter', style='margin-right:3px') strong {{v}}: {{profile._statsComputed[k]}} td ul(style='list-style-type:none') @@ -36,27 +40,27 @@ table.table.table-striped 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 + |: {{(profile.stats.lvl - 1) / 2}}  + li(ng-show='user.flags.itemsEnabled') 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 + |: {{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') 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 + |: {{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') 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}}  + |: {{profile.stats[k] || 0}}  li i.icon-question-sign(popover-title=env.t('buffs'), popover-trigger='mouseenter', popover-placement='top', popover=env.t('buffsText')) | =env.t('buffs') - |: {{profile.stats.buffs[k] || 0}}  + |: {{profile.stats.buffs[k] || 0}}  tr(ng-if='profile.stats.buffs.stealth') td strong=env.t('stealth') @@ -77,7 +81,7 @@ table.table.table-striped(ng-show='user.flags.dropsEnabled') strong=env.t('petsFound') | : {{profile.petCount}} // Dunno why this doesn't work // -// tr +// tr td strong=env.t('mountsTamed') - | : {{profile.mountCount}} // + | : {{profile.mountCount}} // \ No newline at end of file