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

[DE] [SSE] [PE] Bug 42429

Browse source
This commit is contained in:
Julia Svinareva 2019-12-16 13:55:13 +03:00
parent 7dd4e731d9
commit eb7cbca182
6 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -751,7 +751,11 @@
.border-radius(@border-radius-small); .border-radius(@border-radius-small);
&.template-table { &.template-table {
width: 97px; width: 92px;
}
&.sheet-template-table {
width: 83px;
height: 54px;
} }
.icon { .icon {

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

@ -478,7 +478,7 @@ define([
this.mnuTableTemplatePicker.selectRecord(rec, true); this.mnuTableTemplatePicker.selectRecord(rec, true);
this.btnTableTemplate.resumeEvents(); this.btnTableTemplate.resumeEvents();
this.$el.find('.icon-template-table').css({'background-image': 'url(' + rec.get("imageUrl") + ')', 'height': '52px', 'width': '74px', 'background-position': 'center'}); this.$el.find('.icon-template-table').css({'background-image': 'url(' + rec.get("imageUrl") + ')', 'height': '52px', 'width': '72px', 'background-position': 'center'});
this._state.TemplateId = value; this._state.TemplateId = value;
} }

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

@ -446,7 +446,7 @@ define([
this.mnuTableTemplatePicker.selectRecord(rec, true); this.mnuTableTemplatePicker.selectRecord(rec, true);
this.btnTableTemplate.resumeEvents(); this.btnTableTemplate.resumeEvents();
this.$el.find('.icon-template-table').css({'background-image': 'url(' + rec.get("imageUrl") + ')', 'height': '52px', 'width': '74px', 'background-position': 'center'}); this.$el.find('.icon-template-table').css({'background-image': 'url(' + rec.get("imageUrl") + ')', 'height': '52px', 'width': '72px', 'background-position': 'center'});
this._state.TemplateId = value; this._state.TemplateId = value;
} }

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

@ -43,7 +43,7 @@
</tr> </tr>
<tr> <tr>
<td colspan=2 class="padding-small"> <td colspan=2 class="padding-small">
<div class="" id="table-btn-template" style="width: 100%; height: 58px;"></div> <div class="" id="table-btn-template" style="width: 100%; height: 52px;"></div>
</td> </td>
</tr> </tr>
<tr> <tr>

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

@ -408,7 +408,7 @@ define([
this.mnuTableTemplatePicker.selectRecord(rec, true); this.mnuTableTemplatePicker.selectRecord(rec, true);
this.btnTableTemplate.resumeEvents(); this.btnTableTemplate.resumeEvents();
this.$el.find('.icon-template-table').css({'background-image': 'url(' + rec.get("imageUrl") + ')', 'height': '52px', 'width': '71px', 'background-position': 'center'}); this.$el.find('.icon-template-table').css({'background-image': 'url(' + rec.get("imageUrl") + ')', 'height': '48px', 'width': '63px', 'background-position': 'center'});
this._state.TemplateName=value; this._state.TemplateName=value;
} }
@ -430,10 +430,10 @@ define([
if (!this.btnTableTemplate) { if (!this.btnTableTemplate) {
this.btnTableTemplate = new Common.UI.Button({ this.btnTableTemplate = new Common.UI.Button({
cls : 'btn-large-dataview template-table', cls : 'btn-large-dataview sheet-template-table',
iconCls : 'icon-template-table', iconCls : 'icon-template-table',
menu : new Common.UI.Menu({ menu : new Common.UI.Menu({
style: 'width: 575px;', style: 'width: 512px;',
items: [ items: [
{ template: _.template('<div id="id-table-menu-template" class="menu-table-template" style="margin: 5px 5px 5px 10px;"></div>') } { template: _.template('<div id="id-table-menu-template" class="menu-table-template" style="margin: 5px 5px 5px 10px;"></div>') }
] ]
@ -443,11 +443,11 @@ define([
self.mnuTableTemplatePicker = new Common.UI.DataView({ self.mnuTableTemplatePicker = new Common.UI.DataView({
el: $('#id-table-menu-template'), el: $('#id-table-menu-template'),
parentMenu: btn.menu, parentMenu: btn.menu,
restoreHeight: 350, restoreHeight: 325,
groups: new Common.UI.DataViewGroupStore(), groups: new Common.UI.DataViewGroupStore(),
store: new Common.UI.DataViewStore(), store: new Common.UI.DataViewStore(),
itemTemplate: _.template('<div id="<%= id %>" class="item"><img src="<%= imageUrl %>" height="50" width="70"></div>'), itemTemplate: _.template('<div id="<%= id %>" class="item"><img src="<%= imageUrl %>" height="46" width="61"></div>'),
style: 'max-height: 350px;' style: 'max-height: 325px;'
}); });
}); });
this.btnTableTemplate.render($('#table-btn-template')); this.btnTableTemplate.render($('#table-btn-template'));

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

@ -736,7 +736,7 @@ define([
lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth, _set.ruleFilter, _set.multiselect, _set.cantModifyFilter], lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth, _set.ruleFilter, _set.multiselect, _set.cantModifyFilter],
menu : new Common.UI.Menu({ menu : new Common.UI.Menu({
items: [ items: [
{ template: _.template('<div id="id-toolbar-menu-table-templates" style="width: 288px; height: 300px; margin: 0px 4px;"></div>') } { template: _.template('<div id="id-toolbar-menu-table-templates" style="width: 494px; height: 300px; margin: 0px 4px;"></div>') }
] ]
}) })
}); });