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

[rtl] Fix settings in dialogs for DE

Browse source
This commit is contained in:
JuliaSvinareva 2022-11-09 16:58:55 +03:00
parent 79800e9db5
commit f8d9a6d5e4
12 changed files with 271 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
apps/documenteditor/main/app/view/BookmarksDialog.js
View file

@ -52,7 +52,8 @@ define([
options: {
contentWidth: 310,
height: 366,
buttons: null
buttons: null,
id: 'window-bookmarks'
},
initialize : function(options) {
@ -72,13 +73,13 @@ define([
'</tr>',
'<tr>',
'<td class="padding-large">',
'<div id="bookmarks-txt-name" style="display:inline-block;vertical-align: top;margin-right: 10px;"></div>',
'<div id="bookmarks-txt-name" class="margin-right" style="display:inline-block;vertical-align: top;"></div>',
'<button type="button" result="add" class="btn btn-text-default" id="bookmarks-btn-add" style="vertical-align: top;">', me.textAdd,'</button>',
'</td>',
'</tr>',
'<tr>',
'<td class="padding-extra-small">',
'<label class="header" style="margin-right: 10px;">', me.textSort,'</label>',
'<label class="header margin-right">', me.textSort,'</label>',
'<div id="bookmarks-radio-name"></div>',
'<div id="bookmarks-radio-location"></div>',
'</td>',
@ -90,15 +91,15 @@ define([
'</tr>',
'<tr>',
'<td class="padding-large">',
'<button type="button" class="btn btn-text-default" id="bookmarks-btn-goto" style="margin-right: 5px;">', me.textGoto,'</button>',
'<button type="button" class="btn btn-text-default" id="bookmarks-btn-goto">', me.textGoto,'</button>',
'<div style="display: inline-block; position: relative;">',
'<button type="button" class="btn btn-text-default auto dropdown-toggle move-focus" id="bookmarks-btn-link" style="min-width: 75px;" data-toggle="dropdown">', me.textGetLink,'</button>',
'<div id="id-clip-copy-box" class="dropdown-menu" style="width: 291px; left: -80px; padding: 10px;">',
'<div id="id-dlg-clip-copy"></div>',
'<button id="id-dlg-copy-btn" class="btn btn-text-default" style="margin-left: 5px; width: 86px;">' + me.textCopy + '</button>',
'<button id="id-dlg-copy-btn" class="btn btn-text-default" style="width: 86px;">' + me.textCopy + '</button>',
'</div>',
'</div>',
'<button type="button" class="btn btn-text-default" id="bookmarks-btn-delete" style="float: right;">', me.textDelete,'</button>',
'<button type="button" class="btn btn-text-default" id="bookmarks-btn-delete">', me.textDelete,'</button>',
'</td>',
'</tr>',
'<tr>',

11
apps/documenteditor/main/app/view/CaptionDialog.js
View file

@ -49,7 +49,8 @@ define([
DE.Views.CaptionDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({
options: {
contentWidth: 351,
height: 350
height: 350,
id: 'window-caption'
},
initialize : function(options) {
@ -65,7 +66,7 @@ define([
'<tr>',
'<td colspan="3" class="padding-small">',
'<label class="input-label">', me.textCaption,'</label>',
'<div id="caption-txt-caption" style="margin-right: 10px;"></div>',
'<div id="caption-txt-caption" class="margin-right"></div>',
'</td>',
'<td class="padding-small">',
'<label class="input-label">', me.textInsert,'</label>',
@ -75,10 +76,10 @@ define([
'<tr>',
'<td colspan="2" class="padding-small">',
'<label class="input-label">', me.textLabel,'</label>',
'<div id="caption-combo-label" class="input-group-nr" style="width:160px;margin-right: 10px;"></div>',
'<div id="caption-combo-label" class="input-group-nr margin-right" style="width:160px;"></div>',
'</td>',
'<td class="padding-small" style="vertical-align: bottom;">',
'<button type="button" result="add" class="btn btn-text-default" id="caption-btn-add" style="margin-right: 10px;">', me.textAdd,'</button>',
'<button type="button" result="add" class="btn btn-text-default margin-right" id="caption-btn-add">', me.textAdd,'</button>',
'</td>',
'<td class="padding-small" style="vertical-align: bottom;">',
'<button type="button" result="add" class="btn btn-text-default" id="caption-btn-delete">', me.textDelete,'</button>',
@ -107,7 +108,7 @@ define([
'<tr>',
'<td colspan="2" class="padding-small">',
'<label class="input-label">', me.textChapter,'</label>',
'<div id="caption-combo-chapter" class="input-group-nr" style="width:160px;margin-right: 10px;"></div>',
'<div id="caption-combo-chapter" class="input-group-nr margin-right" style="width:160px;"></div>',
'</td>',
'<td colspan="2" class="padding-small">',
'<label class="input-label" >', me.textSeparator,'</label>',

9
apps/documenteditor/main/app/view/CrossReferenceDialog.js
View file

@ -49,7 +49,8 @@ define([
height: 410,
style: 'min-width: 240px;',
cls: 'modal-dlg',
modal: false
modal: false,
id: 'window-cross-ref'
},
initialize : function(options) {
@ -62,11 +63,11 @@ define([
'<div class="box">',
'<table cols="2" style="width: 100%;">',
'<tr>',
'<td style="padding-right: 5px;">',
'<td class="padding-right">',
'<label class="input-label">' + this.txtType + '</label>',
'<div id="id-dlg-cross-type" class="input-group-nr" style="width: 100%;margin-bottom: 10px;"></div>',
'</td>',
'<td style="padding-left: 5px;">',
'<td class="padding-left">',
'<label class="input-label">' + this.txtReference + '</label>',
'<div id="id-dlg-cross-ref" class="input-group-nr" style="width: 100%;margin-bottom: 10px;"></div>',
'</td>',
@ -83,7 +84,7 @@ define([
'</tr>',
'<tr>',
'<td colspan="2" style="padding-bottom: 10px;">',
'<div id="id-dlg-cross-separate" style="display: inline-block;vertical-align: middle;margin-right: 10px;"></div>',
'<div id="id-dlg-cross-separate" style="display: inline-block;vertical-align: middle;"></div>',
'<div id="id-dlg-cross-separator" style="display: inline-block;vertical-align: middle;"></div>',
'</td>',
'</tr>',

5
apps/documenteditor/main/app/view/CustomColumnsDialog.js
View file

@ -50,6 +50,7 @@ define([
header: true,
style: 'min-width: 216px;',
cls: 'modal-dlg',
id: 'window-custom-columns',
buttons: ['ok', 'cancel']
},
@ -61,10 +62,10 @@ define([
this.template = [
'<div class="box" style="height: 90px;">',
'<div class="input-row" style="margin: 10px 0;">',
'<label class="input-label">' + this.textColumns + '</label><div id="custom-columns-spin-num" style="float: right;"></div>',
'<label class="input-label">' + this.textColumns + '</label><div id="custom-columns-spin-num"></div>',
'</div>',
'<div class="input-row" style="margin: 10px 0;">',
'<label class="input-label">' + this.textSpacing + '</label><div id="custom-columns-spin-spacing" style="float: right;"></div>',
'<label class="input-label">' + this.textSpacing + '</label><div id="custom-columns-spin-spacing"></div>',
'</div>',
'<div class="input-row" style="margin: 10px 0;">',
'<div id="custom-columns-separator"></div>',

5
apps/documenteditor/main/app/view/HyperlinkSettingsDialog.js
View file

@ -58,6 +58,7 @@ define([
width: 350,
style: 'min-width: 230px;',
cls: 'modal-dlg',
id: 'window-hyperlink',
buttons: ['ok', 'cancel']
},
@ -69,8 +70,8 @@ define([
this.template = [
'<div class="box" style="height: 319px;">',
'<div class="input-row" style="margin-bottom: 10px;">',
'<button type="button" class="btn btn-text-default auto" id="id-dlg-hyperlink-external" style="border-top-right-radius: 0;border-bottom-right-radius: 0;">', this.textExternal,'</button>',
'<button type="button" class="btn btn-text-default auto" id="id-dlg-hyperlink-internal" style="border-top-left-radius: 0;border-bottom-left-radius: 0;border-left-width: 0;margin-left: -1px;">', this.textInternal,'</button>',
'<button type="button" class="btn btn-text-default auto" id="id-dlg-hyperlink-external">', this.textExternal,'</button>',
'<button type="button" class="btn btn-text-default auto" id="id-dlg-hyperlink-internal">', this.textInternal,'</button>',
'</div>',
'<div id="id-external-link">',
'<div class="input-row">',

5
apps/documenteditor/main/app/view/LineNumbersDialog.js
View file

@ -51,6 +51,7 @@ define([
header: true,
style: 'min-width: 290px;',
cls: 'modal-dlg',
id: 'window-line-numbers',
buttons: ['ok', 'cancel']
},
@ -63,8 +64,8 @@ define([
'<div class="box" style="">',
'<div id="line-numbers-add-line-numbering" style="margin-bottom: 15px;"></div>',
'<div style="margin-bottom: 15px;">',
'<div style="display: inline-block; margin-right: 9px;"><label>' + this.textStartAt + '</label><div id="line-numbers-start-at"></div></div>',
'<div style="display: inline-block; margin-right: 9px;"><label>' + this.textFromText + '</label><div id="line-numbers-from-text"></div></div>',
'<div class="margin-right" style="display: inline-block;"><label>' + this.textStartAt + '</label><div id="line-numbers-start-at"></div></div>',
'<div class="margin-right" style="display: inline-block;"><label>' + this.textFromText + '</label><div id="line-numbers-from-text"></div></div>',
'<div style="display: inline-block;"><label>' + this.textCountBy + '</label><div id="line-numbers-count-by"></div></div>',
'</div>',
'<div style="margin-bottom: 8px;"><label>' + this.textNumbering + '</label></div>',

7
apps/documenteditor/main/app/view/NoteSettingsDialog.js
View file

@ -50,6 +50,7 @@ define([
options: {
contentWidth: 300,
height: 395,
id: 'window-note-settings',
buttons: null
},
@ -71,13 +72,13 @@ define([
'<tr>',
'<td class="padding-small">',
'<div id="note-settings-radio-foot" style="margin-top: 4px;display: inline-block"></div>',
'<div id="note-settings-combo-footnote" class="input-group-nr" style="display: inline-block; width:150px;float:right;"></div>',
'<div id="note-settings-combo-footnote" class="input-group-nr" style="display: inline-block; width:150px;"></div>',
'</td>',
'</tr>',
'<tr>',
'<td class="padding-large">',
'<div id="note-settings-radio-end" style="margin-top: 4px;display: inline-block"></div>',
'<div id="note-settings-combo-endnote" class="input-group-nr" style="display: inline-block; width:150px;float:right;"></div>',
'<div id="note-settings-combo-endnote" class="input-group-nr" style="display: inline-block; width:150px;"></div>',
'</td>',
'</tr>',
'<tr>',
@ -87,7 +88,7 @@ define([
'</tr>',
'<tr>',
'<td class="padding-small">',
'<div style="display: inline-block; margin-right: 10px; vertical-align: middle;">',
'<div class="margin-right" style="display: inline-block; vertical-align: middle;">',
'<label class="input-label">', me.textNumFormat,'</label>',
'<div id="note-settings-combo-format" class="input-group-nr" style="width:150px;"></div>',
'</div>','<div style="display: inline-block; vertical-align: middle;">',

10
apps/documenteditor/main/app/view/PageMarginsDialog.js
View file

@ -60,14 +60,14 @@ define([
this.template = [
'<div class="box" style="height: 245px;">',
'<div style="float: left;">',
'<div class="margins-settings">',
'<label style="font-weight: bold;">' + this.textTitle + '</label>',
'<div style="margin-top: 2px;">',
'<div style="display: inline-block;">',
'<label class="input-label">' + this.textTop + '</label>',
'<div id="page-margins-spin-top"></div>',
'</div>',
'<div style="display: inline-block; margin-left: 8px;">',
'<div class="margin-left" style="display: inline-block;">',
'<label class="input-label">' + this.textBottom + '</label>',
'<div id="page-margins-spin-bottom"></div>',
'</div>',
@ -77,7 +77,7 @@ define([
'<label class="input-label" id="margin-left-label">' + this.textLeft + '</label>',
'<div id="page-margins-spin-left"></div>',
'</div>',
'<div style="display: inline-block; margin-left: 8px;">',
'<div class="margin-left" style="display: inline-block;">',
'<label class="input-label" id="margin-right-label">' + this.textRight + '</label>',
'<div id="page-margins-spin-right"></div>',
'</div>',
@ -86,7 +86,7 @@ define([
'<label style="font-weight: bold;">' + this.textGutterPosition + '</label>',
'<div>',
'<div style="display: inline-block;" id="page-margins-spin-gutter"></div>',
'<div style="display: inline-block; margin-left: 8px;" id="page-margins-spin-gutter-position"></div>',
'<div style="display: inline-block;" id="page-margins-spin-gutter-position" class="margin-left"></div>',
'</div>',
'</div>',
'<div style="margin-top: 10px;">',
@ -98,7 +98,7 @@ define([
'<div id="page-margins-cmb-multiple-pages"></div>',
'</div>',
'</div>',
'<div style="float: right;">',
'<div class="margins-preview">',
'<label style="font-weight: bold;">' + this.textPreview + '</label>',
'<div id="page-margins-preview" style="margin-top: 2px; height: 120px; width: 162px;"></div>',
'</div>',

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

@ -68,7 +68,7 @@ define([
'</td>',
'</tr>',
'<tr>',
'<td style="padding-right: 10px;">',
'<td class="padding-right">',
'<label class="input-label">' + this.textWidth + '</label>',
'<div id="page-size-spin-width"></div>',
'</td>',

15
apps/documenteditor/main/app/view/TableOfContentsSettings.js
View file

@ -49,7 +49,8 @@ define([
DE.Views.TableOfContentsSettings = Common.Views.AdvancedSettingsWindow.extend(_.extend({
options: {
contentWidth: 500,
height: 455
height: 455,
id: 'window-table-contents'
},
initialize : function(options) {
@ -69,7 +70,7 @@ define([
'<div id="tableofcontents-chb-pages"></div>',
'</td>',
'<td rowspan="5" class="padding-small" style="vertical-align: top;">',
'<div class="canvas-box" style="width: 240px; height: 182px; float: right;position:relative;overflow:hidden;">',
'<div class="canvas-box" style="width: 240px; height: 182px; position:relative; overflow:hidden;">',
'<div id="tableofcontents-img" style="width: 230px; height: 100%;"></div>',
'</div>',
'</td>',
@ -82,7 +83,7 @@ define([
'<tr>',
'<td class="padding-large">',
'<label class="input-label">' + me.textLeader + '</label>',
'<div id="tableofcontents-combo-leader" class="input-group-nr" style="display: inline-block; width:95px; margin-left: 10px;"></div>',
'<div id="tableofcontents-combo-leader" class="input-group-nr margin-left" style="display: inline-block; width:95px;"></div>',
'</td>',
'</tr>',
'<tr>',
@ -116,11 +117,11 @@ define([
'<% } else { %>',
'<div id="tableofcontents-from-levels" style="width:220px;">',
'<label class="input-label">' + me.textLevels + '</label>',
'<div id="tableofcontents-spin-levels" style="display: inline-block; width:95px; margin-left: 10px;"></div>',
'<div id="tableofcontents-spin-levels" class="margin-left" style="display: inline-block; width:95px;"></div>',
'</div>',
'<div id="tableofcontents-from-styles" class="hidden">',
'<table><tr><td style="height: 25px;">',
'<label class="input-label" style="width: 144px; margin-left: 23px;">' + me.textStyle + '</label>',
'<label class="input-label label-style" style="width: 144px;">' + me.textStyle + '</label>',
'<label class="input-label" style="">' + me.textLevel + '</label>',
'</td></tr>',
'<tr><td>',
@ -130,8 +131,8 @@ define([
'<% } %>',
'</td>',
'<td class="padding-small" style="vertical-align: top;">',
'<label class="input-label" style="margin-left: 10px;">' + me.textStyles + '</label>',
'<div id="tableofcontents-combo-styles" class="input-group-nr" style="display: inline-block; width:95px; margin-left: 10px;"></div>',
'<label class="input-label margin-left">' + me.textStyles + '</label>',
'<div id="tableofcontents-combo-styles" class="input-group-nr margin-left" style="display: inline-block; width:95px;"></div>',
'</td>',
'</tr>',
'</table>',

6
apps/documenteditor/main/resources/less/advanced-settings.less
View file

@ -63,12 +63,6 @@
}
}
#bookmarks-radio-name {
display: inline-block;
margin-right: 10px;
vertical-align: middle;
}
#id-text-table-spn-fixed, #bookmarks-radio-location {
display: inline-block;
vertical-align: middle;

226
apps/documenteditor/main/resources/less/toolbar.less
View file

@ -267,3 +267,229 @@
}
}
}
#window-page-margins {
.margins-settings {
float: left;
.rtl & {
float: right;
}
}
.margins-preview {
float: right;
.rtl & {
float: left;
}
}
.margin-left {
margin-left: 8px;
.rtl & {
margin-left: 0;
margin-right: 8px;
}
}
}
#window-page-size {
.padding-right {
padding-right: 10px;
.rtl & {
padding-right: 0;
padding-left: 10px;
}
}
}
#window-line-numbers {
.margin-right {
margin-right: 9px;
.rtl & {
margin-right: 0;
margin-left: 9px;
}
}
}
#window-custom-columns {
#custom-columns-spin-num, #custom-columns-spin-spacing {
float: right;
.rtl & {
float: left;
}
}
}
#window-note-settings {
#note-settings-combo-footnote,
#note-settings-combo-endnote {
float: right;
.rtl & {
float: left;
}
}
.margin-right {
margin-right: 10px;
.rtl & {
margin-right: 0;
margin-left: 10px;
}
}
}
#window-table-contents {
.canvas-box {
float: right;
.rtl & {
float: left;
}
}
.margin-left {
margin-left: 10px;
.rtl & {
margin-left: 0;
margin-right: 10px;
}
}
.label-style {
margin-left: 23px;
.rtl & {
margin-left: 0;
margin-right: 23px;
}
}
}
#window-hyperlink {
#id-dlg-hyperlink-external {
border-top-right-radius: 0;
border-bottom-right-radius: 0;
.rtl & {
.border-radius(@border-radius-small);
border-top-left-radius: 0;
border-bottom-left-radius: 0;
}
}
#id-dlg-hyperlink-internal {
border-top-left-radius: 0;
border-bottom-left-radius: 0;
border-left-width: 0;
margin-left: -1px;
.rtl & {
border: @scaled-one-px-value solid @border-regular-control;
.border-radius(@border-radius-small);
margin-left: 0;
border-top-right-radius: 0;
border-bottom-right-radius: 0;
border-right-width: 0;
margin-right: -1px;
}
}
}
#window-bookmarks {
.margin-right {
margin-right: 10px;
.rtl & {
margin-right: 0;
margin-left: 10px;
}
}
#bookmarks-btn-goto {
margin-right: 5px;
.rtl & {
margin-right: 0;
margin-left: 5px;
}
}
#id-dlg-copy-btn {
margin-left: 5px;
.rtl & {
margin-left: 0;
margin-right: 5px;
}
}
#bookmarks-btn-delete {
float: right;
.rtl & {
float: left;
}
}
#bookmarks-radio-name {
display: inline-block;
margin-right: 10px;
vertical-align: middle;
.rtl & {
margin-right: 0;
margin-left: 10px;
}
}
}
#window-caption {
.margin-right {
margin-right: 10px;
.rtl & {
margin-right: 0;
margin-left: 10px;
}
}
}
#window-cross-ref {
.padding-right {
padding-right: 5px;
.rtl & {
padding-right: 0;
padding-left: 5px;
}
}
.padding-left {
padding-left: 5px;
.rtl & {
padding-left: 0;
padding-right: 5px;
}
}
#id-dlg-cross-separate {
margin-right: 10px;
.rtl & {
margin-right: 0;
margin-left: 10px;
}
}
}