diff --git a/apps/common/main/lib/view/OpenDialog.js b/apps/common/main/lib/view/OpenDialog.js index 96abab1c3..a6b01b5ee 100644 --- a/apps/common/main/lib/view/OpenDialog.js +++ b/apps/common/main/lib/view/OpenDialog.js @@ -55,8 +55,8 @@ define([ _.extend(_options, { closable : false, - width : (options.preview) ? 414 : 262, - height : (options.preview) ? 291 : ((options.type == Asc.c_oAscAdvancedOptionsID.CSV) ? 205 : 155), + width : (options.preview) ? 414 : ((options.type == Asc.c_oAscAdvancedOptionsID.DRM) ? 370 : 262), + height : (options.preview) ? 277 : ((options.type == Asc.c_oAscAdvancedOptionsID.CSV) ? 190 : 187), header : true, preview : options.preview, cls : 'open-dlg', @@ -70,8 +70,12 @@ define([ '
', '
', '<% if (type == Asc.c_oAscAdvancedOptionsID.DRM) { %>', - '', - '
', + '
', + '
', + '
' + t.txtProtected+ '
', + '', + '
', + '
', '<% } else { %>', '
', '', @@ -105,11 +109,10 @@ define([ '<% } %>', '
', '
', - '
', '' ].join(''); @@ -527,7 +530,8 @@ define([ txtPreview: 'Preview', txtComma: 'Comma', txtColon: 'Colon', - txtSemicolon: 'Semicolon' + txtSemicolon: 'Semicolon', + txtProtected: 'Once you enter the password and open the file, the current password to the file will be reset.' }, Common.Views.OpenDialog || {})); }); \ No newline at end of file diff --git a/apps/common/main/resources/less/opendialog.less b/apps/common/main/resources/less/opendialog.less index 762e50ef6..19e2a3d75 100644 --- a/apps/common/main/resources/less/opendialog.less +++ b/apps/common/main/resources/less/opendialog.less @@ -15,7 +15,7 @@ .content-panel { vertical-align: top; - padding: 15px; + padding: 15px 15px 0; width: 100%; .inner-content { @@ -74,6 +74,17 @@ padding-bottom: 8px; } } + + .icon { + float: left; + width: 35px; + height: 35px; + + &.warn { + height: 32px; + background-position: @alerts-offset-x @alerts-offset-y - 105px; + } + } } } .footer { diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json index 6034057be..90cf32c46 100644 --- a/apps/documenteditor/main/locale/en.json +++ b/apps/documenteditor/main/locale/en.json @@ -191,6 +191,7 @@ "Common.Views.OpenDialog.txtPreview": "Preview", "Common.Views.OpenDialog.txtTitle": "Choose %1 options", "Common.Views.OpenDialog.txtTitleProtected": "Protected 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.PasswordDialog.cancelButtonText": "Cancel", "Common.Views.PasswordDialog.okButtonText": "OK", "Common.Views.PasswordDialog.txtDescription": "Set a password to protect this document", diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json index ecfcf89e7..05d9177de 100644 --- a/apps/presentationeditor/main/locale/en.json +++ b/apps/presentationeditor/main/locale/en.json @@ -123,6 +123,7 @@ "Common.Views.OpenDialog.txtPassword": "Password", "Common.Views.OpenDialog.txtTitle": "Choose %1 options", "Common.Views.OpenDialog.txtTitleProtected": "Protected 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.PasswordDialog.cancelButtonText": "Cancel", "Common.Views.PasswordDialog.okButtonText": "OK", "Common.Views.PasswordDialog.txtDescription": "Set a password to protect this document", diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json index e2692d855..73354488f 100644 --- a/apps/spreadsheeteditor/main/locale/en.json +++ b/apps/spreadsheeteditor/main/locale/en.json @@ -113,6 +113,7 @@ "Common.Views.OpenDialog.txtTab": "Tab", "Common.Views.OpenDialog.txtTitle": "Choose %1 options", "Common.Views.OpenDialog.txtTitleProtected": "Protected 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.PasswordDialog.cancelButtonText": "Cancel", "Common.Views.PasswordDialog.okButtonText": "OK", "Common.Views.PasswordDialog.txtDescription": "Set a password to protect this document",