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

[SSE] Move color scheme button to Layout tab

Browse source
This commit is contained in:
Julia Radzhabova 2020-04-14 16:08:14 +03:00
parent 39892cb54a
commit c47d09be76
6 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
apps/common/main/resources/img/toolbar/1.5x/big/btn-colorschemas.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 275 B

BIN
apps/common/main/resources/img/toolbar/1x/big/btn-colorschemas.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 229 B

BIN
apps/common/main/resources/img/toolbar/2x/big/btn-colorschemas.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 394 B

6
apps/spreadsheeteditor/main/app/template/Toolbar.template
View file

@ -109,7 +109,7 @@
<div class="group"> <div class="group">
<div class="elset"> <div class="elset">
<span class="btn-slot split" id="slot-btn-clear"></span> <span class="btn-slot split" id="slot-btn-clear"></span>
<span class="btn-slot split" id="slot-btn-colorschemas"></span> <span class="btn-slot split" id="slot-btn-condformat"></span>
</div> </div>
<div class="elset"> <div class="elset">
<span class="btn-slot split" id="slot-btn-copystyle"></span> <span class="btn-slot split" id="slot-btn-copystyle"></span>
@ -162,6 +162,10 @@
<span class="btn-slot text x-huge" id="slot-img-movefrwd"></span> <span class="btn-slot text x-huge" id="slot-img-movefrwd"></span>
<span class="btn-slot text x-huge" id="slot-img-movebkwd"></span> <span class="btn-slot text x-huge" id="slot-img-movebkwd"></span>
</div> </div>
<div class="separator long"></div>
<div class="group">
<span class="btn-slot text x-huge" id="slot-btn-colorschemas"></span>
</div>
</section> </section>
<section class="panel" data-tab="formula"> <section class="panel" data-tab="formula">
<div class="group"> <div class="group">

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

@ -1018,8 +1018,9 @@ define([
me.btnColorSchemas = new Common.UI.Button({ me.btnColorSchemas = new Common.UI.Button({
id : 'id-toolbar-btn-colorschemas', id : 'id-toolbar-btn-colorschemas',
cls : 'btn-toolbar', cls : 'btn-toolbar x-huge icon-top',
iconCls : 'toolbar__icon toolbar__icon btn-colorschemas', iconCls : 'toolbar__icon btn-colorschemas',
caption : me.capBtnColorSchemas,
lock : [_set.editCell, _set.lostConnect, _set.coAuth], lock : [_set.editCell, _set.lostConnect, _set.coAuth],
menu : new Common.UI.Menu({ menu : new Common.UI.Menu({
items: [], items: [],
@ -2393,6 +2394,7 @@ define([
tipInsertSymbol: 'Insert symbol', tipInsertSymbol: 'Insert symbol',
txtAutosumTip: 'Summation', txtAutosumTip: 'Summation',
capBtnPrintTitles: 'Print Titles', capBtnPrintTitles: 'Print Titles',
tipPrintTitles: 'Print titles' tipPrintTitles: 'Print titles',
capBtnColorSchemas: 'Color Scheme'
}, SSE.Views.Toolbar || {})); }, SSE.Views.Toolbar || {}));
}); });

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

@ -2653,6 +2653,7 @@
"SSE.Views.Toolbar.txtTime": "Time", "SSE.Views.Toolbar.txtTime": "Time",
"SSE.Views.Toolbar.txtUnmerge": "Unmerge Cells", "SSE.Views.Toolbar.txtUnmerge": "Unmerge Cells",
"SSE.Views.Toolbar.txtYen": "¥ Yen", "SSE.Views.Toolbar.txtYen": "¥ Yen",
"SSE.Views.Toolbar.capBtnColorSchemas": "Color Scheme",
"SSE.Views.Top10FilterDialog.textType": "Show", "SSE.Views.Top10FilterDialog.textType": "Show",
"SSE.Views.Top10FilterDialog.txtBottom": "Bottom", "SSE.Views.Top10FilterDialog.txtBottom": "Bottom",
"SSE.Views.Top10FilterDialog.txtItems": "Item", "SSE.Views.Top10FilterDialog.txtItems": "Item",