4 files changed, 77 insertions, 60 deletions

diff --git a/client/src/app/shared/images/global-icon.component.ts b/client/src/app/shared/images/global-icon.component.ts
index 806aca347..d2700f6c3 100644
--- a/client/src/app/shared/images/global-icon.component.ts
+++ b/client/src/app/shared/images/global-icon.component.ts
@@ -1,57 +1,62 @@
 import { ChangeDetectionStrategy, Component, ElementRef, Input, OnInit } from '@angular/core'
 import { HooksService } from '@app/core/plugins/hooks.service'
-import { I18n } from '@ngx-translate/i18n-polyfill'
 
 const icons = {
-  'add': require('!!raw-loader?!../../../assets/images/global/add.svg'),
-  'user': require('!!raw-loader?!../../../assets/images/global/user.svg'),
-  'sign-out': require('!!raw-loader?!../../../assets/images/global/sign-out.svg'),
-  'syndication': require('!!raw-loader?!../../../assets/images/global/syndication.svg'),
-  'help': require('!!raw-loader?!../../../assets/images/global/help.svg'),
-  'sparkle': require('!!raw-loader?!../../../assets/images/global/sparkle.svg'),
-  'alert': require('!!raw-loader?!../../../assets/images/global/alert.svg'),
-  'cloud-error': require('!!raw-loader?!../../../assets/images/global/cloud-error.svg'),
-  'clock': require('!!raw-loader?!../../../assets/images/global/clock.svg'),
-  'user-add': require('!!raw-loader?!../../../assets/images/global/user-add.svg'),
-  'no': require('!!raw-loader?!../../../assets/images/global/no.svg'),
-  'cloud-download': require('!!raw-loader?!../../../assets/images/global/cloud-download.svg'),
-  'undo': require('!!raw-loader?!../../../assets/images/global/undo.svg'),
-  'history': require('!!raw-loader?!../../../assets/images/global/history.svg'),
-  'circle-tick': require('!!raw-loader?!../../../assets/images/global/circle-tick.svg'),
-  'cog': require('!!raw-loader?!../../../assets/images/global/cog.svg'),
-  'download': require('!!raw-loader?!../../../assets/images/global/download.svg'),
-  'go': require('!!raw-loader?!../../../assets/images/menu/go.svg'),
-  'edit': require('!!raw-loader?!../../../assets/images/global/edit.svg'),
-  'im-with-her': require('!!raw-loader?!../../../assets/images/global/im-with-her.svg'),
-  'delete': require('!!raw-loader?!../../../assets/images/global/delete.svg'),
-  'server': require('!!raw-loader?!../../../assets/images/global/server.svg'),
-  'cross': require('!!raw-loader?!../../../assets/images/global/cross.svg'),
-  'validate': require('!!raw-loader?!../../../assets/images/global/validate.svg'),
-  'tick': require('!!raw-loader?!../../../assets/images/global/tick.svg'),
-  'repeat': require('!!raw-loader?!../../../assets/images/global/repeat.svg'),
-  'inbox-full': require('!!raw-loader?!../../../assets/images/global/inbox-full.svg'),
-  'dislike': require('!!raw-loader?!../../../assets/images/video/dislike.svg'),
-  'support': require('!!raw-loader?!../../../assets/images/video/support.svg'),
-  'like': require('!!raw-loader?!../../../assets/images/video/like.svg'),
-  'more-horizontal': require('!!raw-loader?!../../../assets/images/global/more-horizontal.svg'),
-  'more-vertical': require('!!raw-loader?!../../../assets/images/global/more-vertical.svg'),
-  'share': require('!!raw-loader?!../../../assets/images/video/share.svg'),
-  'upload': require('!!raw-loader?!../../../assets/images/video/upload.svg'),
-  'playlist-add': require('!!raw-loader?!../../../assets/images/video/playlist-add.svg'),
-  'play': require('!!raw-loader?!../../../assets/images/global/play.svg'),
-  'playlists': require('!!raw-loader?!../../../assets/images/global/playlists.svg'),
-  'about': require('!!raw-loader?!../../../assets/images/menu/about.svg'),
-  'globe': require('!!raw-loader?!../../../assets/images/menu/globe.svg'),
-  'home': require('!!raw-loader?!../../../assets/images/menu/home.svg'),
-  'recently-added': require('!!raw-loader?!../../../assets/images/menu/recently-added.svg'),
-  'trending': require('!!raw-loader?!../../../assets/images/menu/trending.svg'),
-  'videos': require('!!raw-loader?!../../../assets/images/global/videos.svg'),
-  'folder': require('!!raw-loader?!../../../assets/images/global/folder.svg'),
-  'administration': require('!!raw-loader?!../../../assets/images/menu/administration.svg'),
-  'subscriptions': require('!!raw-loader?!../../../assets/images/menu/subscriptions.svg'),
-  'users': require('!!raw-loader?!../../../assets/images/global/users.svg'),
-  'search': require('!!raw-loader?!../../../assets/images/global/search.svg'),
-  'refresh': require('!!raw-loader?!../../../assets/images/global/refresh.svg')
+  'add': require('!!raw-loader?!../../../assets/images/global/add.svg').default,
+  'user': require('!!raw-loader?!../../../assets/images/global/user.svg').default,
+  'sign-out': require('!!raw-loader?!../../../assets/images/global/sign-out.svg').default,
+  'syndication': require('!!raw-loader?!../../../assets/images/global/syndication.svg').default,
+  'help': require('!!raw-loader?!../../../assets/images/global/help.svg').default,
+  'sparkle': require('!!raw-loader?!../../../assets/images/global/sparkle.svg').default,
+  'alert': require('!!raw-loader?!../../../assets/images/global/alert.svg').default,
+  'cloud-error': require('!!raw-loader?!../../../assets/images/global/cloud-error.svg').default,
+  'clock': require('!!raw-loader?!../../../assets/images/global/clock.svg').default,
+  'user-add': require('!!raw-loader?!../../../assets/images/global/user-add.svg').default,
+  'no': require('!!raw-loader?!../../../assets/images/global/no.svg').default,
+  'cloud-download': require('!!raw-loader?!../../../assets/images/global/cloud-download.svg').default,
+  'undo': require('!!raw-loader?!../../../assets/images/global/undo.svg').default,
+  'history': require('!!raw-loader?!../../../assets/images/global/history.svg').default,
+  'circle-tick': require('!!raw-loader?!../../../assets/images/global/circle-tick.svg').default,
+  'cog': require('!!raw-loader?!../../../assets/images/global/cog.svg').default,
+  'download': require('!!raw-loader?!../../../assets/images/global/download.svg').default,
+  'go': require('!!raw-loader?!../../../assets/images/menu/go.svg').default,
+  'edit': require('!!raw-loader?!../../../assets/images/global/edit.svg').default,
+  'im-with-her': require('!!raw-loader?!../../../assets/images/global/im-with-her.svg').default,
+  'delete': require('!!raw-loader?!../../../assets/images/global/delete.svg').default,
+  'server': require('!!raw-loader?!../../../assets/images/global/server.svg').default,
+  'cross': require('!!raw-loader?!../../../assets/images/global/cross.svg').default,
+  'validate': require('!!raw-loader?!../../../assets/images/global/validate.svg').default,
+  'tick': require('!!raw-loader?!../../../assets/images/global/tick.svg').default,
+  'repeat': require('!!raw-loader?!../../../assets/images/global/repeat.svg').default,
+  'inbox-full': require('!!raw-loader?!../../../assets/images/global/inbox-full.svg').default,
+  'dislike': require('!!raw-loader?!../../../assets/images/video/dislike.svg').default,
+  'support': require('!!raw-loader?!../../../assets/images/video/support.svg').default,
+  'like': require('!!raw-loader?!../../../assets/images/video/like.svg').default,
+  'more-horizontal': require('!!raw-loader?!../../../assets/images/global/more-horizontal.svg').default,
+  'more-vertical': require('!!raw-loader?!../../../assets/images/global/more-vertical.svg').default,
+  'share': require('!!raw-loader?!../../../assets/images/video/share.svg').default,
+  'upload': require('!!raw-loader?!../../../assets/images/video/upload.svg').default,
+  'playlist-add': require('!!raw-loader?!../../../assets/images/video/playlist-add.svg').default,
+  'play': require('!!raw-loader?!../../../assets/images/global/play.svg').default,
+  'playlists': require('!!raw-loader?!../../../assets/images/global/playlists.svg').default,
+  'globe': require('!!raw-loader?!../../../assets/images/menu/globe.svg').default,
+  'home': require('!!raw-loader?!../../../assets/images/menu/home.svg').default,
+  'recently-added': require('!!raw-loader?!../../../assets/images/menu/recently-added.svg').default,
+  'trending': require('!!raw-loader?!../../../assets/images/menu/trending.svg').default,
+  'video-lang': require('!!raw-loader?!../../../assets/images/global/video-lang.svg').default,
+  'videos': require('!!raw-loader?!../../../assets/images/global/videos.svg').default,
+  'folder': require('!!raw-loader?!../../../assets/images/global/folder.svg').default,
+  'subscriptions': require('!!raw-loader?!../../../assets/images/menu/subscriptions.svg').default,
+  'language': require('!!raw-loader?!../../../assets/images/menu/language.svg').default,
+  'unsensitive': require('!!raw-loader?!../../../assets/images/menu/eye.svg').default,
+  'sensitive': require('!!raw-loader?!../../../assets/images/menu/eye-closed.svg').default,
+  'p2p': require('!!raw-loader?!../../../assets/images/menu/p2p.svg').default,
+  'users': require('!!raw-loader?!../../../assets/images/global/users.svg').default,
+  'search': require('!!raw-loader?!../../../assets/images/global/search.svg').default,
+  'refresh': require('!!raw-loader?!../../../assets/images/global/refresh.svg').default,
+  'npm': require('!!raw-loader?!../../../assets/images/global/npm.svg').default,
+  'fullscreen': require('!!raw-loader?!../../../assets/images/global/fullscreen.svg').default,
+  'exit-fullscreen': require('!!raw-loader?!../../../assets/images/global/exit-fullscreen.svg').default
 }
 
 export type GlobalIconName = keyof typeof icons
