diff --git a/src/portal/src/app/account/sign-in/sign-in.component.html b/src/portal/src/app/account/sign-in/sign-in.component.html index 8dd0ed564..bd18dfda7 100644 --- a/src/portal/src/app/account/sign-in/sign-in.component.html +++ b/src/portal/src/app/account/sign-in/sign-in.component.html @@ -17,11 +17,20 @@ placeholder='{{"PLACEHOLDER.SIGN_IN_NAME" | translate}}' #userNameInput='ngModel'> {{ 'TOOLTIP.SIGN_IN_USERNAME' | translate }} - - - {{ 'TOOLTIP.SIGN_IN_PWD' | translate }} - +
+
+
+ + + + +
+ + {{ 'TOOLTIP.SIGN_IN_PWD' | translate }} + +
+
diff --git a/src/portal/src/app/account/sign-in/sign-in.component.scss b/src/portal/src/app/account/sign-in/sign-in.component.scss index dd8fa76eb..dec695bf4 100644 --- a/src/portal/src/app/account/sign-in/sign-in.component.scss +++ b/src/portal/src/app/account/sign-in/sign-in.component.scss @@ -73,4 +73,12 @@ display: flex; align-items: center; justify-content: space-between; +} +.pw-eye { + margin-left: -20px; + margin-right: 8px; + cursor: pointer; +} +.pwd-input { + padding-right: 26px; } \ No newline at end of file diff --git a/src/portal/src/app/account/sign-in/sign-in.component.ts b/src/portal/src/app/account/sign-in/sign-in.component.ts index 151eaabc0..592037c8f 100644 --- a/src/portal/src/app/account/sign-in/sign-in.component.ts +++ b/src/portal/src/app/account/sign-in/sign-in.component.ts @@ -43,6 +43,7 @@ const expireDays = 10; }) export class SignInComponent implements AfterViewChecked, OnInit { + showPwd: boolean = false; redirectUrl: string = ""; appConfig: AppConfig = new AppConfig(); // Remeber me indicator diff --git a/src/portal/src/app/base/account-settings/account-settings-modal.component.html b/src/portal/src/app/base/account-settings/account-settings-modal.component.html index 02f583eef..dbfc9aaf9 100644 --- a/src/portal/src/app/base/account-settings/account-settings-modal.component.html +++ b/src/portal/src/app/base/account-settings/account-settings-modal.component.html @@ -42,7 +42,7 @@ diff --git a/src/portal/src/app/base/left-side-nav/user/change-password/change-password.component.html b/src/portal/src/app/base/left-side-nav/user/change-password/change-password.component.html index 5c8d68c2f..a7d12c128 100644 --- a/src/portal/src/app/base/left-side-nav/user/change-password/change-password.component.html +++ b/src/portal/src/app/base/left-side-nav/user/change-password/change-password.component.html @@ -2,25 +2,39 @@

{{'RESET_PWD.TITLE' | translate}}

-
- - - - - {{'TOOLTIP.PASSWORD' | translate}} - - - - - - - {{'TOOLTIP.CONFIRM_PWD' | translate}} - - + +
+ +
+
+ + + + +
+ + {{ 'TOOLTIP.SIGN_IN_PWD' | translate }} + +
+
+
+ +
+
+ + + + +
+ + {{'TOOLTIP.CONFIRM_PWD' | translate}} + +
+
diff --git a/src/portal/src/app/base/left-side-nav/user/change-password/change-password.component.scss b/src/portal/src/app/base/left-side-nav/user/change-password/change-password.component.scss index 8e56ad0e7..5ce5ff8fd 100644 --- a/src/portal/src/app/base/left-side-nav/user/change-password/change-password.component.scss +++ b/src/portal/src/app/base/left-side-nav/user/change-password/change-password.component.scss @@ -1,3 +1,11 @@ .form .form-block, form .form-block { margin: .5rem 0 2rem 0; +} +.pw-eye { + margin-left: -20px; + margin-right: 8px; + cursor: pointer; +} +.pwd-input { + padding-right: 26px; } \ No newline at end of file diff --git a/src/portal/src/app/base/left-side-nav/user/change-password/change-password.component.ts b/src/portal/src/app/base/left-side-nav/user/change-password/change-password.component.ts index 4c54c5bd1..de06cae21 100644 --- a/src/portal/src/app/base/left-side-nav/user/change-password/change-password.component.ts +++ b/src/portal/src/app/base/left-side-nav/user/change-password/change-password.component.ts @@ -24,6 +24,8 @@ import { InlineAlertComponent } from "../../../../shared/components/inline-alert styleUrls: ['./change-password.component.scss', '../../../../common.scss'] }) export class ChangePasswordComponent { + showNewPwd: boolean = false; + showConfirmPwd: boolean = false; opened: boolean = false; onGoing: boolean = false; password: string = ""; @@ -62,6 +64,8 @@ export class ChangePasswordComponent { } public open(userId: number): void { + this.showConfirmPwd = false; + this.showNewPwd = false; this.onGoing = false; this.validationState = { "newPassword": true, diff --git a/src/portal/src/app/base/password-setting/password-setting.component.html b/src/portal/src/app/base/password-setting/password-setting.component.html index 044b70f61..aa830c619 100644 --- a/src/portal/src/app/base/password-setting/password-setting.component.html +++ b/src/portal/src/app/base/password-setting/password-setting.component.html @@ -2,33 +2,53 @@

{{'CHANGE_PWD.TITLE' | translate}}

-
- - - - - {{'TOOLTIP.CURRENT_PWD' | translate}} - - - - - - {{'CHANGE_PWD.PASS_TIPS' | translate}} - - {{'TOOLTIP.PASSWORD' | translate}} - - - - - - - {{'TOOLTIP.CONFIRM_PWD' | translate}} - - + +
+ +
+
+ + + + +
+ + {{'TOOLTIP.CURRENT_PWD' | translate}} + +
+
+
+ +
+
+ + + + +
+ + {{'TOOLTIP.PASSWORD' | translate}} + +
+
+
+ +
+
+ + + + +
+ + {{'TOOLTIP.CONFIRM_PWD' | translate}} + +
+
diff --git a/src/portal/src/app/base/password-setting/password-setting.component.scss b/src/portal/src/app/base/password-setting/password-setting.component.scss index fb56152c2..e8672e5ba 100644 --- a/src/portal/src/app/base/password-setting/password-setting.component.scss +++ b/src/portal/src/app/base/password-setting/password-setting.component.scss @@ -8,4 +8,15 @@ .password-body { min-height: 130px; -} \ No newline at end of file +} +.pw-eye { + margin-left: -24px; + margin-right: 8px; + cursor: pointer; +} +.pwd-input { + padding-right: 26px; +} +.clr-control-label { + width: 8.6rem !important; +} diff --git a/src/portal/src/app/base/password-setting/password-setting.component.spec.ts b/src/portal/src/app/base/password-setting/password-setting.component.spec.ts index 7f59c8771..f60d18b8c 100644 --- a/src/portal/src/app/base/password-setting/password-setting.component.spec.ts +++ b/src/portal/src/app/base/password-setting/password-setting.component.spec.ts @@ -68,7 +68,7 @@ describe('PasswordSettingComponent', () => { await fixture.whenStable(); const newPasswordInputError: any = fixture.nativeElement.querySelector("#newPassword-error"); expect(newPasswordInputError.innerText) - .toEqual(' TOOLTIP.PASSWORD '); + .toEqual('TOOLTIP.PASSWORD'); }); it('should verify new Password valid', async () => { await fixture.whenStable(); @@ -94,7 +94,7 @@ describe('PasswordSettingComponent', () => { await fixture.whenStable(); const reNewPasswordInputError: any = fixture.nativeElement.querySelector("#reNewPassword-error"); expect(reNewPasswordInputError.innerText) - .toEqual(' TOOLTIP.CONFIRM_PWD '); + .toEqual('TOOLTIP.CONFIRM_PWD'); }); it('should verify comfirm Password valid', async () => { await fixture.whenStable(); diff --git a/src/portal/src/app/base/password-setting/password-setting.component.ts b/src/portal/src/app/base/password-setting/password-setting.component.ts index 15b8c83da..0ae6c430a 100644 --- a/src/portal/src/app/base/password-setting/password-setting.component.ts +++ b/src/portal/src/app/base/password-setting/password-setting.component.ts @@ -25,6 +25,9 @@ import { InlineAlertComponent } from "../../shared/components/inline-alert/inlin styleUrls: ['./password-setting.component.scss', '../../common.scss'] }) export class PasswordSettingComponent implements AfterViewChecked { + showOldPwd: boolean = false; + showNewPwd: boolean = false; + showReNewPwd: boolean =false; opened: boolean = false; oldPwd: string = ""; newPwd: string = ""; diff --git a/src/portal/src/app/shared/components/new-user-form/new-user-form.component.html b/src/portal/src/app/shared/components/new-user-form/new-user-form.component.html index 6b2f214cb..64a302556 100644 --- a/src/portal/src/app/shared/components/new-user-form/new-user-form.component.html +++ b/src/portal/src/app/shared/components/new-user-form/new-user-form.component.html @@ -38,25 +38,39 @@ {{'TOOLTIP.FULL_NAME' | translate}} - - - - {{'CHANGE_PWD.PASS_TIPS' | translate}} - - {{'TOOLTIP.PASSWORD' | translate}} - - - - - - - {{'TOOLTIP.CONFIRM_PWD' | translate}} - - +
+ +
+
+ + + + +
+ {{'CHANGE_PWD.PASS_TIPS' | translate}} + + {{'TOOLTIP.PASSWORD' | translate}} + +
+
+
+ +
+
+ + + + +
+ + {{'TOOLTIP.CONFIRM_PWD' | translate}} + +
+
{{"SYSTEM_ROBOT.NEW_TOKEN" | translate}}
- + + +
{{'SYSTEM_ROBOT.SECRET' | translate}} @@ -37,14 +40,17 @@
- + + +
{{'SYSTEM_ROBOT.SECRET' | translate}} diff --git a/src/portal/src/app/shared/components/view-token/view-token.component.scss b/src/portal/src/app/shared/components/view-token/view-token.component.scss index 61dd6b896..8f43cae6a 100644 --- a/src/portal/src/app/shared/components/view-token/view-token.component.scss +++ b/src/portal/src/app/shared/components/view-token/view-token.component.scss @@ -50,3 +50,11 @@ .clr-form { padding-left: 0; } +.pw-eye { + margin-left: -20px; + margin-right: 8px; + cursor: pointer; +} +.pwd-input { + padding-right: 26px; +} diff --git a/src/portal/src/app/shared/components/view-token/view-token.component.ts b/src/portal/src/app/shared/components/view-token/view-token.component.ts index ce5016d3c..ea16c88a0 100644 --- a/src/portal/src/app/shared/components/view-token/view-token.component.ts +++ b/src/portal/src/app/shared/components/view-token/view-token.component.ts @@ -18,6 +18,8 @@ import { errorHandler } from "../../units/shared.utils"; styleUrls: ['./view-token.component.scss'] }) export class ViewTokenComponent implements OnInit { + showNewPwd: boolean = false; + showConfirmPwd: boolean = false; tokenModalOpened: boolean = false; robot: Robot; newSecret: string; @@ -46,6 +48,8 @@ export class ViewTokenComponent implements OnInit { this.tokenModalOpened = false; } open() { + this.showNewPwd = false; + this.showConfirmPwd = false; this.tokenModalOpened = true; this.inlineAlertComponent.close(); this.copyToken = false;