diff --git a/apps/api/documents/api.js b/apps/api/documents/api.js
index 50848e08f..f18237c3f 100644
--- a/apps/api/documents/api.js
+++ b/apps/api/documents/api.js
@@ -719,8 +719,15 @@
: config.type === "embedded"
? "embed"
: "main";
- path += "/index.html";
+ var index = "/index.html";
+ if (config.editorConfig && config.editorConfig.targetApp!=='desktop') {
+ var customization = config.editorConfig.customization;
+ if ( typeof(customization) == 'object' && (customization.loaderName || customization.loaderLogo)) {
+ index = "/index_loader.html";
+ }
+ }
+ path += index;
return path;
}
@@ -737,6 +744,8 @@
params += "&customer=ONLYOFFICE";
if ( (typeof(config.editorConfig.customization) == 'object') && config.editorConfig.customization.loaderLogo) {
if (config.editorConfig.customization.loaderLogo !== '') params += "&logo=" + config.editorConfig.customization.loaderLogo;
+ } else if ( (typeof(config.editorConfig.customization) == 'object') && config.editorConfig.customization.logo) {
+ if (config.editorConfig.customization.logo.image) params += "&headerlogo=" + config.editorConfig.customization.logo.image;
}
}
diff --git a/apps/documenteditor/main/index.html b/apps/documenteditor/main/index.html
index c39284863..dc7f5bab5 100644
--- a/apps/documenteditor/main/index.html
+++ b/apps/documenteditor/main/index.html
@@ -52,8 +52,9 @@
display: inline-block;
width: 86px;
height: 20px;
- background-image: url(http://192.168.3.191:8080/web-apps-pro/apps/common/main/resources/img/header/header-logo.png);
- background-repeat: no-repeat;
+ background: url('../../common/main/resources/img/header/header-logo.png') no-repeat;
+ background-size: contain;
+ opacity: 0;
}
.loadmask > .brendpanel .circle {
@@ -170,37 +171,9 @@
var params = getUrlParams(),
lang = (params["lang"] || 'en').split(/[\-\_]/)[0],
- customer = params["customer"] ? ('
' + encodeUrlParam(params["customer"]) + '
') : '',
- margin = (customer !== '') ? 50 : 20,
- loading = 'Loading...',
- logo = params["logo"] ? ((params["logo"] !== 'none') ? ('') : '') : null;
+ logo = params["headerlogo"] ? 'url(' + encodeUrlParam(params["headerlogo"]) + ')' : null;
window.frameEditorId = params["frameEditorId"];
-
- if ( lang == 'de') loading = 'Ladevorgang...';
- else if ( lang == 'es') loading = 'Cargando...';
- else if ( lang == 'fr') loading = 'Chargement en cours...';
- else if ( lang == 'it') loading = 'Caricamento in corso...';
- else if ( lang == 'pt') loading = 'Carregando...';
- else if ( lang == 'ru') loading = 'Загрузка...';
- else if ( lang == 'sl') loading = 'Nalaganje...';
- else if ( lang == 'tr') loading = 'Yükleniyor...';
- else if ( lang == 'bg') loading = 'Зареждане...';
- else if ( lang == 'cs') loading = 'Nahrávám...';
- else if ( lang == 'hu') loading = 'Betöltés...';
- else if ( lang == 'ja') loading = '読み込み中...';
- else if ( lang == 'ko') loading = '로드 중...';
- else if ( lang == 'lv') loading = 'Ieladēšana ...';
- else if ( lang == 'nl') loading = 'Laden...';
- else if ( lang == 'pl') loading = 'Ładowanie...';
- else if ( lang == 'sk') loading = 'Nahrávam...';
- else if ( lang == 'uk') loading = 'Завантаження...';
- else if ( lang == 'vi') loading = 'Đang tải...';
- else if ( lang == 'zh') loading = '加载中...';
-
- if (stopLoading) {
- document.getElementById('loading-mask').remove();
- }
@@ -211,6 +184,18 @@
+
+
diff --git a/apps/documenteditor/main/index_loader.html b/apps/documenteditor/main/index_loader.html
new file mode 100644
index 000000000..5019ebabd
--- /dev/null
+++ b/apps/documenteditor/main/index_loader.html
@@ -0,0 +1,303 @@
+
+
+
+ ONLYOFFICE Documents
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/apps/presentationeditor/main/index.html b/apps/presentationeditor/main/index.html
index 3f2cf5c10..6b34b8d55 100644
--- a/apps/presentationeditor/main/index.html
+++ b/apps/presentationeditor/main/index.html
@@ -47,8 +47,9 @@
display: inline-block;
width: 86px;
height: 20px;
- background-image: url(http://192.168.3.191:8080/web-apps-pro/apps/common/main/resources/img/header/header-logo.png);
- background-repeat: no-repeat;
+ background: url('../../common/main/resources/img/header/header-logo.png') no-repeat;
+ background-size: contain;
+ opacity: 0;
}
.loadmask > .brendpanel .spacer {
@@ -188,37 +189,9 @@
var params = getUrlParams(),
lang = (params["lang"] || 'en').split(/[\-\_]/)[0],
- customer = params["customer"] ? ('' + encodeUrlParam(params["customer"]) + '
') : '',
- margin = (customer !== '') ? 50 : 20,
- loading = 'Loading...',
- logo = params["logo"] ? ((params["logo"] !== 'none') ? ('') : '') : null;
+ logo = params["headerlogo"] ? 'url(' + encodeUrlParam(params["headerlogo"]) + ')' : null;
window.frameEditorId = params["frameEditorId"];
-
- if ( lang == 'de') loading = 'Ladevorgang...';
- else if ( lang == 'es') loading = 'Cargando...';
- else if ( lang == 'fr') loading = 'Chargement en cours...';
- else if ( lang == 'it') loading = 'Caricamento in corso...';
- else if ( lang == 'pt') loading = 'Carregando...';
- else if ( lang == 'ru') loading = 'Загрузка...';
- else if ( lang == 'sl') loading = 'Nalaganje...';
- else if ( lang == 'tr') loading = 'Yükleniyor...';
- else if ( lang == 'bg') loading = 'Зареждане...';
- else if ( lang == 'cs') loading = 'Nahrávám...';
- else if ( lang == 'hu') loading = 'Betöltés...';
- else if ( lang == 'ja') loading = '読み込み中...';
- else if ( lang == 'ko') loading = '로드 중...';
- else if ( lang == 'lv') loading = 'Ieladēšana ...';
- else if ( lang == 'nl') loading = 'Laden...';
- else if ( lang == 'pl') loading = 'Ładowanie...';
- else if ( lang == 'sk') loading = 'Nahrávam...';
- else if ( lang == 'uk') loading = 'Завантаження...';
- else if ( lang == 'vi') loading = 'Đang tải...';
- else if ( lang == 'zh') loading = '加载中...';
-
- if (stopLoading) {
- document.getElementById('loading-mask').remove();
- }
@@ -229,6 +202,18 @@
+
+
diff --git a/apps/presentationeditor/main/index_loader.html b/apps/presentationeditor/main/index_loader.html
new file mode 100644
index 000000000..bc50707ae
--- /dev/null
+++ b/apps/presentationeditor/main/index_loader.html
@@ -0,0 +1,296 @@
+
+
+
+ ONLYOFFICE Presentation Editor
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/apps/spreadsheeteditor/main/index.html b/apps/spreadsheeteditor/main/index.html
index 9a565c43f..7d715d12f 100644
--- a/apps/spreadsheeteditor/main/index.html
+++ b/apps/spreadsheeteditor/main/index.html
@@ -46,8 +46,9 @@
display: inline-block;
width: 86px;
height: 20px;
- background-image: url(http://192.168.3.191:8080/web-apps-pro/apps/common/main/resources/img/header/header-logo.png);
- background-repeat: no-repeat;
+ background: url('../../common/main/resources/img/header/header-logo.png') no-repeat;
+ background-size: contain;
+ opacity: 0;
}
.loadmask > .brendpanel .spacer {
@@ -177,37 +178,9 @@
var params = getUrlParams(),
lang = (params["lang"] || 'en').split(/[\-\_]/)[0],
- customer = params["customer"] ? ('' + encodeUrlParam(params["customer"]) + '
') : '',
- margin = (customer !== '') ? 50 : 20,
- loading = 'Loading...',
- logo = params["logo"] ? ((params["logo"] !== 'none') ? ('') : '') : null;
+ logo = params["headerlogo"] ? 'url(' + encodeUrlParam(params["headerlogo"]) + ')' : null;
window.frameEditorId = params["frameEditorId"];
-
- if ( lang == 'de') loading = 'Ladevorgang...';
- else if ( lang == 'es') loading = 'Cargando...';
- else if ( lang == 'fr') loading = 'Chargement en cours...';
- else if ( lang == 'it') loading = 'Caricamento in corso...';
- else if ( lang == 'pt') loading = 'Carregando...';
- else if ( lang == 'ru') loading = 'Загрузка...';
- else if ( lang == 'sl') loading = 'Nalaganje...';
- else if ( lang == 'tr') loading = 'Yükleniyor...';
- else if ( lang == 'bg') loading = 'Зареждане...';
- else if ( lang == 'cs') loading = 'Nahrávám...';
- else if ( lang == 'hu') loading = 'Betöltés...';
- else if ( lang == 'ja') loading = '読み込み中...';
- else if ( lang == 'ko') loading = '로드 중...';
- else if ( lang == 'lv') loading = 'Ieladēšana ...';
- else if ( lang == 'nl') loading = 'Laden...';
- else if ( lang == 'pl') loading = 'Ładowanie...';
- else if ( lang == 'sk') loading = 'Nahrávam...';
- else if ( lang == 'uk') loading = 'Завантаження...';
- else if ( lang == 'vi') loading = 'Đang tải...';
- else if ( lang == 'zh') loading = '加载中...';
-
- if (stopLoading) {
- document.getElementById('loading-mask').remove();
- }
@@ -220,6 +193,18 @@
+
+
diff --git a/apps/spreadsheeteditor/main/index_loader.html b/apps/spreadsheeteditor/main/index_loader.html
new file mode 100644
index 000000000..af0b26d38
--- /dev/null
+++ b/apps/spreadsheeteditor/main/index_loader.html
@@ -0,0 +1,300 @@
+
+
+
+ ONLYOFFICE Document Editor
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file