diff --git a/client/src/app/shared/images/preview-upload.component.html b/client/src/app/shared/images/preview-upload.component.html
index 5e1d5211b..7c3a2b588 100644
--- a/client/src/app/shared/images/preview-upload.component.html
+++ b/client/src/app/shared/images/preview-upload.component.html
@@ -1,13 +1,11 @@
 <div class="root">
   <div class="preview-container">
     <my-reactive-file
-      [inputName]="inputName" [inputLabel]="inputLabel" [extensions]="videoImageExtensions" [maxFileSize]="maxVideoImageSize"
-      icon="edit" (fileChanged)="onFileChanged($event)"
+      [inputName]="inputName" [inputLabel]="inputLabel" [extensions]="videoImageExtensions" [maxFileSize]="maxVideoImageSize" placement="right"
+      icon="edit" (fileChanged)="onFileChanged($event)" [ngbTooltip]="'(extensions: '+ videoImageExtensions +', '+ maxSizeText +': '+ maxVideoImageSizeInBytes +')'"
     ></my-reactive-file>
 
     <img *ngIf="imageSrc" [ngStyle]="{ width: previewWidth, height: previewHeight }" [src]="imageSrc" class="preview" />
     <div *ngIf="!imageSrc" [ngStyle]="{ width: previewWidth, height: previewHeight }" class="preview no-image"></div>
   </div>
