diff --git a/apps/documenteditor/main/app/template/MailMerge.template b/apps/documenteditor/main/app/template/MailMerge.template index 1d7d07e5f..69b5c8410 100644 --- a/apps/documenteditor/main/app/template/MailMerge.template +++ b/apps/documenteditor/main/app/template/MailMerge.template @@ -32,11 +32,11 @@ -
-
-
-
-
+
+
+
+
+
@@ -62,12 +62,12 @@ -
-
-
-
- -
+
+
+
+
+ +
@@ -77,7 +77,7 @@ - + diff --git a/apps/documenteditor/main/app/view/MailMergeSettings.js b/apps/documenteditor/main/app/view/MailMergeSettings.js index 728f06278..271bfaa27 100644 --- a/apps/documenteditor/main/app/view/MailMergeSettings.js +++ b/apps/documenteditor/main/app/view/MailMergeSettings.js @@ -197,7 +197,7 @@ define([ this.btnFirst = new Common.UI.Button({ parentEl: $('#mmerge-button-first', me.$el), cls: 'btn-toolbar', - iconCls: 'toolbar__icon btn-firstitem', + iconCls: 'toolbar__icon ' + (!Common.UI.isRTL() ? 'btn-firstitem' : 'btn-lastitem'), disabled: true, value: 0, hint: this.txtFirst, @@ -211,7 +211,7 @@ define([ this.btnPrev = new Common.UI.Button({ parentEl: $('#mmerge-button-prev', me.$el), cls: 'btn-toolbar', - iconCls: 'toolbar__icon btn-previtem', + iconCls: 'toolbar__icon ' + (!Common.UI.isRTL() ? 'btn-previtem' : 'btn-nextitem'), disabled: true, value: 1, hint: this.txtPrev, @@ -225,7 +225,7 @@ define([ this.btnNext = new Common.UI.Button({ parentEl: $('#mmerge-button-next', me.$el), cls: 'btn-toolbar', - iconCls: 'toolbar__icon btn-nextitem', + iconCls: 'toolbar__icon ' + (!Common.UI.isRTL() ? 'btn-nextitem' : 'btn-previtem'), value: 2, hint: this.txtNext, lock: [_set.noRecipients, _set.lostConnect], @@ -238,7 +238,7 @@ define([ this.btnLast = new Common.UI.Button({ parentEl: $('#mmerge-button-last', me.$el), cls: 'btn-toolbar', - iconCls: 'toolbar__icon btn-lastitem', + iconCls: 'toolbar__icon ' + (!Common.UI.isRTL() ? 'btn-lastitem' : 'btn-firstitem'), value: 3, hint: this.txtLast, lock: [_set.noRecipients, _set.lostConnect], diff --git a/apps/documenteditor/main/resources/less/rightmenu.less b/apps/documenteditor/main/resources/less/rightmenu.less index 1ab8ddd59..8e8110655 100644 --- a/apps/documenteditor/main/resources/less/rightmenu.less +++ b/apps/documenteditor/main/resources/less/rightmenu.less @@ -328,6 +328,76 @@ } } } + + &#id-mail-merge-settings { + #mmerge-button-first, + #mmerge-button-prev { + display: inline-block; + margin-right: 4px; + + .rtl & { + margin-right: 0; + margin-left: 4px; + } + } + + #mmerge-field-num { + display:inline-block; + vertical-align: middle; + } + + #mmerge-button-next, + #mmerge-button-last { + display: inline-block; + margin-left: 4px; + + .rtl & { + margin-left: 0; + margin-right: 4px; + } + } + + #mmerge-radio-all, #mmerge-radio-current { + margin-bottom: 5px; + } + + #mmerge-radio-from-to { + display: inline-block; + vertical-align: middle; + margin-right: 2px; + + .rtl & { + margin-right: 0; + margin-left: 2px; + } + } + + #mmerge-field-from, #mmerge-field-to { + display: inline-block; + vertical-align: middle; + } + + .text-to-label { + width: 30px; + text-align: right; + vertical-align: middle; + margin-right: 2px; + + .rtl & { + text-align: left; + margin-right: 0; + margin-left: 2px; + } + } + + .portal-button { + text-align: right; + + .rtl & { + text-align: left; + } + } + } } .ie {