From 7822e2aaecd48755a8698b491cc9eab8d51cf44c Mon Sep 17 00:00:00 2001 From: Brian Murray Date: Fri, 19 Feb 2016 19:15:32 -0800 Subject: [PATCH 1/3] end sureRest sentence with a period --- common/locales/en/character.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/locales/en/character.json b/common/locales/en/character.json index 18e769834d..c7bd0db9b2 100644 --- a/common/locales/en/character.json +++ b/common/locales/en/character.json @@ -136,7 +136,7 @@ "respawn": "Respawn!", "youDied": "You Died!", "dieText": "You've lost a Level, all your Gold, and a random piece of Equipment. Arise, Habiteer, and try again! Curb those negative Habits, be vigilant in completion of Dailies, and hold death at arm's length with a Health Potion if you falter!", - "sureReset": "Are you sure? This will reset your character's class and allocated points (you'll get them all back to re-allocate), and costs 3 gems", + "sureReset": "Are you sure? This will reset your character's class and allocated points (you'll get them all back to re-allocate), and costs 3 gems.", "purchaseFor": "Purchase for <%= cost %> Gems?", "notEnoughMana": "Not enough mana.", "invalidTarget": "Invalid target", From 04d0bcadb7266baedb8823b2e23fb53bae1e9a37 Mon Sep 17 00:00:00 2001 From: Brian Murray Date: Fri, 19 Feb 2016 19:22:05 -0800 Subject: [PATCH 2/3] in profile.jade in the character build section display detailed info about the attribute --- website/views/options/profile.jade | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/website/views/options/profile.jade b/website/views/options/profile.jade index ceccce5729..365f195ed0 100644 --- a/website/views/options/profile.jade +++ b/website/views/options/profile.jade @@ -208,19 +208,27 @@ mixin profileStats |  =env.t('distributePoints') tr - td= env.t('allocateStr') + ' {{user.stats.str}}' + td + span.hint(popover-trigger='mouseenter', popover-placement='right', popover=env.t('strengthText')) + =env.t('allocateStr') + ' {{user.stats.str}}' td a.btn.btn-primary(ng-show='user.stats.points', ng-click='allocate("str")', popover-trigger='mouseenter', popover-placement='right', popover=env.t('allocateStrPop')) + tr - td= env.t('allocateInt') + ' {{user.stats.int}}' + td + span.hint(popover-trigger='mouseenter', popover-placement='right', popover=env.t('intText')) + =env.t('allocateInt') + ' {{user.stats.int}}' td a.btn.btn-primary(ng-show='user.stats.points', ng-click='allocate("int")', popover-trigger='mouseenter', popover-placement='right', popover=env.t('allocateIntPop')) + tr - td= env.t('allocateCon') + ' {{user.stats.con}}' + td + span.hint(popover-trigger='mouseenter', popover-placement='right', popover=env.t('conText')) + =env.t('allocateCon') + ' {{user.stats.con}}' td a.btn.btn-primary(ng-show='user.stats.points', ng-click='allocate("con")', popover-trigger='mouseenter', popover-placement='right', popover=env.t('allocateConPop')) + tr - td= env.t('allocatePer') + ' {{user.stats.per}}' + td + span.hint(popover-trigger='mouseenter', popover-placement='right', popover=env.t('perText')) + =env.t('allocatePer') + ' {{user.stats.per}}' td a.btn.btn-primary(ng-show='user.stats.points', ng-click='allocate("per")', popover-trigger='mouseenter', popover-placement='right', popover=env.t('allocatePerPop')) + From 45a938c12d37c603d299773ff9d0b2a28995d13d Mon Sep 17 00:00:00 2001 From: Brian Murray Date: Fri, 19 Feb 2016 21:46:23 -0800 Subject: [PATCH 3/3] put the atrribute allocation td building in a loop to clean up the code per Alys --- website/views/options/profile.jade | 31 +++++++----------------------- 1 file changed, 7 insertions(+), 24 deletions(-) diff --git a/website/views/options/profile.jade b/website/views/options/profile.jade index 365f195ed0..099c680b73 100644 --- a/website/views/options/profile.jade +++ b/website/views/options/profile.jade @@ -207,30 +207,13 @@ mixin profileStats span.glyphicon.glyphicon-download |  =env.t('distributePoints') - tr - td - span.hint(popover-trigger='mouseenter', popover-placement='right', popover=env.t('strengthText')) - =env.t('allocateStr') + ' {{user.stats.str}}' - td - a.btn.btn-primary(ng-show='user.stats.points', ng-click='allocate("str")', popover-trigger='mouseenter', popover-placement='right', popover=env.t('allocateStrPop')) + - tr - td - span.hint(popover-trigger='mouseenter', popover-placement='right', popover=env.t('intText')) - =env.t('allocateInt') + ' {{user.stats.int}}' - td - a.btn.btn-primary(ng-show='user.stats.points', ng-click='allocate("int")', popover-trigger='mouseenter', popover-placement='right', popover=env.t('allocateIntPop')) + - tr - td - span.hint(popover-trigger='mouseenter', popover-placement='right', popover=env.t('conText')) - =env.t('allocateCon') + ' {{user.stats.con}}' - td - a.btn.btn-primary(ng-show='user.stats.points', ng-click='allocate("con")', popover-trigger='mouseenter', popover-placement='right', popover=env.t('allocateConPop')) + - tr - td - span.hint(popover-trigger='mouseenter', popover-placement='right', popover=env.t('perText')) - =env.t('allocatePer') + ' {{user.stats.per}}' - td - a.btn.btn-primary(ng-show='user.stats.points', ng-click='allocate("per")', popover-trigger='mouseenter', popover-placement='right', popover=env.t('allocatePerPop')) + + each statInfo, stat in { str: {title:"allocateStr",popover:'strengthText',allocatepop:'allocateStrPop'},int: {title:"allocateInt",popover:'intText',allocatepop:'allocateIntPop'},con: {title:"allocateCon",popover:'conText',allocatepop:'allocateConPop'},per: {title:"allocatePer",popover:'perText',allocatepop:'allocatePerPop'} } + tr + td + span.hint(popover-trigger='mouseenter', popover-placement='right', popover=env.t(statInfo.popover)) + =env.t(statInfo.title) + ' {{user.stats.' + stat + '}}' + td + a.btn.btn-primary(ng-show='user.stats.points', ng-click='allocate("#{stat}")', popover-trigger='mouseenter', popover-placement='right', popover=env.t(statInfo.allocatepop)) + div(ng-class='user.flags.classSelected && !user.preferences.disableClasses ? "col-md-4" : "col-md-6"')