diff options
3 files changed, 16 insertions, 29 deletions
diff --git a/client/src/app/+videos/+video-watch/video-watch.component.html b/client/src/app/+videos/+video-watch/video-watch.component.html index 0d6103b3b..45cfba167 100644 --- a/client/src/app/+videos/+video-watch/video-watch.component.html +++ b/client/src/app/+videos/+video-watch/video-watch.component.html | |||
@@ -86,7 +86,7 @@ | |||
86 | 86 | ||
87 | </div> | 87 | </div> |
88 | 88 | ||
89 | <my-video-description [video]="video"></my-video-description> | 89 | <my-video-description [video]="video" (timestampClicked)="handleTimestampClicked($event)"></my-video-description> |
90 | 90 | ||
91 | <my-video-attributes [video]="video"></my-video-attributes> | 91 | <my-video-attributes [video]="video"></my-video-attributes> |
92 | 92 | ||
diff --git a/client/src/app/shared/shared-main/video/video.service.ts b/client/src/app/shared/shared-main/video/video.service.ts index 49d6fc1c7..04a39be0e 100644 --- a/client/src/app/shared/shared-main/video/video.service.ts +++ b/client/src/app/shared/shared-main/video/video.service.ts | |||
@@ -379,28 +379,24 @@ export class VideoService implements VideosProvider { | |||
379 | } | 379 | } |
380 | 380 | ||
381 | explainedPrivacyLabels (serverPrivacies: VideoConstant<VideoPrivacy>[], defaultPrivacyId = VideoPrivacy.PUBLIC) { | 381 | explainedPrivacyLabels (serverPrivacies: VideoConstant<VideoPrivacy>[], defaultPrivacyId = VideoPrivacy.PUBLIC) { |
382 | const descriptions = [ | 382 | const descriptions = { |
383 | { | 383 | [VideoPrivacy.PRIVATE]: $localize`Only I can see this video`, |
384 | id: VideoPrivacy.PRIVATE, | 384 | [VideoPrivacy.UNLISTED]: $localize`Only shareable via a private link`, |
385 | description: $localize`Only I can see this video` | 385 | [VideoPrivacy.PUBLIC]: $localize`Anyone can see this video`, |
386 | }, | 386 | [VideoPrivacy.INTERNAL]: $localize`Only users of this instance can see this video` |
387 | { | 387 | } |
388 | id: VideoPrivacy.UNLISTED, | 388 | |
389 | description: $localize`Only shareable via a private link` | 389 | const videoPrivacies = serverPrivacies.map(p => { |
390 | }, | 390 | return { |
391 | { | 391 | ...p, |
392 | id: VideoPrivacy.PUBLIC, | 392 | |
393 | description: $localize`Anyone can see this video` | 393 | description: descriptions[p.id] |
394 | }, | ||
395 | { | ||
396 | id: VideoPrivacy.INTERNAL, | ||
397 | description: $localize`Only users of this instance can see this video` | ||
398 | } | 394 | } |
399 | ] | 395 | }) |
400 | 396 | ||
401 | return { | 397 | return { |
402 | defaultPrivacyId: serverPrivacies.find(p => p.id === defaultPrivacyId)?.id || serverPrivacies[0].id, | 398 | videoPrivacies, |
403 | videoPrivacies: serverPrivacies.map(p => ({ ...p, description: descriptions.find(p => p.id).description })) | 399 | defaultPrivacyId: serverPrivacies.find(p => p.id === defaultPrivacyId)?.id || serverPrivacies[0].id |
404 | } | 400 | } |
405 | } | 401 | } |
406 | 402 | ||
diff --git a/client/src/app/shared/shared-moderation/moderation.scss b/client/src/app/shared/shared-moderation/moderation.scss index ef822d092..badf9ce4c 100644 --- a/client/src/app/shared/shared-moderation/moderation.scss +++ b/client/src/app/shared/shared-moderation/moderation.scss | |||
@@ -29,15 +29,6 @@ | |||
29 | height: 100% !important; | 29 | height: 100% !important; |
30 | left: 0; | 30 | left: 0; |
31 | }; | 31 | }; |
32 | |||
33 | div { | ||
34 | @include miniature-thumbnail; | ||
35 | |||
36 | display: inline-flex; | ||
37 | justify-content: center; | ||
38 | align-items: center; | ||
39 | color: pvar(--inputPlaceholderColor); | ||
40 | } | ||
41 | } | 32 | } |
42 | 33 | ||
43 | .chip { | 34 | .chip { |