From 4395af1008656af2b0ab5f7c2fb48725673a1a69 Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <julia.radzhabova@onlyoffice.com>
Date: Tue, 30 Aug 2022 21:54:42 +0300
Subject: [PATCH] [DE] Fix form settings

---
 .../main/app/template/FormSettings.template   | 25 +++++++++----------
 .../main/app/view/FormSettings.js             | 10 +++++---
 apps/documenteditor/main/locale/en.json       |  1 +
 3 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/apps/documenteditor/main/app/template/FormSettings.template b/apps/documenteditor/main/app/template/FormSettings.template
index 3e532db07..bf46a5a7a 100644
--- a/apps/documenteditor/main/app/template/FormSettings.template
+++ b/apps/documenteditor/main/app/template/FormSettings.template
@@ -40,11 +40,6 @@
             <div id="form-txt-help"></div>
         </td>
     </tr>
-    <tr class="form-textfield">
-        <td class="padding-small">
-            <div class="separator horizontal"></div>
-        </td>
-    </tr>
     <tr class="form-textfield">
         <td class="padding-small">
             <label class="input-label"><%= scope.textFormat %></label>
@@ -67,6 +62,8 @@
             <div class="separator horizontal"></div>
         </td>
     </tr>
+</table>
+<table cols="2">
     <tr class="form-list">
         <td colspan="2" class="padding-small">
             <label class="input-label"><%= scope.textValue %></label>
@@ -74,7 +71,7 @@
     </tr>
     <tr class="form-list" style="vertical-align: top;">
         <td class="padding-small">
-            <div id="form-txt-new-value" style="margin-right: 5px;"></div>
+            <div id="form-txt-new-value" style="width:164px; margin-right: 5px;"></div>
         </td>
         <td class="padding-small">
             <div id="form-list-add" style="margin-left: 5px;"></div>
@@ -82,7 +79,7 @@
     </tr>
     <tr class="form-list" style="vertical-align: top;">
         <td class="padding-large">
-            <div id="form-list-list" style="width:162px; height: 95px;margin-right: 5px;"></div>
+            <div id="form-list-list" style="width:164px; height: 95px;margin-right: 5px;"></div>
         </td>
         <td class="padding-large">
             <div id="form-list-delete" style="margin-bottom: 5px;margin-left: 5px;"></div>
@@ -90,6 +87,8 @@
             <div id="form-list-down" style="margin-left: 5px;"></div>
         </td>
     </tr>
+</table>
+<table cols="1">
     <tr class="form-not-image">
         <td class="padding-small">
             <div id="form-chb-fixed"></div>
@@ -124,16 +123,16 @@
 </table>
 <table cols="2">
     <tr class="form-textfield">
-        <td colspan=2>
+        <td colspan=2 style="padding-left: 22px;">
             <label class="input-label"><%= scope.textWidth %></label>
         </td>
     </tr>
     <tr class="form-textfield">
-        <td class="padding-small" width="50%">
-            <div id="form-combo-width-rule" style="width: 85px;"></div>
+        <td class="padding-small" style="padding-left: 22px;">
+            <div id="form-combo-width-rule" style="width: 82px;"></div>
         </td>
-        <td class="padding-small" width="50%">
-            <div id="form-spin-width"></div>
+        <td class="padding-small">
+            <div id="form-spin-width" style="float:right;"></div>
         </td>
     </tr>
     <tr class="form-textfield">
@@ -184,7 +183,7 @@
         </td>
     </tr>
     <tr>
-        <td class="padding-large">
+        <td class="padding-small">
             <label class="input-label" style="margin-top: 4px;"><%= scope.textBackgroundColor %></label>
             <div id="form-background-color-btn" style="display: inline-block; float: right;"></div>
         </td>
diff --git a/apps/documenteditor/main/app/view/FormSettings.js b/apps/documenteditor/main/app/view/FormSettings.js
index 905e8e977..bb03b58a7 100644
--- a/apps/documenteditor/main/app/view/FormSettings.js
+++ b/apps/documenteditor/main/app/view/FormSettings.js
@@ -224,7 +224,7 @@ define([
             this.cmbWidthRule = new Common.UI.ComboBox({
                 el: $markup.findById('#form-combo-width-rule'),
                 cls: 'input-group-nr',
-                menuStyle: 'min-width: 85px;',
+                menuStyle: 'min-width: 82px;',
                 editable: false,
                 data: this._arrWidthRule,
                 dataHint: '1',
@@ -237,7 +237,7 @@ define([
             this.spnWidth = new Common.UI.MetricSpinner({
                 el: $markup.findById('#form-spin-width'),
                 step: .1,
-                width: 85,
+                width: 82,
                 defaultUnit : "cm",
                 value: '',
                 allowAuto: false,
@@ -1317,6 +1317,9 @@ define([
                 } else
                     this._originalTextFormProps = null;
 
+                if (props.get_ComplexFormPr()) {
+                    this.labelFormName.text(this.textComplex);
+                }
                 this._noApply = false;
 
                 this.KeySettingsTd.toggleClass('padding-small', !connected);
@@ -1565,7 +1568,8 @@ define([
         textFormatSymbols: 'Allowed Symbols',
         textLetters: 'Letters',
         textDigits: 'Digits',
-        textNone: 'None'
+        textNone: 'None',
+        textComplex: 'Complex Field'
 
     }, DE.Views.FormSettings || {}));
 });
\ No newline at end of file
diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json
index 85027e766..6ece81050 100644
--- a/apps/documenteditor/main/locale/en.json
+++ b/apps/documenteditor/main/locale/en.json
@@ -1888,6 +1888,7 @@
   "DE.Views.FormSettings.textLetters": "Letters",
   "DE.Views.FormSettings.textDigits": "Digits",
   "DE.Views.FormSettings.textNone": "None",
+  "DE.Views.FormSettings.textComplex": "Complex Field",
   "DE.Views.FormsTab.capBtnCheckBox": "Checkbox",
   "DE.Views.FormsTab.capBtnComboBox": "Combo Box",
   "DE.Views.FormsTab.capBtnDownloadForm": "Download as oform",