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

Fix Bug 39696

Browse source
This commit is contained in:
Julia Radzhabova 2018-11-13 11:40:35 +03:00
parent 2f22174090
commit 524eaa94f2
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
apps/common/main/lib/view/Header.js
View file

@ -204,11 +204,12 @@ define([
if ( me.logo ) if ( me.logo )
me.logo.children(0).on('click', function (e) { me.logo.children(0).on('click', function (e) {
var _url = !!me.branding && !!me.branding.logo && !!me.branding.logo.url ? var _url = !!me.branding && !!me.branding.logo && (me.branding.logo.url!==undefined) ?
me.branding.logo.url : 'http://www.onlyoffice.com'; me.branding.logo.url : 'https://www.onlyoffice.com';
if (_url) {
var newDocumentPage = window.open(_url); var newDocumentPage = window.open(_url);
newDocumentPage && newDocumentPage.focus(); newDocumentPage && newDocumentPage.focus();
}
}); });
onResetUsers(storeUsers); onResetUsers(storeUsers);
@ -412,6 +413,7 @@ define([
if (this.branding && this.branding.logo && this.branding.logo.image && this.logo) { if (this.branding && this.branding.logo && this.branding.logo.image && this.logo) {
this.logo.html('<img src="' + this.branding.logo.image + '" style="max-width:100px; max-height:20px; margin: 0;"/>'); this.logo.html('<img src="' + this.branding.logo.image + '" style="max-width:100px; max-height:20px; margin: 0;"/>');
this.logo.css({'background-image': 'none', width: 'auto'}); this.logo.css({'background-image': 'none', width: 'auto'});
(this.branding.logo.url || this.branding.logo.url===undefined) && this.logo.addClass('link');
} }
return $html; return $html;
@ -522,6 +524,7 @@ define([
if (element) { if (element) {
element.html('<img src="' + value.logo.image + '" style="max-width:100px; max-height:20px; margin: 0;"/>'); element.html('<img src="' + value.logo.image + '" style="max-width:100px; max-height:20px; margin: 0;"/>');
element.css({'background-image': 'none', width: 'auto'}); element.css({'background-image': 'none', width: 'auto'});
(value.logo.url || value.logo.url===undefined) && element.addClass('link');
} }
} }
} }

2
apps/common/main/resources/less/header.less
View file

@ -144,7 +144,7 @@
.background-ximage('@{common-image-path}/header/header-logo.png', '@{common-image-path}/header/header-logo@2x.png', 86px); .background-ximage('@{common-image-path}/header/header-logo.png', '@{common-image-path}/header/header-logo@2x.png', 86px);
} }
img { &.link img {
cursor: pointer; cursor: pointer;
} }
} }