From 6b2a60330f9b9321ee53554c6dd7595596bc42f3 Mon Sep 17 00:00:00 2001 From: Bob Steffes Date: Wed, 20 Nov 2013 13:08:05 -0800 Subject: [PATCH 1/2] Add link to wikia Tags article when creating a new challenge The ? icon now links to the wiki Tags article --- views/options/social/challenges.jade | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/views/options/social/challenges.jade b/views/options/social/challenges.jade index 075b82cac2..2c8a64059a 100644 --- a/views/options/social/challenges.jade +++ b/views/options/social/challenges.jade @@ -92,7 +92,8 @@ script(type='text/ng-template', id='partials/options.social.challenges.html') .option-medium input.option-content(type='text', minlength="3", maxlength="16", ng-model='newChallenge.shortName', placeholder='Tag Name', required) - i.icon-question-sign(popover="Challenges appear on tag-lists & task-tooltips. So while you'll want a descriptive title above, you'll also need a 'short name'. Eg, 'Lose 10 pounds in 3 months' might become '-10lb'", popover-trigger='mouseenter', popover-placement='right') + a(target='_blank', href='http://habitrpg.wikia.com/wiki/Tags') + i.icon-question-sign(popover="Challenges appear on tag-lists & task-tooltips. So while you'll want a descriptive title above, you'll also need a 'short name'. Eg, 'Lose 10 pounds in 3 months' might become '-10lb' (Click the '?' for more info).", popover-trigger='mouseenter', popover-placement='right') textarea.option-content(cols='3', placeholder='Description', ng-model='newChallenge.description') From e458b571dc8ec01ae791f9ee7e2bad5d70da0fdb Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Thu, 21 Nov 2013 20:37:55 -0600 Subject: [PATCH 2/2] Move stat formulae to mouseover popup instead of inline --- views/shared/profiles/stats.jade | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/views/shared/profiles/stats.jade b/views/shared/profiles/stats.jade index 364adbc2e5..fc24520ea8 100644 --- a/views/shared/profiles/stats.jade +++ b/views/shared/profiles/stats.jade @@ -26,17 +26,22 @@ p | : {{profile.stats.exp | number:0}} / {{tnl(profile.stats.lvl)}} p strong Strength - | (Level-1)/2: {{userStr(profile.stats.lvl)}} + | : + span(popover-trigger='mouseenter', popover='(Level-1)/2') {{userStr(profile.stats.lvl)}} p strong Defense - | (Level-1)/2: {{userDef(profile.stats.lvl)}} + | : + span(popover-trigger='mouseenter', popover='(Level-1)/2') {{userDef(profile.stats.lvl)}} p strong Pets Found | : {{countExists(profile.items.pets)}} hr p strong Total Experience Boost - | (Attack + Strength): {{totalStr(profile.stats.lvl, profile.items.weapon)}} % + | : + span(popover-trigger='mouseenter', popover='Attack + Strength') {{totalStr(profile.stats.lvl, profile.items.weapon)}} % + p strong Total Damage Reduction - | (Defense + Protection): {{totalDef(profile.stats.lvl, profile.items.armor, profile.items.head, profile.items.shield)}} % \ No newline at end of file + | : + 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