Add channel information in my videos
This commit is contained in:
parent
b27b12552b
commit
c4a6f7901c
|
@ -13,6 +13,7 @@
|
||||||
[miniatureDisplayOptions]="miniatureDisplayOptions"
|
[miniatureDisplayOptions]="miniatureDisplayOptions"
|
||||||
[titlePage]="titlePage"
|
[titlePage]="titlePage"
|
||||||
[getVideosObservableFunction]="getVideosObservableFunction"
|
[getVideosObservableFunction]="getVideosObservableFunction"
|
||||||
|
[ownerDisplayType]="ownerDisplayType"
|
||||||
#videosSelection
|
#videosSelection
|
||||||
>
|
>
|
||||||
<ng-template ptTemplate="globalButtons">
|
<ng-template ptTemplate="globalButtons">
|
||||||
|
|
|
@ -12,7 +12,7 @@ import { VideoService } from '../../shared/video/video.service'
|
||||||
import { I18n } from '@ngx-translate/i18n-polyfill'
|
import { I18n } from '@ngx-translate/i18n-polyfill'
|
||||||
import { ScreenService } from '@app/shared/misc/screen.service'
|
import { ScreenService } from '@app/shared/misc/screen.service'
|
||||||
import { VideoChangeOwnershipComponent } from './video-change-ownership/video-change-ownership.component'
|
import { VideoChangeOwnershipComponent } from './video-change-ownership/video-change-ownership.component'
|
||||||
import { MiniatureDisplayOptions } from '@app/shared/video/video-miniature.component'
|
import { MiniatureDisplayOptions, OwnerDisplayType } from '@app/shared/video/video-miniature.component'
|
||||||
import { SelectionType, VideosSelectionComponent } from '@app/shared/video/videos-selection.component'
|
import { SelectionType, VideosSelectionComponent } from '@app/shared/video/videos-selection.component'
|
||||||
import { VideoSortField } from '@app/shared/video/sort-field.type'
|
import { VideoSortField } from '@app/shared/video/sort-field.type'
|
||||||
import { DisableForReuseHook } from '@app/core/routing/disable-for-reuse-hook'
|
import { DisableForReuseHook } from '@app/core/routing/disable-for-reuse-hook'
|
||||||
|
@ -36,12 +36,14 @@ export class MyAccountVideosComponent implements OnInit, DisableForReuseHook {
|
||||||
miniatureDisplayOptions: MiniatureDisplayOptions = {
|
miniatureDisplayOptions: MiniatureDisplayOptions = {
|
||||||
date: true,
|
date: true,
|
||||||
views: true,
|
views: true,
|
||||||
by: false,
|
by: true,
|
||||||
privacyLabel: false,
|
privacyLabel: false,
|
||||||
privacyText: true,
|
privacyText: true,
|
||||||
state: true,
|
state: true,
|
||||||
blacklistInfo: true
|
blacklistInfo: true
|
||||||
}
|
}
|
||||||
|
ownerDisplayType: OwnerDisplayType = 'videoChannel'
|
||||||
|
|
||||||
videos: Video[] = []
|
videos: Video[] = []
|
||||||
videosSearch: string
|
videosSearch: string
|
||||||
videosSearchChanged = new Subject<string>()
|
videosSearchChanged = new Subject<string>()
|
||||||
|
|
|
@ -165,6 +165,10 @@ $more-margin-right: 15px;
|
||||||
width: fit-content;
|
width: fit-content;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.video-miniature-created-at-views + .video-miniature-channel {
|
||||||
|
margin-top: 5px;
|
||||||
|
}
|
||||||
|
|
||||||
.video-info-privacy {
|
.video-info-privacy {
|
||||||
margin-top: 5px;
|
margin-top: 5px;
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,7 +7,10 @@
|
||||||
<my-peertube-checkbox [inputName]="'video-check-' + video.id" [(ngModel)]="_selection[video.id]"></my-peertube-checkbox>
|
<my-peertube-checkbox [inputName]="'video-check-' + video.id" [(ngModel)]="_selection[video.id]"></my-peertube-checkbox>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<my-video-miniature [video]="video" [displayAsRow]="true" [displayOptions]="miniatureDisplayOptions" [displayVideoActions]="false"></my-video-miniature>
|
<my-video-miniature
|
||||||
|
[video]="video" [displayAsRow]="true" [displayOptions]="miniatureDisplayOptions"
|
||||||
|
[displayVideoActions]="false" [ownerDisplayType]="ownerDisplayType"
|
||||||
|
></my-video-miniature>
|
||||||
|
|
||||||
<!-- Display only once -->
|
<!-- Display only once -->
|
||||||
<div class="action-selection-mode" *ngIf="isInSelectionMode() === true && i === 0">
|
<div class="action-selection-mode" *ngIf="isInSelectionMode() === true && i === 0">
|
||||||
|
|
|
@ -14,7 +14,7 @@ import { ActivatedRoute, Router } from '@angular/router'
|
||||||
import { AbstractVideoList } from '@app/shared/video/abstract-video-list'
|
import { AbstractVideoList } from '@app/shared/video/abstract-video-list'
|
||||||
import { AuthService, Notifier, ServerService } from '@app/core'
|
import { AuthService, Notifier, ServerService } from '@app/core'
|
||||||
import { ScreenService } from '@app/shared/misc/screen.service'
|
import { ScreenService } from '@app/shared/misc/screen.service'
|
||||||
import { MiniatureDisplayOptions } from '@app/shared/video/video-miniature.component'
|
import { MiniatureDisplayOptions, OwnerDisplayType } from '@app/shared/video/video-miniature.component'
|
||||||
import { Observable } from 'rxjs'
|
import { Observable } from 'rxjs'
|
||||||
import { Video } from '@app/shared/video/video.model'
|
import { Video } from '@app/shared/video/video.model'
|
||||||
import { PeerTubeTemplateDirective } from '@app/shared/angular/peertube-template.directive'
|
import { PeerTubeTemplateDirective } from '@app/shared/angular/peertube-template.directive'
|
||||||
|
@ -36,7 +36,10 @@ export class VideosSelectionComponent extends AbstractVideoList implements OnIni
|
||||||
@Input() pagination: ComponentPagination
|
@Input() pagination: ComponentPagination
|
||||||
@Input() titlePage: string
|
@Input() titlePage: string
|
||||||
@Input() miniatureDisplayOptions: MiniatureDisplayOptions
|
@Input() miniatureDisplayOptions: MiniatureDisplayOptions
|
||||||
|
@Input() ownerDisplayType: OwnerDisplayType
|
||||||
|
|
||||||
@Input() getVideosObservableFunction: (page: number, sort?: VideoSortField) => Observable<ResultList<Video>>
|
@Input() getVideosObservableFunction: (page: number, sort?: VideoSortField) => Observable<ResultList<Video>>
|
||||||
|
|
||||||
@ContentChildren(PeerTubeTemplateDirective) templates: QueryList<PeerTubeTemplateDirective<'rowButtons' | 'globalButtons'>>
|
@ContentChildren(PeerTubeTemplateDirective) templates: QueryList<PeerTubeTemplateDirective<'rowButtons' | 'globalButtons'>>
|
||||||
|
|
||||||
@Output() selectionChange = new EventEmitter<SelectionType>()
|
@Output() selectionChange = new EventEmitter<SelectionType>()
|
||||||
|
|
Loading…
Reference in New Issue