diff options
5 files changed, 9 insertions, 5 deletions
diff --git a/client/src/app/+videos/+video-edit/shared/video-edit.component.html b/client/src/app/+videos/+video-edit/shared/video-edit.component.html index 650448a74..2892d603d 100644 --- a/client/src/app/+videos/+video-edit/shared/video-edit.component.html +++ b/client/src/app/+videos/+video-edit/shared/video-edit.component.html | |||
@@ -183,7 +183,7 @@ | |||
183 | [href]="videoCaption.captionPath" | 183 | [href]="videoCaption.captionPath" |
184 | >{{ videoCaption.language.label }}</a> | 184 | >{{ videoCaption.language.label }}</a> |
185 | 185 | ||
186 | <div i18n class="caption-entry-state">Already uploaded ✔</div> | 186 | <div i18n class="caption-entry-state">Already uploaded on {{ videoCaption.updatedAt | date }} ✔</div> |
187 | 187 | ||
188 | <span i18n class="caption-entry-edit" (click)="videoCaptionEditModal.show()">Edit</span> | 188 | <span i18n class="caption-entry-edit" (click)="videoCaptionEditModal.show()">Edit</span> |
189 | <span i18n class="caption-entry-delete" (click)="deleteCaption(videoCaption)">Delete</span> | 189 | <span i18n class="caption-entry-delete" (click)="deleteCaption(videoCaption)">Delete</span> |
diff --git a/client/src/app/+videos/+video-edit/shared/video-edit.component.scss b/client/src/app/+videos/+video-edit/shared/video-edit.component.scss index e8a6c6e42..a8075cc6d 100644 --- a/client/src/app/+videos/+video-edit/shared/video-edit.component.scss +++ b/client/src/app/+videos/+video-edit/shared/video-edit.component.scss | |||
@@ -41,7 +41,6 @@ my-peertube-checkbox { | |||
41 | a.caption-entry-label { | 41 | a.caption-entry-label { |
42 | @include disable-default-a-behaviour; | 42 | @include disable-default-a-behaviour; |
43 | 43 | ||
44 | flex-grow: 1; | ||
45 | color: #000; | 44 | color: #000; |
46 | 45 | ||
47 | &:hover { | 46 | &:hover { |
@@ -53,11 +52,13 @@ my-peertube-checkbox { | |||
53 | @include margin-right(20px); | 52 | @include margin-right(20px); |
54 | 53 | ||
55 | font-weight: bold; | 54 | font-weight: bold; |
56 | width: 150px; | 55 | min-width: 100px; |
57 | } | 56 | } |
58 | 57 | ||
59 | .caption-entry-state { | 58 | .caption-entry-state { |
60 | width: 200px; | 59 | @include margin-right(15px); |
60 | |||
61 | min-width: 250px; | ||
61 | 62 | ||
62 | &.caption-entry-state-create { | 63 | &.caption-entry-state-create { |
63 | color: #39CC0B; | 64 | color: #39CC0B; |
diff --git a/client/src/app/shared/shared-main/video-caption/video-caption-edit.model.ts b/client/src/app/shared/shared-main/video-caption/video-caption-edit.model.ts index 129e80bc0..8d578cae6 100644 --- a/client/src/app/shared/shared-main/video-caption/video-caption-edit.model.ts +++ b/client/src/app/shared/shared-main/video-caption/video-caption-edit.model.ts | |||
@@ -6,6 +6,7 @@ export interface VideoCaptionEdit { | |||
6 | 6 | ||
7 | action?: 'CREATE' | 'REMOVE' | 'UPDATE' | 7 | action?: 'CREATE' | 'REMOVE' | 'UPDATE' |
8 | captionfile?: any | 8 | captionfile?: any |
9 | updatedAt?: string | ||
9 | } | 10 | } |
10 | 11 | ||
11 | export type VideoCaptionWithPathEdit = VideoCaptionEdit & { captionPath?: string } | 12 | export type VideoCaptionWithPathEdit = VideoCaptionEdit & { captionPath?: string } |
diff --git a/server/models/video/video-caption.ts b/server/models/video/video-caption.ts index 6b240f116..5fbcd6e3b 100644 --- a/server/models/video/video-caption.ts +++ b/server/models/video/video-caption.ts | |||
@@ -195,7 +195,8 @@ export class VideoCaptionModel extends Model<Partial<AttributesOnly<VideoCaption | |||
195 | id: this.language, | 195 | id: this.language, |
196 | label: VideoCaptionModel.getLanguageLabel(this.language) | 196 | label: VideoCaptionModel.getLanguageLabel(this.language) |
197 | }, | 197 | }, |
198 | captionPath: this.getCaptionStaticPath() | 198 | captionPath: this.getCaptionStaticPath(), |
199 | updatedAt: this.updatedAt.toISOString() | ||
199 | } | 200 | } |
200 | } | 201 | } |
201 | 202 | ||
diff --git a/shared/models/videos/caption/video-caption.model.ts b/shared/models/videos/caption/video-caption.model.ts index d3c73e1a6..6d5665006 100644 --- a/shared/models/videos/caption/video-caption.model.ts +++ b/shared/models/videos/caption/video-caption.model.ts | |||
@@ -3,4 +3,5 @@ import { VideoConstant } from '../video-constant.model' | |||
3 | export interface VideoCaption { | 3 | export interface VideoCaption { |
4 | language: VideoConstant<string> | 4 | language: VideoConstant<string> |
5 | captionPath: string | 5 | captionPath: string |
6 | updatedAt: string | ||
6 | } | 7 | } |