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

Merge pull request #103 from ONLYOFFICE/feature/bugfix5.1.3

Browse source 
Feature/bugfix5.1.3
This commit is contained in:
Julia Radzhabova 2018-04-27 16:18:36 +03:00 committed by GitHub
parent 210a5bf3c7 9d9270f711
commit 272fc79fe6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
36 changed files with 109 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/common/main/lib/component/SynchronizeTip.js
View file

@ -48,7 +48,7 @@ define([
},
template: _.template([
'<div class="synch-tip-root <%= scope.placement %>">',
'<div class="synch-tip-root <% if (!!scope.options.extCls) {print(scope.options.extCls + \" \");} %><%= scope.placement %>">',
'<div class="asc-synchronizetip">',
'<div class="tip-arrow <%= scope.placement %>"></div>',
'<div>',

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

@ -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([
'<div class="box" style="height:' + (_options.height - 85) + 'px;">',
'<div class="content-panel" >',
'<% if (type == Asc.c_oAscAdvancedOptionsID.DRM) { %>',
'<label class="header">' + t.txtPassword + '</label>',
'<div id="id-password-txt" style="margin-bottom:15px;"></div>',
'<div>',
'<div class="icon img-commonctrl warn"/>',
'<div style="padding-left: 50px;"><div style="font-size: 12px;">' + t.txtProtected+ '</div>',
'<label class="header" style="margin-top: 15px;">' + t.txtPassword + '</label>',
'<div id="id-password-txt" style="width: 240px;"></div></div>',
'</div>',
'<% } else { %>',
'<div style="display: inline-block; margin-bottom:15px;margin-right: 10px;">',
'<label class="header">' + t.txtEncoding + '</label>',
@ -105,11 +109,10 @@ define([
'<% } %>',
'</div>',
'</div>',
'<div class="separator horizontal"/>',
'<div class="footer center">',
'<button class="btn normal dlg-btn primary" result="ok" style="margin-right:10px;">' + t.okButtonText + '</button>',
'<button class="btn normal dlg-btn primary" result="ok">' + t.okButtonText + '</button>',
'<% if (closable) { %>',
'<button class="btn normal dlg-btn" result="cancel">' + t.closeButtonText + '</button>',
'<button class="btn normal dlg-btn" result="cancel" style="margin-left:10px;">' + t.closeButtonText + '</button>',
'<% } %>',
'</div>'
].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 || {}));
});

14
apps/common/main/lib/view/SignDialog.js
View file

@ -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([
'<div id="id-dlg-sign-fonts" class="input-row" style="display: inline-block;"></div>',
'<div id="id-dlg-sign-font-size" class="input-row" style="display: inline-block;margin-left: 3px;"></div>',
'<div id="id-dlg-sign-bold" style="display: inline-block;margin-left: 3px;"></div>','<div id="id-dlg-sign-italic" style="display: inline-block;margin-left: 3px;"></div>',
'<div class="input-row" style="margin-top: 10px;">',
'<div style="margin: 10px 0 5px 0;">',
'<label>' + this.textUseImage + '</label>',
'</div>',
'<button id="id-dlg-sign-image" class="btn btn-text-default" style="">' + this.textSelectImage + '</button>',
'<button id="id-dlg-sign-image" class="btn btn-text-default auto">' + this.textSelectImage + '</button>',
'<div class="input-row" style="margin-top: 10px;">',
'<label style="font-weight: bold;">' + this.textSignature + '</label>',
'</div>',
@ -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();

2
apps/common/main/lib/view/SignSettingsDialog.js
View file

@ -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 || {}))
});

13
apps/common/main/resources/less/opendialog.less
View file

@ -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 {

6
apps/common/main/resources/less/synchronize-tip.less
View file

@ -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;

4
apps/common/main/resources/less/toolbar.less
View file

@ -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;
}
}
}

2
apps/documenteditor/main/app/controller/LeftMenu.js
View file

@ -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;

10
apps/documenteditor/main/app/controller/Main.js
View file

@ -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',

