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

[DE] added caption for some buttons

Browse source
This commit is contained in:
Maxim Kadushkin 2017-03-06 12:26:18 +03:00
parent 357bcc9061
commit 63da5b2483
5 changed files with 96 additions and 17 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

@ -468,12 +468,14 @@ define([
this.btnPrev = new Common.UI.Button({ this.btnPrev = new Common.UI.Button({
cls: 'btn-toolbar', cls: 'btn-toolbar',
iconCls: 'img-commonctrl review-prev', iconCls: 'img-commonctrl review-prev',
caption: this.txtPrev,
value: 1 value: 1
}); });
this.btnNext = new Common.UI.Button({ this.btnNext = new Common.UI.Button({
cls: 'btn-toolbar', cls: 'btn-toolbar',
iconCls: 'img-commonctrl review-next', iconCls: 'img-commonctrl review-next',
caption: this.txtNext,
value: 2 value: 2
}); });
@ -517,6 +519,8 @@ define([
cls: 'btn-toolbar', cls: 'btn-toolbar',
iconCls: 'img-commonctrl review-close' iconCls: 'img-commonctrl review-close'
// hint: this.txtClose, // hint: this.txtClose,
iconCls: 'img-commonctrl review-close',
caption: this.txtTurnon
}); });
var me = this; var me = this;

68
apps/documenteditor/main/app/template/Toolbar.template
View file

@ -121,31 +121,69 @@
<section class="panel" data-tab="ins"> <section class="panel" data-tab="ins">
<div class="group"> <div class="group">
<div class="elset"> <div class="elset">
<span class="btn-slot split" id="slot-btn-pagebreak"></span> <span class="btn-slot text" id="slot-btn-pagebreak"></span>
<span class="btn-slot split" id="slot-btn-insimage"></span> </div>
<span class="btn-slot split" id="slot-btn-inschart"></span> <div class="elset">
<span class="btn-slot split" id="slot-btn-instext"></span> <span class="btn-slot text" id="slot-btn-editheader"></span>
<span class="btn-slot split" id="slot-btn-insequation"></span> </div>
<span class="btn-slot split" id="slot-btn-dropcap"></span> </div>
<div class="separator long"></div>
<div class="group">
<div class="elset">
<span class="btn-slot text" id="slot-btn-insimage"></span>
</div>
<div class="elset">
<span class="btn-slot text" id="slot-btn-instable"></span>
</div>
</div>
<div class="group">
<div class="elset">
<span class="btn-slot text" id="slot-btn-inschart"></span>
</div>
<div class="elset">
<span class="btn-slot text" id="slot-btn-inshyperlink"></span>
</div>
</div>
<div class="group">
<div class="elset">
<span class="btn-slot text" id="slot-btn-instext"></span>
</div>
<div class="elset">
<span class="btn-slot text" id="slot-btn-insshape"></span>
</div>
</div>
<div class="separator long"></div>
<div class="group">
<div class="elset">
<span class="btn-slot text" id="slot-btn-dropcap"></span>
</div>
<div class="elset">
<span class="btn-slot text" id="slot-btn-insequation"></span>
</div>
</div>
<div class="group">
<div class="elset">
<span class="btn-slot text" id="slot-btn-notes"></span>
</div> </div>
<div class="elset"> <div class="elset">
<span class="btn-slot split" id="slot-btn-editheader"></span>
<span class="btn-slot split" id="slot-btn-instable"></span>
<span class="btn-slot split" id="slot-btn-inshyperlink"></span>
<span class="btn-slot split" id="slot-btn-insshape"></span>
<span class="btn-slot split" id="slot-btn-notes"></span>
</div> </div>
</div> </div>
</section> </section>
<section class="panel" data-tab="layout"> <section class="panel" data-tab="layout">
<div class="group"> <div class="group">
<div class="elset"> <div class="elset">
<span class="btn-slot split" id="slot-btn-pageorient"></span> <span class="btn-slot text" id="slot-btn-pageorient"></span>
<span class="btn-slot split" id="slot-btn-pagemargins"></span>
</div> </div>
<div class="elset"> <div class="elset">
<span class="btn-slot split" id="slot-btn-pagesize"></span> <span class="btn-slot text" id="slot-btn-pagesize"></span>
<span class="btn-slot split" id="slot-btn-columns"></span> </div>
</div>
<div class="group">
<div class="elset">
<span class="btn-slot text" id="slot-btn-pagemargins"></span>
</div>
<div class="elset">
<span class="btn-slot text" id="slot-btn-columns"></span>
</div> </div>
</div> </div>
</section> </section>

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

