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

[rtl] Make settings in right menu (mail merge)

Browse source
This commit is contained in:
JuliaSvinareva 2022-10-24 19:41:45 +03:00
parent d29d0d61c7
commit 98cb1e1327
3 changed files with 86 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
apps/documenteditor/main/app/template/MailMerge.template
View file

@ -32,11 +32,11 @@
</tr>
<tr>
<td class="padding-small">
<div id="mmerge-button-first" style="display: inline-block;margin-right: 4px;"></div>
<div id="mmerge-button-prev" style="display: inline-block;margin-right: 4px;"></div>
<div id="mmerge-field-num" style="display:inline-block;vertical-align: middle;"></div>
<div id="mmerge-button-next" style="display: inline-block;margin-left: 4px;"></div>
<div id="mmerge-button-last" style="display: inline-block;margin-left: 4px;"></div>
<div id="mmerge-button-first"></div>
<div id="mmerge-button-prev"></div>
<div id="mmerge-field-num"></div>
<div id="mmerge-button-next"></div>
<div id="mmerge-button-last"></div>
</td>
</tr>
<tr>
@ -62,12 +62,12 @@
</tr>
<tr>
<td class="padding-large">
<div id="mmerge-radio-all" style="margin-bottom: 5px;"></div>
<div id="mmerge-radio-current" style="margin-bottom: 5px;"></div>
<div id="mmerge-radio-from-to" style="display: inline-block;vertical-align: middle; margin-right: 2px;"></div>
<div id="mmerge-field-from" style="display: inline-block;vertical-align: middle;"></div>
<label style="width: 30px; text-align: right; vertical-align: middle; margin-right: 2px;"><%= scope.textTo %></label>
<div id="mmerge-field-to" style="display: inline-block;vertical-align: middle;"></div>
<div id="mmerge-radio-all"></div>
<div id="mmerge-radio-current"></div>
<div id="mmerge-radio-from-to"></div>
<div id="mmerge-field-from"></div>
<label class="text-to-label"><%= scope.textTo %></label>
<div id="mmerge-field-to"></div>
</td>
</tr>
</table>
@ -77,7 +77,7 @@
<button type="button" class="btn btn-text-default" id="mmerge-button-download" style="width:90px;" data-hint="1" data-hint-direction="bottom" data-hint-offset="big"><%= scope.textDownload %></button>
<button type="button" class="btn btn-text-default hidden" id="mmerge-button-merge" style="width:90px;" data-hint="1" data-hint-direction="bottom" data-hint-offset="big"><%= scope.textMerge %></button>
</td>
<td width="50%" style="text-align: right;">
<td class="portal-button" width="50%">
<button type="button" class="btn btn-text-default" id="mmerge-button-portal" style="width:90px;" data-hint="1" data-hint-direction="bottom" data-hint-offset="big"><%= scope.textPortal %></button>
</td>
</tr>

8
apps/documenteditor/main/app/view/MailMergeSettings.js
View file

@ -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],

70
apps/documenteditor/main/resources/less/rightmenu.less
View file

@ -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 {