diff options
Diffstat (limited to 'client/src/app/videos/+video-edit/shared')
3 files changed, 26 insertions, 45 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 4675cb827..16dbf5cfc 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 | |||
@@ -110,31 +110,22 @@ | |||
110 | </div> | 110 | </div> |
111 | </div> | 111 | </div> |
112 | 112 | ||
113 | <div class="form-group form-group-checkbox"> | 113 | <my-peertube-checkbox |
114 | <input type="checkbox" id="nsfw" formControlName="nsfw" /> | 114 | inputName="nsfw" formControlName="nsfw" |
115 | <label for="nsfw"></label> | 115 | i18n-labelText labelText="This video contains mature or explicit content" |
116 | <label i18n for="nsfw">This video contains mature or explicit content</label> | 116 | i18n-helpHtml helpHtml="Some instances do not list videos containing mature or explicit content by default." |
117 | <my-help | 117 | ></my-peertube-checkbox> |
118 | tooltipPlacement="top" helpType="custom" i18n-customHtml | 118 | |
119 | customHtml="Some instances do not list videos containing mature or explicit content by default." | 119 | <my-peertube-checkbox |
120 | ></my-help> | 120 | inputName="commentsEnabled" formControlName="commentsEnabled" |
121 | </div> | 121 | i18n-labelText labelText="Enable video comments" |
122 | 122 | ></my-peertube-checkbox> | |
123 | <div class="form-group form-group-checkbox"> | 123 | |
124 | <input type="checkbox" id="commentsEnabled" formControlName="commentsEnabled" /> | 124 | <my-peertube-checkbox |
125 | <label for="commentsEnabled"></label> | 125 | inputName="waitTranscoding" formControlName="waitTranscoding" |
126 | <label i18n for="commentsEnabled">Enable video comments</label> | 126 | i18n-labelText labelText="Wait transcoding before publishing the video" |
127 | </div> | 127 | i18n-helpHtml helpHtml="If you decide not to wait for transcoding before publishing the video, it could be unplayable until transcoding ends." |
128 | 128 | ></my-peertube-checkbox> | |
129 | <div class="form-group form-group-checkbox"> | ||
130 | <input type="checkbox" id="waitTranscoding" formControlName="waitTranscoding" /> | ||
131 | <label for="waitTranscoding"></label> | ||
132 | <label i18n for="waitTranscoding">Wait transcoding before publishing the video</label> | ||
133 | <my-help | ||
134 | tooltipPlacement="top" helpType="custom" i18n-customHtml | ||
135 | customHtml="If you decide not to wait for transcoding before publishing the video, it could be unplayable until transcoding ends." | ||
136 | ></my-help> | ||
137 | </div> | ||
138 | 129 | ||
139 | </div> | 130 | </div> |
140 | </tab> | 131 | </tab> |
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 03b8359de..058ccba36 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 | |||
@@ -16,31 +16,12 @@ | |||
16 | input { | 16 | input { |
17 | @include peertube-input-text(100%); | 17 | @include peertube-input-text(100%); |
18 | display: block; | 18 | display: block; |
19 | |||
20 | &[type=checkbox] { | ||
21 | @include peertube-checkbox(1px); | ||
22 | } | ||
23 | } | 19 | } |
24 | 20 | ||
25 | input, select { | 21 | input, select { |
26 | font-size: 15px | 22 | font-size: 15px |
27 | } | 23 | } |
28 | 24 | ||
29 | .form-group-checkbox { | ||
30 | display: flex; | ||
31 | align-items: center; | ||
32 | |||
33 | label { | ||
34 | font-weight: $font-regular; | ||
35 | margin: 0; | ||
36 | } | ||
37 | |||
38 | input { | ||
39 | width: 10px; | ||
40 | margin-right: 10px; | ||
41 | } | ||
42 | } | ||
43 | |||
44 | .label-tags + span { | 25 | .label-tags + span { |
45 | font-size: 15px; | 26 | font-size: 15px; |
46 | } | 27 | } |
diff --git a/client/src/app/videos/+video-edit/shared/video-edit.component.ts b/client/src/app/videos/+video-edit/shared/video-edit.component.ts index 743c015cb..00c7bc41d 100644 --- a/client/src/app/videos/+video-edit/shared/video-edit.component.ts +++ b/client/src/app/videos/+video-edit/shared/video-edit.component.ts | |||
@@ -49,6 +49,7 @@ export class VideoEditComponent implements OnInit, OnDestroy { | |||
49 | calendarDateFormat: string | 49 | calendarDateFormat: string |
50 | 50 | ||
51 | private schedulerInterval | 51 | private schedulerInterval |
52 | private firstPatchDone = false | ||
52 | 53 | ||
53 | constructor ( | 54 | constructor ( |
54 | private formValidatorService: FormValidatorService, | 55 | private formValidatorService: FormValidatorService, |
@@ -167,6 +168,7 @@ export class VideoEditComponent implements OnInit, OnDestroy { | |||
167 | .pipe(map(res => parseInt(res.toString(), 10))) | 168 | .pipe(map(res => parseInt(res.toString(), 10))) |
168 | .subscribe( | 169 | .subscribe( |
169 | newPrivacyId => { | 170 | newPrivacyId => { |
171 | |||
170 | this.schedulePublicationEnabled = newPrivacyId === this.SPECIAL_SCHEDULED_PRIVACY | 172 | this.schedulePublicationEnabled = newPrivacyId === this.SPECIAL_SCHEDULED_PRIVACY |
171 | 173 | ||
172 | // Value changed | 174 | // Value changed |
@@ -182,11 +184,18 @@ export class VideoEditComponent implements OnInit, OnDestroy { | |||
182 | scheduleControl.clearValidators() | 184 | scheduleControl.clearValidators() |
183 | 185 | ||
184 | waitTranscodingControl.enable() | 186 | waitTranscodingControl.enable() |
185 | waitTranscodingControl.setValue(true) | 187 | |
188 | // Do not update the control value on first patch (values come from the server) | ||
189 | if (this.firstPatchDone === true) { | ||
190 | waitTranscodingControl.setValue(true) | ||
191 | } | ||
186 | } | 192 | } |
187 | 193 | ||
188 | scheduleControl.updateValueAndValidity() | 194 | scheduleControl.updateValueAndValidity() |
189 | waitTranscodingControl.updateValueAndValidity() | 195 | waitTranscodingControl.updateValueAndValidity() |
196 | |||
197 | this.firstPatchDone = true | ||
198 | |||
190 | } | 199 | } |
191 | ) | 200 | ) |
192 | } | 201 | } |