diff --git a/apps/api/documents/api.js b/apps/api/documents/api.js index 5fb76ccaa..d462c2a94 100644 --- a/apps/api/documents/api.js +++ b/apps/api/documents/api.js @@ -691,6 +691,9 @@ if (config.editorConfig.customization.loaderName !== 'none') params += "&customer=" + config.editorConfig.customization.loaderName; } else params += "&customer=ONLYOFFICE"; + if ( (typeof(config.editorConfig.customization) == 'object') && config.editorConfig.customization.loaderLogo) { + if (config.editorConfig.customization.loaderLogo !== '') params += "&logo=" + config.editorConfig.customization.loaderLogo; + } } return params; diff --git a/apps/documenteditor/embed/index.html b/apps/documenteditor/embed/index.html index 462870e25..434e979a9 100644 --- a/apps/documenteditor/embed/index.html +++ b/apps/documenteditor/embed/index.html @@ -32,6 +32,12 @@ bottom: 42%; position: absolute; text-align: center; + line-height: 10px; + } + + .loader-logo { + max-height: 160px; + margin-bottom: 10px; } .loader-page-romb { @@ -219,7 +225,8 @@ lang = (params["lang"] || 'en').split("-")[0], customer = params["customer"] ? ('
' + encodeUrlParam(params["customer"]) + '
') : '', margin = (customer !== '') ? 50 : 20, - loading = 'Loading...'; + loading = 'Loading...', + logo = params["logo"] ? ((params["logo"] !== 'none') ? ('') : '') : null; if ( lang == 'de') loading = 'Ladevorgang...'; else if ( lang == 'es') loading = 'Cargando...'; @@ -232,12 +239,14 @@ document.write( '
' + - '
' + - '
' + - '
' + - '
' + - '
' + - '
' + + '
' + + ((logo!==null) ? logo : + '
' + + '
' + + '
' + + '
' + + '
') + + '
' + '
' + customer + '
' + loading + '
' + '
' + diff --git a/apps/documenteditor/embed/index.html.deploy b/apps/documenteditor/embed/index.html.deploy index 44c24a922..8cd0fae20 100644 --- a/apps/documenteditor/embed/index.html.deploy +++ b/apps/documenteditor/embed/index.html.deploy @@ -28,6 +28,12 @@ bottom: 42%; position: absolute; text-align: center; + line-height: 10px; + } + + .loader-logo { + max-height: 160px; + margin-bottom: 10px; } .loader-page-romb { @@ -209,7 +215,8 @@ lang = (params["lang"] || 'en').split("-")[0], customer = params["customer"] ? ('
' + encodeUrlParam(params["customer"]) + '
') : '', margin = (customer !== '') ? 50 : 20, - loading = 'Loading...'; + loading = 'Loading...', + logo = params["logo"] ? ((params["logo"] !== 'none') ? ('') : '') : null; if ( lang == 'de') loading = 'Ladevorgang...'; else if ( lang == 'es') loading = 'Cargando...'; @@ -222,12 +229,14 @@ document.write( '
' + - '
' + - '
' + - '
' + - '
' + - '
' + - '
' + + '
' + + ((logo!==null) ? logo : + '
' + + '
' + + '
' + + '
' + + '
') + + '
' + '
' + customer + '
' + loading + '
' + '
' + diff --git a/apps/documenteditor/main/index.html b/apps/documenteditor/main/index.html index 1f4f6534d..9536fde40 100644 --- a/apps/documenteditor/main/index.html +++ b/apps/documenteditor/main/index.html @@ -31,6 +31,12 @@ bottom: 42%; position: absolute; text-align: center; + line-height: 10px; + } + + .loader-logo { + max-height: 160px; + margin-bottom: 10px; } .loader-page-romb { @@ -201,8 +207,9 @@ lang = (params["lang"] || 'en').split("-")[0], customer = params["customer"] ? ('
' + encodeUrlParam(params["customer"]) + '
') : '', margin = (customer !== '') ? 50 : 20, - loading = 'Loading...'; - + loading = 'Loading...', + logo = params["logo"] ? ((params["logo"] !== 'none') ? ('') : '') : null; + if ( lang == 'de') loading = 'Ladevorgang...'; else if ( lang == 'es') loading = 'Cargando...'; else if ( lang == 'fr') loading = 'Chargement en cours...'; @@ -214,12 +221,14 @@ document.write( '
' + - '
' + - '
' + - '
' + - '
' + - '
' + - '
' + + '
' + + ((logo!==null) ? logo : + '
' + + '
' + + '
' + + '
' + + '
') + + '
' + '
' + customer + '
' + loading + '
' + '
' + diff --git a/apps/documenteditor/main/index.html.deploy b/apps/documenteditor/main/index.html.deploy index 9f5cc1c09..dbce6eefb 100644 --- a/apps/documenteditor/main/index.html.deploy +++ b/apps/documenteditor/main/index.html.deploy @@ -30,6 +30,12 @@ bottom: 42%; position: absolute; text-align: center; + line-height: 10px; + } + + .loader-logo { + max-height: 160px; + margin-bottom: 10px; } .loader-page-romb { @@ -201,7 +207,8 @@ lang = (params["lang"] || 'en').split("-")[0], customer = params["customer"] ? ('
' + encodeUrlParam(params["customer"]) + '
') : '', margin = (customer !== '') ? 50 : 20, - loading = 'Loading...'; + loading = 'Loading...', + logo = params["logo"] ? ((params["logo"] !== 'none') ? ('') : '') : null; if ( lang == 'de') loading = 'Ladevorgang...'; else if ( lang == 'es') loading = 'Cargando...'; @@ -214,12 +221,14 @@ document.write( '
' + - '
' + - '
' + - '
' + - '
' + - '
' + - '
' + + '
' + + ((logo!==null) ? logo : + '
' + + '
' + + '
' + + '
' + + '
') + + '
' + '
' + customer + '
' + loading + '
' + '
' + diff --git a/apps/documenteditor/mobile/index.html b/apps/documenteditor/mobile/index.html index 4ba0132ba..0f1c69336 100644 --- a/apps/documenteditor/mobile/index.html +++ b/apps/documenteditor/mobile/index.html @@ -27,6 +27,12 @@ bottom: 42%; position: absolute; text-align: center; + line-height: 10px; + } + + .loader-logo { + max-height: 160px; + margin-bottom: 10px; } .loader-page-romb { @@ -255,7 +261,8 @@ lang = (params["lang"] || 'en').split("-")[0], customer = params["customer"] ? ('
' + encodeUrlParam(params["customer"]) + '
') : '', margin = (customer !== '') ? 50 : 20, - loading = 'Loading...'; + loading = 'Loading...', + logo = params["logo"] ? ((params["logo"] !== 'none') ? ('') : '') : null; if ( lang == 'de') loading = 'Ladevorgang...'; else if ( lang == 'es') loading = 'Cargando...'; @@ -268,12 +275,14 @@ document.write( '
' + - '
' + - '
' + - '
' + - '
' + - '
' + - '
' + + '
' + + ((logo!==null) ? logo : + '
' + + '
' + + '
' + + '
' + + '
') + + '
' + '
' + customer + '
' + loading + '
' + '
' + diff --git a/apps/documenteditor/mobile/index.html.deploy b/apps/documenteditor/mobile/index.html.deploy index 61a898732..6aff9b148 100644 --- a/apps/documenteditor/mobile/index.html.deploy +++ b/apps/documenteditor/mobile/index.html.deploy @@ -27,6 +27,12 @@ bottom: 42%; position: absolute; text-align: center; + line-height: 10px; + } + + .loader-logo { + max-height: 160px; + margin-bottom: 10px; } .loader-page-romb { @@ -246,7 +252,8 @@ lang = (params["lang"] || 'en').split("-")[0], customer = params["customer"] ? ('
' + encodeUrlParam(params["customer"]) + '
') : '', margin = (customer !== '') ? 50 : 20, - loading = 'Loading...'; + loading = 'Loading...', + logo = params["logo"] ? ((params["logo"] !== 'none') ? ('') : '') : null; if ( lang == 'de') loading = 'Ladevorgang...'; else if ( lang == 'es') loading = 'Cargando...'; @@ -259,12 +266,14 @@ document.write( '
' + - '
' + - '
' + - '
' + - '
' + - '
' + - '
' + + '
' + + ((logo!==null) ? logo : + '
' + + '
' + + '
' + + '
' + + '
') + + '
' + '
' + customer + '
' + loading + '
' + '
' + diff --git a/apps/presentationeditor/embed/index.html b/apps/presentationeditor/embed/index.html index 10b2a4f7b..4d5ac8759 100644 --- a/apps/presentationeditor/embed/index.html +++ b/apps/presentationeditor/embed/index.html @@ -32,6 +32,12 @@ bottom: 42%; position: absolute; text-align: center; + line-height: 10px; + } + + .loader-logo { + max-height: 160px; + margin-bottom: 10px; } .loader-page-romb { @@ -218,7 +224,8 @@ lang = (params["lang"] || 'en').split("-")[0], customer = params["customer"] ? ('
' + encodeUrlParam(params["customer"]) + '
') : '', margin = (customer !== '') ? 50 : 20, - loading = 'Loading...'; + loading = 'Loading...', + logo = params["logo"] ? ((params["logo"] !== 'none') ? ('') : '') : null; if ( lang == 'de') loading = 'Ladevorgang...'; else if ( lang == 'es') loading = 'Cargando...'; @@ -231,12 +238,14 @@ document.write( '
' + - '
' + - '
' + - '
' + - '
' + - '
' + - '
' + + '
' + + ((logo!==null) ? logo : + '
' + + '
' + + '
' + + '
' + + '
') + + '
' + '
' + customer + '
' + loading + '
' + '
' + diff --git a/apps/presentationeditor/embed/index.html.deploy b/apps/presentationeditor/embed/index.html.deploy index 9978f153f..04a4475f0 100644 --- a/apps/presentationeditor/embed/index.html.deploy +++ b/apps/presentationeditor/embed/index.html.deploy @@ -28,6 +28,12 @@ bottom: 42%; position: absolute; text-align: center; + line-height: 10px; + } + + .loader-logo { + max-height: 160px; + margin-bottom: 10px; } .loader-page-romb { @@ -209,7 +215,8 @@ lang = (params["lang"] || 'en').split("-")[0], customer = params["customer"] ? ('
' + encodeUrlParam(params["customer"]) + '
') : '', margin = (customer !== '') ? 50 : 20, - loading = 'Loading...'; + loading = 'Loading...', + logo = params["logo"] ? ((params["logo"] !== 'none') ? ('') : '') : null; if ( lang == 'de') loading = 'Ladevorgang...'; else if ( lang == 'es') loading = 'Cargando...'; @@ -222,12 +229,14 @@ document.write( '
' + - '
' + - '
' + - '
' + - '
' + - '
' + - '
' + + '
' + + ((logo!==null) ? logo : + '
' + + '
' + + '
' + + '
' + + '
') + + '
' + '
' + customer + '
' + loading + '
' + '
' + diff --git a/apps/presentationeditor/main/index.html b/apps/presentationeditor/main/index.html index f432bbacf..c658b759c 100644 --- a/apps/presentationeditor/main/index.html +++ b/apps/presentationeditor/main/index.html @@ -31,6 +31,12 @@ bottom: 42%; position: absolute; text-align: center; + line-height: 10px; + } + + .loader-logo { + max-height: 160px; + margin-bottom: 10px; } .loader-page-romb { @@ -202,7 +208,8 @@ lang = (params["lang"] || 'en').split("-")[0], customer = params["customer"] ? ('
' + encodeUrlParam(params["customer"]) + '
') : '', margin = (customer !== '') ? 50 : 20, - loading = 'Loading...'; + loading = 'Loading...', + logo = params["logo"] ? ((params["logo"] !== 'none') ? ('') : '') : null; if ( lang == 'de') loading = 'Ladevorgang...'; else if ( lang == 'es') loading = 'Cargando...'; @@ -215,12 +222,14 @@ document.write( '
' + - '
' + - '
' + - '
' + - '
' + - '
' + - '
' + + '
' + + ((logo!==null) ? logo : + '
' + + '
' + + '
' + + '
' + + '
') + + '
' + '
' + customer + '
' + loading + '
' + '
' + diff --git a/apps/presentationeditor/main/index.html.deploy b/apps/presentationeditor/main/index.html.deploy index d4d704cb7..f7d3b129e 100644 --- a/apps/presentationeditor/main/index.html.deploy +++ b/apps/presentationeditor/main/index.html.deploy @@ -30,6 +30,12 @@ bottom: 42%; position: absolute; text-align: center; + line-height: 10px; + } + + .loader-logo { + max-height: 160px; + margin-bottom: 10px; } .loader-page-romb { @@ -201,7 +207,8 @@ lang = (params["lang"] || 'en').split("-")[0], customer = params["customer"] ? ('
' + encodeUrlParam(params["customer"]) + '
') : '', margin = (customer !== '') ? 50 : 20, - loading = 'Loading...'; + loading = 'Loading...', + logo = params["logo"] ? ((params["logo"] !== 'none') ? ('') : '') : null; if ( lang == 'de') loading = 'Ladevorgang...'; else if ( lang == 'es') loading = 'Cargando...'; @@ -214,12 +221,14 @@ document.write( '
' + - '
' + - '
' + - '
' + - '
' + - '
' + - '
' + + '
' + + ((logo!==null) ? logo : + '
' + + '
' + + '
' + + '
' + + '
') + + '
' + '
' + customer + '
' + loading + '
' + '
' + diff --git a/apps/presentationeditor/mobile/index.html b/apps/presentationeditor/mobile/index.html index 7e951db70..e49d34e65 100644 --- a/apps/presentationeditor/mobile/index.html +++ b/apps/presentationeditor/mobile/index.html @@ -27,6 +27,12 @@ bottom: 42%; position: absolute; text-align: center; + line-height: 10px; + } + + .loader-logo { + max-height: 160px; + margin-bottom: 10px; } .loader-page-romb { @@ -254,7 +260,8 @@ lang = (params["lang"] || 'en').split("-")[0], customer = params["customer"] ? ('
' + encodeUrlParam(params["customer"]) + '
') : '', margin = (customer !== '') ? 50 : 20, - loading = 'Loading...'; + loading = 'Loading...', + logo = params["logo"] ? ((params["logo"] !== 'none') ? ('') : '') : null; if ( lang == 'de') loading = 'Ladevorgang...'; else if ( lang == 'es') loading = 'Cargando...'; @@ -267,12 +274,14 @@ document.write( '
' + - '
' + - '
' + - '
' + - '
' + - '
' + - '
' + + '
' + + ((logo!==null) ? logo : + '
' + + '
' + + '
' + + '
' + + '
') + + '
' + '
' + customer + '
' + loading + '
' + '
' + diff --git a/apps/presentationeditor/mobile/index.html.deploy b/apps/presentationeditor/mobile/index.html.deploy index b2c10fde9..665b835aa 100644 --- a/apps/presentationeditor/mobile/index.html.deploy +++ b/apps/presentationeditor/mobile/index.html.deploy @@ -27,6 +27,12 @@ bottom: 42%; position: absolute; text-align: center; + line-height: 10px; + } + + .loader-logo { + max-height: 160px; + margin-bottom: 10px; } .loader-page-romb { @@ -245,7 +251,8 @@ lang = (params["lang"] || 'en').split("-")[0], customer = params["customer"] ? ('
' + encodeUrlParam(params["customer"]) + '
') : '', margin = (customer !== '') ? 50 : 20, - loading = 'Loading...'; + loading = 'Loading...', + logo = params["logo"] ? ((params["logo"] !== 'none') ? ('') : '') : null; if ( lang == 'de') loading = 'Ladevorgang...'; else if ( lang == 'es') loading = 'Cargando...'; @@ -258,12 +265,14 @@ document.write( '
' + - '
' + - '
' + - '
' + - '
' + - '
' + - '
' + + '
' + + ((logo!==null) ? logo : + '
' + + '
' + + '
' + + '
' + + '
') + + '
' + '
' + customer + '
' + loading + '
' + '
' + diff --git a/apps/spreadsheeteditor/embed/index.html b/apps/spreadsheeteditor/embed/index.html index 42a86cd81..895dc945d 100644 --- a/apps/spreadsheeteditor/embed/index.html +++ b/apps/spreadsheeteditor/embed/index.html @@ -32,6 +32,12 @@ bottom: 42%; position: absolute; text-align: center; + line-height: 10px; + } + + .loader-logo { + max-height: 160px; + margin-bottom: 10px; } .loader-page-romb { @@ -218,7 +224,8 @@ lang = (params["lang"] || 'en').split("-")[0], customer = params["customer"] ? ('
' + encodeUrlParam(params["customer"]) + '
') : '', margin = (customer !== '') ? 50 : 20, - loading = 'Loading...'; + loading = 'Loading...', + logo = params["logo"] ? ((params["logo"] !== 'none') ? ('') : '') : null; if ( lang == 'de') loading = 'Ladevorgang...'; else if ( lang == 'es') loading = 'Cargando...'; @@ -231,12 +238,14 @@ document.write( '
' + - '
' + - '
' + - '
' + - '
' + - '
' + - '
' + + '
' + + ((logo!==null) ? logo : + '
' + + '
' + + '
' + + '
' + + '
') + + '
' + '
' + customer + '
' + loading + '
' + '
' + diff --git a/apps/spreadsheeteditor/embed/index.html.deploy b/apps/spreadsheeteditor/embed/index.html.deploy index 1221bd95e..20b56331d 100644 --- a/apps/spreadsheeteditor/embed/index.html.deploy +++ b/apps/spreadsheeteditor/embed/index.html.deploy @@ -28,6 +28,12 @@ bottom: 42%; position: absolute; text-align: center; + line-height: 10px; + } + + .loader-logo { + max-height: 160px; + margin-bottom: 10px; } .loader-page-romb { @@ -209,7 +215,8 @@ lang = (params["lang"] || 'en').split("-")[0], customer = params["customer"] ? ('
' + encodeUrlParam(params["customer"]) + '
') : '', margin = (customer !== '') ? 50 : 20, - loading = 'Loading...'; + loading = 'Loading...', + logo = params["logo"] ? ((params["logo"] !== 'none') ? ('') : '') : null; if ( lang == 'de') loading = 'Ladevorgang...'; else if ( lang == 'es') loading = 'Cargando...'; @@ -222,12 +229,14 @@ document.write( '
' + - '
' + - '
' + - '
' + - '
' + - '
' + - '
' + + '
' + + ((logo!==null) ? logo : + '
' + + '
' + + '
' + + '
' + + '
') + + '
' + '
' + customer + '
' + loading + '
' + '
' + diff --git a/apps/spreadsheeteditor/main/index.html b/apps/spreadsheeteditor/main/index.html index c44092db7..ffabec8dd 100644 --- a/apps/spreadsheeteditor/main/index.html +++ b/apps/spreadsheeteditor/main/index.html @@ -33,6 +33,12 @@ bottom: 42%; position: absolute; text-align: center; + line-height: 10px; + } + + .loader-logo { + max-height: 160px; + margin-bottom: 10px; } .loader-page-romb { @@ -204,7 +210,8 @@ lang = (params["lang"] || 'en').split("-")[0], customer = params["customer"] ? ('
' + encodeUrlParam(params["customer"]) + '
') : '', margin = (customer !== '') ? 50 : 20, - loading = 'Loading...'; + loading = 'Loading...', + logo = params["logo"] ? ((params["logo"] !== 'none') ? ('') : '') : null; if ( lang == 'de') loading = 'Ladevorgang...'; else if ( lang == 'es') loading = 'Cargando...'; @@ -217,12 +224,14 @@ document.write( '
' + - '
' + - '
' + - '
' + - '
' + - '
' + - '
' + + '
' + + ((logo!==null) ? logo : + '
' + + '
' + + '
' + + '
' + + '
') + + '
' + '
' + customer + '
' + loading + '
' + '
' + diff --git a/apps/spreadsheeteditor/main/index.html.deploy b/apps/spreadsheeteditor/main/index.html.deploy index 39ff60dad..5f2784487 100644 --- a/apps/spreadsheeteditor/main/index.html.deploy +++ b/apps/spreadsheeteditor/main/index.html.deploy @@ -32,6 +32,12 @@ bottom: 42%; position: absolute; text-align: center; + line-height: 10px; + } + + .loader-logo { + max-height: 160px; + margin-bottom: 10px; } .loader-page-romb { @@ -202,7 +208,8 @@ lang = (params["lang"] || 'en').split("-")[0], customer = params["customer"] ? ('
' + encodeUrlParam(params["customer"]) + '
') : '', margin = (customer !== '') ? 50 : 20, - loading = 'Loading...'; + loading = 'Loading...', + logo = params["logo"] ? ((params["logo"] !== 'none') ? ('') : '') : null; if ( lang == 'de') loading = 'Ladevorgang...'; else if ( lang == 'es') loading = 'Cargando...'; @@ -215,12 +222,14 @@ document.write( '
' + - '
' + - '
' + - '
' + - '
' + - '
' + - '
' + + '
' + + ((logo!==null) ? logo : + '
' + + '
' + + '
' + + '
' + + '
') + + '
' + '
' + customer + '
' + loading + '
' + '
' + diff --git a/apps/spreadsheeteditor/mobile/index.html b/apps/spreadsheeteditor/mobile/index.html index 060680fd7..fcc392663 100644 --- a/apps/spreadsheeteditor/mobile/index.html +++ b/apps/spreadsheeteditor/mobile/index.html @@ -27,6 +27,12 @@ bottom: 42%; position: absolute; text-align: center; + line-height: 10px; + } + + .loader-logo { + max-height: 160px; + margin-bottom: 10px; } .loader-page-romb { @@ -261,7 +267,8 @@ lang = (params["lang"] || 'en').split("-")[0], customer = params["customer"] ? ('
' + encodeUrlParam(params["customer"]) + '
') : '', margin = (customer !== '') ? 50 : 20, - loading = 'Loading...'; + loading = 'Loading...', + logo = params["logo"] ? ((params["logo"] !== 'none') ? ('') : '') : null; if ( lang == 'de') loading = 'Ladevorgang...'; else if ( lang == 'es') loading = 'Cargando...'; @@ -274,12 +281,14 @@ document.write( '
' + - '
' + - '
' + - '
' + - '
' + - '
' + - '
' + + '
' + + ((logo!==null) ? logo : + '
' + + '
' + + '
' + + '
' + + '
') + + '
' + '
' + customer + '
' + loading + '
' + '
' + diff --git a/apps/spreadsheeteditor/mobile/index.html.deploy b/apps/spreadsheeteditor/mobile/index.html.deploy index 9aff2595a..2e682249d 100644 --- a/apps/spreadsheeteditor/mobile/index.html.deploy +++ b/apps/spreadsheeteditor/mobile/index.html.deploy @@ -27,6 +27,12 @@ bottom: 42%; position: absolute; text-align: center; + line-height: 10px; + } + + .loader-logo { + max-height: 160px; + margin-bottom: 10px; } .loader-page-romb { @@ -246,7 +252,8 @@ lang = (params["lang"] || 'en').split("-")[0], customer = params["customer"] ? ('
' + encodeUrlParam(params["customer"]) + '
') : '', margin = (customer !== '') ? 50 : 20, - loading = 'Loading...'; + loading = 'Loading...', + logo = params["logo"] ? ((params["logo"] !== 'none') ? ('') : '') : null; if ( lang == 'de') loading = 'Ladevorgang...'; else if ( lang == 'es') loading = 'Cargando...'; @@ -259,12 +266,14 @@ document.write( '
' + - '
' + - '
' + - '
' + - '
' + - '
' + - '
' + + '
' + + ((logo!==null) ? logo : + '
' + + '
' + + '
' + + '
' + + '
') + + '
' + '
' + customer + '
' + loading + '
' + '
' +