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

Refactoring add/remove comments buttons: change icons, change caption of buttons on Collaboration tab.

Browse source
This commit is contained in:
Julia Radzhabova 2019-11-06 17:22:12 +03:00
parent 5ad8e3a0ca
commit cfb06354ca
11 changed files with 21 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -307,7 +307,7 @@ define([
cls: 'btn-toolbar x-huge icon-top', cls: 'btn-toolbar x-huge icon-top',
caption: this.txtCommentRemove, caption: this.txtCommentRemove,
split: true, split: true,
iconCls: 'btn-menu-comments' iconCls: 'btn-rem-comment'
}); });
} }
@ -654,7 +654,7 @@ define([
txtOriginalCap: 'Original', txtOriginalCap: 'Original',
strFastDesc: 'Real-time co-editing. All changes are saved automatically.', strFastDesc: 'Real-time co-editing. All changes are saved automatically.',
strStrictDesc: 'Use the \'Save\' button to sync the changes you and others make.', strStrictDesc: 'Use the \'Save\' button to sync the changes you and others make.',
txtCommentRemove: 'Remove Comments', txtCommentRemove: 'Remove',
tipCommentRemCurrent: 'Remove current comments', tipCommentRemCurrent: 'Remove current comments',
tipCommentRem: 'Remove comments', tipCommentRem: 'Remove comments',
txtCommentRemCurrent: 'Remove Current Comments', txtCommentRemCurrent: 'Remove Current Comments',

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

@ -533,6 +533,7 @@
.button-normal-icon(btn-caption, 76, @toolbar-big-icon-size); .button-normal-icon(btn-caption, 76, @toolbar-big-icon-size);
.button-normal-icon(btn-calculation, 80, @toolbar-big-icon-size); .button-normal-icon(btn-calculation, 80, @toolbar-big-icon-size);
.button-normal-icon(btn-scale, 81, @toolbar-big-icon-size); .button-normal-icon(btn-scale, 81, @toolbar-big-icon-size);
.button-normal-icon(btn-rem-comment, 83, @toolbar-big-icon-size);
[applang=ru] { [applang=ru] {
.btn-toolbar { .btn-toolbar {

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

@ -2887,6 +2887,8 @@ define([
btn.on('click', function (btn, e) { btn.on('click', function (btn, e) {
Common.NotificationCenter.trigger('app:comment:add', 'toolbar'); Common.NotificationCenter.trigger('app:comment:add', 'toolbar');
}); });
if (btn.cmpEl.closest('#review-changes-panel').length>0)
btn.setCaption(me.toolbar.capBtnAddComment);
}, this); }, this);
} }
} }

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

@ -2324,7 +2324,8 @@ define([
capBtnWatermark: 'Watermark', capBtnWatermark: 'Watermark',
textEditWatermark: 'Custom Watermark', textEditWatermark: 'Custom Watermark',
textRemWatermark: 'Remove Watermark', textRemWatermark: 'Remove Watermark',
tipWatermark: 'Edit watermark' tipWatermark: 'Edit watermark',
capBtnAddComment: 'Add Comment'
} }
})(), DE.Views.Toolbar || {})); })(), DE.Views.Toolbar || {}));
}); });

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

