Migrate to bootstrap 4 and ng-bootstrap

9 files changed, 140 insertions, 165 deletions

diff --git a/client/src/app/videos/+video-watch/modal/video-download.component.html b/client/src/app/videos/+video-watch/modal/video-download.component.html
index 31b2f4228..edd054123 100644
--- a/client/src/app/videos/+video-watch/modal/video-download.component.html
+++ b/client/src/app/videos/+video-watch/modal/video-download.component.html
@@ -1,47 +1,42 @@
-<div bsModal #modal="bs-modal" class="modal" tabindex="-1">
-  <div class="modal-dialog">
-    <div class="modal-content">
-
-      <div class="modal-header">
-        <span class="close" aria-hidden="true" (click)="hide()"></span>
-        <h4 i18n class="modal-title">Download video</h4>
-      </div>
-
-      <div class="modal-body">
-        <div class="peertube-select-container">
-          <select [(ngModel)]="resolutionId">
-            <option *ngFor="let file of video.files" [value]="file.resolution.id">{{ file.resolution.label }}</option>
-          </select>
-        </div>
+<ng-template #modal let-hide="close">
+  <div class="modal-header">
+    <h4 i18n class="modal-title">Download video</h4>
+    <span class="close" aria-hidden="true" (click)="hide()"></span>
+  </div>
 
-        <div class="download-type">
-          <div class="peertube-radio-container">
-            <input type="radio" name="download" id="download-direct" [(ngModel)]="downloadType" value="direct">
-            <label i18n for="download-direct">Direct download</label>
-          </div>
-          
-          <div class="peertube-radio-container">
-            <input type="radio" name="download" id="download-torrent" [(ngModel)]="downloadType" value="torrent">
-            <label i18n for="download-torrent">Torrent (.torrent file)</label>
-          </div>
+  <div class="modal-body">
+    <div class="peertube-select-container">
+      <select [(ngModel)]="resolutionId">
+        <option *ngFor="let file of video.files" [value]="file.resolution.id">{{ file.resolution.label }}</option>
+      </select>
+    </div>
 
-          <div class="peertube-radio-container">
-            <input type="radio" name="download" id="download-magnet" [(ngModel)]="downloadType" value="magnet">
-            <label i18n for="download-magnet">Torrent (magnet link)</label>
-          </div>
-        </div>
+    <div class="download-type">
+      <div class="peertube-radio-container">
+        <input type="radio" name="download" id="download-direct" [(ngModel)]="downloadType" value="direct">
+        <label i18n for="download-direct">Direct download</label>
+      </div>
 
-        <div class="form-group inputs">
-          <span i18n class="action-button action-button-cancel" (click)="hide()">
-            Cancel
-          </span>
+      <div class="peertube-radio-container">
+        <input type="radio" name="download" id="download-torrent" [(ngModel)]="downloadType" value="torrent">
+        <label i18n for="download-torrent">Torrent (.torrent file)</label>
+      </div>
 
-          <input
-            type="submit" i18n-value value="Download" class="action-button-submit"
-            (click)="download()"
-          >
-        </div>
+      <div class="peertube-radio-container">
+        <input type="radio" name="download" id="download-magnet" [(ngModel)]="downloadType" value="magnet">
+        <label i18n for="download-magnet">Torrent (magnet link)</label>
       </div>
     </div>
   </div>
