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

Collaboration tab: added description for co-editing mode and review mode options.

Browse source
This commit is contained in:
Julia Radzhabova 2017-10-19 15:11:51 +03:00
parent b7d6e75ed6
commit 844b287c30
4 changed files with 52 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
apps/common/main/lib/view/ReviewChanges.js
View file

@ -664,29 +664,39 @@ define([
); );
me.btnReject.updateHint([me.tipRejectCurrent, me.txtRejectChanges]); me.btnReject.updateHint([me.tipRejectCurrent, me.txtRejectChanges]);
var menuTemplate = _.template('<a id="<%= id %>" tabindex="-1" type="menuitem"><div><%= caption %></div>' +
'<% if (options.description !== null) { %><label style="display: block;color: #a5a5a5;cursor: pointer;white-space: normal;"><%= options.description %></label>' +
'<% } %></a>');
me.btnReviewView.setMenu( me.btnReviewView.setMenu(
new Common.UI.Menu({ new Common.UI.Menu({
cls: 'ppm-toolbar', cls: 'ppm-toolbar',
items: [ items: [
{ {
caption: me.txtMarkup, caption: me.txtMarkupCap,
checkable: true, checkable: true,
toggleGroup: 'menuReviewView', toggleGroup: 'menuReviewView',
checked: true, checked: true,
value: 'markup' value: 'markup',
template: menuTemplate,
description: me.txtMarkup
}, },
{ {
caption: me.txtFinal, caption: me.txtFinalCap,
checkable: true, checkable: true,
toggleGroup: 'menuReviewView', toggleGroup: 'menuReviewView',
checked: false, checked: false,
template: menuTemplate,
description: me.txtFinal,
value: 'final' value: 'final'
}, },
{ {
caption: me.txtOriginal, caption: me.txtOriginalCap,
checkable: true, checkable: true,
toggleGroup: 'menuReviewView', toggleGroup: 'menuReviewView',
checked: false, checked: false,
template: menuTemplate,
description: me.txtOriginal,
value: 'original' value: 'original'
} }
] ]
@ -705,12 +715,15 @@ define([
me.btnCoAuthMode.setMenu( me.btnCoAuthMode.setMenu(
new Common.UI.Menu({ new Common.UI.Menu({
cls: 'ppm-toolbar', cls: 'ppm-toolbar',
style: 'max-width: 220px;',
items: [ items: [
{ {
caption: me.strFast, caption: me.strFast,
checkable: true, checkable: true,
toggleGroup: 'menuCoauthMode', toggleGroup: 'menuCoauthMode',
checked: true, checked: true,
template: menuTemplate,
description: me.strFastDesc,
value: 1 value: 1
}, },
{ {
@ -718,6 +731,8 @@ define([
checkable: true, checkable: true,
toggleGroup: 'menuCoauthMode', toggleGroup: 'menuCoauthMode',
checked: false, checked: false,
template: menuTemplate,
description: me.strStrictDesc,
value: 0 value: 0
} }
] ]
@ -927,9 +942,9 @@ define([
txtAcceptChanges: 'Accept Changes', txtAcceptChanges: 'Accept Changes',
txtRejectChanges: 'Reject Changes', txtRejectChanges: 'Reject Changes',
txtView: 'Display Mode', txtView: 'Display Mode',
txtMarkup: 'All changes (Editing)', txtMarkup: 'Text with changes (Editing)',
txtFinal: 'All changes accepted (Preview)', txtFinal: 'All changes like accept (Preview)',
txtOriginal: 'All changes rejected (Preview)', txtOriginal: 'Text without changes (Preview)',
tipReviewView: 'Select the way you want the changes to be displayed', tipReviewView: 'Select the way you want the changes to be displayed',
tipAcceptCurrent: 'Accept current changes', tipAcceptCurrent: 'Accept current changes',
tipRejectCurrent: 'Reject current changes', tipRejectCurrent: 'Reject current changes',
@ -941,7 +956,12 @@ define([
strStrict: 'Strict', strStrict: 'Strict',
txtHistory: 'Version History', txtHistory: 'Version History',
tipHistory: 'Show version history', tipHistory: 'Show version history',
txtChat: 'Chat' txtChat: 'Chat',
txtMarkupCap: 'Markup',
txtFinalCap: 'Final',
txtOriginalCap: 'Original',
strFastDesc: 'Real-time co-editing. All changes are saved automatically.',
strStrictDesc: 'Use the \'Save\' button to sync the changes you and others make.'
} }
}()), Common.Views.ReviewChanges || {})); }()), Common.Views.ReviewChanges || {}));

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

@ -207,10 +207,13 @@
"Common.Views.ReviewChanges.txtAcceptCurrent": "Accept Current Change", "Common.Views.ReviewChanges.txtAcceptCurrent": "Accept Current Change",
"Common.Views.ReviewChanges.txtClose": "Close", "Common.Views.ReviewChanges.txtClose": "Close",
"Common.Views.ReviewChanges.txtDocLang": "Language", "Common.Views.ReviewChanges.txtDocLang": "Language",
"Common.Views.ReviewChanges.txtFinal": "All changes accepted (Preview)", "Common.Views.ReviewChanges.txtFinal": "All changes like accept (Preview)",
"Common.Views.ReviewChanges.txtMarkup": "All changes (Editing)", "Common.Views.ReviewChanges.txtMarkup": "Text with changes (Editing)",
"Common.Views.ReviewChanges.txtNext": "Next", "Common.Views.ReviewChanges.txtNext": "Next",
"Common.Views.ReviewChanges.txtOriginal": "All changes rejected (Preview)", "Common.Views.ReviewChanges.txtOriginal": "Text without changes (Preview)",
"Common.Views.ReviewChanges.txtMarkupCap": "Markup",
"Common.Views.ReviewChanges.txtFinalCap": "Final",
"Common.Views.ReviewChanges.txtOriginalCap": "Original",
"Common.Views.ReviewChanges.txtPrev": "Previous", "Common.Views.ReviewChanges.txtPrev": "Previous",
"Common.Views.ReviewChanges.txtReject": "Reject", "Common.Views.ReviewChanges.txtReject": "Reject",
"Common.Views.ReviewChanges.txtRejectAll": "Reject All Changes", "Common.Views.ReviewChanges.txtRejectAll": "Reject All Changes",
@ -225,6 +228,8 @@
"Common.Views.ReviewChanges.tipCoAuthMode": "Set co-editing mode", "Common.Views.ReviewChanges.tipCoAuthMode": "Set co-editing mode",
"Common.Views.ReviewChanges.strFast": "Fast", "Common.Views.ReviewChanges.strFast": "Fast",
"Common.Views.ReviewChanges.strStrict": "Strict", "Common.Views.ReviewChanges.strStrict": "Strict",
"Common.Views.ReviewChanges.strFastDesc": "Real-time co-editing. All changes are saved automatically.",
"Common.Views.ReviewChanges.strStrictDesc": "Use the 'Save' button to sync the changes you and others make.",
"Common.Views.ReviewChanges.txtHistory": "Version History", "Common.Views.ReviewChanges.txtHistory": "Version History",
"Common.Views.ReviewChanges.tipHistory": "Show version history", "Common.Views.ReviewChanges.tipHistory": "Show version history",
"Common.Views.ReviewChangesDialog.textTitle": "Review Changes", "Common.Views.ReviewChangesDialog.textTitle": "Review Changes",

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

@ -140,10 +140,13 @@
"Common.Views.ReviewChanges.txtAcceptCurrent": "Accept Current Change", "Common.Views.ReviewChanges.txtAcceptCurrent": "Accept Current Change",
"Common.Views.ReviewChanges.txtClose": "Close", "Common.Views.ReviewChanges.txtClose": "Close",
"Common.Views.ReviewChanges.txtDocLang": "Language", "Common.Views.ReviewChanges.txtDocLang": "Language",
"Common.Views.ReviewChanges.txtFinal": "All changes accepted (Preview)", "Common.Views.ReviewChanges.txtFinal": "All changes like accept (Preview)",
"Common.Views.ReviewChanges.txtMarkup": "All changes (Editing)", "Common.Views.ReviewChanges.txtMarkup": "Text with changes (Editing)",
"Common.Views.ReviewChanges.txtNext": "Next", "Common.Views.ReviewChanges.txtNext": "Next",
"Common.Views.ReviewChanges.txtOriginal": "All changes rejected (Preview)", "Common.Views.ReviewChanges.txtOriginal": "Text without changes (Preview)",
"Common.Views.ReviewChanges.txtMarkupCap": "Markup",
"Common.Views.ReviewChanges.txtFinalCap": "Final",
"Common.Views.ReviewChanges.txtOriginalCap": "Original",
"Common.Views.ReviewChanges.txtPrev": "Previous", "Common.Views.ReviewChanges.txtPrev": "Previous",
"Common.Views.ReviewChanges.txtReject": "Reject", "Common.Views.ReviewChanges.txtReject": "Reject",
"Common.Views.ReviewChanges.txtRejectAll": "Reject All Changes", "Common.Views.ReviewChanges.txtRejectAll": "Reject All Changes",
@ -158,6 +161,8 @@
"Common.Views.ReviewChanges.tipCoAuthMode": "Set co-editing mode", "Common.Views.ReviewChanges.tipCoAuthMode": "Set co-editing mode",
"Common.Views.ReviewChanges.strFast": "Fast", "Common.Views.ReviewChanges.strFast": "Fast",
"Common.Views.ReviewChanges.strStrict": "Strict", "Common.Views.ReviewChanges.strStrict": "Strict",
"Common.Views.ReviewChanges.strFastDesc": "Real-time co-editing. All changes are saved automatically.",
"Common.Views.ReviewChanges.strStrictDesc": "Use the 'Save' button to sync the changes you and others make.",
"Common.Views.ReviewChanges.txtHistory": "Version History", "Common.Views.ReviewChanges.txtHistory": "Version History",
"Common.Views.ReviewChanges.tipHistory": "Show version history", "Common.Views.ReviewChanges.tipHistory": "Show version history",
"PE.Controllers.LeftMenu.newDocumentTitle": "Unnamed presentation", "PE.Controllers.LeftMenu.newDocumentTitle": "Unnamed presentation",

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

@ -126,10 +126,13 @@
"Common.Views.ReviewChanges.txtAcceptCurrent": "Accept Current Change", "Common.Views.ReviewChanges.txtAcceptCurrent": "Accept Current Change",
"Common.Views.ReviewChanges.txtClose": "Close", "Common.Views.ReviewChanges.txtClose": "Close",
"Common.Views.ReviewChanges.txtDocLang": "Language", "Common.Views.ReviewChanges.txtDocLang": "Language",
"Common.Views.ReviewChanges.txtFinal": "All changes accepted (Preview)", "Common.Views.ReviewChanges.txtFinal": "All changes like accept (Preview)",
"Common.Views.ReviewChanges.txtMarkup": "All changes (Editing)", "Common.Views.ReviewChanges.txtMarkup": "Text with changes (Editing)",
"Common.Views.ReviewChanges.txtNext": "Next", "Common.Views.ReviewChanges.txtNext": "Next",
"Common.Views.ReviewChanges.txtOriginal": "All changes rejected (Preview)", "Common.Views.ReviewChanges.txtOriginal": "Text without changes (Preview)",
"Common.Views.ReviewChanges.txtMarkupCap": "Markup",
"Common.Views.ReviewChanges.txtFinalCap": "Final",
"Common.Views.ReviewChanges.txtOriginalCap": "Original",
"Common.Views.ReviewChanges.txtPrev": "Previous", "Common.Views.ReviewChanges.txtPrev": "Previous",
"Common.Views.ReviewChanges.txtReject": "Reject", "Common.Views.ReviewChanges.txtReject": "Reject",
"Common.Views.ReviewChanges.txtRejectAll": "Reject All Changes", "Common.Views.ReviewChanges.txtRejectAll": "Reject All Changes",
@ -144,6 +147,8 @@
"Common.Views.ReviewChanges.tipCoAuthMode": "Set co-editing mode", "Common.Views.ReviewChanges.tipCoAuthMode": "Set co-editing mode",
"Common.Views.ReviewChanges.strFast": "Fast", "Common.Views.ReviewChanges.strFast": "Fast",
"Common.Views.ReviewChanges.strStrict": "Strict", "Common.Views.ReviewChanges.strStrict": "Strict",
"Common.Views.ReviewChanges.strFastDesc": "Real-time co-editing. All changes are saved automatically.",
"Common.Views.ReviewChanges.strStrictDesc": "Use the 'Save' button to sync the changes you and others make.",
"Common.Views.ReviewChanges.txtHistory": "Version History", "Common.Views.ReviewChanges.txtHistory": "Version History",
"Common.Views.ReviewChanges.tipHistory": "Show version history", "Common.Views.ReviewChanges.tipHistory": "Show version history",
"SSE.Controllers.DocumentHolder.alignmentText": "Alignment", "SSE.Controllers.DocumentHolder.alignmentText": "Alignment",