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

Merge pull request #687 from ONLYOFFICE/fix/protected-files

Browse source 
Fix/protected files
This commit is contained in:
Julia Radzhabova 2021-02-02 13:32:05 +03:00 committed by GitHub
parent ffca21bce1 822d88b6d9
commit 20cd47b211
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
apps/common/main/lib/view/OpenDialog.js
View file

@ -59,7 +59,7 @@ define([
width = 414;
height = 277;
} else {
width = (options.type !== Common.Utils.importTextType.DRM) ? 340 : (options.warning ? 420 : 262);
width = (options.type !== Common.Utils.importTextType.DRM) ? 340 : (options.warning ? 420 : 280);
height = (options.type == Common.Utils.importTextType.CSV || options.type == Common.Utils.importTextType.Paste || options.type == Common.Utils.importTextType.Columns) ? 190 : (options.warning ? 187 : 147);
}
@ -92,7 +92,7 @@ define([
'</div>',
'<% } else { %>',
'<div>',
'<label class="header">' + t.txtPassword + '</label>',
'<label class="">' + t.txtOpenFile + '</label>',
'<div id="id-password-txt"></div>',
'</div>',
'<% } %>',
@ -507,7 +507,8 @@ define([
txtColon: 'Colon',
txtSemicolon: 'Semicolon',
txtProtected: 'Once you enter the password and open the file, the current password to the file will be reset.',
txtAdvanced: 'Advanced'
txtAdvanced: 'Advanced',
txtOpenFile: "Enter a password to open the file"
}, Common.Views.OpenDialog || {}));
});

8
apps/common/main/lib/view/PasswordDialog.js
View file

@ -54,8 +54,8 @@ define([
_options = {};
_.extend(_options, {
width : 350,
height : 238,
width : 370,
height : 270,
header : true,
cls : 'modal-dlg',
contentTemplate : '',
@ -77,6 +77,7 @@ define([
'<label>' + t.txtRepeat + '</label>',
'</div>',
'<div id="id-repeat-txt" class="input-row" style="margin-bottom: 10px;"></div>',
'<label>' + t.txtWarning + '</label>',
'</div>'
].join('');
@ -154,7 +155,8 @@ define([
txtPassword : "Password",
txtDescription : "A Password is required to open this document",
txtRepeat: 'Repeat password',
txtIncorrectPwd: 'Confirmation password is not identical'
txtIncorrectPwd: 'Confirmation password is not identical',
txtWarning: 'Warning: If you lose or forget the password, it cannot be recovered. Please keep it in a safe place.'
}, Common.Views.PasswordDialog || {}));
});

2
apps/documenteditor/main/locale/en.json
View file

@ -257,6 +257,7 @@
"Common.Views.OpenDialog.txtEncoding": "Encoding ",
"Common.Views.OpenDialog.txtIncorrectPwd": "Password is incorrect.",
"Common.Views.OpenDialog.txtPassword": "Password",
"Common.Views.OpenDialog.txtOpenFile": "Enter a password to open the file",
"Common.Views.OpenDialog.txtPreview": "Preview",
"Common.Views.OpenDialog.txtProtected": "Once you enter the password and open the file, the current password to the file will be reset.",
"Common.Views.OpenDialog.txtTitle": "Choose %1 options",
@ -266,6 +267,7 @@
"Common.Views.PasswordDialog.txtPassword": "Password",
"Common.Views.PasswordDialog.txtRepeat": "Repeat password",
"Common.Views.PasswordDialog.txtTitle": "Set Password",
"Common.Views.PasswordDialog.txtWarning": "Warning: If you lose or forget the password, it cannot be recovered. Please keep it in a safe place.",
"Common.Views.PluginDlg.textLoading": "Loading",
"Common.Views.Plugins.groupCaption": "Plugins",
"Common.Views.Plugins.strPlugins": "Plugins",

2
apps/presentationeditor/main/locale/en.json
View file

@ -160,6 +160,7 @@
"Common.Views.OpenDialog.txtEncoding": "Encoding ",
"Common.Views.OpenDialog.txtIncorrectPwd": "Password is incorrect.",
"Common.Views.OpenDialog.txtPassword": "Password",
"Common.Views.OpenDialog.txtOpenFile": "Enter a password to open the file",
"Common.Views.OpenDialog.txtProtected": "Once you enter the password and open the file, the current password to the file will be reset.",
"Common.Views.OpenDialog.txtTitle": "Choose %1 options",
"Common.Views.OpenDialog.txtTitleProtected": "Protected File",
@ -168,6 +169,7 @@
"Common.Views.PasswordDialog.txtPassword": "Password",
"Common.Views.PasswordDialog.txtRepeat": "Repeat password",
"Common.Views.PasswordDialog.txtTitle": "Set Password",
"Common.Views.PasswordDialog.txtWarning": "Warning: If you lose or forget the password, it cannot be recovered. Please keep it in a safe place.",
"Common.Views.PluginDlg.textLoading": "Loading",
"Common.Views.Plugins.groupCaption": "Plugins",
"Common.Views.Plugins.strPlugins": "Plugins",

2
apps/spreadsheeteditor/main/locale/en.json
View file

@ -153,6 +153,7 @@
"Common.Views.OpenDialog.txtIncorrectPwd": "Password is incorrect.",
"Common.Views.OpenDialog.txtOther": "Other",
"Common.Views.OpenDialog.txtPassword": "Password",
"Common.Views.OpenDialog.txtOpenFile": "Enter a password to open the file",
"Common.Views.OpenDialog.txtPreview": "Preview",
"Common.Views.OpenDialog.txtProtected": "Once you enter the password and open the file, the current password to the file will be reset.",
"Common.Views.OpenDialog.txtSemicolon": "Semicolon",
@ -165,6 +166,7 @@
"Common.Views.PasswordDialog.txtPassword": "Password",
"Common.Views.PasswordDialog.txtRepeat": "Repeat password",
"Common.Views.PasswordDialog.txtTitle": "Set Password",
"Common.Views.PasswordDialog.txtWarning": "Warning: If you lose or forget the password, it cannot be recovered. Please keep it in a safe place.",
"Common.Views.PluginDlg.textLoading": "Loading",
"Common.Views.Plugins.groupCaption": "Plugins",
"Common.Views.Plugins.strPlugins": "Plugins",