From c3fce5fcbaf29efa0b64df3a326f357404060044 Mon Sep 17 00:00:00 2001 From: scribblypanda Date: Sun, 11 Jan 2015 01:18:37 -0500 Subject: [PATCH 01/14] changed Username to Login Name --- views/options/settings.jade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/options/settings.jade b/views/options/settings.jade index 3fb026d635..4678e16034 100644 --- a/views/options/settings.jade +++ b/views/options/settings.jade @@ -90,7 +90,7 @@ script(type='text/ng-template', id='partials/options.settings.settings.html') .panel-body p(ng-if='user.auth.facebook.id') Registered with Facebook div(ng-if='user.auth.local.username') - p Username: {{user.auth.local.username}} + p Login Name: {{user.auth.local.username}} p Email: {{user.auth.local.email}} hr h5=env.t('changeUsername') From 998fe684e41b330da89b0fdf939348143706f18b Mon Sep 17 00:00:00 2001 From: scribblypanda Date: Sun, 11 Jan 2015 03:20:22 -0500 Subject: [PATCH 02/14] added new translatable string emailChange --- views/options/settings.jade | 2 ++ 1 file changed, 2 insertions(+) diff --git a/views/options/settings.jade b/views/options/settings.jade index 4678e16034..c4b5e6c5a8 100644 --- a/views/options/settings.jade +++ b/views/options/settings.jade @@ -92,6 +92,8 @@ script(type='text/ng-template', id='partials/options.settings.settings.html') div(ng-if='user.auth.local.username') p Login Name: {{user.auth.local.username}} p Email: {{user.auth.local.email}} + small + =env.t('emailChange') hr h5=env.t('changeUsername') form(ng-submit='changeUsername(changeUser)', ng-show='user.auth.local') From 9907379a60ebf378e3bceb16594d7a4664b96c36 Mon Sep 17 00:00:00 2001 From: scribblypanda Date: Sun, 11 Jan 2015 10:22:24 -0500 Subject: [PATCH 03/14] plain text to translatable strings --- views/options/settings.jade | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/views/options/settings.jade b/views/options/settings.jade index c4b5e6c5a8..f2c23ac371 100644 --- a/views/options/settings.jade +++ b/views/options/settings.jade @@ -88,10 +88,10 @@ 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') 'registeredWithFb' div(ng-if='user.auth.local.username') - p Login Name: {{user.auth.local.username}} - p Email: {{user.auth.local.email}} + p 'username': {{user.auth.local.username}} + p 'email': {{user.auth.local.email}} small =env.t('emailChange') hr From d560bacd32f0f0cf28d1808e4c8970c4d6889253 Mon Sep 17 00:00:00 2001 From: scribblypanda Date: Sun, 11 Jan 2015 10:36:14 -0500 Subject: [PATCH 04/14] plain text to translatable strings --- views/options/settings.jade | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/views/options/settings.jade b/views/options/settings.jade index f2c23ac371..40b555a584 100644 --- a/views/options/settings.jade +++ b/views/options/settings.jade @@ -88,10 +88,13 @@ script(type='text/ng-template', id='partials/options.settings.settings.html') .panel-heading span Registration .panel-body - p(ng-if='user.auth.facebook.id') 'registeredWithFb' + 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}} + =env.t('username'): {{user.auth.local.username}} + |  + =env.t('email)': {{user.auth.local.email}} + |  small =env.t('emailChange') hr From 684c6a997d482162db0738a01bce99e65b73dec8 Mon Sep 17 00:00:00 2001 From: scribblypanda Date: Sun, 11 Jan 2015 13:18:00 -0500 Subject: [PATCH 05/14] fixed emailChange message, displays properly on localhost --- views/options/settings.jade | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/views/options/settings.jade b/views/options/settings.jade index 40b555a584..bf7d06b1c6 100644 --- a/views/options/settings.jade +++ b/views/options/settings.jade @@ -91,12 +91,19 @@ script(type='text/ng-template', id='partials/options.settings.settings.html') p(ng-if='user.auth.facebook.id') =env.t('registeredWithFb') div(ng-if='user.auth.local.username') - =env.t('username'): {{user.auth.local.username}} - |  - =env.t('email)': {{user.auth.local.email}} - |  + p + =env.t('username') + |: {{user.auth.local.username}} + p + =env.t('email') + |: {{user.auth.local.email}} + p small - =env.t('emailChange') + =env.t('emailChange1') + |  + a(href='emailto: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') From 393ef6b1f44b4936f219135bf285feae08f680a4 Mon Sep 17 00:00:00 2001 From: scribblypanda Date: Sun, 11 Jan 2015 20:17:05 -0500 Subject: [PATCH 06/14] added description of display name and link to page to edit login name --- views/options/profile.jade | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/views/options/profile.jade b/views/options/profile.jade index 59c48b0d6e..b348d25ede 100644 --- a/views/options/profile.jade +++ b/views/options/profile.jade @@ -213,6 +213,15 @@ 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 + =env.t('displayNameDescription1') + |  + a(href='https://habitrpg.com/#/options/settings/settings')=env.t('displayNameDescription2') + |  + =env.t('displayNameDescription3') + br + //span(ng-show='profile.profile.name') {{profile.profile.name}} span.muted(ng-hide='profile.profile.name') -  =env.t('none') |  - From 8e3e66dc08d435e0488bf85e8b862ad82ee5b185 Mon Sep 17 00:00:00 2001 From: scribblypanda Date: Sun, 11 Jan 2015 20:30:25 -0500 Subject: [PATCH 07/14] added description of login name and link to page to edit display name --- views/options/settings.jade | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/views/options/settings.jade b/views/options/settings.jade index bf7d06b1c6..809fbf3372 100644 --- a/views/options/settings.jade +++ b/views/options/settings.jade @@ -93,7 +93,15 @@ script(type='text/ng-template', id='partials/options.settings.settings.html') div(ng-if='user.auth.local.username') p =env.t('username') - |: {{user.auth.local.username}} + |: {{user.auth.local.username}} + p + small + =env.t('loginNameDescription1') + |  + a(href='https://habitrpg.com/#/options/profile/profile')=env.t('loginNameDescription2') + |  + =env.t('loginNameDescription3') + br p =env.t('email') |: {{user.auth.local.email}} From 9fe93351ae1bc7d4b32c036935d1412e8ca1b53b Mon Sep 17 00:00:00 2001 From: scribblypanda Date: Wed, 14 Jan 2015 22:38:02 -0500 Subject: [PATCH 08/14] applied .muted to text so less cluttered looking --- views/options/profile.jade | 14 ++++++-------- views/options/settings.jade | 25 ++++++++++++------------- 2 files changed, 18 insertions(+), 21 deletions(-) diff --git a/views/options/profile.jade b/views/options/profile.jade index b348d25ede..8f91880cbe 100644 --- a/views/options/profile.jade +++ b/views/options/profile.jade @@ -214,14 +214,12 @@ script(id='partials/options.profile.profile.html', type='text/ng-template') h4=env.t('displayName') span(ng-show='profile.profile.name') {{profile.profile.name}} p - small - =env.t('displayNameDescription1') - |  - a(href='https://habitrpg.com/#/options/settings/settings')=env.t('displayNameDescription2') - |  - =env.t('displayNameDescription3') - br - //span(ng-show='profile.profile.name') {{profile.profile.name}} + small.muted + =env.t('displayNameDescription1') + |  + a(href='https://habitrpg.com/#/options/settings/settings')=env.t('displayNameDescription2') + |  + =env.t('displayNameDescription3') span.muted(ng-hide='profile.profile.name') -  =env.t('none') |  - diff --git a/views/options/settings.jade b/views/options/settings.jade index 809fbf3372..4457c68ab7 100644 --- a/views/options/settings.jade +++ b/views/options/settings.jade @@ -95,23 +95,22 @@ script(type='text/ng-template', id='partials/options.settings.settings.html') =env.t('username') |: {{user.auth.local.username}} p - small - =env.t('loginNameDescription1') - |  - a(href='https://habitrpg.com/#/options/profile/profile')=env.t('loginNameDescription2') - |  - =env.t('loginNameDescription3') - br + small.muted + =env.t('loginNameDescription1') + |  + a(href='https://habitrpg.com/#/options/profile/profile')=env.t('loginNameDescription2') + |  + =env.t('loginNameDescription3') p =env.t('email') |: {{user.auth.local.email}} p - small - =env.t('emailChange1') - |  - a(href='emailto:admin@habitrpg.com' target='_blank')=env.t('emailChange2') - |  - =env.t('emailChange3') + small.muted + =env.t('emailChange1') + |  + a(href='emailto: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') From f9b507e782c4f9867fb91785496b82fd13663d81 Mon Sep 17 00:00:00 2001 From: scribblypanda Date: Thu, 15 Jan 2015 08:23:23 -0500 Subject: [PATCH 09/14] changed links to relative, corrected mailto link --- views/options/profile.jade | 2 +- views/options/settings.jade | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/views/options/profile.jade b/views/options/profile.jade index 8f91880cbe..5f6ed31b04 100644 --- a/views/options/profile.jade +++ b/views/options/profile.jade @@ -217,7 +217,7 @@ script(id='partials/options.profile.profile.html', type='text/ng-template') small.muted =env.t('displayNameDescription1') |  - a(href='https://habitrpg.com/#/options/settings/settings')=env.t('displayNameDescription2') + a(href='/#/options/settings/settings')=env.t('displayNameDescription2') |  =env.t('displayNameDescription3') span.muted(ng-hide='profile.profile.name') -  diff --git a/views/options/settings.jade b/views/options/settings.jade index 4457c68ab7..2a5fee087c 100644 --- a/views/options/settings.jade +++ b/views/options/settings.jade @@ -98,7 +98,7 @@ script(type='text/ng-template', id='partials/options.settings.settings.html') small.muted =env.t('loginNameDescription1') |  - a(href='https://habitrpg.com/#/options/profile/profile')=env.t('loginNameDescription2') + a(href='/#/options/profile/profile')=env.t('loginNameDescription2') |  =env.t('loginNameDescription3') p @@ -108,7 +108,7 @@ script(type='text/ng-template', id='partials/options.settings.settings.html') small.muted =env.t('emailChange1') |  - a(href='emailto:admin@habitrpg.com' target='_blank')=env.t('emailChange2') + a(href='mailto:admin@habitrpg.com' target='_blank')=env.t('emailChange2') |  =env.t('emailChange3') hr From 801a5a957a6f3b9a9a41d8b8889538e2e3a87113 Mon Sep 17 00:00:00 2001 From: Blade Barringer Date: Sun, 18 Jan 2015 15:33:58 -0600 Subject: [PATCH 10/14] Removed target="_blank" attribute from mailto link --- views/options/settings.jade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/options/settings.jade b/views/options/settings.jade index 2a5fee087c..fd9ae4cc0c 100644 --- a/views/options/settings.jade +++ b/views/options/settings.jade @@ -108,7 +108,7 @@ script(type='text/ng-template', id='partials/options.settings.settings.html') small.muted =env.t('emailChange1') |  - a(href='mailto:admin@habitrpg.com' target='_blank')=env.t('emailChange2') + a(href='mailto:admin@habitrpg.com')=env.t('emailChange2') |  =env.t('emailChange3') hr From ad612a9c3691ebdca4b011a4bc43a59c70efee0d Mon Sep 17 00:00:00 2001 From: Blade Barringer Date: Sun, 18 Jan 2015 15:38:16 -0600 Subject: [PATCH 11/14] Adjusted some spacing and line breaks --- views/options/settings.jade | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/views/options/settings.jade b/views/options/settings.jade index fd9ae4cc0c..7f07c2d01e 100644 --- a/views/options/settings.jade +++ b/views/options/settings.jade @@ -88,12 +88,10 @@ script(type='text/ng-template', id='partials/options.settings.settings.html') .panel-heading span Registration .panel-body - p(ng-if='user.auth.facebook.id') - =env.t('registeredWithFb') + p(ng-if='user.auth.facebook.id')=env.t('registeredWithFb') div(ng-if='user.auth.local.username') - p - =env.t('username') - |: {{user.auth.local.username}} + p=env.t('username') + |: {{user.auth.local.username}} p small.muted =env.t('loginNameDescription1') @@ -101,9 +99,8 @@ script(type='text/ng-template', id='partials/options.settings.settings.html') a(href='/#/options/profile/profile')=env.t('loginNameDescription2') |  =env.t('loginNameDescription3') - p - =env.t('email') - |: {{user.auth.local.email}} + p=env.t('email') + |: {{user.auth.local.email}} p small.muted =env.t('emailChange1') From c4c2c6a1dc59b0301d42b14b20a110a739fefc78 Mon Sep 17 00:00:00 2001 From: Blade Barringer Date: Sun, 18 Jan 2015 15:39:45 -0600 Subject: [PATCH 12/14] Adjusted spacing and line breaks --- views/options/profile.jade | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/views/options/profile.jade b/views/options/profile.jade index 5f6ed31b04..19a2ba48d1 100644 --- a/views/options/profile.jade +++ b/views/options/profile.jade @@ -214,12 +214,11 @@ script(id='partials/options.profile.profile.html', type='text/ng-template') 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') + 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') |  - From 62c9aafb7d2fff40f261a5f0dff77833487749e2 Mon Sep 17 00:00:00 2001 From: Blade Barringer Date: Sun, 18 Jan 2015 15:50:43 -0600 Subject: [PATCH 13/14] Added sync after changing username so username would update --- public/js/controllers/settingsCtrl.js | 1 + 1 file changed, 1 insertion(+) diff --git a/public/js/controllers/settingsCtrl.js b/public/js/controllers/settingsCtrl.js index 7220791520..599e29664c 100644 --- a/public/js/controllers/settingsCtrl.js +++ b/public/js/controllers/settingsCtrl.js @@ -85,6 +85,7 @@ habitrpg.controller('SettingsCtrl', .success(function(){ alert(window.env.t('usernameSuccess')); $scope.changeUser = {}; + User.sync(); }) .error(function(data){ alert(data.err); From 5026e67ead219f9d5a1f228351cf6efc0298f08f Mon Sep 17 00:00:00 2001 From: Blade Barringer Date: Sun, 18 Jan 2015 15:51:00 -0600 Subject: [PATCH 14/14] Added one way binding for email --- views/options/settings.jade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/options/settings.jade b/views/options/settings.jade index 7f07c2d01e..b2437f81cf 100644 --- a/views/options/settings.jade +++ b/views/options/settings.jade @@ -100,7 +100,7 @@ script(type='text/ng-template', id='partials/options.settings.settings.html') |  =env.t('loginNameDescription3') p=env.t('email') - |: {{user.auth.local.email}} + |: {{::user.auth.local.email}} p small.muted =env.t('emailChange1')