sudoxreboot/habitica-self-host
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-self-host.git synced 2026-08-04 04:59:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix version conflict

Browse source
This commit is contained in:
Marcelo Sizer 2014-01-24 07:28:30 -02:00
parent fe99bca10f
commit ed71522131
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
views/options/profile.jade
View file

@ -119,16 +119,16 @@ script(id='partials/options.profile.stats.html', type='text/ng-template')
h3=env.t('characterbuild') h3=env.t('characterbuild')
h4 h4
=env.t('class') + ': ' =env.t('class') + ': '
span {{ {warrior:'Warrior',wizard:'Mage',healer:'Healer',rogue:'Rogue'}[user.stats.class] }} span {{ {warrior:'Warrior',wizard:'Mage',healer:'Healer',rogue:'Rogue'}[user.stats.class] }} 
a.btn.btn-danger.btn-mini(ng-click='changeClass(null)')=env.t('changeclass') a.btn.btn-danger.btn-mini(ng-click='changeClass(null)')=env.t('changeclass')
small 3 <span class="Pet_Currency_Gem1x inline-gems"/> small 3 <span class="Pet_Currency_Gem1x inline-gems"/>
table.table.table-striped table.table.table-striped
tr tr
td td
strong strong
{{user.stats.points}} {{user.stats.points}}&nbsp;
=env.t('unallocated') =env.t('unallocated')
| &nbsp;
i.icon-question-sign(popover-trigger='mouseenter', popover-placement='right', popover=env.t('levelpopover')) i.icon-question-sign(popover-trigger='mouseenter', popover-placement='right', popover=env.t('levelpopover'))
td td
tr tr
@ -137,19 +137,23 @@ script(id='partials/options.profile.stats.html', type='text/ng-template')
label.checkbox label.checkbox
input(type='checkbox', ng-model='user.preferences.automaticAllocation', ng-change='set({"preferences.automaticAllocation": user.preferences.automaticAllocation?true: false})', ng-click='set({"preferences.allocationMode":"taskbased"})') input(type='checkbox', ng-model='user.preferences.automaticAllocation', ng-change='set({"preferences.automaticAllocation": user.preferences.automaticAllocation?true: false})', ng-click='set({"preferences.allocationMode":"taskbased"})')
=env.t('automaticallocation') =env.t('automaticallocation')
&nbsp;
i.icon-question-sign(popover-trigger='mouseenter', popover-placement='right', popover=env.t('automaticallocationpopover')) i.icon-question-sign(popover-trigger='mouseenter', popover-placement='right', popover=env.t('automaticallocationpopover'))
form(ng-show='user.preferences.automaticAllocation',style='margin-left:1em') form(ng-show='user.preferences.automaticAllocation',style='margin-left:1em')
label.radio label.radio
input(type='radio', name='allocationMode', value='flat', ng-model='user.preferences.allocationMode', ng-change='set({"preferences.allocationMode": "flat"})') input(type='radio', name='allocationMode', value='flat', ng-model='user.preferences.allocationMode', ng-change='set({"preferences.allocationMode": "flat"})')
=env.t('evenallocation') =env.t('evenallocation')
&nbsp;
i.icon-question-sign(popover-trigger='mouseenter', popover-placement='right', popover=env.t('evenallocationpopover')) i.icon-question-sign(popover-trigger='mouseenter', popover-placement='right', popover=env.t('evenallocationpopover'))
label.radio label.radio
input(type='radio', name='allocationMode', value='classbased', ng-model='user.preferences.allocationMode', ng-change='set({"preferences.allocationMode": "classbased"})') input(type='radio', name='allocationMode', value='classbased', ng-model='user.preferences.allocationMode', ng-change='set({"preferences.allocationMode": "classbased"})')
=env.t('classallocation') =env.t('classallocation')
&nbsp;
i.icon-question-sign(popover-trigger='mouseenter', popover-placement='right', popover=env.t('classallocationpopover')) i.icon-question-sign(popover-trigger='mouseenter', popover-placement='right', popover=env.t('classallocationpopover'))
label.radio label.radio
input(type='radio', name='allocationMode', value='taskbased', ng-model='user.preferences.allocationMode', ng-change='set({"preferences.allocationMode": "taskbased"})') input(type='radio', name='allocationMode', value='taskbased', ng-model='user.preferences.allocationMode', ng-change='set({"preferences.allocationMode": "taskbased"})')
=env.t('taskallocation') =env.t('taskallocation')
&nbsp;
i.icon-question-sign(popover-trigger='mouseenter', popover-placement='right', popover=env.t('taskallocationpopover')) i.icon-question-sign(popover-trigger='mouseenter', popover-placement='right', popover=env.t('taskallocationpopover'))
tr tr
td= env.t('allocatestr') + ' {{user.stats.str}}' td= env.t('allocatestr') + ' {{user.stats.str}}'