[rtl] Make checkboxes, settings in file menu

This commit is contained in:
JuliaSvinareva 2022-10-17 17:35:15 +03:00
parent 3032035cfb
commit 65c89bf6d2
8 changed files with 244 additions and 34 deletions

View file

@ -6,6 +6,11 @@
position: relative; position: relative;
min-height: 1em; min-height: 1em;
.rtl & {
padding-left: 0;
padding-right: 22px;
}
input[type=checkbox] { input[type=checkbox] {
display: none; display: none;
@ -21,6 +26,11 @@
left: 0; left: 0;
margin-top: auto; margin-top: auto;
.rtl & {
left: auto;
right: 0;
}
+ span { + span {
outline: @scaled-one-px-value-ie dotted transparent; outline: @scaled-one-px-value-ie dotted transparent;
outline: @scaled-one-px-value dotted transparent; outline: @scaled-one-px-value dotted transparent;

View file

@ -10,6 +10,12 @@
svg { svg {
margin-right: 8px; margin-right: 8px;
.rtl & {
margin-right: 0;
margin-left: 8px;
}
.rb-circle { .rb-circle {
fill: @background-normal-ie; fill: @background-normal-ie;
fill: @background-normal; fill: @background-normal;

View file

@ -350,8 +350,8 @@ define([
'<tr class="themes">', '<tr class="themes">',
'<td><label><%= scope.strTheme %></label></td>', '<td><label><%= scope.strTheme %></label></td>',
'<td>', '<td>',
'<div><div id="fms-cmb-theme" style="display: inline-block; margin-right: 15px;vertical-align: middle;"></div>', '<div><div id="fms-cmb-theme"></div>',
'<div id="fms-chb-dark-mode" style="display: inline-block; vertical-align: middle;margin-top: 2px;"></div></div></td>', '<div id="fms-chb-dark-mode"></div></div></td>',
'</tr>', '</tr>',
'<tr class="edit">', '<tr class="edit">',
'<td><label><%= scope.strUnit %></label></td>', '<td><label><%= scope.strUnit %></label></td>',
@ -368,7 +368,7 @@ define([
'<tr class="macros">', '<tr class="macros">',
'<td><label><%= scope.strMacrosSettings %></label></td>', '<td><label><%= scope.strMacrosSettings %></label></td>',
'<td>', '<td>',
'<div><div id="fms-cmb-macros" style="display: inline-block; margin-right: 15px; vertical-align: middle;"></div>', '<div><div id="fms-cmb-macros"></div>',
'</tr>', '</tr>',
'<tr class ="divider-group"></tr>', '<tr class ="divider-group"></tr>',
'<tr class="fms-btn-apply">', '<tr class="fms-btn-apply">',
@ -1874,7 +1874,7 @@ define([
'<td class="right"><div id="id-info-rights"></div></td>', '<td class="right"><div id="id-info-rights"></div></td>',
'</tr>', '</tr>',
'<tr class="edit-rights">', '<tr class="edit-rights">',
'<td class="left"></td><td class="right"><button id="id-info-btn-edit" class="btn normal dlg-btn primary custom" style="margin-right: 10px;">' + this.txtBtnAccessRights + '</button></td>', '<td class="left"></td><td class="right"><button id="id-info-btn-edit" class="btn normal dlg-btn primary custom">' + this.txtBtnAccessRights + '</button></td>',
'</tr>', '</tr>',
'</table>' '</table>'
].join('')); ].join(''));
@ -2197,7 +2197,7 @@ define([
'</tr>', '</tr>',
'<tr>', '<tr>',
'<td><div id="fms-btn-change-pwd" style="width:190px;"></div></td>', '<td><div id="fms-btn-change-pwd" style="width:190px;"></div></td>',
'<td align="right"><div id="fms-btn-delete-pwd" style="width:190px; margin-left:20px;"></div></td>', '<td align="right"><div id="fms-btn-delete-pwd" style="width:190px;"></div></td>',
'</tr>', '</tr>',
'</table>', '</table>',
'</div>', '</div>',

View file

@ -249,6 +249,34 @@
} }
} }
} }
#fms-cmb-theme {
display: inline-block;
margin-right: 15px;
vertical-align: middle;
.rtl & {
margin-right: 0;
margin-left: 15px;
}
}
#fms-chb-dark-mode {
display: inline-block;
vertical-align: middle;
margin-top: 2px;
}
#fms-cmb-macros {
display: inline-block;
margin-right: 15px;
vertical-align: middle;
.rtl & {
margin-right: 0;
margin-left: 15px;
}
}
} }
#panel-createnew { #panel-createnew {
@ -260,6 +288,10 @@
.font-weight-bold(); .font-weight-bold();
padding: 0 0 10px 10px; padding: 0 0 10px 10px;
white-space: nowrap; white-space: nowrap;
.rtl & {
padding: 0 10px 10px 0;
}
} }
@ -420,11 +452,19 @@
.help-item-wrap { .help-item-wrap {
padding: 4px 2px 4px 20px; padding: 4px 2px 4px 20px;
.rtl & {
padding: 4px 20px 4px 2px;
}
} }
.header-name { .header-name {
padding: 16px 2px 4px 10px; padding: 16px 2px 4px 10px;
font-size: 12px; font-size: 12px;
.rtl & {
padding: 16px 10px 4px 2px;
}
} }
} }
} }
@ -433,6 +473,15 @@
#file-menu-panel & { #file-menu-panel & {
padding: 0 30px; padding: 0 30px;
} }
#id-info-btn-edit {
margin-right: 10px;
.rtl & {
margin-right: 0;
margin-left: 10px;
}
}
} }
#panel-info, #panel-info,
@ -442,11 +491,19 @@
td { td {
padding: 0 20px 5px 0; padding: 0 20px 5px 0;
.rtl & {
padding: 0 0 5px 20px;
}
&.left { &.left {
padding: 5px 10px; padding: 5px 10px;
text-align: right; text-align: right;
width: 30%; width: 30%;
.rtl & {
text-align: left;
}
label { label {
.font-weight-bold(); .font-weight-bold();
} }
@ -523,22 +580,31 @@
} }
#panel-protect { #panel-protect {
label { label {
font-size: 12px; font-size: 12px;
} }
#file-menu-panel & { #file-menu-panel & {
padding: 30px 30px; padding: 30px 30px;
} }
.header { .header {
.font-weight-bold(); .font-weight-bold();
margin: 30px 0 10px; margin: 30px 0 10px;
} }
table { table {
td { td {
padding: 5px 0; padding: 5px 0;
}
}
#fms-btn-delete-pwd {
margin-left: 20px;
.rtl & {
margin-left: 0;
margin-right: 20px;
}
} }
} }
}