@ -581,6 +581,7 @@ define([
id: 'id-toolbar-btn-inserttable', id: 'id-toolbar-btn-inserttable',
cls: 'btn-toolbar', cls: 'btn-toolbar',
iconCls: 'btn-inserttable', iconCls: 'btn-inserttable',
caption: me.capBtnInsTable,
menu: new Common.UI.Menu({ menu: new Common.UI.Menu({
items: [ items: [
{template: _.template('<div id="id-toolbar-menu-tablepicker" class="dimension-picker" style="margin: 5px 10px;"></div>')}, {template: _.template('<div id="id-toolbar-menu-tablepicker" class="dimension-picker" style="margin: 5px 10px;"></div>')},
@ -594,6 +595,7 @@ define([
id: 'id-toolbar-btn-insertimage', id: 'id-toolbar-btn-insertimage',
cls: 'btn-toolbar', cls: 'btn-toolbar',
iconCls: 'btn-insertimage', iconCls: 'btn-insertimage',
caption: me.capBtnInsImage,
menu: new Common.UI.Menu({ menu: new Common.UI.Menu({
items: [ items: [
{caption: this.mniImageFromFile, value: 'file'}, {caption: this.mniImageFromFile, value: 'file'},
@ -606,6 +608,7 @@ define([
this.btnInsertChart = new Common.UI.Button({ this.btnInsertChart = new Common.UI.Button({
id: 'id-toolbar-btn-insertchart', id: 'id-toolbar-btn-insertchart',
cls: 'btn-toolbar', cls: 'btn-toolbar',
caption: me.capBtnInsChart,
iconCls: 'btn-insertchart', iconCls: 'btn-insertchart',
menu: new Common.UI.Menu({ menu: new Common.UI.Menu({
style: 'width: 435px;', style: 'width: 435px;',
@ -620,6 +623,7 @@ define([
id: 'id-toolbar-btn-inserttext', id: 'id-toolbar-btn-inserttext',
cls: 'btn-toolbar', cls: 'btn-toolbar',
iconCls: 'btn-text', iconCls: 'btn-text',
caption: me.capBtnInsTextbox,
enableToggle: true, enableToggle: true,
split: true, split: true,
menu: new Common.UI.Menu({ menu: new Common.UI.Menu({
@ -646,6 +650,7 @@ define([
cls: 'btn-toolbar', cls: 'btn-toolbar',
iconCls: 'btn-pagebreak', iconCls: 'btn-pagebreak',
split: true, split: true,
caption: me.capBtnInsPagebreak,
menu: true menu: true
}); });
this.paragraphControls.push(this.btnInsertPageBreak); this.paragraphControls.push(this.btnInsertPageBreak);
@ -653,6 +658,7 @@ define([
this.btnInsertHyperlink = new Common.UI.Button({ this.btnInsertHyperlink = new Common.UI.Button({
id: 'id-toolbar-btn-inserthyperlink', id: 'id-toolbar-btn-inserthyperlink',
cls: 'btn-toolbar', cls: 'btn-toolbar',
caption: me.capBtnInsLink,
iconCls: 'btn-inserthyperlink' iconCls: 'btn-inserthyperlink'
}); });
this.paragraphControls.push(this.btnInsertHyperlink); this.paragraphControls.push(this.btnInsertHyperlink);
@ -661,6 +667,7 @@ define([
id: 'id-toolbar-btn-editheader', id: 'id-toolbar-btn-editheader',
cls: 'btn-toolbar', cls: 'btn-toolbar',
iconCls: 'btn-editheader', iconCls: 'btn-editheader',
caption: me.capBtnInsHeader,
menu: true menu: true
}); });
this.mnuPageNumberPosPicker = { this.mnuPageNumberPosPicker = {
@ -683,6 +690,7 @@ define([
id: 'id-toolbar-btn-insertshape', id: 'id-toolbar-btn-insertshape',
cls: 'btn-toolbar', cls: 'btn-toolbar',
iconCls: 'btn-insertshape', iconCls: 'btn-insertshape',
caption: me.capBtnInsShape,
enableToggle: true, enableToggle: true,
menu: new Common.UI.Menu({cls: 'menu-shapes'}) menu: new Common.UI.Menu({cls: 'menu-shapes'})
}); });
@ -692,6 +700,7 @@ define([
id: 'id-toolbar-btn-insertequation', id: 'id-toolbar-btn-insertequation',
cls: 'btn-toolbar', cls: 'btn-toolbar',
iconCls: 'btn-insertequation', iconCls: 'btn-insertequation',
caption: me.capBtnInsEquation,
split: true, split: true,
menu: new Common.UI.Menu({cls: 'menu-shapes'}) menu: new Common.UI.Menu({cls: 'menu-shapes'})
}); });
@ -701,6 +710,7 @@ define([
id: 'id-toolbar-btn-dropcap', id: 'id-toolbar-btn-dropcap',
cls: 'btn-toolbar', cls: 'btn-toolbar',
iconCls: 'btn-dropcap', iconCls: 'btn-dropcap',
caption: me.capBtnInsDropcap,
menu: new Common.UI.Menu({ menu: new Common.UI.Menu({
cls: 'ppm-toolbar', cls: 'ppm-toolbar',
items: [ items: [
@ -737,6 +747,7 @@ define([
id: 'id-toolbar-btn-columns', id: 'id-toolbar-btn-columns',
cls: 'btn-toolbar', cls: 'btn-toolbar',
iconCls: 'btn-columns', iconCls: 'btn-columns',
caption: me.capBtnColumns,
menu: new Common.UI.Menu({ menu: new Common.UI.Menu({
cls: 'ppm-toolbar', cls: 'ppm-toolbar',
items: [ items: [
@ -784,6 +795,7 @@ define([
id: 'id-toolbar-btn-pageorient', id: 'id-toolbar-btn-pageorient',
cls: 'btn-toolbar', cls: 'btn-toolbar',
iconCls: 'btn-pageorient', iconCls: 'btn-pageorient',
caption: me.capBtnPageOrient,
menu: new Common.UI.Menu({ menu: new Common.UI.Menu({
cls: 'ppm-toolbar', cls: 'ppm-toolbar',
items: [ items: [
@ -819,6 +831,7 @@ define([
id: 'id-toolbar-btn-pagemargins', id: 'id-toolbar-btn-pagemargins',
cls: 'btn-toolbar', cls: 'btn-toolbar',
iconCls: 'btn-pagemargins', iconCls: 'btn-pagemargins',
caption: me.capBtnMargins,
menu: new Common.UI.Menu({ menu: new Common.UI.Menu({
items: [ items: [
{ {
@ -877,6 +890,7 @@ define([
id: 'id-toolbar-btn-pagesize', id: 'id-toolbar-btn-pagesize',
cls: 'btn-toolbar', cls: 'btn-toolbar',
iconCls: 'btn-pagesize', iconCls: 'btn-pagesize',
caption: me.capBtnPageSize,
menu: new Common.UI.Menu({ menu: new Common.UI.Menu({
items: [ items: [
{ {
@ -1048,6 +1062,7 @@ define([
id: 'id-toolbar-btn-notes', id: 'id-toolbar-btn-notes',
cls: 'btn-toolbar', cls: 'btn-toolbar',
iconCls: 'btn-notes', iconCls: 'btn-notes',
caption: 'Footnotes',
split: true, split: true,
menu: true menu: true
}); });

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

@ -180,11 +180,14 @@
"Common.Views.ReviewChanges.txtAcceptAll": "Accept All Changes", "Common.Views.ReviewChanges.txtAcceptAll": "Accept All Changes",
"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.txtNext": "To Next Change", "Common.Views.ReviewChanges.hintNext": "To Next Change",
"Common.Views.ReviewChanges.txtPrev": "To Previous Change", "Common.Views.ReviewChanges.hintPrev": "To Previous Change",
"Common.Views.ReviewChanges.txtReject": "Reject", "Common.Views.ReviewChanges.txtReject": "Reject",
"Common.Views.ReviewChanges.txtRejectAll": "Reject All Changes", "Common.Views.ReviewChanges.txtRejectAll": "Reject All Changes",
"Common.Views.ReviewChanges.txtRejectCurrent": "Reject Current Change", "Common.Views.ReviewChanges.txtRejectCurrent": "Reject Current Change",
"Common.Views.ReviewChanges.txtPrev": "Previous",
"Common.Views.ReviewChanges.txtNext": "Next",
"Common.Views.ReviewChanges.txtTurnon": "Turn On",
"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.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", "DE.Controllers.LeftMenu.newDocumentTitle": "Unnamed document",
"DE.Controllers.LeftMenu.notcriticalErrorTitle": "Warning", "DE.Controllers.LeftMenu.notcriticalErrorTitle": "Warning",
@ -1580,6 +1583,21 @@
"DE.Views.Toolbar.tipSynchronize": "The document has been changed by another user. Please click to save your changes and reload the updates.", "DE.Views.Toolbar.tipSynchronize": "The document has been changed by another user. Please click to save your changes and reload the updates.",
"DE.Views.Toolbar.tipUndo": "Undo", "DE.Views.Toolbar.tipUndo": "Undo",
"DE.Views.Toolbar.tipViewSettings": "View Settings", "DE.Views.Toolbar.tipViewSettings": "View Settings",
"DE.Views.Toolbar.capBtnInsPagebreak": "Page Break",
"DE.Views.Toolbar.capBtnInsImage": "Picture",
"DE.Views.Toolbar.capBtnInsTable": "Table",
"DE.Views.Toolbar.capBtnInsChart": "Chart",
"DE.Views.Toolbar.capBtnInsLink": "Hyperlink",
"DE.Views.Toolbar.capBtnInsShape": "Shape",
"DE.Views.Toolbar.capBtnInsTextbox": "Text",
"DE.Views.Toolbar.capBtnInsDropcap": "Drop Cap",
"DE.Views.Toolbar.capBtnInsFootnote": "Footnotes",
"DE.Views.Toolbar.capBtnInsEquation": "Equation",
"DE.Views.Toolbar.capBtnInsHeader": "Headers/Footers",
"DE.Views.Toolbar.capBtnColumns": "Columns",
"DE.Views.Toolbar.capBtnPageOrient": "Orientation",
"DE.Views.Toolbar.capBtnMargins": "Margins",
"DE.Views.Toolbar.capBtnPageSize": "Size",
"DE.Views.Toolbar.txtScheme1": "Office", "DE.Views.Toolbar.txtScheme1": "Office",
"DE.Views.Toolbar.txtScheme10": "Median", "DE.Views.Toolbar.txtScheme10": "Median",
"DE.Views.Toolbar.txtScheme11": "Metro", "DE.Views.Toolbar.txtScheme11": "Metro",

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

@ -203,6 +203,10 @@
width: 28px; width: 28px;
} }
&.text {
width: auto;
}
&.border { &.border {
border: 1px solid @gray; border: 1px solid @gray;
.border-radius(1px); .border-radius(1px);