diff --git a/apps/common/embed/resources/less/common.less b/apps/common/embed/resources/less/common.less index 1f0d4e378..9703638ad 100644 --- a/apps/common/embed/resources/less/common.less +++ b/apps/common/embed/resources/less/common.less @@ -239,7 +239,7 @@ display: block; width: 100px; height: 20px; - background: data-uri('../../../../common/embed/resources/img/logo.svg') no-repeat; + background: url(../../../../common/embed/resources/img/logo.svg) no-repeat; } // Control buttons diff --git a/apps/common/mobile/lib/view/About.jsx b/apps/common/mobile/lib/view/About.jsx index 039533f22..3dd4cac9a 100644 --- a/apps/common/mobile/lib/view/About.jsx +++ b/apps/common/mobile/lib/view/About.jsx @@ -18,7 +18,8 @@ const PageAbout = props => { const logoCustomer = customer ? customer.logo : null; const publisherUrl = __PUBLISHER_URL__, - publisherPrintUrl = publisherUrl.replace(/https?:\/{2}|\/$/,""); + publisherPrintUrl = publisherUrl.replace(/https?:\/{2}|\/$/g,""); + const publisherName = __PUBLISHER_NAME__.replace(/\\"/g, '"'); const editors = { de: 'DOCUMENT EDITOR', @@ -79,7 +80,7 @@ const PageAbout = props => {

-

{__PUBLISHER_NAME__}

+

{publisherName}

{publisherPrintUrl}

@@ -95,7 +96,7 @@ const PageAbout = props => {

{_t.textVersion} {__PRODUCT_VERSION__}

-

{__PUBLISHER_NAME__}

+

{publisherName}

{__PUBLISHER_ADDRESS__} diff --git a/apps/common/mobile/resources/less/about.less b/apps/common/mobile/resources/less/about.less index 8a7559530..3072fb575 100644 --- a/apps/common/mobile/resources/less/about.less +++ b/apps/common/mobile/resources/less/about.less @@ -1,4 +1,5 @@ @text-normal: #000; +// @common-image-about-path - defined in webpack config .about { .page-content { @@ -36,6 +37,6 @@ display: inline-block; width: 100%; height: 55px; - background: url('../../../../common/main/resources/img/about/logo_s.svg') no-repeat center; + background: ~"url(@{common-image-about-path}/logo_s.svg) no-repeat center"; } } diff --git a/apps/common/mobile/resources/less/ios/icons.less b/apps/common/mobile/resources/less/ios/icons.less index 4339dc06a..401956832 100644 --- a/apps/common/mobile/resources/less/ios/icons.less +++ b/apps/common/mobile/resources/less/ios/icons.less @@ -1,3 +1,5 @@ +// @common-image-header-path - defined in webpack config + .device-ios { i.icon { &.icon_mask { @@ -6,7 +8,7 @@ &.icon-logo { width: 100px; height: 14px; - background: url('../../img/header/logo-ios.svg') no-repeat center; + background: ~"url(@{common-image-header-path}/logo-ios.svg)" no-repeat center; } &.icon-prev { width: 22px; diff --git a/apps/common/mobile/resources/less/material/icons.less b/apps/common/mobile/resources/less/material/icons.less index ffc52be05..53577e587 100644 --- a/apps/common/mobile/resources/less/material/icons.less +++ b/apps/common/mobile/resources/less/material/icons.less @@ -1,3 +1,5 @@ +// @common-image-header-path - defined in webpack config + .device-android { i.icon { &.icon_mask { @@ -6,7 +8,7 @@ &.icon-logo { width: 100px; height: 14px; - background: url('../../img/header/logo-android.svg') no-repeat center; + background: ~"url(@{common-image-header-path}/logo-android.svg) no-repeat center"; } &.icon-prev { width: 20px; diff --git a/apps/documenteditor/main/index_loader.html.deploy b/apps/documenteditor/main/index_loader.html.deploy index 3f60b2346..2ed070fc8 100644 --- a/apps/documenteditor/main/index_loader.html.deploy +++ b/apps/documenteditor/main/index_loader.html.deploy @@ -287,7 +287,7 @@ - + diff --git a/apps/documenteditor/mobile/src/lib/i18n.js b/apps/documenteditor/mobile/src/lib/i18n.js index fea50f663..d77f77191 100644 --- a/apps/documenteditor/mobile/src/lib/i18n.js +++ b/apps/documenteditor/mobile/src/lib/i18n.js @@ -6,7 +6,7 @@ i18n.use(initReactI18next) .use(Fetch) .init({ lng: Common.Locale.currentLang, - fallbackLng: "en", + fallbackLng: Common.Locale.defaultLang, escapeValue: false, backend: { loadPath: './locale/{{lng}}.json' diff --git a/apps/documenteditor/mobile/src/page/main.jsx b/apps/documenteditor/mobile/src/page/main.jsx index 25d2abca5..871e7cc75 100644 --- a/apps/documenteditor/mobile/src/page/main.jsx +++ b/apps/documenteditor/mobile/src/page/main.jsx @@ -86,7 +86,12 @@ class MainPage extends Component { render() { const appOptions = this.props.storeAppOptions; const config = appOptions.config; - const showLogo = !(appOptions.canBrandingExt && (config.customization && (config.customization.loaderName || config.customization.loaderLogo))); + + let showLogo = !(appOptions.canBrandingExt && (config.customization && (config.customization.loaderName || config.customization.loaderLogo))); + if ( !Object.keys(config).length ) { + showLogo = !/&(?:logo)=/.test(window.location.search); + } + const showPlaceholder = !appOptions.isDocReady && (!config.customization || !(config.customization.loaderName || config.customization.loaderLogo)); if ( $$('.skl-container').length ) { $$('.skl-container').remove(); diff --git a/apps/presentationeditor/main/index_loader.html.deploy b/apps/presentationeditor/main/index_loader.html.deploy index 89730f698..d109aa1ad 100644 --- a/apps/presentationeditor/main/index_loader.html.deploy +++ b/apps/presentationeditor/main/index_loader.html.deploy @@ -287,7 +287,7 @@ - + +