Fixed overlapping/cut text in heating property form

implements #8607

webroot/js/dss/dss-setup-interface/dSS/config/Config.js

@@ -23,23 +23,31 @@ dSS.config.dialogSettings = {
},
'fr_CH': {
shadePropertyWindowWidth    : 685,
-        heatingPropertyWindowWidth  : 705,
+        heatingPropertyWindowWidth  : 600,
deviceSettingsWindowWidth   : 465,
finsCalibrationWindowWidth  : 600
},
'en_US': {
shadePropertyWindowWidth    : 510,
-        heatingPropertyWindowWidth  : 530,
+        heatingPropertyWindowWidth  : 520,
deviceSettingsWindowWidth   : 395,
finsCalibrationWindowWidth  : 500
},
'tr_TR': {
shadePropertyWindowWidth    : 500,
-        heatingPropertyWindowWidth  : 520,
+        heatingPropertyWindowWidth  : 550,
deviceSettingsWindowWidth   : 465,
finsCalibrationWindowWidth  : 500
+    },
+    'pt_PT': {
+        heatingPropertyWindowWidth  : 610
+    },
+    'da_DK': {
+        heatingPropertyWindowWidth  : 530
+    },
+    'it_IT': {
+        heatingPropertyWindowWidth  : 530
}
-
};
dSS.config.groups = {

webroot/js/dss/dss-setup-interface/dSS/devices/HeatingPropertyForm.js

@@ -16,10 +16,29 @@ dSS.devprops.HeatingPropertiesForm = Ext.extend(Ext.form.FormPanel, {
return;
}
+        // hack #8607
+        // some languages just can't keep it short and we can't use automatic
+        // layouting because Ext does not support labels after the input fields
+        // (i.e. %, s, etc.) which the PO wants to have
+        var inputwidth = 150;
+        var rightmarginhack = 55;
+        if (dSS.config.language === 'fr_CH') {
+            inputwidth = 180;
+        } else if (dSS.config.language === 'pt_PT') {
+            inputwidth = 185;
+        } else if (dSS.config.language === 'da_DK') {
+            inputwidth = 160;
+            rightmarginhack = 65;
+        } else if (dSS.config.language === 'it_IT') {
+            inputwidth = 195;
+        } else if (dSS.config.language === 'nl_NL') {
+            inputwidth = 155;
+        }
+
var inputXPos =
-            dSS.gthelper.getDialogConfig('heatingPropertyWindowWidth') - 205;
-        var inputwidth = 150;
+            dSS.gthelper.getDialogConfig('heatingPropertyWindowWidth') -
+            (inputwidth + rightmarginhack);
this.dSUID = config.dSUID;
this.outputMode = config.outputMode;
@@ -96,15 +115,15 @@ dSS.devprops.HeatingPropertiesForm = Ext.extend(Ext.form.FormPanel, {
this.valveProtection = new Ext.form.Checkbox(
{
-                x: inputXPos,
+                x: inputXPos - 2,
y: 72
});
items.push(this.valveProtection);
items.push(new Ext.form.Label(
{
-                text: dSS._("Disable valve protection"),
-                x: inputXPos + 20,
+                text: dSS._("Disable valve protection") + ':',
+                x: 6,
y: 78
}));
@@ -138,7 +157,7 @@ dSS.devprops.HeatingPropertiesForm = Ext.extend(Ext.form.FormPanel, {
items.push(new Ext.form.Label(
{
-                text: dSS._("Setting value in emergency mode"),
+                text: dSS._("Setting value in emergency mode") + ':' ,
x: 6,
y: 142
}));