Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[Embedded] Change logo: imageEmbedded->image

Browse source
This commit is contained in:
Julia Radzhabova 2021-09-30 16:35:37 +03:00
parent 8bf0d510c1
commit 4e29149fb5
10 changed files with 27 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/api/documents/api.js
View file

@ -105,7 +105,7 @@
customization: { customization: {
logo: { logo: {
image: url, image: url,
imageEmbedded: url, imageEmbedded: url, // deprecated, use image instead
url: http://... url: http://...
}, },
customer: { customer: {
@ -918,8 +918,8 @@
if ( (typeof(config.editorConfig.customization) == 'object') && config.editorConfig.customization.loaderLogo) { if ( (typeof(config.editorConfig.customization) == 'object') && config.editorConfig.customization.loaderLogo) {
if (config.editorConfig.customization.loaderLogo !== '') params += "&logo=" + encodeURIComponent(config.editorConfig.customization.loaderLogo); if (config.editorConfig.customization.loaderLogo !== '') params += "&logo=" + encodeURIComponent(config.editorConfig.customization.loaderLogo);
} else if ( (typeof(config.editorConfig.customization) == 'object') && config.editorConfig.customization.logo) { } else if ( (typeof(config.editorConfig.customization) == 'object') && config.editorConfig.customization.logo) {
if (config.type=='embedded' && config.editorConfig.customization.logo.imageEmbedded) if (config.type=='embedded' && (config.editorConfig.customization.logo.imageEmbedded || config.editorConfig.customization.logo.image))
params += "&headerlogo=" + encodeURIComponent(config.editorConfig.customization.logo.imageEmbedded); params += "&headerlogo=" + encodeURIComponent(config.editorConfig.customization.logo.imageEmbedded || config.editorConfig.customization.logo.image);
else if (config.type!='embedded' && config.editorConfig.customization.logo.image) else if (config.type!='embedded' && config.editorConfig.customization.logo.image)
params += "&headerlogo=" + encodeURIComponent(config.editorConfig.customization.logo.image); params += "&headerlogo=" + encodeURIComponent(config.editorConfig.customization.logo.image);
} }

4
apps/documenteditor/embed/index.html
View file

@ -43,14 +43,14 @@
.loadmask > .brendpanel .loading-logo { .loadmask > .brendpanel .loading-logo {
max-width: 200px; max-width: 200px;
height: 24px; height: 20px;
margin-left: 10px; margin-left: 10px;
text-align: center; text-align: center;
} }
.loadmask > .brendpanel .loading-logo > img { .loadmask > .brendpanel .loading-logo > img {
display: inline-block; display: inline-block;
max-width: 124px; max-width: 100px;
max-height: 20px; max-height: 20px;
opacity: 0; opacity: 0;
} }

4
apps/documenteditor/embed/index.html.deploy
View file

@ -41,14 +41,14 @@
.loadmask > .brendpanel .loading-logo { .loadmask > .brendpanel .loading-logo {
max-width: 200px; max-width: 200px;
height: 24px; height: 20px;
margin-left: 10px; margin-left: 10px;
text-align: center; text-align: center;
} }
.loadmask > .brendpanel .loading-logo > img { .loadmask > .brendpanel .loading-logo > img {
display: inline-block; display: inline-block;
max-width: 124px; max-width: 100px;
max-height: 20px; max-height: 20px;
opacity: 0; opacity: 0;
} }

6
apps/documenteditor/embed/js/ApplicationController.js
View file

@ -599,9 +599,11 @@ DE.ApplicationController = new(function(){
config.customization && config.customization.logo ) { config.customization && config.customization.logo ) {
var logo = $('#header-logo'); var logo = $('#header-logo');
if (config.customization.logo.imageEmbedded) { if (config.customization.logo.imageEmbedded || config.customization.logo.image) {
logo.html('<img src="'+config.customization.logo.imageEmbedded+'" style="max-width:124px; max-height:20px;"/>'); logo.html('<img src="'+(config.customization.logo.imageEmbedded || config.customization.logo.image)+'" style="max-width:124px; max-height:20px;"/>');
logo.css({'background-image': 'none', width: 'auto', height: 'auto'}); logo.css({'background-image': 'none', width: 'auto', height: 'auto'});
config.customization.logo.imageEmbedded && console.log("Obsolete: The 'imageEmbedded' parameter of the 'customization.logo' section is deprecated. Please use 'image' parameter instead.");
} }
if (config.customization.logo.url) { if (config.customization.logo.url) {

4
apps/presentationeditor/embed/index.html
View file

@ -43,14 +43,14 @@
.loadmask > .brendpanel .loading-logo { .loadmask > .brendpanel .loading-logo {
max-width: 200px; max-width: 200px;
height: 24px; height: 20px;
margin-left: 10px; margin-left: 10px;
text-align: center; text-align: center;
} }
.loadmask > .brendpanel .loading-logo > img { .loadmask > .brendpanel .loading-logo > img {
display: inline-block; display: inline-block;
max-width: 124px; max-width: 100px;
max-height: 20px; max-height: 20px;
opacity: 0; opacity: 0;
} }

4
apps/presentationeditor/embed/index.html.deploy
View file

@ -41,14 +41,14 @@
.loadmask > .brendpanel .loading-logo { .loadmask > .brendpanel .loading-logo {
max-width: 200px; max-width: 200px;
height: 24px; height: 20px;
margin-left: 10px; margin-left: 10px;
text-align: center; text-align: center;
} }
.loadmask > .brendpanel .loading-logo > img { .loadmask > .brendpanel .loading-logo > img {
display: inline-block; display: inline-block;
max-width: 124px; max-width: 100px;
max-height: 20px; max-height: 20px;
opacity: 0; opacity: 0;
} }

6
apps/presentationeditor/embed/js/ApplicationController.js
View file

@ -457,9 +457,11 @@ PE.ApplicationController = new(function(){
config.customization && config.customization.logo ) { config.customization && config.customization.logo ) {
var logo = $('#header-logo'); var logo = $('#header-logo');
if (config.customization.logo.imageEmbedded) { if (config.customization.logo.imageEmbedded || config.customization.logo.image) {
logo.html('<img src="'+config.customization.logo.imageEmbedded+'" style="max-width:124px; max-height:20px;"/>'); logo.html('<img src="'+(config.customization.logo.imageEmbedded || config.customization.logo.image)+'" style="max-width:124px; max-height:20px;"/>');
logo.css({'background-image': 'none', width: 'auto', height: 'auto'}); logo.css({'background-image': 'none', width: 'auto', height: 'auto'});
config.customization.logo.imageEmbedded && console.log("Obsolete: The 'imageEmbedded' parameter of the 'customization.logo' section is deprecated. Please use 'image' parameter instead.");
} }
if (config.customization.logo.url) { if (config.customization.logo.url) {

4
apps/spreadsheeteditor/embed/index.html
View file

@ -43,14 +43,14 @@
.loadmask > .brendpanel .loading-logo { .loadmask > .brendpanel .loading-logo {
max-width: 200px; max-width: 200px;
height: 24px; height: 20px;
margin-left: 10px; margin-left: 10px;
text-align: center; text-align: center;
} }
.loadmask > .brendpanel .loading-logo > img { .loadmask > .brendpanel .loading-logo > img {
display: inline-block; display: inline-block;
max-width: 124px; max-width: 100px;
max-height: 20px; max-height: 20px;
opacity: 0; opacity: 0;
} }

4
apps/spreadsheeteditor/embed/index.html.deploy
View file

@ -40,14 +40,14 @@
.loadmask > .brendpanel .loading-logo { .loadmask > .brendpanel .loading-logo {
max-width: 200px; max-width: 200px;
height: 24px; height: 20px;
margin-left: 10px; margin-left: 10px;
text-align: center; text-align: center;
} }
.loadmask > .brendpanel .loading-logo > img { .loadmask > .brendpanel .loading-logo > img {
display: inline-block; display: inline-block;
max-width: 124px; max-width: 100px;
max-height: 20px; max-height: 20px;
opacity: 0; opacity: 0;
} }

6
apps/spreadsheeteditor/embed/js/ApplicationController.js
View file

@ -353,9 +353,11 @@ SSE.ApplicationController = new(function(){
config.customization && config.customization.logo ) { config.customization && config.customization.logo ) {
var logo = $('#header-logo'); var logo = $('#header-logo');
if (config.customization.logo.imageEmbedded) { if (config.customization.logo.imageEmbedded || config.customization.logo.image) {
logo.html('<img src="'+config.customization.logo.imageEmbedded+'" style="max-width:124px; max-height:20px;"/>'); logo.html('<img src="'+(config.customization.logo.imageEmbedded || config.customization.logo.image)+'" style="max-width:124px; max-height:20px;"/>');
logo.css({'background-image': 'none', width: 'auto', height: 'auto'}); logo.css({'background-image': 'none', width: 'auto', height: 'auto'});
config.customization.logo.imageEmbedded && console.log("Obsolete: The 'imageEmbedded' parameter of the 'customization.logo' section is deprecated. Please use 'image' parameter instead.");
} }
if (config.customization.logo.url) { if (config.customization.logo.url) {