aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2021-12-09 13:41:24 +0100
committerChocobozzz <me@florianbigard.com>2021-12-09 13:41:24 +0100
commit0882c8e6509b2a4ea48f6c48ecb2aa4aa371500a (patch)
tree6f787473199e6d7e161137c5ab66a169f461499f /client/src
parent6ba93fa6392429f22d338f3cdce50707995ced3b (diff)
parent2e694a3b9850fa8f426aa4bf31fc8a596ae2d310 (diff)
downloadPeerTube-0882c8e6509b2a4ea48f6c48ecb2aa4aa371500a.tar.gz
PeerTube-0882c8e6509b2a4ea48f6c48ecb2aa4aa371500a.tar.zst
PeerTube-0882c8e6509b2a4ea48f6c48ecb2aa4aa371500a.zip
Merge branch 'release/4.0.0' into develop
Diffstat (limited to 'client/src')
-rw-r--r--client/src/app/+home/home-routing.module.ts7
-rw-r--r--client/src/app/+my-account/my-account-settings/my-account-settings.component.html20
-rw-r--r--client/src/app/core/theme/theme.service.ts1
-rw-r--r--client/src/app/shared/shared-user-settings/user-interface-settings.component.ts2
4 files changed, 17 insertions, 13 deletions
diff --git a/client/src/app/+home/home-routing.module.ts b/client/src/app/+home/home-routing.module.ts
index a2085f191..bedf26be0 100644
--- a/client/src/app/+home/home-routing.module.ts
+++ b/client/src/app/+home/home-routing.module.ts
@@ -5,7 +5,12 @@ import { HomeComponent } from './home.component'
5const homeRoutes: Routes = [ 5const homeRoutes: Routes = [
6 { 6 {
7 path: '', 7 path: '',
8 component: HomeComponent 8 component: HomeComponent,
9 data: {
10 meta: {
11 title: $localize`Homepage`
12 }
13 }
9 } 14 }
10] 15]
11 16
diff --git a/client/src/app/+my-account/my-account-settings/my-account-settings.component.html b/client/src/app/+my-account/my-account-settings/my-account-settings.component.html
index 48d06280b..8ca197fd4 100644
--- a/client/src/app/+my-account/my-account-settings/my-account-settings.component.html
+++ b/client/src/app/+my-account/my-account-settings/my-account-settings.component.html
@@ -20,6 +20,16 @@
20 </div> 20 </div>
21</div> 21</div>
22 22
23<div class="form-row mt-5"> <!-- interface grid -->
24 <div class="form-group col-12 col-lg-4 col-xl-3">
25 <h2 i18n class="account-title">INTERFACE</h2>
26 </div>
27
28 <div class="form-group col-12 col-lg-8 col-xl-9">
29 <my-user-interface-settings [user]="user" [userInformationLoaded]="userInformationLoaded"></my-user-interface-settings>
30 </div>
31</div>
32
23<div class="form-row mt-5"> <!-- video settings grid --> 33<div class="form-row mt-5"> <!-- video settings grid -->
24 <div class="form-group col-12 col-lg-4 col-xl-3"> 34 <div class="form-group col-12 col-lg-4 col-xl-3">
25 <div class="anchor" id="video-settings"></div> <!-- video settings anchor --> 35 <div class="anchor" id="video-settings"></div> <!-- video settings anchor -->
@@ -42,16 +52,6 @@
42 </div> 52 </div>
43</div> 53</div>
44 54
45<div class="form-row mt-5"> <!-- interface grid -->
46 <div class="form-group col-12 col-lg-4 col-xl-3">
47 <h2 i18n class="account-title">INTERFACE</h2>
48 </div>
49
50 <div class="form-group col-12 col-lg-8 col-xl-9">
51 <my-user-interface-settings [user]="user" [userInformationLoaded]="userInformationLoaded"></my-user-interface-settings>
52 </div>
53</div>
54
55<div class="form-row mt-5" *ngIf="user.pluginAuth === null"> <!-- password grid --> 55<div class="form-row mt-5" *ngIf="user.pluginAuth === null"> <!-- password grid -->
56 <div class="form-group col-12 col-lg-4 col-xl-3"> 56 <div class="form-group col-12 col-lg-4 col-xl-3">
57 <h2 i18n class="account-title">PASSWORD</h2> 57 <h2 i18n class="account-title">PASSWORD</h2>
diff --git a/client/src/app/core/theme/theme.service.ts b/client/src/app/core/theme/theme.service.ts
index c9e6fa700..ac3468941 100644
--- a/client/src/app/core/theme/theme.service.ts
+++ b/client/src/app/core/theme/theme.service.ts
@@ -141,7 +141,6 @@ export class ThemeService {
141 } 141 }
142 142
143 this.auth.userInformationLoaded 143 this.auth.userInformationLoaded
144 .pipe(first())
145 .subscribe(() => this.updateCurrentTheme()) 144 .subscribe(() => this.updateCurrentTheme())
146 } 145 }
147 146
diff --git a/client/src/app/shared/shared-user-settings/user-interface-settings.component.ts b/client/src/app/shared/shared-user-settings/user-interface-settings.component.ts
index bd1cb0353..d04a2c348 100644
--- a/client/src/app/shared/shared-user-settings/user-interface-settings.component.ts
+++ b/client/src/app/shared/shared-user-settings/user-interface-settings.component.ts
@@ -48,7 +48,7 @@ export class UserInterfaceSettingsComponent extends FormReactive implements OnIn
48 }) 48 })
49 49
50 if (this.reactiveUpdate) { 50 if (this.reactiveUpdate) {
51 this.formValuesWatcher = this.form.valueChanges.subscribe(val => this.updateInterfaceSettings()) 51 this.formValuesWatcher = this.form.valueChanges.subscribe(() => this.updateInterfaceSettings())
52 } 52 }
53 }) 53 })
54 } 54 }