diff options
-rw-r--r-- | client/src/app/+admin/admin.component.ts | 59 | ||||
-rw-r--r-- | client/src/app/+my-account/my-account.module.ts | 2 | ||||
-rw-r--r-- | client/src/app/shared/shared-main/shared-main.module.ts | 2 |
3 files changed, 36 insertions, 27 deletions
diff --git a/client/src/app/+admin/admin.component.ts b/client/src/app/+admin/admin.component.ts index c1c160ad1..51c64694f 100644 --- a/client/src/app/+admin/admin.component.ts +++ b/client/src/app/+admin/admin.component.ts | |||
@@ -19,22 +19,22 @@ export class AdminComponent implements OnInit { | |||
19 | ) {} | 19 | ) {} |
20 | 20 | ||
21 | ngOnInit () { | 21 | ngOnInit () { |
22 | const federationItems: TopMenuDropdownParam = { | 22 | const federationItems: TopMenuDropdownParam = { |
23 | label: this.i18n('Federation'), | 23 | label: this.i18n('Federation'), |
24 | children: [ | 24 | children: [ |
25 | { | 25 | { |
26 | label: this.i18n('Instances you follow'), | 26 | label: this.i18n('Instances you follow'), |
27 | routerLink: '/admin/follows/following-list', | 27 | routerLink: '/admin/follows/following-list', |
28 | iconName: 'sign-out' | 28 | iconName: 'sign-out' |
29 | }, | 29 | }, |
30 | { | 30 | { |
31 | label: this.i18n('Instances following you'), | 31 | label: this.i18n('Instances following you'), |
32 | routerLink: '/admin/follows/followers-list', | 32 | routerLink: '/admin/follows/followers-list', |
33 | iconName: 'sign-in' | 33 | iconName: 'sign-in' |
34 | }, | 34 | }, |
35 | { | 35 | { |
36 | label: this.i18n('Video redundancies'), | 36 | label: this.i18n('Video redundancies'), |
37 | routerLink: '/admin/follows/video-redundancies-list', | 37 | routerLink: '/admin/follows/video-redundancies-list', |
38 | iconName: 'videos' | 38 | iconName: 'videos' |
39 | } | 39 | } |
40 | ] | 40 | ] |
@@ -44,26 +44,35 @@ export class AdminComponent implements OnInit { | |||
44 | label: this.i18n('Moderation'), | 44 | label: this.i18n('Moderation'), |
45 | children: [] | 45 | children: [] |
46 | } | 46 | } |
47 | if (this.hasVideoAbusesRight()) moderationItems.children.push({ | 47 | |
48 | label: this.i18n('Video reports'), | 48 | if (this.hasVideoAbusesRight()) { |
49 | routerLink: '/admin/moderation/video-abuses/list', | 49 | moderationItems.children.push({ |
50 | iconName: 'flag' | 50 | label: this.i18n('Video reports'), |
51 | }) | 51 | routerLink: '/admin/moderation/video-abuses/list', |
52 | if (this.hasVideoBlocklistRight()) moderationItems.children.push({ | 52 | iconName: 'flag' |
53 | label: this.i18n('Video blocks'), | 53 | }) |
54 | routerLink: '/admin/moderation/video-blocks/list', | 54 | } |
55 | iconName: 'cross' | 55 | if (this.hasVideoBlocklistRight()) { |
56 | }) | 56 | moderationItems.children.push({ |
57 | if (this.hasAccountsBlocklistRight()) moderationItems.children.push({ | 57 | label: this.i18n('Video blocks'), |
58 | label: this.i18n('Muted accounts'), | 58 | routerLink: '/admin/moderation/video-blocks/list', |
59 | routerLink: '/admin/moderation/blocklist/accounts', | 59 | iconName: 'cross' |
60 | iconName: 'user' | 60 | }) |
61 | }) | 61 | } |
62 | if (this.hasServersBlocklistRight()) moderationItems.children.push({ | 62 | if (this.hasAccountsBlocklistRight()) { |
63 | label: this.i18n('Muted servers'), | 63 | moderationItems.children.push({ |
64 | routerLink: '/admin/moderation/blocklist/servers', | 64 | label: this.i18n('Muted accounts'), |
65 | iconName: 'server' | 65 | routerLink: '/admin/moderation/blocklist/accounts', |
66 | }) | 66 | iconName: 'user' |
67 | }) | ||
68 | } | ||
69 | if (this.hasServersBlocklistRight()) { | ||
70 | moderationItems.children.push({ | ||
71 | label: this.i18n('Muted servers'), | ||
72 | routerLink: '/admin/moderation/blocklist/servers', | ||
73 | iconName: 'server' | ||
74 | }) | ||
75 | } | ||
67 | 76 | ||
68 | if (this.hasUsersRight()) this.menuEntries.push({ label: this.i18n('Users'), routerLink: '/admin/users' }) | 77 | if (this.hasUsersRight()) this.menuEntries.push({ label: this.i18n('Users'), routerLink: '/admin/users' }) |
69 | if (this.hasServerFollowRight()) this.menuEntries.push(federationItems) | 78 | if (this.hasServerFollowRight()) this.menuEntries.push(federationItems) |
diff --git a/client/src/app/+my-account/my-account.module.ts b/client/src/app/+my-account/my-account.module.ts index 0ce243844..742a516d5 100644 --- a/client/src/app/+my-account/my-account.module.ts +++ b/client/src/app/+my-account/my-account.module.ts | |||
@@ -77,7 +77,7 @@ import { MyAccountComponent } from './my-account.component' | |||
77 | MyAccountVideoPlaylistCreateComponent, | 77 | MyAccountVideoPlaylistCreateComponent, |
78 | MyAccountVideoPlaylistUpdateComponent, | 78 | MyAccountVideoPlaylistUpdateComponent, |
79 | MyAccountVideoPlaylistsComponent, | 79 | MyAccountVideoPlaylistsComponent, |
80 | MyAccountVideoPlaylistElementsComponent, | 80 | MyAccountVideoPlaylistElementsComponent |
81 | ], | 81 | ], |
82 | 82 | ||
83 | exports: [ | 83 | exports: [ |
diff --git a/client/src/app/shared/shared-main/shared-main.module.ts b/client/src/app/shared/shared-main/shared-main.module.ts index 04e3eb0af..732914e34 100644 --- a/client/src/app/shared/shared-main/shared-main.module.ts +++ b/client/src/app/shared/shared-main/shared-main.module.ts | |||
@@ -83,7 +83,7 @@ import { AUTH_INTERCEPTOR_PROVIDER } from './auth' | |||
83 | ListOverflowComponent, | 83 | ListOverflowComponent, |
84 | TopMenuDropdownComponent, | 84 | TopMenuDropdownComponent, |
85 | 85 | ||
86 | UserNotificationsComponent, | 86 | UserNotificationsComponent |
87 | ], | 87 | ], |
88 | 88 | ||
89 | exports: [ | 89 | exports: [ |