aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2021-01-18 11:45:00 +0100
committerChocobozzz <me@florianbigard.com>2021-01-18 11:53:27 +0100
commit9dfaa38c9a23a6093faabc06d7b91caecf993dfd (patch)
tree81456a1c8d7ae23a1fa451799fa37a0529132042
parenta8a63b1ffe3780615c1dba6b4d776535a0e3a83d (diff)
downloadPeerTube-9dfaa38c9a23a6093faabc06d7b91caecf993dfd.tar.gz
PeerTube-9dfaa38c9a23a6093faabc06d7b91caecf993dfd.tar.zst
PeerTube-9dfaa38c9a23a6093faabc06d7b91caecf993dfd.zip
username field consistency
-rw-r--r--client/src/app/+my-account/my-account-settings/my-account-profile/my-account-profile.component.html8
-rw-r--r--client/src/app/+my-account/my-account-settings/my-account-profile/my-account-profile.component.scss12
-rw-r--r--client/src/app/+my-account/my-account-settings/my-account-profile/my-account-profile.component.ts6
3 files changed, 11 insertions, 15 deletions
diff --git a/client/src/app/+my-account/my-account-settings/my-account-profile/my-account-profile.component.html b/client/src/app/+my-account/my-account-settings/my-account-profile/my-account-profile.component.html
index 7e6b45386..eb2a48e15 100644
--- a/client/src/app/+my-account/my-account-settings/my-account-profile/my-account-profile.component.html
+++ b/client/src/app/+my-account/my-account-settings/my-account-profile/my-account-profile.component.html
@@ -3,13 +3,13 @@
3<form role="form" (ngSubmit)="updateMyProfile()" [formGroup]="form"> 3<form role="form" (ngSubmit)="updateMyProfile()" [formGroup]="form">
4 4
5 <div class="form-group"> 5 <div class="form-group">
6 <label i18n for="user-name">User name</label> 6 <label i18n for="username">Username</label>
7 <input 7 <input
8 type="text" id="user-name" class="form-control" 8 type="text" id="username" class="form-control"
9 formControlName="user-name" 9 formControlName="username" readonly
10 > 10 >
11 <div class="text-muted" i18n> 11 <div class="text-muted" i18n>
12 People can find you @{{ user.username }}@{{ instanceHost }} 12 People can find you using @{{ user.username }}@{{ instanceHost }}
13 </div> 13 </div>
14 </div> 14 </div>
15 15
diff --git a/client/src/app/+my-account/my-account-settings/my-account-profile/my-account-profile.component.scss b/client/src/app/+my-account/my-account-settings/my-account-profile/my-account-profile.component.scss
index 58402a272..2d24417a1 100644
--- a/client/src/app/+my-account/my-account-settings/my-account-profile/my-account-profile.component.scss
+++ b/client/src/app/+my-account/my-account-settings/my-account-profile/my-account-profile.component.scss
@@ -10,20 +10,16 @@ label {
10 margin-bottom: 15px; 10 margin-bottom: 15px;
11} 11}
12 12
13input#username + .text-muted {
14 margin-top: 5px;
15}
16
13input[type=text] { 17input[type=text] {
14 @include peertube-input-text(340px); 18 @include peertube-input-text(340px);
15 19
16 display: block; 20 display: block;
17} 21}
18 22
19input#user-name {
20 border: none;
21
22 & + div {
23 padding-left: 15px;
24 }
25}
26
27input[type=submit] { 23input[type=submit] {
28 @include peertube-button; 24 @include peertube-button;
29 @include orange-button; 25 @include orange-button;
diff --git a/client/src/app/+my-account/my-account-settings/my-account-profile/my-account-profile.component.ts b/client/src/app/+my-account/my-account-settings/my-account-profile/my-account-profile.component.ts
index 957abe555..80e4446c8 100644
--- a/client/src/app/+my-account/my-account-settings/my-account-profile/my-account-profile.component.ts
+++ b/client/src/app/+my-account/my-account-settings/my-account-profile/my-account-profile.component.ts
@@ -25,15 +25,15 @@ export class MyAccountProfileComponent extends FormReactive implements OnInit {
25 25
26 ngOnInit () { 26 ngOnInit () {
27 this.buildForm({ 27 this.buildForm({
28 'user-name': null, 28 username: null,
29 'display-name': USER_DISPLAY_NAME_REQUIRED_VALIDATOR, 29 'display-name': USER_DISPLAY_NAME_REQUIRED_VALIDATOR,
30 description: USER_DESCRIPTION_VALIDATOR 30 description: USER_DESCRIPTION_VALIDATOR
31 }) 31 })
32 this.form.controls['user-name'].disable() 32 this.form.controls['username'].disable()
33 33
34 this.userInformationLoaded.subscribe(() => { 34 this.userInformationLoaded.subscribe(() => {
35 this.form.patchValue({ 35 this.form.patchValue({
36 'user-name': this.user.username, 36 username: this.user.username,
37 'display-name': this.user.account.displayName, 37 'display-name': this.user.account.displayName,
38 description: this.user.account.description 38 description: this.user.account.description
39 }) 39 })