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

[rtl] Fix dialogs, pivot styles combobox, warning windows for SSE

Browse source
This commit is contained in:
JuliaSvinareva 2022-11-29 21:07:36 +03:00
parent 7d4c913be9
commit 35b454811c
11 changed files with 90 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/common/main/lib/component/ComboDataView.js
View file

@ -299,7 +299,7 @@ define([
var itemMargins = parseFloat(itemEl.css('margin-left')) + parseFloat(itemEl.css('margin-right')); var itemMargins = parseFloat(itemEl.css('margin-left')) + parseFloat(itemEl.css('margin-right'));
var fieldPickerEl = this.fieldPicker.$el; var fieldPickerEl = this.fieldPicker.$el;
var fieldPickerPadding = parseFloat(fieldPickerEl.css('padding-right')); var fieldPickerPadding = parseFloat(fieldPickerEl.css(Common.UI.isRTL() ? 'padding-left' : 'padding-right'));
var fieldPickerBorder = parseFloat(fieldPickerEl.css('border-width')); var fieldPickerBorder = parseFloat(fieldPickerEl.css('border-width'));
var dataviewPaddings = parseFloat(this.fieldPicker.$el.find('.dataview').css('padding-left')) + parseFloat(this.fieldPicker.$el.find('.dataview').css('padding-right')); var dataviewPaddings = parseFloat(this.fieldPicker.$el.find('.dataview').css('padding-left')) + parseFloat(this.fieldPicker.$el.find('.dataview').css('padding-right'));

5
apps/common/main/lib/component/Window.js
View file

@ -456,7 +456,7 @@ define([
var template = '<div class="info-box">' + var template = '<div class="info-box">' +
'<% if (typeof iconCls !== "undefined") { %><div class="icon <%= iconCls %>"></div><% } %>' + '<% if (typeof iconCls !== "undefined") { %><div class="icon <%= iconCls %>"></div><% } %>' +
'<div class="text" <% if (typeof iconCls == "undefined") { %> style="padding-left:10px;" <% } %>><span><%= msg %></span>' + '<div class="text" dir="ltr" <% if (typeof iconCls == "undefined") { %> style="padding-left:10px;" <% } %>><span><%= msg %></span>' +
'<% if (dontshow) { %><div class="dont-show-checkbox"></div><% } %>' + '<% if (dontshow) { %><div class="dont-show-checkbox"></div><% } %>' +
'</div>' + '</div>' +
'</div>' + '</div>' +
@ -491,7 +491,8 @@ define([
text_cnt.height(Math.max(text.height(), icon_height) + ((check.length>0) ? (check.height() + parseInt(check.css('margin-top'))) : 0)); text_cnt.height(Math.max(text.height(), icon_height) + ((check.length>0) ? (check.height() + parseInt(check.css('margin-top'))) : 0));
body.height(parseInt(text_cnt.css('height')) + parseInt(footer.css('height'))); body.height(parseInt(text_cnt.css('height')) + parseInt(footer.css('height')));
var span_el = check.find('span'); var span_el = check.find('span');
window.setSize(Math.max(text.width(), span_el.length>0 ? span_el.position().left + span_el.width() : 0) + text.position().left + parseInt(text_cnt.css('padding-right')), window.setSize(Math.max(text.width(), span_el.length>0 ? span_el.position().left + span_el.width() : 0) + text.position().left + parseInt(text_cnt.css('padding-right')) +
(Common.UI.isRTL() && icon.length > 0 ? icon.width() + parseInt(icon.css('margin-right')) + parseInt(icon.css('margin-left')) : 0),
parseInt(body.css('height')) + parseInt(header.css('height'))); parseInt(body.css('height')) + parseInt(header.css('height')));
} else { } else {
text.css('white-space', 'normal'); text.css('white-space', 'normal');

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

@ -1074,6 +1074,11 @@
border: @scaled-one-px-value-ie solid @border-regular-control-ie; border: @scaled-one-px-value-ie solid @border-regular-control-ie;
border: @scaled-one-px-value solid @border-regular-control; border: @scaled-one-px-value solid @border-regular-control;
position: relative; position: relative;
.rtl & {
margin-right: 0;
margin-left: 3px;
}
} }
&.sheet-template-table { &.sheet-template-table {

17
apps/common/main/resources/less/combo-dataview.less
View file

@ -265,6 +265,13 @@
margin-right: -@combo-dataview-button-width; margin-right: -@combo-dataview-button-width;
padding-right: @combo-dataview-button-width; padding-right: @combo-dataview-button-width;
.rtl & {
margin-right: 0;
padding-right: 0;
margin-left: -@combo-dataview-button-width;
padding-left: @combo-dataview-button-width;
}
.dataview { .dataview {
padding: 2px; padding: 2px;
} }
@ -399,6 +406,11 @@
position: absolute; position: absolute;
padding-right: 12px; padding-right: 12px;
.rtl & {
padding-right: 0;
padding-left: 12px;
}
.more-container & { .more-container & {
position: static; position: static;
} }
@ -428,6 +440,11 @@
.group-description { .group-description {
padding: 3px 0 3px 10px; padding: 3px 0 3px 10px;
.font-weight-bold(); .font-weight-bold();
.rtl & {
padding: 3px 10px 3px 0;
text-align: right;
}
} }
} }
} }

14
apps/common/main/resources/less/window.less
View file

@ -205,6 +205,11 @@
.icon { .icon {
float: left; float: left;
margin: 0 0 0 10px; margin: 0 0 0 10px;
.rtl & {
float: right;
margin: 0 10px 0 10px;
}
} }
min-height: 90px; min-height: 90px;
@ -215,9 +220,18 @@
padding: 20px 20px 20px 10px; padding: 20px 20px 20px 10px;
height: 50px; height: 50px;
.rtl & {
padding: 20px 10px 20px 20px;
}
.text { .text {
padding-left: 60px; padding-left: 60px;
.rtl & {
padding-left: 0;
padding-right: 60px;
}
span { span {
font-size: 12px; font-size: 12px;
white-space: nowrap; white-space: nowrap;

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

@ -25,7 +25,7 @@
</tr> </tr>
<tr> <tr>
<td class="padding-large"> <td class="padding-large">
<button type="button" class="btn btn-text-default" id="name-manager-btn-new" style="min-width: 100px;margin-right:5px;"><%= scope.textNew %></button> <button type="button" class="btn btn-text-default" id="name-manager-btn-new" style="min-width: 100px;"><%= scope.textNew %></button>
<button type="button" class="btn btn-text-default" id="name-manager-btn-edit" style="min-width: 100px;"><%= scope.textEdit %></button> <button type="button" class="btn btn-text-default" id="name-manager-btn-edit" style="min-width: 100px;"><%= scope.textEdit %></button>
</td> </td>
<td class="padding-large" style="text-align: right;width:90px;"> <td class="padding-large" style="text-align: right;width:90px;">

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

@ -54,7 +54,8 @@ define([ 'text!spreadsheeteditor/main/app/template/NameManagerDlg.template',
alias: 'NameManagerDlg', alias: 'NameManagerDlg',
contentWidth: 525, contentWidth: 525,
height: 353, height: 353,
buttons: null buttons: null,
id: 'window-name-manager'
}, },
initialize: function (options) { initialize: function (options) {

4
apps/spreadsheeteditor/main/app/view/PageMarginsDialog.js
View file

@ -62,7 +62,7 @@ define([
'<div class="box" style="height: 85px;">', '<div class="box" style="height: 85px;">',
'<table cols="2" style="width: 100%;margin-bottom: 10px;">', '<table cols="2" style="width: 100%;margin-bottom: 10px;">',
'<tr>', '<tr>',
'<td style="padding-right: 10px;padding-bottom: 8px;">', '<td class="padding-right" style="padding-bottom: 8px;">',
'<label class="input-label">' + this.textTop + '</label>', '<label class="input-label">' + this.textTop + '</label>',
'<div id="page-margins-spin-top"></div>', '<div id="page-margins-spin-top"></div>',
'</td>', '</td>',
@ -72,7 +72,7 @@ define([
'</td>', '</td>',
'</tr>', '</tr>',
'<tr>', '<tr>',
'<td class="padding-small" style="padding-right: 10px;">', '<td class="padding-small padding-right">',
'<label class="input-label">' + this.textLeft + '</label>', '<label class="input-label">' + this.textLeft + '</label>',
'<div id="page-margins-spin-left"></div>', '<div id="page-margins-spin-left"></div>',
'</td>', '</td>',

5
apps/spreadsheeteditor/main/app/view/PivotTable.js
View file

@ -306,7 +306,10 @@ define([
if (menuWidth>Common.Utils.innerWidth()) if (menuWidth>Common.Utils.innerWidth())
menuWidth = Math.max(Math.floor((Common.Utils.innerWidth()-17)/(itemMargin + itemWidth)), 2) * (itemMargin + itemWidth) + 17; menuWidth = Math.max(Math.floor((Common.Utils.innerWidth()-17)/(itemMargin + itemWidth)), 2) * (itemMargin + itemWidth) + 17;
var offset = cmp.cmpEl.width() - cmp.openButton.$el.width() - Math.min(menuWidth, buttonOffsetLeft) - 1; var offset = cmp.cmpEl.width() - cmp.openButton.$el.width() - Math.min(menuWidth, buttonOffsetLeft) - 1;
menu.setOffset(Math.min(offset, 0)); if (Common.UI.isRTL()) {
offset = cmp.openButton.$el.width() + parseFloat($(cmp.$el.find('.combo-dataview').get(0)).css('padding-left'));
}
menu.setOffset(Common.UI.isRTL() ? offset : Math.min(offset, 0));
menu.cmpEl.css({ menu.cmpEl.css({
'width': menuWidth, 'width': menuWidth,

5
apps/spreadsheeteditor/main/app/view/ScaleDialog.js
View file

@ -50,6 +50,7 @@ define([
header: true, header: true,
style: 'min-width: 215px;', style: 'min-width: 215px;',
cls: 'modal-dlg', cls: 'modal-dlg',
id: 'window-scale',
buttons: ['ok', 'cancel'] buttons: ['ok', 'cancel']
}, },
@ -66,7 +67,7 @@ define([
this.template = [ this.template = [
'<div class="box">', '<div class="box">',
'<div id="radio-fit-to" style="margin-bottom: 4px;"></div>', '<div id="radio-fit-to" style="margin-bottom: 4px;"></div>',
'<div style="padding-left: 22px;">', '<div class="padding-left">',
'<div>', '<div>',
'<label style="height: 22px;width: 55px;padding-top: 4px;display: inline-block;margin-bottom: 4px;">' + this.textWidth + '</label>', '<label style="height: 22px;width: 55px;padding-top: 4px;display: inline-block;margin-bottom: 4px;">' + this.textWidth + '</label>',
'<div id="scale-width" style="display: inline-block;margin-bottom: 4px;"></div>', '<div id="scale-width" style="display: inline-block;margin-bottom: 4px;"></div>',
@ -77,7 +78,7 @@ define([
'</div>', '</div>',
'</div>', '</div>',
'<div id="radio-scale-to" style="margin-bottom: 6px;"></div>', '<div id="radio-scale-to" style="margin-bottom: 6px;"></div>',
'<div id="scale" style="padding-left: 22px; margin-bottom: 6px;"></div>', '<div id="scale" class="padding-left" style="margin-bottom: 6px;"></div>',
'</div>' '</div>'
].join(''); ].join('');

38
apps/spreadsheeteditor/main/resources/less/advanced-settings.less
View file

@ -74,6 +74,11 @@
.sort-dialog-btn-text { .sort-dialog-btn-text {
min-width: 100px; min-width: 100px;
margin-right: 5px; margin-right: 5px;
.rtl & {
margin-right: 0;
margin-left: 5px;
}
} }
.input-row--tabs { .input-row--tabs {
@ -570,4 +575,37 @@
.checkbox-indeterminate { .checkbox-indeterminate {
position:absolute; position:absolute;
} }
}
#window-page-margins {
.padding-right {
padding-right: 10px;
.rtl & {
padding-right: 0;
padding-left: 10px;
}
}
}
#window-scale {
.padding-left {
padding-left: 22px;
.rtl & {
padding-left: 0;
padding-right: 22px;
}
}
}
#window-name-manager {
#name-manager-btn-new {
margin-right: 5px;
.rtl & {
margin-right: 0;
margin-left: 5px;
}
}
} }