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

Fix Bug 52178

Browse source
This commit is contained in:
Julia Radzhabova 2021-12-04 22:59:28 +03:00
parent 504b44e385
commit d39e4a41c4
8 changed files with 54 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/common/main/resources/less/buttons.less
View file

@ -449,6 +449,10 @@
display: none; display: none;
} }
} }
&.align-left {
text-align: left;
}
} }
.btn-category { .btn-category {

3
apps/documenteditor/main/app/template/TableSettings.template
View file

@ -96,8 +96,7 @@
</tr> </tr>
<tr> <tr>
<td class="padding-small" colspan=2> <td class="padding-small" colspan=2>
<label class="header" style="margin-top: 3px;"><%= scope.textEdit %></label> <div id="table-btn-edit" style="width:100%;"></div>
<div id="table-btn-edit" style="display: inline-block; float:right;"></div>
</td> </td>
</tr> </tr>
<tr> <tr>

14
apps/documenteditor/main/app/view/TableSettings.js
View file

@ -347,9 +347,11 @@ define([
this.btnEdit = new Common.UI.Button({ this.btnEdit = new Common.UI.Button({
parentEl: $('#table-btn-edit'), parentEl: $('#table-btn-edit'),
cls: 'btn-icon-default', cls : 'btn-toolbar align-left',
iconCls: 'btn-edit-table', iconCls : 'toolbar__icon rows-and-columns',
menu : new Common.UI.Menu({ caption : this.textEdit,
style : 'width: 100%;',
menu: new Common.UI.Menu({
menuAlign: 'tr-br', menuAlign: 'tr-br',
items: [ items: [
{ caption: this.selectRowText, value: 0 }, { caption: this.selectRowText, value: 0 },
@ -370,9 +372,9 @@ define([
{ caption: this.splitCellsText, value: 12 } { caption: this.splitCellsText, value: 12 }
] ]
}), }),
dataHint: '1', dataHint : '1',
dataHintDirection: 'bottom', dataHintDirection: 'left',
dataHintOffset: 'big' dataHintOffset: 'small'
}); });
this.mnuMerge = this.btnEdit.menu.items[this.btnEdit.menu.items.length-2]; this.mnuMerge = this.btnEdit.menu.items[this.btnEdit.menu.items.length-2];
this.mnuSplit = this.btnEdit.menu.items[this.btnEdit.menu.items.length-1]; this.mnuSplit = this.btnEdit.menu.items[this.btnEdit.menu.items.length-1];

3
apps/presentationeditor/main/app/template/TableSettings.template
View file

@ -96,8 +96,7 @@
</tr> </tr>
<tr> <tr>
<td class="padding-small" colspan=2> <td class="padding-small" colspan=2>
<label class="header" style="margin-top: 3px;"><%= scope.textEdit %></label> <div id="table-btn-edit" style="width:100%;"></div>
<div id="table-btn-edit" style="display: inline-block; float:right;"></div>
</td> </td>
</tr> </tr>
<tr> <tr>

14
apps/presentationeditor/main/app/view/TableSettings.js
View file

@ -334,9 +334,11 @@ define([
this.btnEdit = new Common.UI.Button({ this.btnEdit = new Common.UI.Button({
parentEl: $('#table-btn-edit'), parentEl: $('#table-btn-edit'),
cls: 'btn-icon-default', cls : 'btn-toolbar align-left',
iconCls: 'btn-edit-table', iconCls : 'toolbar__icon rows-and-columns',
menu : new Common.UI.Menu({ caption : this.textEdit,
style : 'width: 100%;',
menu: new Common.UI.Menu({
menuAlign: 'tr-br', menuAlign: 'tr-br',
items: [ items: [
{ caption: this.selectRowText, value: 0 }, { caption: this.selectRowText, value: 0 },
@ -357,9 +359,9 @@ define([
{ caption: this.splitCellsText, value: 12 } { caption: this.splitCellsText, value: 12 }
] ]
}), }),
dataHint: '1', dataHint : '1',
dataHintDirection: 'bottom', dataHintDirection: 'left',
dataHintOffset: 'big' dataHintOffset: 'small'
}); });
this.mnuMerge = this.btnEdit.menu.items[this.btnEdit.menu.items.length-2]; this.mnuMerge = this.btnEdit.menu.items[this.btnEdit.menu.items.length-2];
this.mnuSplit = this.btnEdit.menu.items[this.btnEdit.menu.items.length-1]; this.mnuSplit = this.btnEdit.menu.items[this.btnEdit.menu.items.length-1];

8
apps/spreadsheeteditor/main/app/template/TableSettings.template
View file

@ -62,15 +62,13 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="padding-large" colspan=2> <td class="padding-small" colspan=2>
<label class="header" style="margin-top: 3px;"><%= scope.textResize %></label> <div id="table-btn-select-data" style="width:100%;"></div>
<button type="button" class="btn btn-text-default" id="table-btn-select-data" style="display: inline-block; float:right; min-width: 100px;width: auto;" data-hint="1" data-hint-direction="bottom" data-hint-offset="big"><%= scope.textSelectData %></button>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="padding-small" colspan=2> <td class="padding-small" colspan=2>
<label class="header" style="margin-top: 3px;"><%= scope.textEdit %></label> <div id="table-btn-edit" style="width:100%;"></div>
<div id="table-btn-edit" style="display: inline-block; float:right;"></div>
</td> </td>
</tr> </tr>
<tr> <tr>

8
apps/spreadsheeteditor/main/app/view/CellSettings.js
View file

@ -561,15 +561,15 @@ define([
this.btnCondFormat = new Common.UI.Button({ this.btnCondFormat = new Common.UI.Button({
parentEl: $('#cell-btn-cond-format'), parentEl: $('#cell-btn-cond-format'),
cls : 'btn-toolbar', cls : 'btn-toolbar align-left',
iconCls : 'toolbar__icon btn-cond-format', iconCls : 'toolbar__icon btn-cond-format',
caption : this.textCondFormat, caption : this.textCondFormat,
style : 'width: 100%;text-align: left;', style : 'width: 100%;',
menu: true, menu: true,
disabled: this._locked, disabled: this._locked,
dataHint : '1', dataHint : '1',
dataHintDirection: 'bottom', dataHintDirection: 'left',
dataHintOffset: 'big' dataHintOffset: 'small'
}); });
this.lockedControls.push(this.btnCondFormat); this.lockedControls.push(this.btnCondFormat);
}, },

40
apps/spreadsheeteditor/main/app/view/TableSettings.js
View file

@ -273,16 +273,25 @@ define([
this.lockedControls.push(this.txtTableName); this.lockedControls.push(this.txtTableName);
this.btnSelectData = new Common.UI.Button({ this.btnSelectData = new Common.UI.Button({
el: $('#table-btn-select-data') parentEl: $('#table-btn-select-data'),
cls : 'btn-toolbar align-left',
iconCls : 'toolbar__icon resize-table',
caption : this.textResize,
style : 'width: 100%;',
dataHint : '1',
dataHintDirection: 'left',
dataHintOffset: 'small'
}); });
this.btnSelectData.on('click', _.bind(this.onSelectData, this)); this.btnSelectData.on('click', _.bind(this.onSelectData, this));
this.lockedControls.push(this.btnSelectData); this.lockedControls.push(this.btnSelectData);
this.btnEdit = new Common.UI.Button({ this.btnEdit = new Common.UI.Button({
parentEl: $('#table-btn-edit'), parentEl: $('#table-btn-edit'),
cls: 'btn-icon-default', cls : 'btn-toolbar align-left',
iconCls: 'btn-edit-table', iconCls : 'toolbar__icon rows-and-columns',
menu : new Common.UI.Menu({ caption : this.textEdit,
style : 'width: 100%;',
menu: new Common.UI.Menu({
menuAlign: 'tr-br', menuAlign: 'tr-br',
items: [ items: [
{ caption: this.selectRowText, value: Asc.c_oAscChangeSelectionFormatTable.row, idx: 0 }, { caption: this.selectRowText, value: Asc.c_oAscChangeSelectionFormatTable.row, idx: 0 },
@ -300,10 +309,11 @@ define([
{ caption: this.deleteTableText, value: Asc.c_oAscDeleteOptions.DeleteTable, idx: 10 } { caption: this.deleteTableText, value: Asc.c_oAscDeleteOptions.DeleteTable, idx: 10 }
] ]
}), }),
dataHint: '1', dataHint : '1',
dataHintDirection: 'bottom', dataHintDirection: 'left',
dataHintOffset: 'medium' dataHintOffset: 'small'
}); });
this.btnEdit.menu.on('show:after', _.bind( function(menu){ this.btnEdit.menu.on('show:after', _.bind( function(menu){
if (this.api) { if (this.api) {
menu.items[5].setDisabled(!this._originalProps.asc_getIsInsertRowAbove()); menu.items[5].setDisabled(!this._originalProps.asc_getIsInsertRowAbove());
@ -321,10 +331,10 @@ define([
this.btnConvertRange = new Common.UI.Button({ this.btnConvertRange = new Common.UI.Button({
parentEl: $('#table-btn-convert-range'), parentEl: $('#table-btn-convert-range'),
cls : 'btn-toolbar', cls : 'btn-toolbar align-left',
iconCls : 'toolbar__icon btn-convert-to-range', iconCls : 'toolbar__icon btn-convert-to-range',
caption : this.textConvertRange, caption : this.textConvertRange,
style : 'width: 100%;text-align: left;', style : 'width: 100%;',
dataHint : '1', dataHint : '1',
dataHintDirection: 'left', dataHintDirection: 'left',
dataHintOffset: 'small' dataHintOffset: 'small'
@ -338,10 +348,10 @@ define([
this.btnRemDuplicates = new Common.UI.Button({ this.btnRemDuplicates = new Common.UI.Button({
parentEl: $('#table-btn-rem-duplicates'), parentEl: $('#table-btn-rem-duplicates'),
cls : 'btn-toolbar', cls : 'btn-toolbar align-left',
iconCls : 'toolbar__icon btn-remove-duplicates', iconCls : 'toolbar__icon btn-remove-duplicates',
caption : this.textRemDuplicates, caption : this.textRemDuplicates,
style : 'width: 100%;text-align: left;', style : 'width: 100%;',
dataHint : '1', dataHint : '1',
dataHintDirection: 'left', dataHintDirection: 'left',
dataHintOffset: 'small' dataHintOffset: 'small'
@ -353,10 +363,10 @@ define([
this.btnSlicer = new Common.UI.Button({ this.btnSlicer = new Common.UI.Button({
parentEl: $('#table-btn-slicer'), parentEl: $('#table-btn-slicer'),
cls : 'btn-toolbar', cls : 'btn-toolbar align-left',
iconCls : 'toolbar__icon btn-slicer', iconCls : 'toolbar__icon btn-slicer',
caption : this.textSlicer, caption : this.textSlicer,
style : 'width: 100%;text-align: left;', style : 'width: 100%;',
dataHint : '1', dataHint : '1',
dataHintDirection: 'left', dataHintDirection: 'left',
dataHintOffset: 'small' dataHintOffset: 'small'
@ -366,10 +376,10 @@ define([
this.btnPivot = new Common.UI.Button({ this.btnPivot = new Common.UI.Button({
parentEl: $('#table-btn-pivot'), parentEl: $('#table-btn-pivot'),
cls : 'btn-toolbar', cls : 'btn-toolbar align-left',
iconCls : 'toolbar__icon btn-pivot-sum', iconCls : 'toolbar__icon btn-pivot-sum',
caption : this.textPivot, caption : this.textPivot,
style : 'width: 100%;text-align: left;', style : 'width: 100%;',
dataHint : '1', dataHint : '1',
dataHintDirection: 'left', dataHintDirection: 'left',
dataHintOffset: 'small' dataHintOffset: 'small'