@ -253,7 +253,7 @@
"Common.Views.ReviewChanges.txtSpelling": "Spell Checking", "Common.Views.ReviewChanges.txtSpelling": "Spell Checking",
"Common.Views.ReviewChanges.txtTurnon": "Track Changes", "Common.Views.ReviewChanges.txtTurnon": "Track Changes",
"Common.Views.ReviewChanges.txtView": "Display Mode", "Common.Views.ReviewChanges.txtView": "Display Mode",
"Common.Views.ReviewChanges.txtCommentRemove": "Remove Comments", "Common.Views.ReviewChanges.txtCommentRemove": "Remove",
"Common.Views.ReviewChanges.tipCommentRemCurrent": "Remove current comments", "Common.Views.ReviewChanges.tipCommentRemCurrent": "Remove current comments",
"Common.Views.ReviewChanges.tipCommentRem": "Remove comments", "Common.Views.ReviewChanges.tipCommentRem": "Remove comments",
"Common.Views.ReviewChanges.txtCommentRemCurrent": "Remove Current Comments", "Common.Views.ReviewChanges.txtCommentRemCurrent": "Remove Current Comments",
@ -2056,6 +2056,7 @@
"DE.Views.TextArtSettings.textTemplate": "Template", "DE.Views.TextArtSettings.textTemplate": "Template",
"DE.Views.TextArtSettings.textTransform": "Transform", "DE.Views.TextArtSettings.textTransform": "Transform",
"DE.Views.TextArtSettings.txtNoBorders": "No Line", "DE.Views.TextArtSettings.txtNoBorders": "No Line",
"DE.Views.Toolbar.capBtnAddComment": "Add Comment",
"DE.Views.Toolbar.capBtnBlankPage": "Blank Page", "DE.Views.Toolbar.capBtnBlankPage": "Blank Page",
"DE.Views.Toolbar.capBtnColumns": "Columns", "DE.Views.Toolbar.capBtnColumns": "Columns",
"DE.Views.Toolbar.capBtnComment": "Comment", "DE.Views.Toolbar.capBtnComment": "Comment",

2
apps/presentationeditor/main/app/controller/Toolbar.js
View file

@ -2164,6 +2164,8 @@ define([
btn.on('click', function (btn, e) { btn.on('click', function (btn, e) {
Common.NotificationCenter.trigger('app:comment:add', 'toolbar'); Common.NotificationCenter.trigger('app:comment:add', 'toolbar');
}); });
if (btn.cmpEl.closest('#review-changes-panel').length>0)
btn.setCaption(me.toolbar.capBtnAddComment);
}, this); }, this);
this.toolbar.lockToolbar(PE.enumLock.noSlides, this._state.no_slides, { array: this.btnsComment }); this.toolbar.lockToolbar(PE.enumLock.noSlides, this._state.no_slides, { array: this.btnsComment });
} }

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

@ -1676,7 +1676,8 @@ define([
capBtnInsHeader: 'Header/Footer', capBtnInsHeader: 'Header/Footer',
capBtnSlideNum: 'Slide Number', capBtnSlideNum: 'Slide Number',
capBtnDateTime: 'Date & Time', capBtnDateTime: 'Date & Time',
textListSettings: 'List Settings' textListSettings: 'List Settings',
capBtnAddComment: 'Add Comment'
} }
}()), PE.Views.Toolbar || {})); }()), PE.Views.Toolbar || {}));
}); });

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

@ -178,7 +178,7 @@
"Common.Views.ReviewChanges.txtSpelling": "Spell Checking", "Common.Views.ReviewChanges.txtSpelling": "Spell Checking",
"Common.Views.ReviewChanges.txtTurnon": "Track Changes", "Common.Views.ReviewChanges.txtTurnon": "Track Changes",
"Common.Views.ReviewChanges.txtView": "Display Mode", "Common.Views.ReviewChanges.txtView": "Display Mode",
"Common.Views.ReviewChanges.txtCommentRemove": "Remove Comments", "Common.Views.ReviewChanges.txtCommentRemove": "Remove",
"Common.Views.ReviewChanges.tipCommentRemCurrent": "Remove current comments", "Common.Views.ReviewChanges.tipCommentRemCurrent": "Remove current comments",
"Common.Views.ReviewChanges.tipCommentRem": "Remove comments", "Common.Views.ReviewChanges.tipCommentRem": "Remove comments",
"Common.Views.ReviewChanges.txtCommentRemCurrent": "Remove Current Comments", "Common.Views.ReviewChanges.txtCommentRemCurrent": "Remove Current Comments",
@ -1672,6 +1672,7 @@
"PE.Views.TextArtSettings.txtPapyrus": "Papyrus", "PE.Views.TextArtSettings.txtPapyrus": "Papyrus",
"PE.Views.TextArtSettings.txtWood": "Wood", "PE.Views.TextArtSettings.txtWood": "Wood",
"PE.Views.Toolbar.capAddSlide": "Add Slide", "PE.Views.Toolbar.capAddSlide": "Add Slide",
"PE.Views.Toolbar.capBtnAddComment": "Add Comment",
"PE.Views.Toolbar.capBtnComment": "Comment", "PE.Views.Toolbar.capBtnComment": "Comment",
"PE.Views.Toolbar.capBtnDateTime": "Date & Time", "PE.Views.Toolbar.capBtnDateTime": "Date & Time",
"PE.Views.Toolbar.capBtnInsHeader": "Header/Footer", "PE.Views.Toolbar.capBtnInsHeader": "Header/Footer",

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

