sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-05 12:02:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'issue4468' of https://github.com/scribblypanda/habitrpg into scribblypanda-issue4468

Browse source
This commit is contained in:
Blade Barringer 2015-01-18 15:23:52 -06:00
commit a2d6ed83a1
2 changed files with 29 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
views/options/profile.jade
View file

@ -213,6 +213,13 @@ script(id='partials/options.profile.profile.html', type='text/ng-template')
button.btn.btn-default(ng-click='_editing.profile = true', ng-show='!_editing.profile')= env.t('edit')
h4=env.t('displayName')
span(ng-show='profile.profile.name') {{profile.profile.name}}
p
small.muted
=env.t('displayNameDescription1')
| 
a(href='/#/options/settings/settings')=env.t('displayNameDescription2')
| 
=env.t('displayNameDescription3')
span.muted(ng-hide='profile.profile.name') - 
=env.t('none')
|  -

25
views/options/settings.jade
View file

@ -88,10 +88,29 @@ script(type='text/ng-template', id='partials/options.settings.settings.html')
.panel-heading
span Registration
.panel-body
p(ng-if='user.auth.facebook.id') Registered with Facebook
p(ng-if='user.auth.facebook.id')
=env.t('registeredWithFb')
div(ng-if='user.auth.local.username')
p Username: {{user.auth.local.username}}
p Email: {{user.auth.local.email}}
p
=env.t('username')
|: {{user.auth.local.username}}
p
small.muted
=env.t('loginNameDescription1')
| 
a(href='/#/options/profile/profile')=env.t('loginNameDescription2')
| 
=env.t('loginNameDescription3')
p
=env.t('email')
|: {{user.auth.local.email}}
p
small.muted
=env.t('emailChange1')
| 
a(href='mailto:admin@habitrpg.com' target='_blank')=env.t('emailChange2')
| 
=env.t('emailChange3')
hr
h5=env.t('changeUsername')
form(ng-submit='changeUsername(changeUser)', ng-show='user.auth.local')