From f8d9a6d5e4dd774d86701977e4a0a58fcd005c49 Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Wed, 9 Nov 2022 16:58:55 +0300 Subject: [PATCH] [rtl] Fix settings in dialogs for DE --- .../main/app/view/BookmarksDialog.js | 13 +- .../main/app/view/CaptionDialog.js | 11 +- .../main/app/view/CrossReferenceDialog.js | 9 +- .../main/app/view/CustomColumnsDialog.js | 5 +- .../main/app/view/HyperlinkSettingsDialog.js | 5 +- .../main/app/view/LineNumbersDialog.js | 5 +- .../main/app/view/NoteSettingsDialog.js | 7 +- .../main/app/view/PageMarginsDialog.js | 10 +- .../main/app/view/PageSizeDialog.js | 2 +- .../main/app/view/TableOfContentsSettings.js | 15 +- .../resources/less/advanced-settings.less | 6 - .../main/resources/less/toolbar.less | 226 ++++++++++++++++++ 12 files changed, 271 insertions(+), 43 deletions(-) diff --git a/apps/documenteditor/main/app/view/BookmarksDialog.js b/apps/documenteditor/main/app/view/BookmarksDialog.js index 1d69c9716..5a9336441 100644 --- a/apps/documenteditor/main/app/view/BookmarksDialog.js +++ b/apps/documenteditor/main/app/view/BookmarksDialog.js @@ -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([ '', '', '', - '
', + '
', '', '', '', '', '', - '', + '', '
', '
', '', @@ -90,15 +91,15 @@ define([ '', '', '', - '', + '', '
', '', '', '
', - '', + '', '', '', '', diff --git a/apps/documenteditor/main/app/view/CaptionDialog.js b/apps/documenteditor/main/app/view/CaptionDialog.js index ca5c85884..c7eae492b 100644 --- a/apps/documenteditor/main/app/view/CaptionDialog.js +++ b/apps/documenteditor/main/app/view/CaptionDialog.js @@ -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([ '', '', '', - '
', + '
', '', '', '', @@ -75,10 +76,10 @@ define([ '', '', '', - '
', + '
', '', '', - '', + '', '', '', '', @@ -107,7 +108,7 @@ define([ '', '', '', - '
', + '
', '', '', '', diff --git a/apps/documenteditor/main/app/view/CrossReferenceDialog.js b/apps/documenteditor/main/app/view/CrossReferenceDialog.js index fa8174f5c..bf58e6bc8 100644 --- a/apps/documenteditor/main/app/view/CrossReferenceDialog.js +++ b/apps/documenteditor/main/app/view/CrossReferenceDialog.js @@ -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([ '
', '', '', - '', - '', @@ -83,7 +84,7 @@ define([ '', '', '', '', diff --git a/apps/documenteditor/main/app/view/CustomColumnsDialog.js b/apps/documenteditor/main/app/view/CustomColumnsDialog.js index 8e9eacafb..f37e99785 100644 --- a/apps/documenteditor/main/app/view/CustomColumnsDialog.js +++ b/apps/documenteditor/main/app/view/CustomColumnsDialog.js @@ -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 = [ '
', '
', - '
', + '
', '
', '
', - '
', + '
', '
', '
', '
', diff --git a/apps/documenteditor/main/app/view/HyperlinkSettingsDialog.js b/apps/documenteditor/main/app/view/HyperlinkSettingsDialog.js index 9fc36273c..19f53afaf 100644 --- a/apps/documenteditor/main/app/view/HyperlinkSettingsDialog.js +++ b/apps/documenteditor/main/app/view/HyperlinkSettingsDialog.js @@ -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 = [ '
', '
', - '', - '', + '', + '', '
', '
', '', '', '', '', '', '', @@ -87,7 +88,7 @@ define([ '', '', '', '', '', - '', diff --git a/apps/documenteditor/main/app/view/TableOfContentsSettings.js b/apps/documenteditor/main/app/view/TableOfContentsSettings.js index a417d0e7c..fd7887fea 100644 --- a/apps/documenteditor/main/app/view/TableOfContentsSettings.js +++ b/apps/documenteditor/main/app/view/TableOfContentsSettings.js @@ -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([ '
', '', '', @@ -82,7 +83,7 @@ define([ '', '', '', '', @@ -116,11 +117,11 @@ define([ '<% } else { %>', '
', '', - '
', + '
', '
', '
', + '', '', '
', '
', + '', '', '
', '
', - '
', + '
', '
', '
', '
', - '
', + '
', '
', '
', - '
', + '
', '
', - '
', + '
', '', '
', '
','
', diff --git a/apps/documenteditor/main/app/view/PageMarginsDialog.js b/apps/documenteditor/main/app/view/PageMarginsDialog.js index 9a65bdb86..6fa5cd983 100644 --- a/apps/documenteditor/main/app/view/PageMarginsDialog.js +++ b/apps/documenteditor/main/app/view/PageMarginsDialog.js @@ -60,14 +60,14 @@ define([ this.template = [ '
', - '
', + '
', '', '
', '
', '', '
', '
', - '
', + '
', '', '
', '
', @@ -77,7 +77,7 @@ define([ '', '
', '
', - '
', + '
', '', '
', '
', @@ -86,7 +86,7 @@ define([ '', '
', '
', - '
', + '
', '
', '
', '
', @@ -98,7 +98,7 @@ define([ '
', '
', '
', - '
', + '
', '', '
', '
', diff --git a/apps/documenteditor/main/app/view/PageSizeDialog.js b/apps/documenteditor/main/app/view/PageSizeDialog.js index 44655c846..ef66d699b 100644 --- a/apps/documenteditor/main/app/view/PageSizeDialog.js +++ b/apps/documenteditor/main/app/view/PageSizeDialog.js @@ -68,7 +68,7 @@ define([ '
', + '', '', '
', '
', - '
', + '
', '
', '
', '
', '', - '
', + '
', '
', '', '', '', '
', - '', + '', '', '
', @@ -130,8 +131,8 @@ define([ '<% } %>', '', - '', - '
', + '', + '
', '
', diff --git a/apps/documenteditor/main/resources/less/advanced-settings.less b/apps/documenteditor/main/resources/less/advanced-settings.less index f937fc767..bc4a1fa99 100644 --- a/apps/documenteditor/main/resources/less/advanced-settings.less +++ b/apps/documenteditor/main/resources/less/advanced-settings.less @@ -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; diff --git a/apps/documenteditor/main/resources/less/toolbar.less b/apps/documenteditor/main/resources/less/toolbar.less index 9d6fe4db8..d7e949d6a 100644 --- a/apps/documenteditor/main/resources/less/toolbar.less +++ b/apps/documenteditor/main/resources/less/toolbar.less @@ -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; + } + } +}