From 9e5e035c6e5a0ab1a98066133dadaf8b5849dc36 Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Fri, 22 Nov 2013 23:22:28 -0600 Subject: [PATCH 1/3] Fix matters of colons: missing space after colon in stats, colon getting placed after tags in task tag list. --- views/shared/profiles/stats.jade | 8 ++++---- views/shared/tasks/task.jade | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/views/shared/profiles/stats.jade b/views/shared/profiles/stats.jade index fc24520ea8..13b82771f9 100644 --- a/views/shared/profiles/stats.jade +++ b/views/shared/profiles/stats.jade @@ -26,11 +26,11 @@ p | : {{profile.stats.exp | number:0}} / {{tnl(profile.stats.lvl)}} p strong Strength - | : + | :  span(popover-trigger='mouseenter', popover='(Level-1)/2') {{userStr(profile.stats.lvl)}} p strong Defense - | : + | :  span(popover-trigger='mouseenter', popover='(Level-1)/2') {{userDef(profile.stats.lvl)}} p strong Pets Found @@ -38,10 +38,10 @@ p hr p strong Total Experience Boost - | : + | :  span(popover-trigger='mouseenter', popover='Attack + Strength') {{totalStr(profile.stats.lvl, profile.items.weapon)}} % p strong Total Damage Reduction - | : + | :  span(popover-trigger='mouseenter', popover='Defense + Protection') {{totalDef(profile.stats.lvl, profile.items.armor, profile.items.head, profile.items.shield)}} % \ No newline at end of file diff --git a/views/shared/tasks/task.jade b/views/shared/tasks/task.jade index cdb23ab44a..51be520a49 100644 --- a/views/shared/tasks/task.jade +++ b/views/shared/tasks/task.jade @@ -140,9 +140,9 @@ li(bindonce='list', ng-repeat='task in obj[list.type+"s"]', class='task {{taskCl fieldset.option-group(ng-if='!$state.includes("options.social.challenges")') legend.option-title Tags - label.checkbox(ng-repeat='tag in user.tags') - input(type='checkbox', ng-model='task.tags[tag.id]') - | {{tag.name}} + label.checkbox(ng-repeat='tag in user.tags') + input(type='checkbox', ng-model='task.tags[tag.id]') + | {{tag.name}} // Advanced Options span(bo-if='task.type!="reward"') From 983df5c97cceab2ec5190522a0a1fd43572c676a Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Fri, 22 Nov 2013 23:22:28 -0600 Subject: [PATCH 2/3] Fix matters of colons: missing space after colon in stats, colon getting placed after tags in task tag list. --- views/shared/profiles/stats.jade | 8 ++++---- views/shared/tasks/task.jade | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/views/shared/profiles/stats.jade b/views/shared/profiles/stats.jade index fc24520ea8..13b82771f9 100644 --- a/views/shared/profiles/stats.jade +++ b/views/shared/profiles/stats.jade @@ -26,11 +26,11 @@ p | : {{profile.stats.exp | number:0}} / {{tnl(profile.stats.lvl)}} p strong Strength - | : + | :  span(popover-trigger='mouseenter', popover='(Level-1)/2') {{userStr(profile.stats.lvl)}} p strong Defense - | : + | :  span(popover-trigger='mouseenter', popover='(Level-1)/2') {{userDef(profile.stats.lvl)}} p strong Pets Found @@ -38,10 +38,10 @@ p hr p strong Total Experience Boost - | : + | :  span(popover-trigger='mouseenter', popover='Attack + Strength') {{totalStr(profile.stats.lvl, profile.items.weapon)}} % p strong Total Damage Reduction - | : + | :  span(popover-trigger='mouseenter', popover='Defense + Protection') {{totalDef(profile.stats.lvl, profile.items.armor, profile.items.head, profile.items.shield)}} % \ No newline at end of file diff --git a/views/shared/tasks/task.jade b/views/shared/tasks/task.jade index 90263608de..f78f867d34 100644 --- a/views/shared/tasks/task.jade +++ b/views/shared/tasks/task.jade @@ -140,9 +140,9 @@ li(bindonce='list', ng-repeat='task in obj[list.type+"s"]', class='task {{taskCl fieldset.option-group(ng-if='!$state.includes("options.social.challenges")') legend.option-title Tags - label.checkbox(ng-repeat='tag in user.tags') - input(type='checkbox', ng-model='task.tags[tag.id]') - | {{tag.name}} + label.checkbox(ng-repeat='tag in user.tags') + input(type='checkbox', ng-model='task.tags[tag.id]') + | {{tag.name}} // Advanced Options span(bo-if='task.type!="reward"') From 0d6f3dd5e62772591f70dd73c13d3ada4265f3bd Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Sat, 23 Nov 2013 09:46:28 -0600 Subject: [PATCH 3/3] Make number format consistent between current exp and exp TNL (fix #1827) --- views/shared/header/header.jade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/shared/header/header.jade b/views/shared/header/header.jade index 626d295786..5f7819e656 100644 --- a/views/shared/header/header.jade +++ b/views/shared/header/header.jade @@ -20,7 +20,7 @@ .bar(style='width: {{percent(user.stats.exp,tnl(user.stats.lvl))}}%;') span.meter-text i.icon-star - | {{user.stats.exp | number:0}} / {{tnl(user.stats.lvl)}} + | {{user.stats.exp | number:0}} / {{tnl(user.stats.lvl) | number:0}} // FIXME doesn't look great here, but the "Experience" CSS title rollover covers it where it was before span(ng-show='user.history.exp') a(ng-click='toggleChart("exp")', tooltip='Progress')