Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes #5550, change message according to rebirthLevel

Browse Source
This commit is contained in:
Amin Arria
2015-10-19 12:10:27 -04:30
parent f9a3884c79
commit 038039dbee
4 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
website/views/shared/avatar/index.jade
+3 -1
View File
@@ -26,5 +26,7 @@ mixin herobox(opts)
span.glyphicon.glyphicon-circle-arrow-up(tooltip=env.t('buffed'), tooltip-append-to-body="true",
ng-show='#{buffs}.str || #{buffs}.per || #{buffs}.con || #{buffs}.int || #{buffs}.stealth')
span(tooltip=env.t('level'), tooltip-append-to-body="true") {{profile.stats.lvl}}
span.glyphicon.glyphicon-plus-sign(ng-show='profile.achievements.rebirths',
span.glyphicon.glyphicon-plus-sign(ng-if='::profile.achievements.rebirthLevel < 100', ng-show='profile.achievements.rebirths',
tooltip=env.t('reborn', {reLevel: "{{profile.achievements.rebirthLevel}}"}), tooltip-append-to-body="true")
span.glyphicon.glyphicon-plus-sign(ng-if='::profile.achievements.rebirthLevel >= 100', ng-show='profile.achievements.rebirths',
tooltip=env.t('reborn100'), tooltip-append-to-body="true")
website/views/shared/modals/achievements.jade
+4 -1
View File
@@ -91,6 +91,9 @@ script(id='modals/achievements/rebirth.html', type='text/ng-template')
h4=env.t('modalAchievement')
.modal-body
.achievement.achievement-sun
=env.t('rebirthAchievement', {number: "{{user.achievements.rebirths}}", level: "{{user.achievements.rebirthLevel}}"})
div(ng-if='user.achievements.rebirthLevel < 100')
=env.t('rebirthAchievement', {number: "{{user.achievements.rebirths}}", level: "{{user.achievements.rebirthLevel}}"})
div(ng-if='user.achievements.rebirthLevel >= 100')
=env.t('rebirthAchievement100', {number: "{{user.achievements.rebirths}}"})
.modal-footer
button.btn.btn-default(ng-click='$close()')=env.t('ok')
website/views/shared/profiles/achievements.jade
+4 -1
View File
@@ -120,9 +120,12 @@ div(ng-if='::profile.achievements.rebirths')
h5(ng-if='::profile.achievements.rebirths == 1')=env.t('rebirthBegan')
h5(ng-if='::profile.achievements.rebirths > 1')
=env.t('rebirthText', {rebirths: "{{::profile.achievements.rebirths}}"})
small
small(ng-if='::profile.achievements.rebirthLevel < 100')
=env.t('rebirthOrb')
|&nbsp;{{::profile.achievements.rebirthLevel}}.
small(ng-if='::profile.achievements.rebirthLevel >= 100')
=env.t('rebirthOrb100')
hr
div(ng-if='::profile.achievements.veteran')