@ -3234,6 +3234,8 @@ define([
btn.on('click', function (btn, e) { btn.on('click', function (btn, e) {
Common.NotificationCenter.trigger('app:comment:add', 'toolbar', me.api.asc_getCellInfo().asc_getFlags().asc_getSelectionType() != Asc.c_oAscSelectionType.RangeCells); Common.NotificationCenter.trigger('app:comment:add', 'toolbar', me.api.asc_getCellInfo().asc_getFlags().asc_getSelectionType() != Asc.c_oAscSelectionType.RangeCells);
}); });
if (btn.cmpEl.closest('#review-changes-panel').length>0)
btn.setCaption(me.toolbar.capBtnAddComment);
}, this); }, this);
} }
} }

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

@ -2520,6 +2520,7 @@ define([
textManyPages: 'pages', textManyPages: 'pages',
textHeight: 'Height', textHeight: 'Height',
textWidth: 'Width', textWidth: 'Width',
textMorePages: 'More pages' textMorePages: 'More pages',
capBtnAddComment: 'Add Comment'
}, SSE.Views.Toolbar || {})); }, SSE.Views.Toolbar || {}));
}); });

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

@ -172,7 +172,7 @@
"Common.Views.ReviewChanges.txtSpelling": "Spell Checking", "Common.Views.ReviewChanges.txtSpelling": "Spell Checking",
"Common.Views.ReviewChanges.txtTurnon": "Track Changes", "Common.Views.ReviewChanges.txtTurnon": "Track Changes",
"Common.Views.ReviewChanges.txtView": "Display Mode", "Common.Views.ReviewChanges.txtView": "Display Mode",
"Common.Views.ReviewChanges.txtCommentRemove": "Remove Comments", "Common.Views.ReviewChanges.txtCommentRemove": "Remove",
"Common.Views.ReviewChanges.tipCommentRemCurrent": "Remove current comments", "Common.Views.ReviewChanges.tipCommentRemCurrent": "Remove current comments",
"Common.Views.ReviewChanges.tipCommentRem": "Remove comments", "Common.Views.ReviewChanges.tipCommentRem": "Remove comments",
"Common.Views.ReviewChanges.txtCommentRemCurrent": "Remove Current Comments", "Common.Views.ReviewChanges.txtCommentRemCurrent": "Remove Current Comments",
@ -2199,6 +2199,7 @@
"SSE.Views.TextArtSettings.txtNoBorders": "No Line", "SSE.Views.TextArtSettings.txtNoBorders": "No Line",
"SSE.Views.TextArtSettings.txtPapyrus": "Papyrus", "SSE.Views.TextArtSettings.txtPapyrus": "Papyrus",
"SSE.Views.TextArtSettings.txtWood": "Wood", "SSE.Views.TextArtSettings.txtWood": "Wood",
"SSE.Views.Toolbar.capBtnAddComment": "Add Comment",
"SSE.Views.Toolbar.capBtnComment": "Comment", "SSE.Views.Toolbar.capBtnComment": "Comment",
"SSE.Views.Toolbar.capBtnInsHeader": "Header/Footer", "SSE.Views.Toolbar.capBtnInsHeader": "Header/Footer",
"SSE.Views.Toolbar.capBtnMargins": "Margins", "SSE.Views.Toolbar.capBtnMargins": "Margins",