From 931e248544a84d9eac762d896efa26c013b662ac Mon Sep 17 00:00:00 2001
From: "hamza.hramchi" <hamza.hramchi@xelians.fr>
Date: Thu, 19 Nov 2020 15:06:32 +0100
Subject: [PATCH] FEAT #15460 TIME 1 replace the img tag with mat-icon to solve
the problem of displaying a logo in svg format in some cases
---
.../customization/parameters-customization.component.html | 3 ++-
.../customization/parameters-customization.component.scss | 6 ++++++
.../customization/parameters-customization.component.ts | 6 ++++--
3 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/src/frontend/app/administration/parameter/customization/parameters-customization.component.html b/src/frontend/app/administration/parameter/customization/parameters-customization.component.html
index 1180958600a..031dc5db7e0 100644
--- a/src/frontend/app/administration/parameter/customization/parameters-customization.component.html
+++ b/src/frontend/app/administration/parameter/customization/parameters-customization.component.html
@@ -19,7 +19,8 @@
<div>{{'lang.chooseLogo' | translate}} : </div>
<div>
<mat-card style="width: 350px;background-size: 100%;cursor: pointer;" matRipple>
- <img [src]="logoURL()" (click)="clickLogoButton(uploadLogo)" style="width: 100%;" />
+ <!--<img [src]="logoURL()" (click)="clickLogoButton(uploadLogo)" style="width: 100%;" />-->
+ <mat-icon svgIcon="maarchLogoFull" class="maarchLogo" (click)="clickLogoButton(uploadLogo)"></mat-icon>
<input type="file" name="files[]" #uploadLogo (change)="uploadTrigger($event, 'logo')"
accept="image/svg+xml" style="display: none;">
</mat-card>
diff --git a/src/frontend/app/administration/parameter/customization/parameters-customization.component.scss b/src/frontend/app/administration/parameter/customization/parameters-customization.component.scss
index cd0bf27be23..e2a7367f5b0 100644
--- a/src/frontend/app/administration/parameter/customization/parameters-customization.component.scss
+++ b/src/frontend/app/administration/parameter/customization/parameters-customization.component.scss
@@ -28,4 +28,10 @@
.backgroundItem:not(.disabled):hover {
transition: all 0.3s;
opacity: 1 !important;
+}
+
+.maarchLogo {
+ width: 100%;
+ height: 50%;
+ padding-bottom: 10px;
}
\ No newline at end of file
diff --git a/src/frontend/app/administration/parameter/customization/parameters-customization.component.ts b/src/frontend/app/administration/parameter/customization/parameters-customization.component.ts
index 11fb3b9d060..88f3e0ca107 100644
--- a/src/frontend/app/administration/parameter/customization/parameters-customization.component.ts
+++ b/src/frontend/app/administration/parameter/customization/parameters-customization.component.ts
@@ -144,6 +144,7 @@ export class ParametersCustomizationComponent implements OnInit, OnDestroy {
}
uploadTrigger(fileInput: any, mode: string) {
+ console.log(fileInput);
if (fileInput.target.files && fileInput.target.files[0]) {
const res = this.canUploadFile(fileInput.target.files[0], mode);
if (res === true) {
@@ -196,9 +197,10 @@ export class ParametersCustomizationComponent implements OnInit, OnDestroy {
return true;
}
- logoURL() {
+ // I replaced the img with the mat-icon
+ /* logoURL() {
return this.sanitizer.bypassSecurityTrustUrl(this.stepFormGroup.controls['logo'].value);
- }
+ } */
selectBg(content: string) {
if (!this.stepFormGroup.controls['bodyImage'].disabled) {
--
GitLab