diff --git a/apps/common/main/lib/component/SynchronizeTip.js b/apps/common/main/lib/component/SynchronizeTip.js index c6a62df89..d3cce7eaf 100644 --- a/apps/common/main/lib/component/SynchronizeTip.js +++ b/apps/common/main/lib/component/SynchronizeTip.js @@ -48,7 +48,7 @@ define([ }, template: _.template([ - '
', + '
<%= scope.placement %>">', '
', '
', '
', 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([ '<% } %>', '
', '
', - '
', '
', - '', + '', '<% if (closable) { %>', - '', + '', '<% } %>', '
' ].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/lib/view/SignDialog.js b/apps/common/main/lib/view/SignDialog.js index 4fdcf3f9b..4a2541f4b 100644 --- a/apps/common/main/lib/view/SignDialog.js +++ b/apps/common/main/lib/view/SignDialog.js @@ -51,7 +51,7 @@ define([ Common.Views.SignDialog = Common.UI.Window.extend(_.extend({ options: { - width: 350, + width: 370, style: 'min-width: 350px;', cls: 'modal-dlg' }, @@ -90,10 +90,10 @@ define([ '
', '
', '
','
', - '
', + '
', '', '
', - '', + '', '
', '', '
', @@ -143,7 +143,7 @@ define([ me.cmbFonts = new Common.UI.ComboBoxFonts({ el : $('#id-dlg-sign-fonts'), cls : 'input-group-nr', - style : 'width: 214px;', + style : 'width: 234px;', menuCls : 'scrollable-menu', menuStyle : 'min-width: 55px;max-height: 270px;', store : new Common.Collections.Fonts(), @@ -265,9 +265,9 @@ define([ afterRender: function () { if (this.api) { - this.binding = { - certificateChanged: _.bind(this.onCertificateChanged, this) - }; + if (!this.binding) + this.binding = {}; + this.binding.certificateChanged = _.bind(this.onCertificateChanged, this); this.api.asc_registerCallback('on_signature_defaultcertificate_ret', this.binding.certificateChanged); this.api.asc_registerCallback('on_signature_selectsertificate_ret', this.binding.certificateChanged); this.api.asc_GetDefaultCertificate(); diff --git a/apps/common/main/lib/view/SignSettingsDialog.js b/apps/common/main/lib/view/SignSettingsDialog.js index db62ea0fa..4d284c8cd 100644 --- a/apps/common/main/lib/view/SignSettingsDialog.js +++ b/apps/common/main/lib/view/SignSettingsDialog.js @@ -208,6 +208,6 @@ define([ txtEmpty: 'This field is required', textAllowComment: 'Allow signer to add comment in the signature dialog', textShowDate: 'Show sign date in signature line', - textTitle: 'Signature Settings' + textTitle: 'Signature Setup' }, Common.Views.SignSettingsDialog || {})) }); \ 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/common/main/resources/less/synchronize-tip.less b/apps/common/main/resources/less/synchronize-tip.less index e4eec7177..3853c21aa 100644 --- a/apps/common/main/resources/less/synchronize-tip.less +++ b/apps/common/main/resources/less/synchronize-tip.less @@ -1,8 +1,12 @@ .synch-tip-root { position: absolute; - z-index: @zindex-tooltip + 5; + z-index: @zindex-navbar + 2; width: 300px; + &.inc-index { + z-index: @zindex-navbar + 4; + } + .tip-arrow { position: absolute; overflow: hidden; diff --git a/apps/common/main/resources/less/toolbar.less b/apps/common/main/resources/less/toolbar.less index 6b4dfe3b3..0100a9d8a 100644 --- a/apps/common/main/resources/less/toolbar.less +++ b/apps/common/main/resources/less/toolbar.less @@ -242,13 +242,13 @@ position: absolute; bottom: 0; width: 100%; - z-index: 102; + z-index: @zindex-navbar + 3; } .toolbar { &.cover { ul { - z-index: 102; + z-index: @zindex-navbar + 4; } } } diff --git a/apps/documenteditor/main/app/controller/LeftMenu.js b/apps/documenteditor/main/app/controller/LeftMenu.js index 983b1f656..3c028b807 100644 --- a/apps/documenteditor/main/app/controller/LeftMenu.js +++ b/apps/documenteditor/main/app/controller/LeftMenu.js @@ -333,7 +333,7 @@ define([ value = Common.localStorage.getBool("de-settings-livecomment", true); Common.Utils.InternalSettings.set("de-settings-livecomment", value); - var resolved = Common.localStorage.getBool("de-settings-resolvedcomment", true); + var resolved = Common.localStorage.getBool("de-settings-resolvedcomment"); Common.Utils.InternalSettings.set("de-settings-resolvedcomment", resolved); if (this.mode.canComments && this.leftMenu.panelComments.isVisible()) value = resolved = true; diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index 66d66d966..b30455b5b 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -625,7 +625,7 @@ define([ if (this.api && !toolbarView._state.previewmode) { var cansave = this.api.asc_isDocumentCanSave(), forcesave = this.appOptions.forcesave, - isSyncButton = $('.icon', toolbarView.btnSave.cmpEl).hasClass('btn-synch'), + isSyncButton = toolbarView.btnCollabChanges.$icon.hasClass('btn-synch'), isDisabled = !cansave && !isSyncButton && !forcesave || this._state.isDisconnected || this._state.fastCoauth && this._state.usersCount>1 && !forcesave; toolbarView.btnSave.setDisabled(isDisabled); } @@ -815,7 +815,7 @@ define([ /** coauthoring begin **/ this.isLiveCommenting = Common.localStorage.getBool("de-settings-livecomment", true); Common.Utils.InternalSettings.set("de-settings-livecomment", this.isLiveCommenting); - value = Common.localStorage.getBool("de-settings-resolvedcomment", true); + value = Common.localStorage.getBool("de-settings-resolvedcomment"); Common.Utils.InternalSettings.set("de-settings-resolvedcomment", value); this.isLiveCommenting ? this.api.asc_showComments(value) : this.api.asc_hideComments(); /** coauthoring end **/ @@ -1518,7 +1518,7 @@ define([ var toolbarView = this.getApplication().getController('Toolbar').getView(); if (toolbarView && !toolbarView._state.previewmode) { - var isSyncButton = toolbarView.btnSave.$icon.hasClass('btn-synch'), + var isSyncButton = toolbarView.btnCollabChanges.$icon.hasClass('btn-synch'), forcesave = this.appOptions.forcesave, isDisabled = !isModified && !isSyncButton && !forcesave || this._state.isDisconnected || this._state.fastCoauth && this._state.usersCount>1 && !forcesave; toolbarView.btnSave.setDisabled(isDisabled); @@ -1534,7 +1534,7 @@ define([ var toolbarView = this.getApplication().getController('Toolbar').getView(); if (toolbarView && this.api && !toolbarView._state.previewmode) { - var isSyncButton = $('.icon', toolbarView.btnSave.cmpEl).hasClass('btn-synch'), + var isSyncButton = toolbarView.btnCollabChanges.$icon.hasClass('btn-synch'), forcesave = this.appOptions.forcesave, isDisabled = !isCanSave && !isSyncButton && !forcesave || this._state.isDisconnected || this._state.fastCoauth && this._state.usersCount>1 && !forcesave; toolbarView.btnSave.setDisabled(isDisabled); @@ -2143,7 +2143,7 @@ define([ errorKeyExpire: 'Key descriptor expired', errorUsersExceed: 'Count of users was exceed', errorCoAuthoringDisconnect: 'Server connection lost. You can\'t edit anymore.', - errorFilePassProtect: 'The document is password protected.', + errorFilePassProtect: 'The file is password protected and cannot be opened.', txtBasicShapes: 'Basic Shapes', txtFiguredArrows: 'Figured Arrows', txtMath: 'Math', diff --git a/apps/documenteditor/main/app/controller/Navigation.js b/apps/documenteditor/main/app/controller/Navigation.js index d1fa044f4..db8234147 100644 --- a/apps/documenteditor/main/app/controller/Navigation.js +++ b/apps/documenteditor/main/app/controller/Navigation.js @@ -205,6 +205,7 @@ define([ onSelectItem: function(picker, item, record, e){ if (!this._navigationObject) return; this._navigationObject.goto(record.get('index')); + Common.NotificationCenter.trigger('edit:complete', this.panelNavigation); }, onMenuItemClick: function (menu, item) { diff --git a/apps/documenteditor/main/app/view/FileMenuPanels.js b/apps/documenteditor/main/app/view/FileMenuPanels.js index 7da717107..04d69a892 100644 --- a/apps/documenteditor/main/app/view/FileMenuPanels.js +++ b/apps/documenteditor/main/app/view/FileMenuPanels.js @@ -1115,7 +1115,7 @@ define([ '
', '', '', - '', + '', '', '', '', @@ -1139,7 +1139,7 @@ define([ this.templateSignature = _.template([ '
<%= scope.txtEncrypted %>
', '', - '', + '', '', '', '', diff --git a/apps/documenteditor/main/app/view/Toolbar.js b/apps/documenteditor/main/app/view/Toolbar.js index fc879aaf5..cc81c48d9 100644 --- a/apps/documenteditor/main/app/view/Toolbar.js +++ b/apps/documenteditor/main/app/view/Toolbar.js @@ -2052,6 +2052,7 @@ define([ createSynchTip: function () { this.synchTooltip = new Common.UI.SynchronizeTip({ + extCls: this.mode.isDesktopApp ? 'inc-index' : undefined, target: this.btnCollabChanges.$el }); this.synchTooltip.on('dontshowclick', function () { diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json index 18a38942d..7a335fa2e 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", @@ -291,7 +292,7 @@ "Common.Views.SignSettingsDialog.textInfoTitle": "Signer Title", "Common.Views.SignSettingsDialog.textInstructions": "Instructions for Signer", "Common.Views.SignSettingsDialog.textShowDate": "Show sign date in signature line", - "Common.Views.SignSettingsDialog.textTitle": "Signature Settings", + "Common.Views.SignSettingsDialog.textTitle": "Signature Setup", "Common.Views.SignSettingsDialog.txtEmpty": "This field is required", "DE.Controllers.LeftMenu.leavePageText": "All unsaved changes in this document will be lost.
Click \"Cancel\" then \"Save\" to save them. Click \"OK\" to discard all the unsaved changes.", "DE.Controllers.LeftMenu.newDocumentTitle": "Unnamed document", @@ -321,7 +322,7 @@ "DE.Controllers.Main.errorDatabaseConnection": "External error.
Database connection error. Please contact support in case the error persists.", "DE.Controllers.Main.errorDataRange": "Incorrect data range.", "DE.Controllers.Main.errorDefaultMessage": "Error code: %1", - "DE.Controllers.Main.errorFilePassProtect": "The document is password protected and could not be opened.", + "DE.Controllers.Main.errorFilePassProtect": "The file is password protected and could not be opened.", "DE.Controllers.Main.errorForceSave": "An error occurred while saving the file. Please use the 'Download as' option to save the file to your computer hard drive or try again later.", "DE.Controllers.Main.errorKeyEncrypt": "Unknown key descriptor", "DE.Controllers.Main.errorKeyExpire": "Key descriptor expired", diff --git a/apps/documenteditor/main/resources/less/filemenu.less b/apps/documenteditor/main/resources/less/filemenu.less index a37fdee1a..588b01951 100644 --- a/apps/documenteditor/main/resources/less/filemenu.less +++ b/apps/documenteditor/main/resources/less/filemenu.less @@ -373,7 +373,7 @@ } #panel-protect { - label, span { + label { font-size: 12px; } diff --git a/apps/documenteditor/main/resources/less/toolbar.less b/apps/documenteditor/main/resources/less/toolbar.less index bbe1c7805..f7c26e5fb 100644 --- a/apps/documenteditor/main/resources/less/toolbar.less +++ b/apps/documenteditor/main/resources/less/toolbar.less @@ -30,11 +30,11 @@ position: absolute; top: 32px; left: 48px; - right: 45px; + right: 0; bottom: 0; opacity: 0; background-color: @gray-light; - z-index: @zindex-tooltip + 1; + /* z-index: @zindex-tooltip + 1; */ } .toolbar-group-mask { diff --git a/apps/documenteditor/mobile/app/controller/Main.js b/apps/documenteditor/mobile/app/controller/Main.js index 27f11f7a0..bf1613b60 100644 --- a/apps/documenteditor/mobile/app/controller/Main.js +++ b/apps/documenteditor/mobile/app/controller/Main.js @@ -1093,7 +1093,7 @@ define([ me._state.openDlg = uiApp.modal({ title: me.advDRMOptions, - text: me.advDRMEnterPassword, + text: me.txtProtected, afterText: '
', buttons: [ { @@ -1221,7 +1221,7 @@ define([ errorKeyExpire: 'Key descriptor expired', errorUsersExceed: 'Count of users was exceed', errorCoAuthoringDisconnect: 'Server connection lost. You can\'t edit anymore.', - errorFilePassProtect: 'The document is password protected.', + errorFilePassProtect: 'The file is password protected and could not be opened.', txtEditingMode: 'Set editing mode...', textAnonymous: 'Anonymous', loadingDocumentTitleText: 'Loading document', @@ -1292,7 +1292,8 @@ define([ txtStyle_footnote_text: 'Footnote Text', txtHeader: "Header", txtFooter: "Footer", - warnNoLicenseUsers: 'This version of ONLYOFFICE Editors has certain limitations for concurrent users.
If you need more please consider upgrading your current license or purchasing a commercial one.' + warnNoLicenseUsers: 'This version of ONLYOFFICE Editors has certain limitations for concurrent users.
If you need more please consider upgrading your current license or purchasing a commercial one.', + txtProtected: 'Once you enter the password and open the file, the current password to the file will be reset' } })(), DE.Controllers.Main || {})) }); \ No newline at end of file diff --git a/apps/documenteditor/mobile/locale/en.json b/apps/documenteditor/mobile/locale/en.json index 117d54e5f..425357bbb 100644 --- a/apps/documenteditor/mobile/locale/en.json +++ b/apps/documenteditor/mobile/locale/en.json @@ -37,6 +37,7 @@ "DE.Controllers.EditText.textAuto": "Auto", "DE.Controllers.EditText.textFonts": "Fonts", "DE.Controllers.EditText.textPt": "pt", + "DE.Controllers.Main.txtProtected": "Once you enter the password and open the file, the current password to the file will be reset", "DE.Controllers.Main.advDRMEnterPassword": "Enter your password:", "DE.Controllers.Main.advDRMOptions": "Protected File", "DE.Controllers.Main.advDRMPassword": "Password", @@ -58,7 +59,7 @@ "DE.Controllers.Main.errorDatabaseConnection": "External error.
Database connection error. Please, contact support.", "DE.Controllers.Main.errorDataRange": "Incorrect data range.", "DE.Controllers.Main.errorDefaultMessage": "Error code: %1", - "DE.Controllers.Main.errorFilePassProtect": "The document is password protected.", + "DE.Controllers.Main.errorFilePassProtect": "The file is password protected and could not be opened.", "DE.Controllers.Main.errorKeyEncrypt": "Unknown key descriptor", "DE.Controllers.Main.errorKeyExpire": "Key descriptor expired", "DE.Controllers.Main.errorMailMergeLoadFile": "Loading failed", diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js index 5aef5119d..327fb95ee 100644 --- a/apps/presentationeditor/main/app/controller/Main.js +++ b/apps/presentationeditor/main/app/controller/Main.js @@ -426,7 +426,7 @@ define([ if (this.api && this.api.asc_isDocumentCanSave) { var cansave = this.api.asc_isDocumentCanSave(), forcesave = this.appOptions.forcesave, - isSyncButton = $('.icon', toolbarView.btnSave.cmpEl).hasClass('btn-synch'), + isSyncButton = toolbarView.btnCollabChanges.$icon.hasClass('btn-synch'), isDisabled = !cansave && !isSyncButton && !forcesave || this._state.isDisconnected || this._state.fastCoauth && this._state.usersCount>1 && !forcesave; toolbarView.btnSave.setDisabled(isDisabled); } @@ -1268,7 +1268,7 @@ define([ var toolbarView = this.getApplication().getController('Toolbar').getView('Toolbar'); if (toolbarView) { - var isSyncButton = $('.icon', toolbarView.btnSave.cmpEl).hasClass('btn-synch'), + var isSyncButton = toolbarView.btnCollabChanges.$icon.hasClass('btn-synch'), forcesave = this.appOptions.forcesave, isDisabled = !isModified && !isSyncButton && !forcesave || this._state.isDisconnected || this._state.fastCoauth && this._state.usersCount>1 && !forcesave; toolbarView.btnSave.setDisabled(isDisabled); @@ -1277,7 +1277,7 @@ define([ onDocumentCanSaveChanged: function (isCanSave) { var toolbarView = this.getApplication().getController('Toolbar').getView('Toolbar'); if ( toolbarView ) { - var isSyncButton = $('.icon', toolbarView.btnSave.cmpEl).hasClass('btn-synch'), + var isSyncButton = toolbarView.btnCollabChanges.$icon.hasClass('btn-synch'), forcesave = this.appOptions.forcesave, isDisabled = !isCanSave && !isSyncButton && !forcesave || this._state.isDisconnected || this._state.fastCoauth && this._state.usersCount>1 && !forcesave; toolbarView.btnSave.setDisabled(isDisabled); @@ -1944,7 +1944,7 @@ define([ errorUsersExceed: 'Count of users was exceed', txtEditingMode: 'Set editing mode...', errorCoAuthoringDisconnect: 'Server connection lost. You can\'t edit anymore.', - errorFilePassProtect: 'The document is password protected.', + errorFilePassProtect: 'The file is password protected and cannot be opened.', textAnonymous: 'Anonymous', txtNeedSynchronize: 'You have an updates', applyChangesTitleText: 'Loading Data', diff --git a/apps/presentationeditor/main/app/template/Viewport.template b/apps/presentationeditor/main/app/template/Viewport.template index 960edecea..5307c1f08 100644 --- a/apps/presentationeditor/main/app/template/Viewport.template +++ b/apps/presentationeditor/main/app/template/Viewport.template @@ -1,5 +1,5 @@
- +
diff --git a/apps/presentationeditor/main/app/view/FileMenuPanels.js b/apps/presentationeditor/main/app/view/FileMenuPanels.js index a9472caf9..8824cf8a9 100644 --- a/apps/presentationeditor/main/app/view/FileMenuPanels.js +++ b/apps/presentationeditor/main/app/view/FileMenuPanels.js @@ -880,7 +880,7 @@ define([ '
', '
<%= tipText %>
', '', - '', + '', '', '', '', @@ -904,7 +904,7 @@ define([ this.templateSignature = _.template([ '
<%= scope.txtEncrypted %>
', '', - '', + '', '', '', '', diff --git a/apps/presentationeditor/main/app/view/Toolbar.js b/apps/presentationeditor/main/app/view/Toolbar.js index 0faefcde3..30e984843 100644 --- a/apps/presentationeditor/main/app/view/Toolbar.js +++ b/apps/presentationeditor/main/app/view/Toolbar.js @@ -109,6 +109,8 @@ define([ me.shapeControls = []; me.slideOnlyControls = []; me.synchTooltip = undefined; + me.needShowSynchTip = false; + me.schemeNames = [ me.txtScheme1, me.txtScheme2, me.txtScheme3, me.txtScheme4, me.txtScheme5, me.txtScheme6, me.txtScheme7, me.txtScheme8, me.txtScheme9, me.txtScheme10, @@ -1254,7 +1256,6 @@ define([ /** coauthoring begin **/ this.showSynchTip = !Common.localStorage.getBool('pe-hide-synch'); - this.needShowSynchTip = false; if (this.needShowSynchTip) { this.needShowSynchTip = false; @@ -1404,6 +1405,7 @@ define([ createSynchTip: function () { this.synchTooltip = new Common.UI.SynchronizeTip({ + extCls: this.mode.isDesktopApp ? 'inc-index' : undefined, target: this.btnCollabChanges.$el }); this.synchTooltip.on('dontshowclick', function () { diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json index 35968aa59..476961251 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", @@ -214,7 +215,7 @@ "Common.Views.SignSettingsDialog.textInfoTitle": "Signer Title", "Common.Views.SignSettingsDialog.textInstructions": "Instructions for Signer", "Common.Views.SignSettingsDialog.textShowDate": "Show sign date in signature line", - "Common.Views.SignSettingsDialog.textTitle": "Signature Settings", + "Common.Views.SignSettingsDialog.textTitle": "Signature Setup", "Common.Views.SignSettingsDialog.txtEmpty": "This field is required", "PE.Controllers.LeftMenu.newDocumentTitle": "Unnamed presentation", "PE.Controllers.LeftMenu.requestEditRightsText": "Requesting editing rights...", @@ -235,7 +236,7 @@ "PE.Controllers.Main.errorDatabaseConnection": "External error.
Database connection error. Please contact support in case the error persists.", "PE.Controllers.Main.errorDataRange": "Incorrect data range.", "PE.Controllers.Main.errorDefaultMessage": "Error code: %1", - "PE.Controllers.Main.errorFilePassProtect": "The document is password protected and could not be opened.", + "PE.Controllers.Main.errorFilePassProtect": "The file is password protected and could not be opened.", "PE.Controllers.Main.errorForceSave": "An error occurred while saving the file. Please use the 'Download as' option to save the file to your computer hard drive or try again later.", "PE.Controllers.Main.errorKeyEncrypt": "Unknown key descriptor", "PE.Controllers.Main.errorKeyExpire": "Key descriptor expired", diff --git a/apps/presentationeditor/main/resources/less/document-preview.less b/apps/presentationeditor/main/resources/less/document-preview.less index a5f751d95..dc6160cfb 100644 --- a/apps/presentationeditor/main/resources/less/document-preview.less +++ b/apps/presentationeditor/main/resources/less/document-preview.less @@ -1,3 +1,6 @@ +#pe-preview { + z-index: @zindex-navbar+3; +} .preview-controls { display: table; background: @gray-light; diff --git a/apps/presentationeditor/main/resources/less/leftmenu.less b/apps/presentationeditor/main/resources/less/leftmenu.less index a269387b9..ad4c2a9df 100644 --- a/apps/presentationeditor/main/resources/less/leftmenu.less +++ b/apps/presentationeditor/main/resources/less/leftmenu.less @@ -454,7 +454,7 @@ } #panel-protect { - label, span { + label { font-size: 12px; } diff --git a/apps/presentationeditor/main/resources/less/toolbar.less b/apps/presentationeditor/main/resources/less/toolbar.less index 95fcab43d..081a2a5f7 100644 --- a/apps/presentationeditor/main/resources/less/toolbar.less +++ b/apps/presentationeditor/main/resources/less/toolbar.less @@ -25,11 +25,11 @@ position: absolute; top: 32px; left: 48px; - right: 45px; + right: 0; bottom: 0; opacity: 0; background-color: @gray-light; - z-index: @zindex-tooltip + 1; + /*z-index: @zindex-tooltip + 1;*/ } .menu-layouts { diff --git a/apps/presentationeditor/mobile/app/controller/Main.js b/apps/presentationeditor/mobile/app/controller/Main.js index dc7164c28..fd1ac443b 100644 --- a/apps/presentationeditor/mobile/app/controller/Main.js +++ b/apps/presentationeditor/mobile/app/controller/Main.js @@ -1037,7 +1037,7 @@ define([ me._state.openDlg = uiApp.modal({ title: me.advDRMOptions, - text: me.advDRMEnterPassword, + text: me.txtProtected, afterText: '
', buttons: [ { @@ -1224,7 +1224,7 @@ define([ errorUsersExceed: 'Count of users was exceed', txtEditingMode: 'Set editing mode...', errorCoAuthoringDisconnect: 'Server connection lost. You can\'t edit anymore.', - errorFilePassProtect: 'The document is password protected.', + errorFilePassProtect: 'The file is password protected and cannot be opened.', textAnonymous: 'Anonymous', txtNeedSynchronize: 'You have an updates', applyChangesTitleText: 'Loading Data', @@ -1285,7 +1285,8 @@ define([ txtSlideNumber: 'Slide number', txtSlideSubtitle: 'Slide subtitle', txtSlideTitle: 'Slide title', - warnNoLicenseUsers: 'This version of ONLYOFFICE Editors has certain limitations for concurrent users.
If you need more please consider upgrading your current license or purchasing a commercial one.' + warnNoLicenseUsers: 'This version of ONLYOFFICE Editors has certain limitations for concurrent users.
If you need more please consider upgrading your current license or purchasing a commercial one.', + txtProtected: 'Once you enter the password and open the file, the current password to the file will be reset' } })(), PE.Controllers.Main || {})) }); \ No newline at end of file diff --git a/apps/presentationeditor/mobile/locale/en.json b/apps/presentationeditor/mobile/locale/en.json index ef5060bc6..239e5061a 100644 --- a/apps/presentationeditor/mobile/locale/en.json +++ b/apps/presentationeditor/mobile/locale/en.json @@ -55,6 +55,7 @@ "PE.Controllers.EditText.textAuto": "Auto", "PE.Controllers.EditText.textFonts": "Fonts", "PE.Controllers.EditText.textPt": "pt", + "PE.Controllers.Main.txtProtected": "Once you enter the password and open the file, the current password to the file will be reset", "PE.Controllers.Main.advDRMEnterPassword": "Enter your password:", "PE.Controllers.Main.advDRMOptions": "Protected File", "PE.Controllers.Main.advDRMPassword": "Password", @@ -73,7 +74,7 @@ "PE.Controllers.Main.errorDatabaseConnection": "External error.
Database connection error. Please, contact support.", "PE.Controllers.Main.errorDataRange": "Incorrect data range.", "PE.Controllers.Main.errorDefaultMessage": "Error code: %1", - "PE.Controllers.Main.errorFilePassProtect": "The document is password protected.", + "PE.Controllers.Main.errorFilePassProtect": "The file is password protected and cannot be opened.", "PE.Controllers.Main.errorKeyEncrypt": "Unknown key descriptor", "PE.Controllers.Main.errorKeyExpire": "Key descriptor expired", "PE.Controllers.Main.errorProcessSaveResult": "Saving is failed.", diff --git a/apps/spreadsheeteditor/main/app/controller/LeftMenu.js b/apps/spreadsheeteditor/main/app/controller/LeftMenu.js index 9325c24b8..2adb59ce8 100644 --- a/apps/spreadsheeteditor/main/app/controller/LeftMenu.js +++ b/apps/spreadsheeteditor/main/app/controller/LeftMenu.js @@ -279,7 +279,7 @@ define([ /** coauthoring begin **/ value = Common.localStorage.getBool("sse-settings-livecomment", true); Common.Utils.InternalSettings.set("sse-settings-livecomment", value); - var resolved = Common.localStorage.getBool("sse-settings-resolvedcomment", true); + var resolved = Common.localStorage.getBool("sse-settings-resolvedcomment"); Common.Utils.InternalSettings.set("sse-settings-resolvedcomment", resolved); if (this.mode.canComments && this.leftMenu.panelComments.isVisible()) diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index 95cc2d548..c5dc26601 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -616,7 +616,7 @@ define([ /** coauthoring begin **/ this.isLiveCommenting = Common.localStorage.getBool("sse-settings-livecomment", true); Common.Utils.InternalSettings.set("sse-settings-livecomment", this.isLiveCommenting); - value = Common.localStorage.getBool("sse-settings-resolvedcomment", true); + value = Common.localStorage.getBool("sse-settings-resolvedcomment"); Common.Utils.InternalSettings.set("sse-settings-resolvedcomment", value); this.isLiveCommenting ? this.api.asc_showComments(value) : this.api.asc_hideComments(); @@ -1412,8 +1412,8 @@ define([ this.updateWindowTitle(change); Common.Gateway.setDocumentModified(change); - if (this.toolbarView && this.toolbarView.btnSave && this.api) { - var isSyncButton = $('.icon', this.toolbarView.btnSave.cmpEl).hasClass('btn-synch'), + if (this.toolbarView && this.toolbarView.btnCollabChanges && this.api) { + var isSyncButton = this.toolbarView.btnCollabChanges.$icon.hasClass('btn-synch'), forcesave = this.appOptions.forcesave, cansave = this.api.asc_isDocumentCanSave(), isDisabled = !cansave && !isSyncButton && !forcesave || this._state.isDisconnected || this._state.fastCoauth && this._state.usersCount>1 && !forcesave; @@ -1422,8 +1422,8 @@ define([ }, onDocumentCanSaveChanged: function (isCanSave) { - if (this.toolbarView && this.toolbarView.btnSave) { - var isSyncButton = $('.icon', this.toolbarView.btnSave.cmpEl).hasClass('btn-synch'), + if (this.toolbarView && this.toolbarView.btnCollabChanges) { + var isSyncButton = this.toolbarView.btnCollabChanges.$icon.hasClass('btn-synch'), forcesave = this.appOptions.forcesave, isDisabled = !isCanSave && !isSyncButton && !forcesave || this._state.isDisconnected || this._state.fastCoauth && this._state.usersCount>1 && !forcesave; this.toolbarView.btnSave.setDisabled(isDisabled); @@ -2108,7 +2108,7 @@ define([ errorMoveRange: 'Cann\'t change a part of merged cell', errorBadImageUrl: 'Image url is incorrect', errorCoAuthoringDisconnect: 'Server connection lost. You can\'t edit anymore.', - errorFilePassProtect: 'The document is password protected.', + errorFilePassProtect: 'The file is password protected and cannot be opened.', errorLockedAll: 'The operation could not be done as the sheet has been locked by another user.', txtEditingMode: 'Set editing mode...', textLoadingDocument: 'Loading spreadsheet', diff --git a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js index c90858193..f3879f97c 100644 --- a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js +++ b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js @@ -1340,7 +1340,7 @@ define([ '
', '
<%= tipText %>
', '', - '', + '', '', '', '', @@ -1364,7 +1364,7 @@ define([ this.templateSignature = _.template([ '
<%= scope.txtEncrypted %>
', '', - '', + '', '', '', '', diff --git a/apps/spreadsheeteditor/main/app/view/Toolbar.js b/apps/spreadsheeteditor/main/app/view/Toolbar.js index c6373a31e..0721cd4d5 100644 --- a/apps/spreadsheeteditor/main/app/view/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/view/Toolbar.js @@ -1756,6 +1756,7 @@ define([ createSynchTip: function () { this.synchTooltip = new Common.UI.SynchronizeTip({ + extCls: this.mode.isDesktopApp ? 'inc-index' : undefined, target: this.btnCollabChanges.$el }); this.synchTooltip.on('dontshowclick', function() { diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json index e805b1254..ecca9ec71 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", @@ -204,7 +205,7 @@ "Common.Views.SignSettingsDialog.textInfoTitle": "Signer Title", "Common.Views.SignSettingsDialog.textInstructions": "Instructions for Signer", "Common.Views.SignSettingsDialog.textShowDate": "Show sign date in signature line", - "Common.Views.SignSettingsDialog.textTitle": "Signature Settings", + "Common.Views.SignSettingsDialog.textTitle": "Signature Setup", "Common.Views.SignSettingsDialog.txtEmpty": "This field is required", "SSE.Controllers.DocumentHolder.alignmentText": "Alignment", "SSE.Controllers.DocumentHolder.centerText": "Center", @@ -366,7 +367,7 @@ "SSE.Controllers.Main.errorDatabaseConnection": "External error.
Database connection error. Please contact support in case the error persists.", "SSE.Controllers.Main.errorDataRange": "Incorrect data range.", "SSE.Controllers.Main.errorDefaultMessage": "Error code: %1", - "SSE.Controllers.Main.errorFilePassProtect": "The document is password protected and could not be opened.", + "SSE.Controllers.Main.errorFilePassProtect": "The file is password protected and cannot be opened.", "SSE.Controllers.Main.errorFileRequest": "External error.
File request error. Please contact support in case the error persists.", "SSE.Controllers.Main.errorFileVKey": "External error.
Incorrect security key. Please contact support in case the error persists.", "SSE.Controllers.Main.errorFillRange": "Could not fill the selected range of cells.
All the merged cells need to be the same size.", diff --git a/apps/spreadsheeteditor/main/resources/less/leftmenu.less b/apps/spreadsheeteditor/main/resources/less/leftmenu.less index 59e7c6ba8..7c96ca0ce 100644 --- a/apps/spreadsheeteditor/main/resources/less/leftmenu.less +++ b/apps/spreadsheeteditor/main/resources/less/leftmenu.less @@ -523,7 +523,7 @@ } #panel-protect { - label, span { + label { font-size: 12px; } diff --git a/apps/spreadsheeteditor/main/resources/less/toolbar.less b/apps/spreadsheeteditor/main/resources/less/toolbar.less index ebacaa1d5..b737be58a 100644 --- a/apps/spreadsheeteditor/main/resources/less/toolbar.less +++ b/apps/spreadsheeteditor/main/resources/less/toolbar.less @@ -47,11 +47,11 @@ position: absolute; top: 32px; left: 48px; - right: 45px; + right: 0; bottom: 0; opacity: 0; background-color: @gray-light; - z-index: @zindex-tooltip + 1; + /*z-index: @zindex-tooltip + 1;*/ } .color-schemas-menu { diff --git a/apps/spreadsheeteditor/mobile/app/controller/Main.js b/apps/spreadsheeteditor/mobile/app/controller/Main.js index 01c99eb2f..9ff1c3a98 100644 --- a/apps/spreadsheeteditor/mobile/app/controller/Main.js +++ b/apps/spreadsheeteditor/mobile/app/controller/Main.js @@ -1220,7 +1220,7 @@ define([ me._state.openDlg = uiApp.modal({ title: me.advDRMOptions, - text: me.advDRMEnterPassword, + text: me.txtProtected, afterText: '
', buttons: [ { @@ -1352,7 +1352,7 @@ define([ errorKeyExpire: 'Key descriptor expired', errorUsersExceed: 'Count of users was exceed', errorCoAuthoringDisconnect: 'Server connection lost. You can\'t edit anymore.', - errorFilePassProtect: 'The document is password protected.', + errorFilePassProtect: 'The file is password protected and cannot be opened.', txtBasicShapes: 'Basic Shapes', txtFiguredArrows: 'Figured Arrows', txtMath: 'Math', @@ -1450,7 +1450,8 @@ define([ txtStyle_Percent: 'Percent', txtStyle_Comma: 'Comma', warnNoLicenseUsers: 'This version of ONLYOFFICE Editors has certain limitations for concurrent users.
If you need more please consider upgrading your current license or purchasing a commercial one.', - errorMaxPoints: 'The maximum number of points in series per chart is 4096.' + errorMaxPoints: 'The maximum number of points in series per chart is 4096.', + txtProtected: 'Once you enter the password and open the file, the current password to the file will be reset' } })(), SSE.Controllers.Main || {})) }); \ No newline at end of file diff --git a/apps/spreadsheeteditor/mobile/locale/en.json b/apps/spreadsheeteditor/mobile/locale/en.json index e08b9693f..f624c36c0 100644 --- a/apps/spreadsheeteditor/mobile/locale/en.json +++ b/apps/spreadsheeteditor/mobile/locale/en.json @@ -93,6 +93,7 @@ "SSE.Controllers.EditHyperlink.textInvalidRange": "Invalid cells range", "SSE.Controllers.EditHyperlink.txtNotUrl": "This field should be a URL in the format \"http://www.example.com\"", "SSE.Controllers.Main.advCSVOptions": "Choose CSV Options", + "SSE.Controllers.Main.txtProtected": "Once you enter the password and open the file, the current password to the file will be reset", "SSE.Controllers.Main.advDRMEnterPassword": "Enter your password:", "SSE.Controllers.Main.advDRMOptions": "Protected File", "SSE.Controllers.Main.advDRMPassword": "Password", @@ -123,7 +124,7 @@ "SSE.Controllers.Main.errorDatabaseConnection": "External error.
Database connection error. Please contact support in case the error persists.", "SSE.Controllers.Main.errorDataRange": "Incorrect data range.", "SSE.Controllers.Main.errorDefaultMessage": "Error code: %1", - "SSE.Controllers.Main.errorFilePassProtect": "The document is password protected and could not be opened.", + "SSE.Controllers.Main.errorFilePassProtect": "The file is password protected and cannot be opened.", "SSE.Controllers.Main.errorFileRequest": "External error.
File request error. Please contact support in case the error persists.", "SSE.Controllers.Main.errorFileVKey": "External error.
Incorrect security key. Please contact support in case the error persists.", "SSE.Controllers.Main.errorFillRange": "Could not fill the selected range of cells.
All the merged cells need to be the same size.",
<%= tipText %>