View file

@ -1392,7 +1392,7 @@ define([
'<td class="right"><div id="id-info-rights"></div></td>', '<td class="right"><div id="id-info-rights"></div></td>',
'</tr>', '</tr>',
'<tr class="edit-rights">', '<tr class="edit-rights">',
'<td class="left"></td><td class="right"><button id="id-info-btn-edit" class="btn normal dlg-btn primary custom" style="margin-right: 10px;">' + this.txtBtnAccessRights + '</button></td>', '<td class="left"></td><td class="right"><button id="id-info-btn-edit" class="btn normal dlg-btn primary custom">' + this.txtBtnAccessRights + '</button></td>',
'</tr>', '</tr>',
'</table>' '</table>'
].join('')); ].join(''));

View file

@ -275,6 +275,10 @@
.font-weight-bold(); .font-weight-bold();
padding: 0 0 10px 10px; padding: 0 0 10px 10px;
white-space: nowrap; white-space: nowrap;
.rtl & {
padding: 0 10px 10px 0;
}
} }
.blank-document-info { .blank-document-info {
@ -433,10 +437,18 @@
.help-item-wrap { .help-item-wrap {
padding: 4px 2px 4px 20px; padding: 4px 2px 4px 20px;
.rtl & {
padding: 4px 20px 4px 2px;
}
} }
.header-name { .header-name {
padding: 16px 2px 4px 10px; padding: 16px 2px 4px 10px;
.rtl & {
padding: 16px 10px 4px 2px;
}
} }
} }
} }
@ -452,11 +464,19 @@
td { td {
padding: 0 20px 5px 0; padding: 0 20px 5px 0;
.rtl & {
padding: 0 0 5px 20px;
}
&.left { &.left {
padding: 5px 10px; padding: 5px 10px;
text-align: right; text-align: right;
width: 30%; width: 30%;
.rtl & {
text-align: left;
}
label { label {
.font-weight-bold(); .font-weight-bold();
} }
@ -528,6 +548,14 @@
padding: 5px 0; padding: 5px 0;
} }
} }
#fms-btn-delete-pwd {
margin-left: 20px;
.rtl & {
margin-left: 0;
margin-right: 20px;
}
}
} }
} }
} }

