2 files changed, 28 insertions, 8 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 ea9909612..f3c1f1634 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
@@ -365,14 +365,18 @@
             </div>
 
             <div class="form-group originally-published-at">
-              <label i18n for="originallyPublishedAt">Original publication date</label>
-              <my-help>
-                <ng-template ptTemplate="preHtml">
-                  <ng-container i18n>
-                    This is the date when the content was originally published (e.g. the release date for a film)
-                  </ng-container>
-                </ng-template>
-              </my-help>
+              <div class="label-container">
+                <label i18n for="originallyPublishedAt">Original publication date</label>
+
+                <button i18n class="reset-button reset-button-small" (click)="resetField('originallyPublishedAt')" *ngIf="hasPublicationDate()">
+                  Reset
+                </button>
+              </div>
+
+              <div class="form-group-description" i18n>
+                This is the date when the content was originally published (e.g. the release date for a film)
+              </div>
+
               <p-calendar
                 id="originallyPublishedAt" formControlName="originallyPublishedAt" [dateFormat]="calendarDateFormat" [firstDayOfWeek]="0"
                 [showTime]="true" [hideOnDateTimeSelect]="true" [monthNavigator]="true" [yearNavigator]="true" [yearRange]="myYearRange"
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 b0c1352f3..898d3b0a6 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
@@ -264,6 +264,8 @@ export class VideoEditComponent implements OnInit, OnDestroy {
     if (this.schedulerInterval) clearInterval(this.schedulerInterval)
   }
 
+  // ---------------------------------------------------------------------------
+
   getExistingCaptions () {
     return this.videoCaptions
                .filter(c => c.action !== 'REMOVE')
@@ -312,6 +314,8 @@ export class VideoEditComponent implements OnInit, OnDestroy {
     modalRef.componentInstance.captionEdited.subscribe(this.onCaptionEdited.bind(this))
   }
 
+  // ---------------------------------------------------------------------------
+
   isSaveReplayAllowed () {
     return this.serverConfig.live.allowReplay
   }
@@ -328,6 +332,18 @@ export class VideoEditComponent implements OnInit, OnDestroy {
     return this.serverConfig.live.latencySetting.enabled
   }
 
+  hasPublicationDate () {
+    return !!this.form.value['originallyPublishedAt']
+  }
+
+  // ---------------------------------------------------------------------------
+
+  resetField (name: string) {
+    this.form.patchValue({ [name]: null })
+  }
+
+  // ---------------------------------------------------------------------------
+
   isPluginFieldHidden (pluginField: PluginField) {
     if (typeof pluginField.commonOptions.hidden !== 'function') return false