From c4a6f7901cef3dda857a789af827caae0a8f114f Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 16 Jun 2020 11:44:54 +0200 Subject: Add channel information in my videos --- client/src/app/shared/video/video-miniature.component.scss | 4 ++++ client/src/app/shared/video/videos-selection.component.html | 5 ++++- client/src/app/shared/video/videos-selection.component.ts | 5 ++++- 3 files changed, 12 insertions(+), 2 deletions(-) (limited to 'client/src/app/shared') diff --git a/client/src/app/shared/video/video-miniature.component.scss b/client/src/app/shared/video/video-miniature.component.scss index 1816192ba..38cac5b6e 100644 --- a/client/src/app/shared/video/video-miniature.component.scss +++ b/client/src/app/shared/video/video-miniature.component.scss @@ -165,6 +165,10 @@ $more-margin-right: 15px; width: fit-content; } + .video-miniature-created-at-views + .video-miniature-channel { + margin-top: 5px; + } + .video-info-privacy { margin-top: 5px; } diff --git a/client/src/app/shared/video/videos-selection.component.html b/client/src/app/shared/video/videos-selection.component.html index 2b4b353cf..44aa567b9 100644 --- a/client/src/app/shared/video/videos-selection.component.html +++ b/client/src/app/shared/video/videos-selection.component.html @@ -7,7 +7,10 @@ - +
diff --git a/client/src/app/shared/video/videos-selection.component.ts b/client/src/app/shared/video/videos-selection.component.ts index 17e5beb24..9453664dd 100644 --- a/client/src/app/shared/video/videos-selection.component.ts +++ b/client/src/app/shared/video/videos-selection.component.ts @@ -14,7 +14,7 @@ import { ActivatedRoute, Router } from '@angular/router' import { AbstractVideoList } from '@app/shared/video/abstract-video-list' import { AuthService, Notifier, ServerService } from '@app/core' 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 { Video } from '@app/shared/video/video.model' import { PeerTubeTemplateDirective } from '@app/shared/angular/peertube-template.directive' @@ -36,7 +36,10 @@ export class VideosSelectionComponent extends AbstractVideoList implements OnIni @Input() pagination: ComponentPagination @Input() titlePage: string @Input() miniatureDisplayOptions: MiniatureDisplayOptions + @Input() ownerDisplayType: OwnerDisplayType + @Input() getVideosObservableFunction: (page: number, sort?: VideoSortField) => Observable> + @ContentChildren(PeerTubeTemplateDirective) templates: QueryList> @Output() selectionChange = new EventEmitter() -- cgit v1.2.3