View file

@ -266,7 +266,7 @@ define([
'<tr class="macros">', '<tr class="macros">',
'<td><label><%= scope.strMacrosSettings %></label></td>', '<td><label><%= scope.strMacrosSettings %></label></td>',
'<td>', '<td>',
'<div><div id="fms-cmb-macros" style="display: inline-block; margin-right: 15px;vertical-align: middle;"></div>', '<div><div id="fms-cmb-macros"></div>',
'</td>', '</td>',
'</tr>', '</tr>',
'<tr class ="divider-group"></tr>', '<tr class ="divider-group"></tr>',
@ -276,14 +276,14 @@ define([
'<tr class="">', '<tr class="">',
'<td><label><%= scope.strFuncLocale %></label></td>', '<td><label><%= scope.strFuncLocale %></label></td>',
'<td>', '<td>',
'<div><div id="fms-cmb-func-locale" style="display: inline-block; margin-right: 15px;vertical-align: middle;"></div>', '<div><div id="fms-cmb-func-locale"></div>',
'<label id="fms-lbl-func-locale" style="vertical-align: middle;"><%= scope.strFuncLocaleEx %></label></div></td>', '<label id="fms-lbl-func-locale"><%= scope.strFuncLocaleEx %></label></div></td>',
'</tr>', '</tr>',
'<tr>', '<tr>',
'<td><label><%= scope.txtRegion %></label></td>', '<td><label><%= scope.txtRegion %></label></td>',
'<td>', '<td>',
'<div><div id="fms-cmb-reg-settings" style="display: inline-block; margin-right: 15px;vertical-align: middle;"></div>', '<div><div id="fms-cmb-reg-settings"></div>',
'<label id="fms-lbl-reg-settings" style="vertical-align: middle;"></label></div></td>', '<label id="fms-lbl-reg-settings"></label></div></td>',
'</tr>', '</tr>',
'<tr>', '<tr>',
'<td colspan="2"><div id="fms-chb-separator-settings"></div></td>', '<td colspan="2"><div id="fms-chb-separator-settings"></div></td>',
@ -1767,7 +1767,7 @@ SSE.Views.FileMenuPanels.RecentFiles = Common.UI.BaseView.extend({
'<td class="right"><div id="id-info-rights"></div></td>', '<td class="right"><div id="id-info-rights"></div></td>',
'</tr>', '</tr>',
'<tr class="edit-rights">', '<tr class="edit-rights">',
'<td class="left"></td><td class="right"><button id="id-info-btn-edit" class="btn normal dlg-btn primary custom" style="margin-right: 10px;">' + this.txtBtnAccessRights + '</button></td>', '<td class="left"></td><td class="right"><button id="id-info-btn-edit" class="btn normal dlg-btn primary custom">' + this.txtBtnAccessRights + '</button></td>',
'</tr>', '</tr>',
'</table>' '</table>'
].join('')); ].join(''));
@ -2254,14 +2254,14 @@ SSE.Views.FileMenuPanels.RecentFiles = Common.UI.BaseView.extend({
'<tr><td><label><%= scope.txtRepeatRowsAtTop %></label></td></tr>', '<tr><td><label><%= scope.txtRepeatRowsAtTop %></label></td></tr>',
'<tr><td class="padding-small">', '<tr><td class="padding-small">',
'<table><tbody><tr>', '<table><tbody><tr>',
'<td><div id="print-txt-top" style="width: 163px; margin-right: 8px;"></div></td>', '<td><div id="print-txt-top" style="width: 163px;"></div></td>',
'<td><div id="print-presets-top" style="width: 77px;"></div></td>', '<td><div id="print-presets-top" style="width: 77px;"></div></td>',
'</tr></tbody></table>', '</tr></tbody></table>',
'</td></tr>', '</td></tr>',
'<tr><td><label><%= scope.txtRepeatColumnsAtLeft %></label></td></tr>', '<tr><td><label><%= scope.txtRepeatColumnsAtLeft %></label></td></tr>',
'<tr><td class="padding-large">', '<tr><td class="padding-large">',
'<table><tbody><tr>', '<table><tbody><tr>',
'<td><div id="print-txt-left" style="width: 163px; margin-right: 8px;"></div></td>', '<td><div id="print-txt-left" style="width: 163px;"></div></td>',
'<td><div id="print-presets-left" style="width: 77px;"></div></td>', '<td><div id="print-presets-left" style="width: 77px;"></div></td>',
'</tr></tbody></table>', '</tr></tbody></table>',
'</td></tr>', '</td></tr>',
@ -2274,8 +2274,8 @@ SSE.Views.FileMenuPanels.RecentFiles = Common.UI.BaseView.extend({
'<td><label><%= scope.txtBottom %></label></td>', '<td><label><%= scope.txtBottom %></label></td>',
'</tr>', '</tr>',
'<tr>', '<tr>',
'<td class="padding-small"><div id="print-spin-margin-top" style="margin-right: 8px;"></div></td>', '<td class="padding-small"><div id="print-spin-margin-top"></div></td>',
'<td class="padding-small"><div id="print-spin-margin-bottom" style="margin-right: 8px;"></div></td>', '<td class="padding-small"><div id="print-spin-margin-bottom"></div></td>',
'</tr>', '</tr>',
'<tr>', '<tr>',
'<td><label><%= scope.txtLeft %></label></td>', '<td><label><%= scope.txtLeft %></label></td>',
@ -2310,11 +2310,16 @@ SSE.Views.FileMenuPanels.RecentFiles = Common.UI.BaseView.extend({
'</div>', '</div>',
'</div>', '</div>',
'</div>', '</div>',
'<div id="print-preview-box" style="position: absolute; left: 280px; top: 0; right: 0; bottom: 0;" class="no-padding">', '<div id="print-preview-box" class="no-padding">',
'<div id="print-preview"></div>', '<div id="print-preview"></div>',
'<div id="print-navigation">', '<div id="print-navigation">',
'<div id="print-prev-page" style="display: inline-block; margin-right: 4px;"></div>', '<% if (!isRTL) { %>',
'<div id="print-next-page" style="display: inline-block;"></div>', '<div id="print-prev-page"></div>',
'<div id="print-next-page"></div>',
'<% } else { %>',
'<div id="print-next-page"></div>',
'<div id="print-prev-page"></div>',
'<% } %>',
'<div class="page-number">', '<div class="page-number">',
'<label><%= scope.txtPage %></label>', '<label><%= scope.txtPage %></label>',
'<div id="print-number-page"></div>', '<div id="print-number-page"></div>',
@ -2341,7 +2346,7 @@ SSE.Views.FileMenuPanels.RecentFiles = Common.UI.BaseView.extend({
render: function(node) { render: function(node) {
var me = this; var me = this;
var $markup = $(this.template({scope: this})); var $markup = $(this.template({scope: this, isRTL: Common.UI.isRTL()}));
this.cmbRange = new Common.UI.ComboBox({ this.cmbRange = new Common.UI.ComboBox({
el: $markup.findById('#print-combo-range'), el: $markup.findById('#print-combo-range'),

View file

@ -319,6 +319,24 @@
display: block; display: block;
} }
} }
#fms-cmb-macros,
#fms-cmb-func-locale,
#fms-cmb-reg-settings {
display: inline-block;
margin-right: 15px;
vertical-align: middle;
.rtl & {
margin-right: 0;
margin-left: 15px;
}
}
#fms-lbl-func-locale,
#fms-lbl-reg-settings {
vertical-align: middle;
}
} }
#panel-createnew { #panel-createnew {
@ -330,6 +348,10 @@
.font-weight-bold(); .font-weight-bold();
padding: 0 0 10px 10px; padding: 0 0 10px 10px;
white-space: nowrap; white-space: nowrap;
.rtl & {
padding: 0 10px 10px 0;
}
} }
.blank-document-info { .blank-document-info {
@ -488,10 +510,18 @@
.help-item-wrap { .help-item-wrap {
padding: 4px 2px 4px 20px; padding: 4px 2px 4px 20px;
.rtl & {
padding: 4px 20px 4px 2px;
}
} }
.header-name { .header-name {
padding: 16px 2px 4px 10px; padding: 16px 2px 4px 10px;
.rtl & {
padding: 16px 10px 4px 2px;
}
} }
} }
} }
@ -507,11 +537,19 @@
td { td {
padding: 0 20px 5px 0; padding: 0 20px 5px 0;
.rtl & {
padding: 0 0 5px 20px;
}
&.left { &.left {
padding: 5px 10px; padding: 5px 10px;
text-align: right; text-align: right;
width: 30%; width: 30%;
.rtl & {
text-align: left;
}
label { label {
.font-weight-bold(); .font-weight-bold();
} }
@ -583,6 +621,14 @@
padding: 5px 0; padding: 5px 0;
} }
} }
#fms-btn-delete-pwd {
margin-left: 20px;
.rtl & {
margin-left: 0;
margin-right: 20px;
}
}
} }
#panel-print { #panel-print {
@ -601,6 +647,11 @@
justify-content: center; justify-content: center;
align-items: center; align-items: center;
.rtl & {
right: 280px;
left: 0;
}
div { div {
text-align: center; text-align: center;
} }
@ -625,6 +676,10 @@
.footer { .footer {
.btn.primary { .btn.primary {
margin-right: 8px; margin-right: 8px;
.rtl & {
margin-right: 0;
margin-left: 8px;
}
} }
} }
.settings-container { .settings-container {
@ -658,12 +713,29 @@
} }
} }
} }
#print-txt-top,
#print-txt-left,
#print-spin-margin-top,
#print-spin-margin-bottom {
margin-right: 8px;
.rtl & {
margin-right: 0;
margin-left: 8px;
}
}
} }
#print-navigation { #print-navigation {
height: 50px; height: 50px;
padding-left: 20px; padding-left: 20px;
padding-top: 10px; padding-top: 10px;
display: flex; display: flex;
#print-prev-page {
display: inline-block;
margin-right: 4px;
}
#print-next-page {
display: inline-block;
}
.btn-prev-page, .btn-next-page { .btn-prev-page, .btn-next-page {
background-color: transparent; background-color: transparent;
padding: 0; padding: 0;
@ -703,22 +775,45 @@
align-items: center; align-items: center;
height: 20px; height: 20px;
margin-left: 10px; margin-left: 10px;
.rtl & {
margin-left: 0;
margin-right: 10px;
}
label { label {
.font-weight-bold(); .font-weight-bold();
} }
#print-count-page, #print-number-page { #print-count-page, #print-number-page {
margin-left: 4px; margin-left: 4px;
.rtl & {
margin-left: 0;
margin-right: 4px;
}
} }
} }
#print-active-sheet { #print-active-sheet {
margin-left: 12px; margin-left: 12px;
height: 20px; height: 20px;
line-height: 20px; line-height: 20px;
.rtl & {
margin-left: 0;
margin-right: 12px;
}
} }
} }
#print-preview { #print-preview {
height: calc(100% - 50px); height: calc(100% - 50px);
} }
#print-preview-box {
position: absolute;
left: 280px;
top: 0;
right: 0;
bottom: 0;
.rtl & {
right: 280px;
left: 0;
}
}
} }
} }
} }