diff --git a/apps/common/main/lib/view/OpenDialog.js b/apps/common/main/lib/view/OpenDialog.js index 659d4b7df..6123d15f5 100644 --- a/apps/common/main/lib/view/OpenDialog.js +++ b/apps/common/main/lib/view/OpenDialog.js @@ -68,6 +68,7 @@ define([ preview : options.preview, warning : options.warning, codepages : options.codepages, + warningMsg : options.warningMsg, width : width, height : height, header : true, @@ -85,7 +86,7 @@ define([ '<% if (warning) { %>', '
', '
', - '
' + t.txtProtected+ '
', + '
' + (typeof _options.warningMsg=='string' ? _options.warningMsg : t.txtProtected) + '
', '', '
', '
', diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index 67e9c141d..02657cdb8 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -2098,6 +2098,7 @@ define([ closeFile: me.appOptions.canRequestClose, type: Common.Utils.importTextType.DRM, warning: !(me.appOptions.isDesktopApp && me.appOptions.isOffline), + warningMsg: advOptions, validatePwd: !!me._state.isDRM, handler: function (result, value) { me.isShowOpenDialog = false; diff --git a/apps/documenteditor/main/index.html.deploy b/apps/documenteditor/main/index.html.deploy index f8a97819b..73775aabc 100644 --- a/apps/documenteditor/main/index.html.deploy +++ b/apps/documenteditor/main/index.html.deploy @@ -169,7 +169,7 @@ var re = /chrome\/(\d+)/i.exec(userAgent); if (!!re && !!re[1] && !(re[1] > 49)) { setTimeout(function () { - document.getElementsByTagName('body')[0].className += "winxp"; + document.getElementsByTagName('html')[0].className += "winxp"; },0); } } diff --git a/apps/documenteditor/mobile/app/controller/Main.js b/apps/documenteditor/mobile/app/controller/Main.js index 81837da66..4725b77c5 100644 --- a/apps/documenteditor/mobile/app/controller/Main.js +++ b/apps/documenteditor/mobile/app/controller/Main.js @@ -1339,7 +1339,7 @@ define([ me._state.openDlg = uiApp.modal({ title: me.advDRMOptions, - text: me.txtProtected, + text: (typeof advOptions=='string' ? advOptions : me.txtProtected), afterText: '
', buttons: buttons }); diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js index af7ee014f..3c73a2631 100644 --- a/apps/presentationeditor/main/app/controller/Main.js +++ b/apps/presentationeditor/main/app/controller/Main.js @@ -1888,6 +1888,7 @@ define([ closeFile: me.appOptions.canRequestClose, type: Common.Utils.importTextType.DRM, warning: !(me.appOptions.isDesktopApp && me.appOptions.isOffline), + warningMsg: advOptions, validatePwd: !!me._state.isDRM, handler: function (result, value) { me.isShowOpenDialog = false; diff --git a/apps/presentationeditor/main/index.html.deploy b/apps/presentationeditor/main/index.html.deploy index 0c8eb334f..c8dee126e 100644 --- a/apps/presentationeditor/main/index.html.deploy +++ b/apps/presentationeditor/main/index.html.deploy @@ -206,7 +206,7 @@ var re = /chrome\/(\d+)/i.exec(userAgent); if (!!re && !!re[1] && !(re[1] > 49)) { setTimeout(function () { - document.getElementsByTagName('body')[0].className += "winxp"; + document.getElementsByTagName('html')[0].className += "winxp"; },0); } } diff --git a/apps/presentationeditor/mobile/app/controller/Main.js b/apps/presentationeditor/mobile/app/controller/Main.js index 8f610f438..fdd5896eb 100644 --- a/apps/presentationeditor/mobile/app/controller/Main.js +++ b/apps/presentationeditor/mobile/app/controller/Main.js @@ -1224,7 +1224,7 @@ define([ me._state.openDlg = uiApp.modal({ title: me.advDRMOptions, - text: me.txtProtected, + text: (typeof advOptions=='string' ? advOptions : me.txtProtected), afterText: '
', buttons: buttons }); diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index a8fcf876e..019c519ed 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -1834,6 +1834,7 @@ define([ closeFile: me.appOptions.canRequestClose, type: Common.Utils.importTextType.DRM, warning: !(me.appOptions.isDesktopApp && me.appOptions.isOffline), + warningMsg: advOptions, validatePwd: !!me._state.isDRM, handler: function (result, value) { me.isShowOpenDialog = false; diff --git a/apps/spreadsheeteditor/main/index.html.deploy b/apps/spreadsheeteditor/main/index.html.deploy index cafb71dd4..c1964a9c1 100644 --- a/apps/spreadsheeteditor/main/index.html.deploy +++ b/apps/spreadsheeteditor/main/index.html.deploy @@ -206,7 +206,7 @@ var re = /chrome\/(\d+)/i.exec(userAgent); if (!!re && !!re[1] && !(re[1] > 49)) { setTimeout(function () { - document.getElementsByTagName('body')[0].className += "winxp"; + document.getElementsByTagName('html')[0].className += "winxp"; },0); } } diff --git a/apps/spreadsheeteditor/mobile/app/controller/Main.js b/apps/spreadsheeteditor/mobile/app/controller/Main.js index aca038004..43789958a 100644 --- a/apps/spreadsheeteditor/mobile/app/controller/Main.js +++ b/apps/spreadsheeteditor/mobile/app/controller/Main.js @@ -1430,7 +1430,7 @@ define([ me._state.openDlg = uiApp.modal({ title: me.advDRMOptions, - text: me.txtProtected, + text: (typeof advOptions=='string' ? advOptions : me.txtProtected), afterText: '
', buttons: buttons });