diff options
Diffstat (limited to 'client/src/app/shared')
7 files changed, 45 insertions, 4 deletions
diff --git a/client/src/app/shared/shared-video-miniature/shared-video-miniature.module.ts b/client/src/app/shared/shared-video-miniature/shared-video-miniature.module.ts index 08c8da3dd..3035bcfb3 100644 --- a/client/src/app/shared/shared-video-miniature/shared-video-miniature.module.ts +++ b/client/src/app/shared/shared-video-miniature/shared-video-miniature.module.ts | |||
@@ -4,6 +4,7 @@ import { SharedFormModule } from '../shared-forms' | |||
4 | import { SharedGlobalIconModule } from '../shared-icons' | 4 | import { SharedGlobalIconModule } from '../shared-icons' |
5 | import { SharedMainModule } from '../shared-main/shared-main.module' | 5 | import { SharedMainModule } from '../shared-main/shared-main.module' |
6 | import { SharedModerationModule } from '../shared-moderation' | 6 | import { SharedModerationModule } from '../shared-moderation' |
7 | import { SharedVideoModule } from '../shared-video' | ||
7 | import { SharedThumbnailModule } from '../shared-thumbnail' | 8 | import { SharedThumbnailModule } from '../shared-thumbnail' |
8 | import { SharedVideoLiveModule } from '../shared-video-live' | 9 | import { SharedVideoLiveModule } from '../shared-video-live' |
9 | import { SharedVideoPlaylistModule } from '../shared-video-playlist/shared-video-playlist.module' | 10 | import { SharedVideoPlaylistModule } from '../shared-video-playlist/shared-video-playlist.module' |
@@ -20,7 +21,8 @@ import { VideosSelectionComponent } from './videos-selection.component' | |||
20 | SharedVideoPlaylistModule, | 21 | SharedVideoPlaylistModule, |
21 | SharedThumbnailModule, | 22 | SharedThumbnailModule, |
22 | SharedGlobalIconModule, | 23 | SharedGlobalIconModule, |
23 | SharedVideoLiveModule | 24 | SharedVideoLiveModule, |
25 | SharedVideoModule | ||
24 | ], | 26 | ], |
25 | 27 | ||
26 | declarations: [ | 28 | declarations: [ |
diff --git a/client/src/app/shared/shared-video-miniature/video-miniature.component.html b/client/src/app/shared/shared-video-miniature/video-miniature.component.html index 395a4df97..7a6df7b64 100644 --- a/client/src/app/shared/shared-video-miniature/video-miniature.component.html +++ b/client/src/app/shared/shared-video-miniature/video-miniature.component.html | |||
@@ -28,9 +28,8 @@ | |||
28 | 28 | ||
29 | <span class="views" [title]="video.getExactNumberOfViews()"> | 29 | <span class="views" [title]="video.getExactNumberOfViews()"> |
30 | <ng-container *ngIf="displayOptions.date && displayOptions.views"> • </ng-container> | 30 | <ng-container *ngIf="displayOptions.date && displayOptions.views"> • </ng-container> |
31 | <ng-container i18n *ngIf="displayOptions.views"> | 31 | |
32 | {video.views, plural, =1 {1 view} other {{{ video.views | myNumberFormatter }} views}} | 32 | <my-video-views-counter *ngIf="displayOptions.views" [video]="video"></my-video-views-counter> |
33 | </ng-container> | ||
34 | </span> | 33 | </span> |
35 | </span> | 34 | </span> |
36 | 35 | ||
diff --git a/client/src/app/shared/shared-video/index.ts b/client/src/app/shared/shared-video/index.ts new file mode 100644 index 000000000..33a8b560f --- /dev/null +++ b/client/src/app/shared/shared-video/index.ts | |||
@@ -0,0 +1 @@ | |||
export * from './shared-video.module' | |||
diff --git a/client/src/app/shared/shared-video/shared-video.module.ts b/client/src/app/shared/shared-video/shared-video.module.ts new file mode 100644 index 000000000..dfac4e357 --- /dev/null +++ b/client/src/app/shared/shared-video/shared-video.module.ts | |||
@@ -0,0 +1,19 @@ | |||
1 | |||
2 | import { NgModule } from '@angular/core' | ||
3 | import { SharedMainModule } from '../shared-main/shared-main.module' | ||
4 | import { VideoViewsCounterComponent } from './video-views-counter.component' | ||
5 | |||
6 | @NgModule({ | ||
7 | imports: [ | ||
8 | SharedMainModule | ||
9 | ], | ||
10 | |||
11 | declarations: [ | ||
12 | VideoViewsCounterComponent | ||
13 | ], | ||
14 | |||
15 | exports: [ | ||
16 | VideoViewsCounterComponent | ||
17 | ] | ||
18 | }) | ||
19 | export class SharedVideoModule { } | ||
diff --git a/client/src/app/shared/shared-video/video-views-counter.component.html b/client/src/app/shared/shared-video/video-views-counter.component.html new file mode 100644 index 000000000..a6679f74d --- /dev/null +++ b/client/src/app/shared/shared-video/video-views-counter.component.html | |||
@@ -0,0 +1,9 @@ | |||
1 | <span [title]="video.getExactNumberOfViews()"> | ||
2 | <ng-container i18n *ngIf="!video.isLive"> | ||
3 | {video.views, plural, =1 {1 view} other {{{ video.views | myNumberFormatter }} views}} | ||
4 | </ng-container> | ||
5 | |||
6 | <ng-container i18n *ngIf="video.isLive"> | ||
7 | {video.views, plural, =1 {1 viewer} other {{{ video.views | myNumberFormatter }} viewers}} | ||
8 | </ng-container> | ||
9 | </span> | ||
diff --git a/client/src/app/shared/shared-video/video-views-counter.component.scss b/client/src/app/shared/shared-video/video-views-counter.component.scss new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/client/src/app/shared/shared-video/video-views-counter.component.scss | |||
diff --git a/client/src/app/shared/shared-video/video-views-counter.component.ts b/client/src/app/shared/shared-video/video-views-counter.component.ts new file mode 100644 index 000000000..17e6e37b9 --- /dev/null +++ b/client/src/app/shared/shared-video/video-views-counter.component.ts | |||
@@ -0,0 +1,11 @@ | |||
1 | import { Component, Input } from '@angular/core' | ||
2 | import { Video } from '../shared-main' | ||
3 | |||
4 | @Component({ | ||
5 | selector: 'my-video-views-counter', | ||
6 | styleUrls: [ './video-views-counter.component.scss' ], | ||
7 | templateUrl: './video-views-counter.component.html' | ||
8 | }) | ||
9 | export class VideoViewsCounterComponent { | ||
10 | @Input() video: Video | ||
11 | } | ||