aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src/app/shared
diff options
context:
space:
mode:
Diffstat (limited to 'client/src/app/shared')
-rw-r--r--client/src/app/shared/shared-icons/global-icon.component.ts115
-rw-r--r--client/src/app/shared/shared-main/buttons/button.component.scss4
-rw-r--r--client/src/app/shared/shared-main/users/user-notifications.component.html4
-rw-r--r--client/src/app/shared/shared-video-miniature/video-actions-dropdown.component.ts2
4 files changed, 66 insertions, 59 deletions
diff --git a/client/src/app/shared/shared-icons/global-icon.component.ts b/client/src/app/shared/shared-icons/global-icon.component.ts
index 3de926293..75ab9e8f5 100644
--- a/client/src/app/shared/shared-icons/global-icon.component.ts
+++ b/client/src/app/shared/shared-icons/global-icon.component.ts
@@ -2,62 +2,65 @@ import { ChangeDetectionStrategy, Component, ElementRef, Input, OnInit } from '@
2import { HooksService } from '@app/core/plugins/hooks.service' 2import { HooksService } from '@app/core/plugins/hooks.service'
3 3
4const icons = { 4const icons = {
5 'add': require('!!raw-loader?!../../../assets/images/global/add.svg').default, 5 // misc icons
6 'user': require('!!raw-loader?!../../../assets/images/global/user.svg').default, 6 'npm': require('!!raw-loader?!../../../assets/images/misc/npm.svg').default,
7 'sign-out': require('!!raw-loader?!../../../assets/images/global/sign-out.svg').default, 7 'language': require('!!raw-loader?!../../../assets/images/misc/language.svg').default,
8 'syndication': require('!!raw-loader?!../../../assets/images/global/syndication.svg').default, 8 'video-lang': require('!!raw-loader?!../../../assets/images/misc/video-lang.svg').default,
9 'help': require('!!raw-loader?!../../../assets/images/global/help.svg').default, 9 'support': require('!!raw-loader?!../../../assets/images/misc/support.svg').default,
10 'sparkle': require('!!raw-loader?!../../../assets/images/global/sparkle.svg').default, 10 'robot': require('!!raw-loader?!../../../assets/images/misc/miscellaneous_services.svg').default, // material ui
11 'alert': require('!!raw-loader?!../../../assets/images/global/alert.svg').default, 11 'videos': require('!!raw-loader?!../../../assets/images/misc/video_library.svg').default, // material ui
12 'cloud-error': require('!!raw-loader?!../../../assets/images/global/cloud-error.svg').default, 12 'history': require('!!raw-loader?!../../../assets/images/misc/history.svg').default, // material ui
13 'clock': require('!!raw-loader?!../../../assets/images/global/clock.svg').default, 13 'subscriptions': require('!!raw-loader?!../../../assets/images/misc/subscriptions.svg').default, // material ui
14 'user-add': require('!!raw-loader?!../../../assets/images/global/user-add.svg').default, 14 'playlist-add': require('!!raw-loader?!../../../assets/images/misc/playlist-add.svg').default, // material ui
15 'no': require('!!raw-loader?!../../../assets/images/global/no.svg').default, 15
16 'cloud-download': require('!!raw-loader?!../../../assets/images/global/cloud-download.svg').default, 16 // feather icons
17 'undo': require('!!raw-loader?!../../../assets/images/global/undo.svg').default, 17 'flag': require('!!raw-loader?!../../../assets/images/feather/flag.svg').default,
18 'history': require('!!raw-loader?!../../../assets/images/global/history.svg').default, 18 'playlists': require('!!raw-loader?!../../../assets/images/feather/list.svg').default,
19 'circle-tick': require('!!raw-loader?!../../../assets/images/global/circle-tick.svg').default, 19 'syndication': require('!!raw-loader?!../../../assets/images/feather/syndication.svg').default,
20 'cog': require('!!raw-loader?!../../../assets/images/global/cog.svg').default, 20 'help': require('!!raw-loader?!../../../assets/images/feather/help.svg').default,
21 'download': require('!!raw-loader?!../../../assets/images/global/download.svg').default, 21 'alert': require('!!raw-loader?!../../../assets/images/feather/alert.svg').default,
22 'go': require('!!raw-loader?!../../../assets/images/menu/go.svg').default, 22 'globe': require('!!raw-loader?!../../../assets/images/feather/globe.svg').default,
23 'edit': require('!!raw-loader?!../../../assets/images/global/edit.svg').default, 23 'home': require('!!raw-loader?!../../../assets/images/feather/home.svg').default,
24 'forward': require('!!raw-loader?!../../../assets/images/global/forward.svg').default, 24 'recently-added': require('!!raw-loader?!../../../assets/images/feather/recently-added.svg').default,
25 'delete': require('!!raw-loader?!../../../assets/images/global/delete.svg').default, 25 'trending': require('!!raw-loader?!../../../assets/images/feather/trending.svg').default,
26 'server': require('!!raw-loader?!../../../assets/images/global/server.svg').default, 26 'search': require('!!raw-loader?!../../../assets/images/feather/search.svg').default,
27 'cross': require('!!raw-loader?!../../../assets/images/global/cross.svg').default, 27 'upload': require('!!raw-loader?!../../../assets/images/feather/upload.svg').default,
28 'validate': require('!!raw-loader?!../../../assets/images/global/validate.svg').default, 28 'dislike': require('!!raw-loader?!../../../assets/images/feather/dislike.svg').default,
29 'tick': require('!!raw-loader?!../../../assets/images/global/tick.svg').default, 29 'like': require('!!raw-loader?!../../../assets/images/feather/like.svg').default,
30 'repeat': require('!!raw-loader?!../../../assets/images/global/repeat.svg').default, 30 'no': require('!!raw-loader?!../../../assets/images/feather/no.svg').default,
31 'inbox-full': require('!!raw-loader?!../../../assets/images/global/inbox-full.svg').default, 31 'cloud-download': require('!!raw-loader?!../../../assets/images/feather/cloud-download.svg').default,
32 'dislike': require('!!raw-loader?!../../../assets/images/video/dislike.svg').default, 32 'clock': require('!!raw-loader?!../../../assets/images/feather/clock.svg').default,
33 'support': require('!!raw-loader?!../../../assets/images/video/support.svg').default, 33 'cog': require('!!raw-loader?!../../../assets/images/feather/cog.svg').default,
34 'like': require('!!raw-loader?!../../../assets/images/video/like.svg').default, 34 'delete': require('!!raw-loader?!../../../assets/images/feather/delete.svg').default,
35 'more-horizontal': require('!!raw-loader?!../../../assets/images/global/more-horizontal.svg').default, 35 'inbox-full': require('!!raw-loader?!../../../assets/images/feather/inbox-full.svg').default,
36 'more-vertical': require('!!raw-loader?!../../../assets/images/global/more-vertical.svg').default, 36 'sign-out': require('!!raw-loader?!../../../assets/images/feather/log-out.svg').default,
37 'share': require('!!raw-loader?!../../../assets/images/video/share.svg').default, 37 'download': require('!!raw-loader?!../../../assets/images/feather/download.svg').default,
38 'upload': require('!!raw-loader?!../../../assets/images/video/upload.svg').default, 38 'ownership-change': require('!!raw-loader?!../../../assets/images/feather/share.svg').default,
39 'playlist-add': require('!!raw-loader?!../../../assets/images/video/playlist-add.svg').default, 39 'share': require('!!raw-loader?!../../../assets/images/feather/share-2.svg').default,
40 'play': require('!!raw-loader?!../../../assets/images/global/play.svg').default, 40 'channel': require('!!raw-loader?!../../../assets/images/feather/tv.svg').default,
41 'playlists': require('!!raw-loader?!../../../assets/images/global/playlists.svg').default, 41 'user': require('!!raw-loader?!../../../assets/images/feather/user.svg').default,
42 'globe': require('!!raw-loader?!../../../assets/images/menu/globe.svg').default, 42 'users': require('!!raw-loader?!../../../assets/images/feather/users.svg').default,
43 'home': require('!!raw-loader?!../../../assets/images/menu/home.svg').default, 43 'user-add': require('!!raw-loader?!../../../assets/images/feather/user-plus.svg').default,
44 'recently-added': require('!!raw-loader?!../../../assets/images/menu/recently-added.svg').default, 44 'server': require('!!raw-loader?!../../../assets/images/feather/server.svg').default,
45 'trending': require('!!raw-loader?!../../../assets/images/menu/trending.svg').default, 45 'add': require('!!raw-loader?!../../../assets/images/feather/plus-circle.svg').default,
46 'video-lang': require('!!raw-loader?!../../../assets/images/global/video-lang.svg').default, 46 'cloud-error': require('!!raw-loader?!../../../assets/images/feather/cloud-off.svg').default,
47 'videos': require('!!raw-loader?!../../../assets/images/global/videos.svg').default, 47 'undo': require('!!raw-loader?!../../../assets/images/feather/corner-up-left.svg').default,
48 'folder': require('!!raw-loader?!../../../assets/images/global/folder.svg').default, 48 'circle-tick': require('!!raw-loader?!../../../assets/images/feather/check-circle.svg').default,
49 'subscriptions': require('!!raw-loader?!../../../assets/images/menu/subscriptions.svg').default, 49 'more-horizontal': require('!!raw-loader?!../../../assets/images/feather/more-horizontal.svg').default,
50 'language': require('!!raw-loader?!../../../assets/images/menu/language.svg').default, 50 'more-vertical': require('!!raw-loader?!../../../assets/images/feather/more-vertical.svg').default,
51 'unsensitive': require('!!raw-loader?!../../../assets/images/menu/eye.svg').default, 51 'play': require('!!raw-loader?!../../../assets/images/feather/play.svg').default,
52 'sensitive': require('!!raw-loader?!../../../assets/images/menu/eye-closed.svg').default, 52 'p2p': require('!!raw-loader?!../../../assets/images/feather/airplay.svg').default,
53 'p2p': require('!!raw-loader?!../../../assets/images/menu/p2p.svg').default, 53 'fullscreen': require('!!raw-loader?!../../../assets/images/feather/maximize.svg').default,
54 'users': require('!!raw-loader?!../../../assets/images/global/users.svg').default, 54 'exit-fullscreen': require('!!raw-loader?!../../../assets/images/feather/minimize.svg').default,
55 'search': require('!!raw-loader?!../../../assets/images/global/search.svg').default, 55 'film': require('!!raw-loader?!../../../assets/images/feather/film.svg').default,
56 'refresh': require('!!raw-loader?!../../../assets/images/global/refresh.svg').default, 56 'edit': require('!!raw-loader?!../../../assets/images/feather/edit-2.svg').default,
57 'npm': require('!!raw-loader?!../../../assets/images/global/npm.svg').default, 57 'sensitive': require('!!raw-loader?!../../../assets/images/feather/eye.svg').default,
58 'fullscreen': require('!!raw-loader?!../../../assets/images/global/fullscreen.svg').default, 58 'unsensitive': require('!!raw-loader?!../../../assets/images/feather/eye-off.svg').default,
59 'exit-fullscreen': require('!!raw-loader?!../../../assets/images/global/exit-fullscreen.svg').default, 59 'refresh': require('!!raw-loader?!../../../assets/images/feather/refresh-cw.svg').default,
60 'robot': require('!!raw-loader?!../../../assets/images/global/robot.svg').default 60 'go': require('!!raw-loader?!../../../assets/images/feather/arrow-up-right.svg').default,
61 'cross': require('!!raw-loader?!../../../assets/images/feather/x.svg').default,
62 'tick': require('!!raw-loader?!../../../assets/images/feather/check.svg').default,
63 'repeat': require('!!raw-loader?!../../../assets/images/feather/repeat.svg').default
61} 64}
62 65
63export type GlobalIconName = keyof typeof icons 66export type GlobalIconName = keyof typeof icons
diff --git a/client/src/app/shared/shared-main/buttons/button.component.scss b/client/src/app/shared/shared-main/buttons/button.component.scss
index 3ccfefd7e..5b27af3f4 100644
--- a/client/src/app/shared/shared-main/buttons/button.component.scss
+++ b/client/src/app/shared/shared-main/buttons/button.component.scss
@@ -10,6 +10,10 @@ my-small-loader ::ng-deep .root {
10.action-button { 10.action-button {
11 @include peertube-button-link; 11 @include peertube-button-link;
12 @include button-with-icon(21px, 0, -2px); 12 @include button-with-icon(21px, 0, -2px);
13
14 > :nth-child(2) {
15 margin-left: 5px;
16 }
13} 17}
14 18
15.orange-button { 19.orange-button {
diff --git a/client/src/app/shared/shared-main/users/user-notifications.component.html b/client/src/app/shared/shared-main/users/user-notifications.component.html
index 08771110d..d5be1470e 100644
--- a/client/src/app/shared/shared-main/users/user-notifications.component.html
+++ b/client/src/app/shared/shared-main/users/user-notifications.component.html
@@ -43,7 +43,7 @@
43 </ng-container> 43 </ng-container>
44 44
45 <ng-container *ngSwitchCase="UserNotificationType.NEW_VIDEO_ABUSE_FOR_MODERATORS"> 45 <ng-container *ngSwitchCase="UserNotificationType.NEW_VIDEO_ABUSE_FOR_MODERATORS">
46 <my-global-icon iconName="alert" aria-hidden="true"></my-global-icon> 46 <my-global-icon iconName="flag" aria-hidden="true"></my-global-icon>
47 47
48 <div class="message" i18n> 48 <div class="message" i18n>
49 <a (click)="markAsRead(notification)" [routerLink]="notification.videoAbuseUrl">A new video abuse</a> has been created on video <a (click)="markAsRead(notification)" [routerLink]="notification.videoUrl">{{ notification.videoAbuse.video.name }}</a> 49 <a (click)="markAsRead(notification)" [routerLink]="notification.videoAbuseUrl">A new video abuse</a> has been created on video <a (click)="markAsRead(notification)" [routerLink]="notification.videoUrl">{{ notification.videoAbuse.video.name }}</a>
@@ -81,7 +81,7 @@
81 </ng-container> 81 </ng-container>
82 82
83 <ng-container *ngSwitchCase="UserNotificationType.MY_VIDEO_PUBLISHED"> 83 <ng-container *ngSwitchCase="UserNotificationType.MY_VIDEO_PUBLISHED">
84 <my-global-icon iconName="sparkle" aria-hidden="true"></my-global-icon> 84 <my-global-icon iconName="film" aria-hidden="true"></my-global-icon>
85 85
86 <div class="message" i18n> 86 <div class="message" i18n>
87 Your video <a (click)="markAsRead(notification)" [routerLink]="notification.videoUrl">{{ notification.video.name }}</a> has been published 87 Your video <a (click)="markAsRead(notification)" [routerLink]="notification.videoUrl">{{ notification.video.name }}</a> has been published
diff --git a/client/src/app/shared/shared-video-miniature/video-actions-dropdown.component.ts b/client/src/app/shared/shared-video-miniature/video-actions-dropdown.component.ts
index 9bd0741df..3d1fc8690 100644
--- a/client/src/app/shared/shared-video-miniature/video-actions-dropdown.component.ts
+++ b/client/src/app/shared/shared-video-miniature/video-actions-dropdown.component.ts
@@ -283,7 +283,7 @@ export class VideoActionsDropdownComponent implements OnChanges {
283 label: this.i18n('Report'), 283 label: this.i18n('Report'),
284 handler: () => this.showReportModal(), 284 handler: () => this.showReportModal(),
285 isDisplayed: () => this.authService.isLoggedIn() && this.displayOptions.report, 285 isDisplayed: () => this.authService.isLoggedIn() && this.displayOptions.report,
286 iconName: 'alert' 286 iconName: 'flag'
287 } 287 }
288 ], 288 ],
289 [ // actions regarding the account/its server 289 [ // actions regarding the account/its server