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

[rtl] Fix settings in dialogs from toolbar for PE

Browse source
This commit is contained in:
JuliaSvinareva 2022-11-25 00:15:24 +03:00
parent fb3efad88e
commit 783e40e018
8 changed files with 130 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
apps/common/main/lib/view/ListSettingsDialog.js
View file

@ -64,6 +64,7 @@ define([
height: 261,
style: 'min-width: 240px;',
cls: 'modal-dlg',
id: 'window-list-settings',
split: false,
buttons: ['ok', 'cancel']
},
@ -78,35 +79,35 @@ define([
this.template = [
'<div class="box">',
'<div style="margin-bottom: 16px;">',
'<button type="button" class="btn btn-text-default auto" id="id-dlg-list-bullet" style="border-top-right-radius: 0;border-bottom-right-radius: 0;">', this.textBulleted,'</button>',
'<button type="button" class="btn btn-text-default auto" id="id-dlg-list-numbering" style="border-top-left-radius: 0;border-bottom-left-radius: 0;border-left-width: 0;margin-left: -1px;">', this.textNumbering,'</button>',
'<button type="button" class="btn btn-text-default auto" id="id-dlg-list-bullet">', this.textBulleted,'</button>',
'<button type="button" class="btn btn-text-default auto" id="id-dlg-list-numbering">', this.textNumbering,'</button>',
'</div>',
'<div style="height:120px;">',
'<table cols="3">',
'<tr>',
'<td style="padding-right: 5px;padding-bottom: 8px;min-width: 50px;">',
'<td class="padding-right" style="padding-bottom: 8px;min-width: 50px;">',
'<label class="text">' + this.txtType + '</label>',
'</td>',
'<td style="padding-right: 5px;padding-bottom: 8px;width: 105px;">',
'<td class="padding-right" style="padding-bottom: 8px;width: 105px;">',
'<div id="id-dlg-list-numbering-format" class="input-group-nr" style="width: 105px;"></div>',
'<div id="id-dlg-list-bullet-format" class="input-group-nr" style="width: 105px;"></div>',
'</td>',
'<td style="padding-bottom: 8px;"></td>',
'</tr>',
'<tr class="image">',
'<td style="padding-right: 5px;padding-bottom: 8px;min-width: 50px;">',
'<td class="padding-right" style="padding-bottom: 8px;min-width: 50px;">',
'<label class="text">' + this.txtImport + '</label>',
'</td>',
'<td style="padding-right: 5px;padding-bottom: 8px;width: 105px;">',
'<td class="padding-right" style="padding-bottom: 8px;width: 105px;">',
'<div id="id-dlg-list-image" style="width: 105px;"></div>',
'</td>',
'<td style="padding-bottom: 8px;"></td>',
'</tr>',
'<tr>',
'<td style="padding-right: 5px;padding-bottom: 8px;min-width: 50px;">',
'<td class="padding-right" style="padding-bottom: 8px;min-width: 50px;">',
'<label class="text">' + this.txtSize + '</label>',
'</td>',
'<td style="padding-right: 5px;padding-bottom: 8px;width: 105px;">',
'<td class="padding-right" style="padding-bottom: 8px;width: 105px;">',
'<div id="id-dlg-list-size"></div>',
'</td>',
'<td style="padding-bottom: 8px;">',
@ -114,19 +115,19 @@ define([
'</td>',
'</tr>',
'<tr class="numbering">',
'<td style="padding-right: 5px;padding-bottom: 8px;min-width: 50px;">',
'<td class="padding-right" style="padding-bottom: 8px;min-width: 50px;">',
'<label class="text" style="white-space: nowrap;">' + this.txtStart + '</label>',
'</td>',
'<td style="padding-right: 5px;padding-bottom: 8px;width: 105px;">',
'<td class="padding-right" style="padding-bottom: 8px;width: 105px;">',
'<div id="id-dlg-list-start"></div>',
'</td>',
'<td style="padding-bottom: 8px;"></td>',
'</tr>',
'<tr class="color">',
'<td style="padding-right: 5px;padding-bottom: 8px;min-width: 50px;">',
'<td class="padding-right" style="padding-bottom: 8px;min-width: 50px;">',
'<label class="text">' + this.txtColor + '</label>',
'</td>',
'<td style="padding-right: 5px;padding-bottom: 8px;width: 105px;">',
'<td class="padding-right" style="padding-bottom: 8px;width: 105px;">',
'<div id="id-dlg-list-color"></div>',
'</td>',
'<td style="padding-bottom: 8px;"></td>',

39
apps/common/main/resources/less/advanced-settings-window.less
View file

@ -83,3 +83,42 @@
width:44px;
height:20px;
}
#window-list-settings {
#id-dlg-list-bullet {
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-list-numbering {
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;
}
}
.padding-right {
padding-right: 5px;
.rtl & {
padding-right: 0;
padding-left: 5px;
}
}
}

5
apps/common/main/resources/less/toolbar.less
View file

@ -211,6 +211,11 @@
-ms-flex: 1;
padding-right: 6px;
.rtl & {
padding-right: 0;
padding-left: 6px;
}
.panel:not(.active) {
display: none;
}

10
apps/presentationeditor/main/app/template/HeaderFooterDialog.template
View file

@ -3,18 +3,18 @@
<div id="hf-dlg-chb-datetime"></div>
</td></tr>
<tr><td class="padding-large">
<table id="hf-dlg-tbl-datetime" cols="2" style="margin-left: 22px;">
<table id="hf-dlg-tbl-datetime" cols="2">
<tr>
<td colspan="2" class="padding-very-small">
<div id="hf-dlg-radio-update"></div>
</td>
</tr>
<tr>
<td class="padding-small" style="padding-left: 22px;">
<td class="padding-small format-combo">
<label style="display:block;" class="input-label"><%= scope.textFormat %></label>
<div id="hf-dlg-combo-format" style="width: 100%;"></div>
</td>
<td class="padding-small" style="padding-left: 5px;">
<td class="padding-small lang-combo">
<label style="display:block;" class="input-label"><%= scope.textLang %></label>
<div id="hf-dlg-combo-lang" style="width: 100%;"></div>
</td>
@ -26,7 +26,7 @@
</tr>
<tr>
<td colspan="2">
<div id="hf-dlg-input-fixed" class="input-row" style="margin-left: 22px;"></div>
<div id="hf-dlg-input-fixed" class="input-row"></div>
</td>
</tr>
</table>
@ -38,7 +38,7 @@
<div id="hf-dlg-chb-text"></div>
</td></tr>
<tr><td class="padding-large">
<div id="hf-dlg-text" class="input-row" style="margin-left: 22px;"></div>
<div id="hf-dlg-text" class="input-row"></div>
</td></tr>
<tr><td class="padding-small"></td></tr>
<tr><td class="padding-small">

2
apps/presentationeditor/main/app/template/Toolbar.template
View file

@ -46,7 +46,7 @@
<span class="btn-slot split" id="slot-btn-changeslide"></span>
</div>
<div class="elset">
<span class="btn-slot" id="slot-btn-preview"></span>
<span class="btn-slot split" id="slot-btn-preview"></span>
</div>
</div>
<div class="separator long"></div>

7
apps/presentationeditor/main/app/view/HeaderFooterDialog.js
View file

@ -49,7 +49,8 @@ define(['text!presentationeditor/main/app/template/HeaderFooterDialog.template',
options: {
contentWidth: 360,
height: 380,
buttons: null
buttons: null,
id: 'window-header-footer'
},
initialize : function(options) {
@ -67,8 +68,8 @@ define(['text!presentationeditor/main/app/template/HeaderFooterDialog.template',
'</div>',
'<div class="separator"></div>',
'<div class="menu-panel" style="width: 130px; padding-top: 17px;">',
'<label style="display:block; margin-left: 15px;" class="input-label">' + me.textPreview + '</label>',
'<div style="width: 100px; height: 80px; padding: 5px; margin-left: 15px; border: 1px solid #AFAFAF; border-radius: 2px; background: #ffffff;">',
'<label style="display:block;" class="input-label preview-label">' + me.textPreview + '</label>',
'<div class="preview-canvas" style="width: 100px; height: 80px; padding: 5px; border: 1px solid #AFAFAF; border-radius: 2px; background: #ffffff;">',
'<div id="hf-dlg-canvas-preview" style="width: 100%;height: 100%;"></div>',
'</div>',
'</div>',

4
apps/presentationeditor/main/app/view/SlideSizeSettings.js
View file

@ -66,11 +66,11 @@ define([
'<div id="slide-size-combo" class="" style="margin-bottom: 10px;"></div>',
'<table cols="2" style="width: 100%;margin-bottom: 7px;">',
'<tr>',
'<td class="padding-small" style="padding-right: 10px;">',
'<td class="padding-small padding-right">',
'<label class="input-label" style="font-weight: bold;">' + this.textWidth + '</label>',
'<div id="slide-size-spin-width"></div>',
'</td>',
'<td class="padding-small" style="padding-left: 10px;">',
'<td class="padding-small padding-left">',
'<label class="input-label" style="font-weight: bold;">' + this.textHeight + '</label>',
'<div id="slide-size-spin-height"></div>',
'</td>',

61
apps/presentationeditor/main/resources/less/advanced-settings.less
View file

@ -61,4 +61,65 @@
}
}
#window-slide-size-settings {
.padding-right {
padding-right: 10px;
.rtl & {
padding-right: 0;
padding-left: 10px;
}
}
.padding-left {
padding-left: 10px;
.rtl & {
padding-left: 0;
padding-right: 10px;
}
}
}
#window-header-footer {
#hf-dlg-tbl-datetime,
#hf-dlg-input-fixed,
#hf-dlg-text {
margin-left: 22px;
.rtl & {
margin-left: 0;
margin-right: 22px;
}
}
.format-combo {
padding-left: 22px;
.rtl & {
padding-left: 0;
padding-right: 22px;
}
}
.lang-combo {
padding-left: 5px;
.rtl & {
padding-left: 0;
padding-right: 5px;
}
}
.preview-label,
.preview-canvas {
margin-left: 15px;
.rtl & {
margin-left: 0;
margin-right: 15px;
}
}
}