-</div>
+
+  <div class="modal-footer inputs">
+    <span i18n class="action-button action-button-cancel" (click)="hide()">
+      Cancel
+    </span>
+
+    <input
+      type="submit" i18n-value value="Download" class="action-button-submit"
+      (click)="download()"
+    >
+  </div>
+</ng-template>
diff --git a/client/src/app/videos/+video-watch/modal/video-download.component.ts b/client/src/app/videos/+video-watch/modal/video-download.component.ts
index 2de706e47..1361146dd 100644
--- a/client/src/app/videos/+video-watch/modal/video-download.component.ts
+++ b/client/src/app/videos/+video-watch/modal/video-download.component.ts
@@ -1,6 +1,6 @@
-import { Component, Input, OnInit, ViewChild } from '@angular/core'
-import { ModalDirective } from 'ngx-bootstrap/modal'
+import { Component, ElementRef, Input, OnInit, ViewChild } from '@angular/core'
 import { VideoDetails } from '../../../shared/video/video-details.model'
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
 
 @Component({
   selector: 'my-video-download',
@@ -10,12 +10,12 @@ import { VideoDetails } from '../../../shared/video/video-details.model'
 export class VideoDownloadComponent implements OnInit {
   @Input() video: VideoDetails = null
 
-  @ViewChild('modal') modal: ModalDirective
+  @ViewChild('modal') modal: ElementRef
 
   downloadType: 'direct' | 'torrent' | 'magnet' = 'torrent'
   resolutionId: number | string = -1
 
-  constructor () {
+  constructor (private modalService: NgbModal) {
     // empty
   }
 
@@ -24,11 +24,7 @@ export class VideoDownloadComponent implements OnInit {
   }
 
   show () {
-    this.modal.show()
-  }
-
-  hide () {
-    this.modal.hide()
+    this.modalService.open(this.modal)
   }
 
   download () {
diff --git a/client/src/app/videos/+video-watch/modal/video-report.component.html b/client/src/app/videos/+video-watch/modal/video-report.component.html
index 4ee3721fb..8d9a49276 100644
--- a/client/src/app/videos/+video-watch/modal/video-report.component.html
+++ b/client/src/app/videos/+video-watch/modal/video-report.component.html
@@ -1,36 +1,31 @@
-<div bsModal #modal="bs-modal" class="modal" tabindex="-1">
-  <div class="modal-dialog">
-    <div class="modal-content">
-
-      <div class="modal-header">
-        <span class="close" aria-hidden="true" (click)="hide()"></span>
-        <h4 i18n class="modal-title">Report video</h4>
-      </div>
-
-      <div class="modal-body">
+<ng-template #modal>
+  <div class="modal-header">
+    <h4 i18n class="modal-title">Report video</h4>
+    <span class="close" aria-label="Close" role="button" (click)="hide()"></span>
+  </div>
 
-        <form novalidate [formGroup]="form" (ngSubmit)="report()">
-          <div class="form-group">
-            <textarea i18n-placeholder placeholder="Reason..." formControlName="reason" [ngClass]="{ 'input-error': formErrors['reason'] }">
-            </textarea>
-            <div *ngIf="formErrors.reason" class="form-error">
-              {{ formErrors.reason }}
-            </div>
-          </div>
+  <div class="modal-body">
 
-          <div class="form-group inputs">
-            <span i18n class="action-button action-button-cancel" (click)="hide()">
-              Cancel
-            </span>
+    <form novalidate [formGroup]="form" (ngSubmit)="report()">
+      <div class="form-group">
+        <textarea i18n-placeholder placeholder="Reason..." formControlName="reason" [ngClass]="{ 'input-error': formErrors['reason'] }">
+        </textarea>
+        <div *ngIf="formErrors.reason" class="form-error">
+          {{ formErrors.reason }}
+        </div>
+      </div>
 
-            <input
-              type="submit" i18n-value value="Submit" class="action-button-submit"
-              [disabled]="!form.valid"
-            >
-          </div>
-        </form>
+      <div class="form-group inputs">
+        <span i18n class="action-button action-button-cancel" (click)="hide()">
+          Cancel
+        </span>
 
+        <input
+          type="submit" i18n-value value="Submit" class="action-button-submit"
+          [disabled]="!form.valid"
+        >
       </div>
-    </div>
+    </form>
+
   </div>
-</div>
+</ng-template>
diff --git a/client/src/app/videos/+video-watch/modal/video-report.component.ts b/client/src/app/videos/+video-watch/modal/video-report.component.ts
index d9768fdac..297afb19f 100644
--- a/client/src/app/videos/+video-watch/modal/video-report.component.ts
+++ b/client/src/app/videos/+video-watch/modal/video-report.component.ts
@@ -1,11 +1,12 @@
 import { Component, Input, OnInit, ViewChild } from '@angular/core'
 import { NotificationsService } from 'angular2-notifications'
-import { ModalDirective } from 'ngx-bootstrap/modal'
 import { FormReactive, VideoAbuseService } from '../../../shared/index'
 import { VideoDetails } from '../../../shared/video/video-details.model'
 import { I18n } from '@ngx-translate/i18n-polyfill'
 import { FormValidatorService } from '@app/shared/forms/form-validators/form-validator.service'
 import { VideoAbuseValidatorsService } from '@app/shared/forms/form-validators/video-abuse-validators.service'
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
+import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap/modal/modal-ref'
 
 @Component({
   selector: 'my-video-report',
@@ -15,12 +16,15 @@ import { VideoAbuseValidatorsService } from '@app/shared/forms/form-validators/v
 export class VideoReportComponent extends FormReactive implements OnInit {
   @Input() video: VideoDetails = null
 
-  @ViewChild('modal') modal: ModalDirective
+  @ViewChild('modal') modal: NgbModal
 
   error: string = null
 
+  private openedModal: NgbModalRef
+
   constructor (
     protected formValidatorService: FormValidatorService,
+    private modalService: NgbModal,
     private videoAbuseValidatorsService: VideoAbuseValidatorsService,
     private videoAbuseService: VideoAbuseService,
     private notificationsService: NotificationsService,
@@ -36,11 +40,12 @@ export class VideoReportComponent extends FormReactive implements OnInit {
   }
 
   show () {
-    this.modal.show()
+    this.openedModal = this.modalService.open(this.modal, { keyboard: false })
   }
 
   hide () {
-    this.modal.hide()
+    this.openedModal.close()
+    this.openedModal = null
   }
 
   report () {
diff --git a/client/src/app/videos/+video-watch/modal/video-share.component.html b/client/src/app/videos/+video-watch/modal/video-share.component.html
index 74a3a57d4..02f5f0f44 100644
--- a/client/src/app/videos/+video-watch/modal/video-share.component.html
+++ b/client/src/app/videos/+video-watch/modal/video-share.component.html
@@ -1,52 +1,46 @@
-<div bsModal #modal="bs-modal" class="modal" tabindex="-1">
-  <div class="modal-dialog">
-    <div class="modal-content">
-
-      <div class="modal-header">
-        <span class="close" aria-hidden="true" (click)="hide()"></span>
-        <h4 i18n class="modal-title">Share</h4>
-      </div>
-
-      <div class="modal-body">
-        <div class="form-group">
-          <label i18n>URL</label>
-          <div class="input-group input-group-sm">
-            <input #urlInput (click)="urlInput.select()" type="text" class="form-control input-sm readonly" readonly [value]="getVideoUrl()" />
-            <div class="input-group-btn" placement="bottom right">
-              <button [ngxClipboard]="urlInput" (click)="activateCopiedMessage()" type="button" class="btn btn-default btn-search">
-                <span class="glyphicon glyphicon-copy"></span>
-              </button>
-            </div>
-          </div>
-        </div>
+<ng-template #modal let-hide="close">
+  <div class="modal-header">
+    <h4 i18n class="modal-title">Share</h4>
+    <span class="close" aria-hidden="true" (click)="hide()"></span>
+  </div>
 
-        <div class="form-group">
-          <label i18n>Embed</label>
-          <div class="input-group input-group-sm">
-            <input #shareInput (click)="shareInput.select()" type="text" class="form-control input-sm readonly" readonly [value]="getVideoIframeCode()" />
-            <div class="input-group-btn" placement="bottom right">
-              <button [ngxClipboard]="shareInput" (click)="activateCopiedMessage()" type="button" class="btn btn-default btn-search">
-                <span class="glyphicon glyphicon-copy"></span>
-              </button>
-            </div>
-          </div>
+  <div class="modal-body">
+    <div class="form-group">
+      <label i18n>URL</label>
+      <div class="input-group input-group-sm">
+        <input #urlInput (click)="urlInput.select()" type="text" class="form-control input-sm readonly" readonly [value]="getVideoUrl()" />
+        <div class="input-group-append">
+          <button [ngxClipboard]="urlInput" (click)="activateCopiedMessage()" type="button" class="btn btn-outline-secondary">
+            <span class="glyphicon glyphicon-copy"></span>
+          </button>
         </div>
+      </div>
+    </div>
 
-        <div i18n *ngIf="notSecure()" class="alert alert-warning">
-          The url is not secured (no HTTPS), so the embed video won't work on HTTPS websites (web browsers block non secured HTTP requests on HTTPS websites).
+    <div class="form-group">
+      <label i18n>Embed</label>
+      <div class="input-group input-group-sm">
+        <input #shareInput (click)="shareInput.select()" type="text" class="form-control input-sm readonly" readonly [value]="getVideoIframeCode()" />
+        <div class="input-group-append">
+          <button [ngxClipboard]="shareInput" (click)="activateCopiedMessage()" type="button" class="btn btn-outline-secondary">
+            <span class="glyphicon glyphicon-copy"></span>
+          </button>
         </div>
+      </div>
+    </div>
 
-        <div class="form-group qr-code-group">
-          <label i18n>QR-Code</label>
-          <ngx-qrcode qrc-element-type="url" [qrc-value]="getVideoUrl()" qrc-errorCorrectionLevel="Q"></ngx-qrcode>
-        </div>
+    <div i18n *ngIf="notSecure()" class="alert alert-warning">
+      The url is not secured (no HTTPS), so the embed video won't work on HTTPS websites (web browsers block non secured HTTP requests on HTTPS websites).
+    </div>
 
-        <div class="form-group inputs">
-          <span i18n class="action-button action-button-cancel" (click)="hide()">
-            Cancel
-          </span>
-        </div>
-      </div>
+    <div class="form-group qr-code-group">
+      <label i18n>QR-Code</label>
+      <ngx-qrcode qrc-element-type="url" [qrc-value]="getVideoUrl()" qrc-errorCorrectionLevel="Q"></ngx-qrcode>
     </div>
   </div>
-</div>
+
+  <div class="modal-footer inputs">
+    <span i18n class="action-button action-button-cancel" (click)="hide()">Cancel</span>
+  </div>
+
+</ng-template>
diff --git a/client/src/app/videos/+video-watch/modal/video-share.component.scss b/client/src/app/videos/+video-watch/modal/video-share.component.scss
index c7f30bec5..a9e9b8498 100644
--- a/client/src/app/videos/+video-watch/modal/video-share.component.scss
+++ b/client/src/app/videos/+video-watch/modal/video-share.component.scss
@@ -1,7 +1,14 @@
+@import '~bootstrap/scss/functions';
+@import '~bootstrap/scss/variables';
+
 .action-button-cancel {
   margin-right: 0 !important;
 }
 
+.btn-outline-secondary {
+  border-color: $input-border-color;
+}
+
 .qr-code-group {
   text-align: center;
 }
diff --git a/client/src/app/videos/+video-watch/modal/video-share.component.ts b/client/src/app/videos/+video-watch/modal/video-share.component.ts
index 5c988a43b..14f557f9a 100644
--- a/client/src/app/videos/+video-watch/modal/video-share.component.ts
+++ b/client/src/app/videos/+video-watch/modal/video-share.component.ts
@@ -1,11 +1,9 @@
-import { Component, Input, ViewChild } from '@angular/core'
-
+import { Component, ElementRef, Input, ViewChild } from '@angular/core'
 import { NotificationsService } from 'angular2-notifications'
-
-import { ModalDirective } from 'ngx-bootstrap/modal'
 import { VideoDetails } from '../../../shared/video/video-details.model'
 import { buildVideoEmbed } from '../../../../assets/player/utils'
 import { I18n } from '@ngx-translate/i18n-polyfill'
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
 
 @Component({
   selector: 'my-video-share',
@@ -15,9 +13,10 @@ import { I18n } from '@ngx-translate/i18n-polyfill'
 export class VideoShareComponent {
   @Input() video: VideoDetails = null
 
-  @ViewChild('modal') modal: ModalDirective
+  @ViewChild('modal') modal: ElementRef
 
   constructor (
+    private modalService: NgbModal,
     private notificationsService: NotificationsService,
     private i18n: I18n
   ) {
@@ -25,11 +24,7 @@ export class VideoShareComponent {
   }
 
   show () {
-    this.modal.show()
-  }
-
-  hide () {
-    this.modal.hide()
+    this.modalService.open(this.modal)
   }
 
   getVideoIframeCode () {
diff --git a/client/src/app/videos/+video-watch/modal/video-support.component.html b/client/src/app/videos/+video-watch/modal/video-support.component.html
index 9bcfcea47..00c304709 100644
--- a/client/src/app/videos/+video-watch/modal/video-support.component.html
+++ b/client/src/app/videos/+video-watch/modal/video-support.component.html
@@ -1,22 +1,12 @@
-<div bsModal #modal="bs-modal" class="modal" tabindex="-1">
-  <div class="modal-dialog">
-    <div class="modal-content">
-
-      <div class="modal-header">
-        <span class="close" aria-hidden="true" (click)="hide()"></span>
-        <h4 i18n class="modal-title">Support</h4>
-      </div>
-
-      <div class="modal-body">
+<ng-template #modal let-hide="close">
+  <div class="modal-header">
+    <h4 i18n class="modal-title">Support</h4>
+    <span class="close" aria-label="Close" role="button" (click)="hide()"></span>
+  </div>
 
-        <div [innerHTML]="videoHTMLSupport"></div>
+  <div class="modal-body" [innerHTML]="videoHTMLSupport"></div>
 
-        <div class="form-group inputs">
-          <span i18n class="action-button action-button-cancel" (click)="hide()">
-            Cancel
-          </span>
-        </div>
-      </div>
-    </div>
+  <div class="modal-footer inputs">
+    <span i18n class="action-button action-button-cancel" (click)="hide()">Cancel</span>
   </div>
-</div>
+</ng-template>
diff --git a/client/src/app/videos/+video-watch/modal/video-support.component.ts b/client/src/app/videos/+video-watch/modal/video-support.component.ts
index c515298a0..2d400e0be 100644
--- a/client/src/app/videos/+video-watch/modal/video-support.component.ts
+++ b/client/src/app/videos/+video-watch/modal/video-support.component.ts
@@ -1,8 +1,8 @@
 import { Component, Input, ViewChild } from '@angular/core'
 import { MarkdownService } from '@app/videos/shared'
 
-import { ModalDirective } from 'ngx-bootstrap/modal'
 import { VideoDetails } from '../../../shared/video/video-details.model'
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
 
 @Component({
   selector: 'my-video-support',
@@ -12,21 +12,19 @@ import { VideoDetails } from '../../../shared/video/video-details.model'
 export class VideoSupportComponent {
   @Input() video: VideoDetails = null
 
-  @ViewChild('modal') modal: ModalDirective
+  @ViewChild('modal') modal: NgbModal
 
   videoHTMLSupport = ''
 
-  constructor (private markdownService: MarkdownService) {
+  constructor (
+    private markdownService: MarkdownService,
+    private modalService: NgbModal
+  ) {
     // empty
   }
 
   show () {
-    this.modal.show()
-
     this.videoHTMLSupport = this.markdownService.enhancedMarkdownToHTML(this.video.support)
-  }
-
-  hide () {
-    this.modal.hide()
+    this.modalService.open(this.modal)
   }
 }