From a73ab95f7307da566521e3ac1c5fac150ac63c08 Mon Sep 17 00:00:00 2001
From: "florian.azizian" <florian.azizian@maarch.org>
Date: Tue, 10 Mar 2020 11:57:20 +0100
Subject: [PATCH] FIX #12091 TIME 1:30 tinyMce was not loading after V1 page
---
modules/visa/css/module.css | 72 +------------------
...cknowledgement-receipt-action.component.ts | 1 +
.../sent-resource-page.component.ts | 1 +
3 files changed, 4 insertions(+), 70 deletions(-)
diff --git a/modules/visa/css/module.css b/modules/visa/css/module.css
index 85371ed27c9..4ff5e70e1bf 100755
--- a/modules/visa/css/module.css
+++ b/modules/visa/css/module.css
@@ -1,61 +1,7 @@
-.errorVisa{
- color: #ea0000;
- font-weight: bold;
- text-align: center;
- font-size: 1.4em;
-}
-#visa_listDoc{
- border:1px solid black;
- height:95%;
- width:15%;
- float: left;
-}
-
-#visa_left{
- height:95%;
- width:41%;
- margin-left:1%;
- float: left;
-}
-
-#tabricatorLeft{
- height:99.5%;
- min-width:0;
- width:99.5%;
- margin-bottom:0px;
-}
-
-#visa_right{
- height:95%;
- width:41%;
- margin-left:1%;
- float: left;
-}
-
-#tabricatorRight{
- height:90%;
- min-width:0;
- width:99.5%;
-}
-
-#visa_listDoc .toolbar{
- height: 4%;
- width: 100%;
-}
-
-#visa_listDoc .toolbar table{
- text-align:center;
- width:100%;
-}
-
.selectedId{
background-color:#F99830;
}
-#tab_visaSetWorkflow td{
- white-space: pre;
-}
-
[draggable=true]{
cursor: move;
}
@@ -124,20 +70,6 @@
.vised .visaUserStatus{
opacity: 1;
}
-.visaUserInfo{
- width: 55%;
- font-weight: bold;
-}
-
-.visaUserInfo .nbRes{
- background-color: grey;
- font-weight: normal;
-}
-
-.visaUserInfo sub{
- font-weight: normal;
-}
-
.droptarget:hover.vised #dropZone{
visibility: hidden;
}
@@ -433,7 +365,7 @@ img.panelSelectedThumbnail,img:hover.panelSelectedThumbnail{
cursor:pointer;
}
-.actions{
+/* .actions{
float:right;
width: 25%;
padding: 5px;
@@ -442,7 +374,7 @@ img.panelSelectedThumbnail,img:hover.panelSelectedThumbnail{
text-transform: initial;
border-left: solid 1px black;
border-right: solid 1px black;
-}
+} */
.actions i{
width:5%;
}
diff --git a/src/frontend/app/actions/create-acknowledgement-receipt-action/create-acknowledgement-receipt-action.component.ts b/src/frontend/app/actions/create-acknowledgement-receipt-action/create-acknowledgement-receipt-action.component.ts
index 5df86eadd9d..3c3eff2dd1b 100644
--- a/src/frontend/app/actions/create-acknowledgement-receipt-action/create-acknowledgement-receipt-action.component.ts
+++ b/src/frontend/app/actions/create-acknowledgement-receipt-action/create-acknowledgement-receipt-action.component.ts
@@ -176,6 +176,7 @@ export class CreateAcknowledgementReceiptActionComponent implements OnInit, OnDe
initMce() {
tinymce.init({
selector: "textarea#emailSignature",
+ base_url: '../../node_modules/tinymce/',
readonly: false,
suffix: '.min',
language: this.lang.langISO.replace('-', '_'),
diff --git a/src/frontend/app/sentResource/sent-resource-page/sent-resource-page.component.ts b/src/frontend/app/sentResource/sent-resource-page/sent-resource-page.component.ts
index ca45fdc0a7b..c48714bc7ed 100644
--- a/src/frontend/app/sentResource/sent-resource-page/sent-resource-page.component.ts
+++ b/src/frontend/app/sentResource/sent-resource-page/sent-resource-page.component.ts
@@ -137,6 +137,7 @@ export class SentResourcePageComponent implements OnInit {
initMce() {
tinymce.init({
selector: "textarea#emailSignature",
+ base_url: '../../node_modules/tinymce/',
setup: (editor: any) => {
editor.on('init', (e: any) => {
console.log('The Editor has initialized.');
--
GitLab