diff --git a/apps/common/main/lib/view/Header.js b/apps/common/main/lib/view/Header.js index 2152728c54..6ac2db50ea 100644 --- a/apps/common/main/lib/view/Header.js +++ b/apps/common/main/lib/view/Header.js @@ -259,9 +259,9 @@ define([ var me = this; config = config || appConfig; if (!me.btnPDFMode || !config) return; - me.btnPDFMode.setIconCls('toolbar__icon icon--inverse ' + (config.isPDFEdit ? 'btn-edit' : (config.isPDFAnnotate ? 'btn-menu-comments' : 'btn-sheet-view'))); - me.btnPDFMode.setCaption(config.isPDFEdit ? me.textEdit : (config.isPDFAnnotate ? me.textComment : me.textView)); - me.btnPDFMode.updateHint(config.isPDFEdit ? me.tipEdit : (config.isPDFAnnotate ? me.tipComment : me.tipView)); + me.btnPDFMode.setIconCls('toolbar__icon icon--inverse ' + (config.isPDFEdit ? 'btn-edit' : (config.isPDFAnnotate && config.canCoEditing ? 'btn-menu-comments' : 'btn-sheet-view'))); + me.btnPDFMode.setCaption(config.isPDFEdit ? me.textEdit : (config.isPDFAnnotate && config.canCoEditing ? me.textComment : me.textView)); + me.btnPDFMode.updateHint(config.isPDFEdit ? me.tipEdit : (config.isPDFAnnotate && config.canCoEditing ? me.tipComment : me.tipView)); } function changeDocMode(type, lockEditing) { @@ -445,18 +445,18 @@ define([ caption: me.textEdit, iconCls : 'menu__icon btn-edit', template: menuTemplate, - description: me.textEditDesc, + description: appConfig.canCoEditing ? me.textEditDesc : me.textEditDescNoCoedit, value: 'edit' }); arr.push({ - caption: me.textComment, - iconCls : 'menu__icon btn-menu-comments', + caption: appConfig.canCoEditing ? me.textComment : me.textView, + iconCls : 'menu__icon ' + (appConfig.canCoEditing ? 'btn-menu-comments' : 'btn-sheet-view'), template: menuTemplate, - description: me.textCommentDesc, + description: appConfig.canCoEditing ? me.textCommentDesc : me.textViewDescNoCoedit, value: 'comment', disabled: !appConfig.canPDFAnnotate }); - arr.push({ + appConfig.canCoEditing && arr.push({ caption: me.textView, iconCls : 'menu__icon btn-sheet-view', template: menuTemplate, @@ -1119,6 +1119,8 @@ define([ textViewDesc: 'All changes will be saved locally', textCommentDesc: 'All changes will be saved to the file. Real time collaboration', textEditDesc: 'All changes will be saved to the file. Real time collaboration', + textViewDescNoCoedit: 'View or annotate', + textEditDescNoCoedit: 'Add or edit text, shapes, images etc.', tipView: 'Viewing', tipComment: 'Commenting', tipEdit: 'Editing', diff --git a/apps/pdfeditor/main/app/controller/Main.js b/apps/pdfeditor/main/app/controller/Main.js index d442de36ed..a7f61951b7 100644 --- a/apps/pdfeditor/main/app/controller/Main.js +++ b/apps/pdfeditor/main/app/controller/Main.js @@ -1223,10 +1223,11 @@ define([ this.appOptions.canSwitchMode = pdfEdit; // switch between View/pdf comments/pdf edit this.appOptions.canEdit = this.appOptions.isEdit = pdfEdit; + this.appOptions.canCoEditing = false; // TODO: !(this.appOptions.isDesktopApp && this.appOptions.isOffline), switch between pdf comment/ pdf edit when false this.appOptions.canSaveToFile = this.appOptions.isDesktopApp && this.appOptions.isOffline; - this.appOptions.canPDFAnnotate = pdfEdit && this.appOptions.canLicense && (this.permissions.comment!== false) && !((typeof (this.editorConfig.customization) == 'object') && this.editorConfig.customization.comments===false); + this.appOptions.canPDFAnnotate = pdfEdit && this.appOptions.canLicense;// && (this.permissions.comment!== false) && !((typeof (this.editorConfig.customization) == 'object') && this.editorConfig.customization.comments===false) || this.appOptions.isDesktopApp && this.appOptions.isOffline; this.appOptions.isPDFAnnotate = this.appOptions.canPDFAnnotate; // TODO: this.appOptions.isDesktopApp && this.appOptions.isOffline !! online files always open in view mode - this.appOptions.canPDFEdit = pdfEdit && this.appOptions.canLicense;//(this.permissions.edit !== false); + this.appOptions.canPDFEdit = pdfEdit && this.appOptions.canLicense;//(this.permissions.edit !== false) || this.appOptions.isDesktopApp && this.appOptions.isOffline; this.appOptions.isPDFEdit = false; // this.appOptions.canPDFEdit && this.editorConfig.mode !== 'view'; !! always open in view mode this.appOptions.canComments = this.appOptions.canViewComments = pdfEdit; diff --git a/apps/pdfeditor/main/app/template/Toolbar.template b/apps/pdfeditor/main/app/template/Toolbar.template index 5d558cbed3..4b0143396a 100644 --- a/apps/pdfeditor/main/app/template/Toolbar.template +++ b/apps/pdfeditor/main/app/template/Toolbar.template @@ -74,6 +74,19 @@ + <% if ( config.isRestrictedEdit) { %> +
+
+ + + +
+
+
+ + +
+ <% } else { %>
@@ -127,18 +140,6 @@ - <% if ( config.isRestrictedEdit) { %> -
-
- - - -
-
-
- - -
<% } %>