1
apps/documenteditor/main/app/controller/Navigation.js
View file

@ -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) {

4
apps/documenteditor/main/app/view/FileMenuPanels.js
View file

@ -1115,7 +1115,7 @@ define([
'<div id="fms-btn-add-pwd" style="width:190px;"></div>',
'<table id="id-fms-view-pwd" cols="2" width="300">',
'<tr>',
'<td colspan="2"><span style="cursor: default;"><%= scope.txtEncrypted %></span></td>',
'<td colspan="2"><label style="cursor: default;"><%= scope.txtEncrypted %></label></td>',
'</tr>',
'<tr>',
'<td><div id="fms-btn-change-pwd" style="width:190px;"></div></td>',
@ -1139,7 +1139,7 @@ define([
this.templateSignature = _.template([
'<table cols="2" width="300" class="<% if (!hasRequested && !hasSigned) { %>hidden<% } %>"">',
'<tr>',
'<td colspan="2"><span style="cursor: default;"><%= tipText %></span></td>',
'<td colspan="2"><label style="cursor: default;"><%= tipText %></label></td>',
'</tr>',
'<tr>',
'<td><label class="link signature-view-link">' + me.txtView + '</label></td>',

1
apps/documenteditor/main/app/view/Toolbar.js
View file

@ -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 () {

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

@ -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.<br> 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.<br>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",

2
apps/documenteditor/main/resources/less/filemenu.less
View file

@ -373,7 +373,7 @@
}
#panel-protect {
label, span {
label {
font-size: 12px;
}

4
apps/documenteditor/main/resources/less/toolbar.less
View file

@ -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 {

7
apps/documenteditor/mobile/app/controller/Main.js
View file

@ -1093,7 +1093,7 @@ define([
me._state.openDlg = uiApp.modal({
title: me.advDRMOptions,
text: me.advDRMEnterPassword,
text: me.txtProtected,
afterText: '<div class="input-field"><input type="password" name="modal-password" placeholder="' + me.advDRMPassword + '" class="modal-text-input"></div>',
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.<br>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.<br>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 || {}))
});

3
apps/documenteditor/mobile/locale/en.json
View file

@ -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.<br>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",

8
apps/presentationeditor/main/app/controller/Main.js
View file

@ -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',

2
apps/presentationeditor/main/app/template/Viewport.template
View file

@ -1,5 +1,5 @@
<div class="layout-region">
<div id="pe-preview" style="position:absolute; left: 0; top: 0; display:none; width:100%; height:100%; z-index: 1;"></div>
<div id="pe-preview" style="position:absolute; left: 0; top: 0; display:none; width:100%; height:100%;"></div>
<section class="layout-ct">
<div id="file-menu-panel" class="toolbar-fullview-panel" style="display:none;"></div>
</section>

4
apps/presentationeditor/main/app/view/FileMenuPanels.js
View file

@ -880,7 +880,7 @@ define([
'<div id="fms-btn-add-pwd" style="width:190px;"></div>',
'<table id="id-fms-view-pwd" cols="2" width="300">',
'<tr>',
'<td colspan="2"><span style="cursor: default;"><%= scope.txtEncrypted %></span></td>',
'<td colspan="2"><label style="cursor: default;"><%= scope.txtEncrypted %></label></td>',
'</tr>',
'<tr>',
'<td><div id="fms-btn-change-pwd" style="width:190px;"></div></td>',
@ -904,7 +904,7 @@ define([
this.templateSignature = _.template([
'<table cols="2" width="300" class="<% if (!hasSigned) { %>hidden<% } %>"">',
'<tr>',
'<td colspan="2"><span style="cursor: default;"><%= tipText %></span></td>',
'<td colspan="2"><label style="cursor: default;"><%= tipText %></label></td>',
'</tr>',
'<tr>',
'<td><label class="link signature-view-link">' + me.txtView + '</label></td>',

4
apps/presentationeditor/main/app/view/Toolbar.js
View file

@ -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 () {

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

@ -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.<br>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",

3
apps/presentationeditor/main/resources/less/document-preview.less
View file

@ -1,3 +1,6 @@
#pe-preview {
z-index: @zindex-navbar+3;
}
.preview-controls {
display: table;
background: @gray-light;

2
apps/presentationeditor/main/resources/less/leftmenu.less
View file

@ -454,7 +454,7 @@
}
#panel-protect {
label, span {
label {
font-size: 12px;
}

4
apps/presentationeditor/main/resources/less/toolbar.less
View file

@ -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 {

7
apps/presentationeditor/mobile/app/controller/Main.js
View file

@ -1037,7 +1037,7 @@ define([
me._state.openDlg = uiApp.modal({
title: me.advDRMOptions,
text: me.advDRMEnterPassword,
text: me.txtProtected,
afterText: '<div class="input-field"><input type="password" name="modal-password" placeholder="' + me.advDRMPassword + '" class="modal-text-input"></div>',
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.<br>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.<br>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 || {}))
});

3
apps/presentationeditor/mobile/locale/en.json
View file

@ -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.<br>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.",

2
apps/spreadsheeteditor/main/app/controller/LeftMenu.js
View file

@ -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())

12
apps/spreadsheeteditor/main/app/controller/Main.js
View file

@ -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',

4
apps/spreadsheeteditor/main/app/view/FileMenuPanels.js
View file

@ -1340,7 +1340,7 @@ define([
'<div id="fms-btn-add-pwd" style="width:190px;"></div>',
'<table id="id-fms-view-pwd" cols="2" width="300">',
'<tr>',
'<td colspan="2"><span style="cursor: default;"><%= scope.txtEncrypted %></span></td>',
'<td colspan="2"><label style="cursor: default;"><%= scope.txtEncrypted %></label></td>',
'</tr>',
'<tr>',
'<td><div id="fms-btn-change-pwd" style="width:190px;"></div></td>',
@ -1364,7 +1364,7 @@ define([
this.templateSignature = _.template([
'<table cols="2" width="300" class="<% if (!hasRequested && !hasSigned) { %>hidden<% } %>"">',
'<tr>',
'<td colspan="2"><span style="cursor: default;"><%= tipText %></span></td>',
'<td colspan="2"><label style="cursor: default;"><%= tipText %></label></td>',
'</tr>',
'<tr>',
'<td><label class="link signature-view-link">' + me.txtView + '</label></td>',

1
apps/spreadsheeteditor/main/app/view/Toolbar.js
View file

@ -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() {

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

@ -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.<br>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.<br>File request error. Please contact support in case the error persists.",
"SSE.Controllers.Main.errorFileVKey": "External error.<br>Incorrect security key. Please contact support in case the error persists.",
"SSE.Controllers.Main.errorFillRange": "Could not fill the selected range of cells.<br>All the merged cells need to be the same size.",

2
apps/spreadsheeteditor/main/resources/less/leftmenu.less
View file

@ -523,7 +523,7 @@
}
#panel-protect {
label, span {
label {
font-size: 12px;
}

4
apps/spreadsheeteditor/main/resources/less/toolbar.less
View file

@ -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 {

7
apps/spreadsheeteditor/mobile/app/controller/Main.js
View file

@ -1220,7 +1220,7 @@ define([
me._state.openDlg = uiApp.modal({
title: me.advDRMOptions,
text: me.advDRMEnterPassword,
text: me.txtProtected,
afterText: '<div class="input-field"><input type="password" name="modal-password" placeholder="' + me.advDRMPassword + '" class="modal-text-input"></div>',
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.<br>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 || {}))
});

3
apps/spreadsheeteditor/mobile/locale/en.json
View file

@ -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.<br>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.<br>File request error. Please contact support in case the error persists.",
"SSE.Controllers.Main.errorFileVKey": "External error.<br>Incorrect security key. Please contact support in case the error persists.",
"SSE.Controllers.Main.errorFillRange": "Could not fill the selected range of cells.<br>All the merged cells need to be the same size.",