forks
/
peertube
1
0
Fork 0
Code Releases Activity

Merge branch 'release/3.3.0' into develop

This commit is contained in:
Chocobozzz 2021-07-26 15:18:46 +02:00
parent 15a7eafb89 84c6eadc33
commit ac27887774
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
3 changed files with 16 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/app/+videos/+video-watch/video-watch.component.html
View File

@ -86,7 +86,7 @@
</div>
<my-video-description [video]="video"></my-video-description>
<my-video-description [video]="video" (timestampClicked)="handleTimestampClicked($event)"></my-video-description>
<my-video-attributes [video]="video"></my-video-attributes>

34
client/src/app/shared/shared-main/video/video.service.ts
View File

@ -379,28 +379,24 @@ export class VideoService implements VideosProvider {
}
explainedPrivacyLabels (serverPrivacies: VideoConstant<VideoPrivacy>[], defaultPrivacyId = VideoPrivacy.PUBLIC) {
const descriptions = [
{
id: VideoPrivacy.PRIVATE,
description: $localize`Only I can see this video`
},
{
id: VideoPrivacy.UNLISTED,
description: $localize`Only shareable via a private link`
},
{
id: VideoPrivacy.PUBLIC,
description: $localize`Anyone can see this video`
},
{
id: VideoPrivacy.INTERNAL,
description: $localize`Only users of this instance can see this video`
const descriptions = {
[VideoPrivacy.PRIVATE]: $localize`Only I can see this video`,
[VideoPrivacy.UNLISTED]: $localize`Only shareable via a private link`,
[VideoPrivacy.PUBLIC]: $localize`Anyone can see this video`,
[VideoPrivacy.INTERNAL]: $localize`Only users of this instance can see this video`
}
const videoPrivacies = serverPrivacies.map(p => {
return {
...p,
description: descriptions[p.id]
}
]
})
return {
defaultPrivacyId: serverPrivacies.find(p => p.id === defaultPrivacyId)?.id || serverPrivacies[0].id,
videoPrivacies: serverPrivacies.map(p => ({ ...p, description: descriptions.find(p => p.id).description }))
videoPrivacies,
defaultPrivacyId: serverPrivacies.find(p => p.id === defaultPrivacyId)?.id || serverPrivacies[0].id
}
}

9
client/src/app/shared/shared-moderation/moderation.scss
View File

@ -29,15 +29,6 @@
height: 100% !important;
left: 0;
};
div {
@include miniature-thumbnail;
display: inline-flex;
justify-content: center;
align-items: center;
color: pvar(--inputPlaceholderColor);
}
}
.chip {