sudoxreboot/habitica-self-host
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-self-host.git synced 2026-07-14 02:02:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop

Browse source
This commit is contained in:
Matteo Pagliazzi 2013-11-22 19:21:57 +01:00
commit 967801eb1f
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
views/options/social/challenges.jade
View file

@ -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')

13
views/shared/profiles/stats.jade
View file

@ -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)}} %
| :
span(popover-trigger='mouseenter', popover='Defense + Protection') {{totalDef(profile.stats.lvl, profile.items.armor, profile.items.head, profile.items.shield)}} %