',
- '<% _.each(signatures, function(item) { %>',
- '',
- '| <%= Common.Utils.String.htmlEncode(item.name) %> | ',
- '<%= Common.Utils.String.htmlEncode(item.date) %> | ',
- '
',
- '<% }); %>',
+ var me = this;
+ this.templateSignature = _.template([
+ '',
+ '',
+ '| <%= tipText %> | ',
+ '
',
+ '',
+ ' | ',
+ ' | ',
+ '
',
'
'
].join(''));
},
@@ -899,16 +915,28 @@ define([
render: function() {
$(this.el).html(this.template({scope: this}));
- this.btnAddInvisibleSign = new Common.UI.Button({
- el: '#fms-btn-invisible-sign'
- });
- this.btnAddInvisibleSign.on('click', _.bind(this.addInvisibleSign, this));
+ var protection = PE.getController('Common.Controllers.Protection').getView();
- this.lblSignHeader = $('#id-fms-lbl-sign-header', this.$el);
+ this.btnAddPwd = protection.getButton('add-password');
+ this.btnAddPwd.render(this.$el.find('#fms-btn-add-pwd'));
+ this.btnAddPwd.on('click', _.bind(this.closeMenu, this));
- this.cntValidSign = $('#id-fms-valid-sign');
- this.cntInvalidSign = $('#id-fms-invalid-sign');
+ this.btnChangePwd = protection.getButton('change-password');
+ this.btnChangePwd.render(this.$el.find('#fms-btn-change-pwd'));
+ this.btnChangePwd.on('click', _.bind(this.closeMenu, this));
+ this.btnDeletePwd = protection.getButton('del-password');
+ this.btnDeletePwd.render(this.$el.find('#fms-btn-delete-pwd'));
+ this.btnDeletePwd.on('click', _.bind(this.closeMenu, this));
+
+ this.cntPassword = $('#id-fms-view-pwd');
+
+ this.btnAddInvisibleSign = protection.getButton('signature');
+ this.btnAddInvisibleSign.render(this.$el.find('#fms-btn-invisible-sign'));
+ this.btnAddInvisibleSign.on('click', _.bind(this.closeMenu, this));
+
+ this.cntSignature = $('#id-fms-signature');
+ this.cntSignatureView = $('#id-fms-signature-view');
if (_.isUndefined(this.scroller)) {
this.scroller = new Common.UI.Scroller({
el: $(this.el),
@@ -916,20 +944,21 @@ define([
});
}
+ this.$el.on('click', '.signature-edit-link', _.bind(this.onEdit, this));
+ this.$el.on('click', '.signature-view-link', _.bind(this.onView, this));
+
return this;
},
show: function() {
Common.UI.BaseView.prototype.show.call(this,arguments);
this.updateSignatures();
+ this.updateEncrypt();
},
setMode: function(mode) {
this.mode = mode;
- if (!this.mode.isEdit) {
- this.btnAddInvisibleSign.setVisible(false);
- this.lblSignHeader.html(this.strSignature);
- }
+ this.cntSignature.toggleClass('hidden', !this.mode.canProtect);
},
setApi: function(o) {
@@ -937,34 +966,66 @@ define([
return this;
},
- addInvisibleSign: function() {
- if (this.menu)
- this.menu.fireEvent('signature:invisible', [this.menu]);
+ closeMenu: function() {
+ this.menu && this.menu.hide();
+ },
+
+ onEdit: function() {
+ this.menu && this.menu.hide();
+
+ var me = this;
+ Common.UI.warning({
+ title: this.notcriticalErrorTitle,
+ msg: this.txtEditWarning,
+ buttons: ['ok', 'cancel'],
+ primary: 'ok',
+ callback: function(btn) {
+ if (btn == 'ok') {
+ me.api.asc_RemoveAllSignatures();
+ }
+ }
+ });
+
+ },
+
+ onView: function() {
+ this.menu && this.menu.hide();
+ PE.getController('RightMenu').rightmenu.SetActivePane(Common.Utils.documentSettingsType.Signature, true);
},
updateSignatures: function(){
var valid = this.api.asc_getSignatures(),
- valid_arr = [], invalid_arr = [];
+ hasValid = false,
+ hasInvalid = false;
_.each(valid, function(item, index){
- var sign = {name: item.asc_getSigner1(), date: '18/05/2017'};
- (item.asc_getValid()==0) ? valid_arr.push(sign) : invalid_arr.push(sign);
+ if (item.asc_getValid()==0)
+ hasValid = true;
+ else
+ hasInvalid = true;
});
- // valid_arr = [{name: 'Hammish Mitchell', guid: '123', date: '18/05/2017'}, {name: 'Someone Somewhere', guid: '345', date: '18/05/2017'}];
- // invalid_arr = [{name: 'Mary White', guid: '111', date: '18/05/2017'}, {name: 'John Black', guid: '456', date: '18/05/2017'}];
+ // hasValid = true;
+ // hasInvalid = true;
- this.cntValidSign.html(this.templateValid({signatures: valid_arr, header: this.strValid}));
- this.cntInvalidSign.html(this.templateValid({signatures: invalid_arr, header: this.strInvalid}));
+ var tipText = (hasInvalid) ? this.txtSignedInvalid : (hasValid ? this.txtSigned : "");
+ this.cntSignatureView.html(this.templateSignature({tipText: tipText, hasSigned: (hasValid || hasInvalid)}));
+ },
- this.btnAddInvisibleSign.setDisabled(valid_arr.length>0 || invalid_arr.length>0);
+ updateEncrypt: function() {
+ this.cntPassword.toggleClass('hidden', this.btnAddPwd.isVisible());
},
strProtect: 'Protect Document',
- strInvisibleSign: 'Add invisible digital signature',
- strValid: 'Valid signatures',
- strInvalid: 'Invalid signatures',
- strSignature: 'Signature'
+ strSignature: 'Signature',
+ txtView: 'View signatures',
+ txtEdit: 'Edit document',
+ txtSigned: 'Valid signatures has been added to the document. The document is protected from editing.',
+ txtSignedInvalid: 'Some of the digital signatures in document are invalid or could not be verified. The document is protected from editing.',
+ notcriticalErrorTitle: 'Warning',
+ txtEditWarning: 'Editing will remove the signatures from the document.
Are you sure you want to continue?',
+ strEncrypt: 'Password',
+ txtEncrypted: 'This document has been protected by password'
}, PE.Views.FileMenuPanels.ProtectDoc || {}));
diff --git a/apps/presentationeditor/main/app/view/SignatureSettings.js b/apps/presentationeditor/main/app/view/SignatureSettings.js
index ca732edca..03057fd2d 100644
--- a/apps/presentationeditor/main/app/view/SignatureSettings.js
+++ b/apps/presentationeditor/main/app/view/SignatureSettings.js
@@ -43,8 +43,7 @@ define([
'jquery',
'underscore',
'backbone',
- 'common/main/lib/component/Button',
- 'common/main/lib/view/SignDialog'
+ 'common/main/lib/component/Button'
], function (menuTemplate, $, _, Backbone) {
'use strict';
@@ -63,36 +62,14 @@ define([
},
initialize: function () {
- var me = this;
-
this._state = {
- DisabledControls: false,
- DisabledInsertControls: false,
+ requestedSignatures: undefined,
validSignatures: undefined,
invalidSignatures: undefined,
DisabledEditing: false,
ready: false
};
this._locked = false;
- this.lockedControls = [];
-
- this._noApply = false;
- this._originalProps = null;
-
- this.templateValid = _.template([
- '',
- '',
- ' | ',
- '<% _.each(signatures, function(item) { %>',
- '',
- '<%= Common.Utils.String.htmlEncode(item.name) %> | ',
- ' | ',
- ' ',
- ' | ',
- '<% }); %>',
- ' ',
- ' | '
- ].join(''));
this.render();
},
@@ -102,16 +79,45 @@ define([
scope: this
}));
- this.btnAddInvisibleSign = new Common.UI.Button({
- el: this.$el.find('#signature-invisible-sign')
+ var protection = PE.getController('Common.Controllers.Protection').getView();
+ this.btnAddInvisibleSign = protection.getButton('signature');
+ this.btnAddInvisibleSign.render(this.$el.find('#signature-invisible-sign'));
+
+ this.viewValidList = new Common.UI.DataView({
+ el: $('#signature-valid-sign'),
+ enableKeyEvents: false,
+ itemTemplate: _.template([
+ '',
+ '
',
+ '
<%= Common.Utils.String.htmlEncode(name) %>
',
+ '
<%= Common.Utils.String.htmlEncode(date) %>
',
+ '
',
+ '
',
+ '
<%= Common.Utils.String.htmlEncode(name) %>
',
+ '
<%= Common.Utils.String.htmlEncode(date) %>
',
+ '
Are you sure you want to continue?',
+ strDelete: 'Remove Signature'
}, PE.Views.SignatureSettings || {}));
});
\ No newline at end of file
diff --git a/apps/presentationeditor/main/app/view/Toolbar.js b/apps/presentationeditor/main/app/view/Toolbar.js
index e376a6345..d2c80229a 100644
--- a/apps/presentationeditor/main/app/view/Toolbar.js
+++ b/apps/presentationeditor/main/app/view/Toolbar.js
@@ -1855,7 +1855,8 @@ define([
textTabHome: 'Home',
textTabInsert: 'Insert',
textSurface: 'Surface',
- textShowPresenterView: 'Show presenter view'
+ textShowPresenterView: 'Show presenter view',
+ textTabProtect: 'Protection'
}
}()), PE.Views.Toolbar || {}));
});
\ No newline at end of file
diff --git a/apps/presentationeditor/main/app_dev.js b/apps/presentationeditor/main/app_dev.js
index eef9aa9c7..bcff3a631 100644
--- a/apps/presentationeditor/main/app_dev.js
+++ b/apps/presentationeditor/main/app_dev.js
@@ -146,6 +146,7 @@ require([
/** coauthoring end **/
,'Common.Controllers.Plugins'
,'Common.Controllers.ExternalDiagramEditor'
+ ,'Common.Controllers.Protection'
]
});
@@ -177,6 +178,7 @@ require([
'common/main/lib/controller/Plugins',
'presentationeditor/main/app/view/ChartSettings',
'common/main/lib/controller/ExternalDiagramEditor'
+ ,'common/main/lib/controller/Protection'
], function() {
window.compareVersions = true;
app.start();
diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json
index 72032e2bf..a60ba825f 100644
--- a/apps/presentationeditor/main/locale/en.json
+++ b/apps/presentationeditor/main/locale/en.json
@@ -116,12 +116,29 @@
"Common.Views.OpenDialog.txtPassword": "Password",
"Common.Views.OpenDialog.txtTitle": "Choose %1 options",
"Common.Views.OpenDialog.txtTitleProtected": "Protected File",
+ "Common.Views.PasswordDialog.cancelButtonText": "Cancel",
+ "Common.Views.PasswordDialog.okButtonText": "OK",
+ "Common.Views.PasswordDialog.txtPassword": "Password",
+ "Common.Views.PasswordDialog.txtTitle": "Set Password",
+ "Common.Views.PasswordDialog.txtDescription": "A Password is required to open this document",
+ "Common.Views.PasswordDialog.txtRepeat": "Repeat password",
+ "Common.Views.PasswordDialog.txtIncorrectPwd": "Confirmation password is not identical",
"Common.Views.PluginDlg.textLoading": "Loading",
"Common.Views.Plugins.groupCaption": "Plugins",
"Common.Views.Plugins.strPlugins": "Plugins",
"Common.Views.Plugins.textLoading": "Loading",
"Common.Views.Plugins.textStart": "Start",
"Common.Views.Plugins.textStop": "Stop",
+ "Common.Views.Protection.txtAddPwd": "Add password",
+ "Common.Views.Protection.txtEncrypt": "Encrypt",
+ "Common.Views.Protection.txtSignature": "Signature",
+ "Common.Views.Protection.hintAddPwd": "Encrypt with password",
+ "Common.Views.Protection.hintPwd": "Change or delete password",
+ "Common.Views.Protection.hintSignature": "Add digital signature or signature line",
+ "Common.Views.Protection.txtChangePwd": "Change password",
+ "Common.Views.Protection.txtDeletePwd": "Delete password",
+ "Common.Views.Protection.txtInvisibleSignature": "Add digital signature",
+ "Common.Views.Protection.txtSignatureLine": "Signature line",
"Common.Views.RenameDialog.cancelButtonText": "Cancel",
"Common.Views.RenameDialog.okButtonText": "Ok",
"Common.Views.RenameDialog.textName": "File name",
@@ -857,6 +874,16 @@
"PE.Views.FileMenuPanels.DocumentInfo.txtTitle": "Presentation Title",
"PE.Views.FileMenuPanels.DocumentRights.txtBtnAccessRights": "Change access rights",
"PE.Views.FileMenuPanels.DocumentRights.txtRights": "Persons who have rights",
+ "PE.Views.FileMenuPanels.ProtectDoc.strProtect": "Protect Document",
+ "PE.Views.FileMenuPanels.ProtectDoc.strSignature": "Signature",
+ "PE.Views.FileMenuPanels.ProtectDoc.txtView": "View signatures",
+ "PE.Views.FileMenuPanels.ProtectDoc.txtEdit": "Edit document",
+ "PE.Views.FileMenuPanels.ProtectDoc.txtSigned": "Valid signatures has been added to the document. The document is protected from editing.",
+ "PE.Views.FileMenuPanels.ProtectDoc.txtSignedInvalid": "Some of the digital signatures in document are invalid or could not be verified. The document is protected from editing.",
+ "PE.Views.FileMenuPanels.ProtectDoc.notcriticalErrorTitle": "Warning",
+ "PE.Views.FileMenuPanels.ProtectDoc.txtEditWarning": "Editing will remove the signatures from the document.
Are you sure you want to continue?",
+ "PE.Views.FileMenuPanels.ProtectDoc.strEncrypt": "Password",
+ "PE.Views.FileMenuPanels.ProtectDoc.txtEncrypted": "This document has been protected by password",
"PE.Views.FileMenuPanels.Settings.okButtonText": "Apply",
"PE.Views.FileMenuPanels.Settings.strAlignGuides": "Turn on alignment guides",
"PE.Views.FileMenuPanels.Settings.strAutoRecover": "Turn on autorecover",
@@ -892,11 +919,6 @@
"PE.Views.FileMenuPanels.Settings.txtLast": "View Last",
"PE.Views.FileMenuPanels.Settings.txtPt": "Point",
"PE.Views.FileMenuPanels.Settings.txtSpellCheck": "Spell Checking",
- "PE.Views.FileMenuPanels.ProtectDoc.strProtect": "Protect Document",
- "PE.Views.FileMenuPanels.ProtectDoc.strInvisibleSign": "Add invisible digital signature",
- "PE.Views.FileMenuPanels.ProtectDoc.strValid": "Valid signatures",
- "PE.Views.FileMenuPanels.ProtectDoc.strInvalid": "Invalid signatures",
- "PE.Views.FileMenuPanels.ProtectDoc.strSignature": "Signature",
"PE.Views.HyperlinkSettingsDialog.cancelButtonText": "Cancel",
"PE.Views.HyperlinkSettingsDialog.okButtonText": "OK",
"PE.Views.HyperlinkSettingsDialog.strDisplay": "Display",
@@ -1039,11 +1061,6 @@
"PE.Views.ShapeSettings.txtNoBorders": "No Line",
"PE.Views.ShapeSettings.txtPapyrus": "Papyrus",
"PE.Views.ShapeSettings.txtWood": "Wood",
- "PE.Views.SignatureSettings.strSignature": "Signature",
- "PE.Views.SignatureSettings.strInvisibleSign": "Add invisible digital signature",
- "PE.Views.SignatureSettings.strValid": "Valid signatures",
- "PE.Views.SignatureSettings.strInvalid": "Invalid signatures",
- "PE.Views.SignatureSettings.strView": "View",
"PE.Views.ShapeSettingsAdvanced.cancelButtonText": "Cancel",
"PE.Views.ShapeSettingsAdvanced.okButtonText": "OK",
"PE.Views.ShapeSettingsAdvanced.strColumns": "Columns",
@@ -1078,6 +1095,17 @@
"PE.Views.ShapeSettingsAdvanced.textWeightArrows": "Weights & Arrows",
"PE.Views.ShapeSettingsAdvanced.textWidth": "Width",
"PE.Views.ShapeSettingsAdvanced.txtNone": "None",
+ "PE.Views.SignatureSettings.strSignature": "Signature",
+ "PE.Views.SignatureSettings.strValid": "Valid signatures",
+ "PE.Views.SignatureSettings.strInvalid": "Invalid signatures",
+ "PE.Views.SignatureSettings.strSign": "Sign",
+ "PE.Views.SignatureSettings.strDetails": "Signature Details",
+ "PE.Views.SignatureSettings.strDelete": "Remove Signature",
+ "PE.Views.SignatureSettings.txtSigned": "Valid signatures has been added to the document. The document is protected from editing.",
+ "PE.Views.SignatureSettings.txtSignedInvalid": "Some of the digital signatures in document are invalid or could not be verified. The document is protected from editing.",
+ "PE.Views.SignatureSettings.txtContinueEditing": "Edit anyway",
+ "PE.Views.SignatureSettings.notcriticalErrorTitle": "Warning",
+ "PE.Views.SignatureSettings.txtEditWarning": "Editing will remove the signatures from the document.
Are you sure you want to continue?",
"PE.Views.SlideSettings.strBackground": "Background color",
"PE.Views.SlideSettings.strColor": "Color",
"PE.Views.SlideSettings.strDelay": "Delay",
@@ -1352,6 +1380,7 @@
"PE.Views.Toolbar.textTabFile": "File",
"PE.Views.Toolbar.textTabHome": "Home",
"PE.Views.Toolbar.textTabInsert": "Insert",
+ "PE.Views.Toolbar.textTabProtect": "Protection",
"PE.Views.Toolbar.textTitleError": "Error",
"PE.Views.Toolbar.textUnderline": "Underline",
"PE.Views.Toolbar.textZoom": "Zoom",
diff --git a/apps/presentationeditor/main/resources/less/leftmenu.less b/apps/presentationeditor/main/resources/less/leftmenu.less
index 92711e3a2..fd3b60426 100644
--- a/apps/presentationeditor/main/resources/less/leftmenu.less
+++ b/apps/presentationeditor/main/resources/less/leftmenu.less
@@ -451,6 +451,25 @@
font: 12px tahoma, arial, verdana, sans-serif;
}
}
+
+ #panel-protect {
+ label, span {
+ font-size: 12px;
+ }
+
+ padding: 30px 30px;
+
+ .header {
+ font-weight: bold;
+ margin: 30px 0 10px;
+ }
+
+ table {
+ td {
+ padding: 5px 0;
+ }
+ }
+ }
}
}
@@ -468,32 +487,4 @@
-webkit-transform: rotate(180deg);
-o-transform: rotate(180deg);
transform: rotate(180deg);
-}
-
-#panel-protect {
- #file-menu-panel & {
- padding: 30px 30px;
- }
-
-
- button {
- display: block;
- width: auto;
- margin-top: 20px;
- }
-
- label {
- font: 12px tahoma, arial, verdana, sans-serif;
- }
-
- .header {
- font-weight: bold;
- margin: 30px 0 10px;
- }
-
- table {
- td {
- padding: 5px 5px;
- }
- }
}
\ No newline at end of file
diff --git a/apps/presentationeditor/main/resources/less/rightmenu.less b/apps/presentationeditor/main/resources/less/rightmenu.less
index f48935637..e70ca5ebc 100644
--- a/apps/presentationeditor/main/resources/less/rightmenu.less
+++ b/apps/presentationeditor/main/resources/less/rightmenu.less
@@ -206,8 +206,54 @@ button:active:not(.disabled) .btn-change-shape {background-position: -56px -
background-position: -100px -150px;
}
-.signature-sign-name {
+#signature-requested-sign,
+#signature-valid-sign,
+#signature-invalid-sign {
+ height: 100%;
overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
+ margin: 0 -10px 0 -15px;
+
+ .item {
+ display: block;
+ border: none;
+ width: 100%;
+ .box-shadow(none);
+ margin: 0;
+
+ &:hover,
+ &.over {
+ background-color: @secondary;
+ }
+ }
+
+ .signature-item {
+ padding: 5px 2px 5px 15px;
+ text-overflow: ellipsis;
+
+ .name {
+ width: 100%;
+ white-space: nowrap;
+ overflow: hidden;
+ cursor: pointer;
+ max-width: 160px;
+ text-overflow: ellipsis;
+ }
+
+ .caret {
+ width: 23px;
+ height: 14px;
+ border: 0;
+ background-position: -43px -150px;
+ margin: 8px 15px;
+ display: inline-block;
+ position: absolute;
+ right: 0;
+ }
+
+ &.requested {
+ .caret {
+ margin: 0 15px;
+ }
+ }
+ }
}
\ No newline at end of file