-
-  <div i18n class="file-constraints">(extensions: {{ allowedExtensionsMessage }}, max size: {{ maxVideoImageSize | bytes }})</div>
 </div>
diff --git a/client/src/app/shared/images/preview-upload.component.scss b/client/src/app/shared/images/preview-upload.component.scss
index 257060239..8f3522115 100644
--- a/client/src/app/shared/images/preview-upload.component.scss
+++ b/client/src/app/shared/images/preview-upload.component.scss
@@ -16,11 +16,13 @@
     }
 
     .preview {
-      border: 2px solid grey;
+      object-fit: cover;
       border-radius: 4px;
+      max-width: 100%;
 
       &.no-image {
-        background-color: #ececec;
+        border: 2px solid grey;
+        background-color: var(--mainBackgroundColor);
       }
     }
   }
diff --git a/client/src/app/shared/images/preview-upload.component.ts b/client/src/app/shared/images/preview-upload.component.ts
index f56f5b1f8..7519734ba 100644
--- a/client/src/app/shared/images/preview-upload.component.ts
+++ b/client/src/app/shared/images/preview-upload.component.ts
@@ -3,6 +3,8 @@ import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'
 import { DomSanitizer, SafeResourceUrl } from '@angular/platform-browser'
 import { ServerService } from '@app/core'
 import { ServerConfig } from '@shared/models'
+import { BytesPipe } from 'ngx-pipes'
+import { I18n } from '@ngx-translate/i18n-polyfill'
 
 @Component({
   selector: 'my-preview-upload',
@@ -24,14 +26,20 @@ export class PreviewUploadComponent implements OnInit, ControlValueAccessor {
 
   imageSrc: SafeResourceUrl
   allowedExtensionsMessage = ''
+  maxSizeText: string
 
   private serverConfig: ServerConfig
-  private file: File
+  private bytesPipe: BytesPipe
+  private file: Blob
 
   constructor (
     private sanitizer: DomSanitizer,
-    private serverService: ServerService
-  ) {}
+    private serverService: ServerService,
+    private i18n: I18n
+  ) {
+    this.bytesPipe = new BytesPipe()
+    this.maxSizeText = this.i18n('max size')
+  }
 
   get videoImageExtensions () {
     return this.serverConfig.video.image.extensions
@@ -41,6 +49,10 @@ export class PreviewUploadComponent implements OnInit, ControlValueAccessor {
     return this.serverConfig.video.image.size.max
   }
 
+  get maxVideoImageSizeInBytes () {
+    return this.bytesPipe.transform(this.maxVideoImageSize)
+  }
+
   ngOnInit () {
     this.serverConfig = this.serverService.getTmpConfig()
     this.serverService.getConfig()
@@ -49,7 +61,7 @@ export class PreviewUploadComponent implements OnInit, ControlValueAccessor {
     this.allowedExtensionsMessage = this.videoImageExtensions.join(', ')
   }
 
-  onFileChanged (file: File) {
+  onFileChanged (file: Blob) {
     this.file = file
 
     this.propagateChange(this.file)