update to 2.27.8 version

eq-3 · Mar 30, 2017 · ff030ca · ff030ca
1 parent 532edbd
commit ff030ca
Show file tree

Hide file tree

Showing 8 changed files with 45 additions and 36 deletions.
diff --git a/HMserver/opt/HMServer/HMIPServer.jar b/HMserver/opt/HMServer/HMIPServer.jar
diff --git a/HMserver/opt/HMServer/HMServer.jar b/HMserver/opt/HMServer/HMServer.jar
diff --git a/WebUI/www/config/easymodes/etc/hmipChannelConfigDialogs.tcl b/WebUI/www/config/easymodes/etc/hmipChannelConfigDialogs.tcl
@@ -693,36 +693,41 @@ proc getHeatingClimateControlTransceiver {chn p descr address {extraparam ""}} {
 
     append html "<table class=\"ProfileTbl\">"
       # left
-      incr prn
-      set param SHOW_SET_TEMPERATURE
-      array_clear options
-      set options(0) "\${stringTableClimateControlRegDisplayTempInfoActualTemp}"
-      set options(1) "\${stringTableClimateControlRegDisplayTempInfoSetPoint}"
-
-      append html "<tr>"
-        append html "<td name=\"_expertParam\" class=\"_hidden\">\${stringTableClimateControlRegDisplayTempInfo}</td>"
-        append html "<td name=\"_expertParam\" class=\"_hidden\">[get_ComboBox options $param separate_$CHANNEL\_$prn ps $param onchange=\"setDisplayMode(this)\"]</td>"
 
-        # right
+      set param SHOW_SET_TEMPERATURE
+      if { ! [catch {set tmp $ps($param)}]  } {
         incr prn
-        set param SHOW_HUMIDITY
         array_clear options
-        set options(0) "\${stringTableClimateControlRegDisplayTempHumT}"
-        set options(1) "\${stringTableClimateControlRegDisplayTempHumTH}"
-        append html "<td name=\"_expertParam\" class=\"hidden j_showHumidity\">\${stringTableClimateControlRegDisplayTempHum}</td>"
-        append html "<td name=\"_expertParam\" class=\"hidden j_showHumidity\">[get_ComboBox options $param separate_$CHANNEL\_$prn ps $param]</td>"
-      append html "</tr>"
+        set options(0) "\${stringTableClimateControlRegDisplayTempInfoActualTemp}"
+        set options(1) "\${stringTableClimateControlRegDisplayTempInfoSetPoint}"
+
+        append html "<tr>"
+          append html "<td name=\"_expertParam\" class=\"_hidden\">\${stringTableClimateControlRegDisplayTempInfo}</td>"
+          append html "<td name=\"_expertParam\" class=\"_hidden\">[get_ComboBox options $param separate_$CHANNEL\_$prn ps $param onchange=\"setDisplayMode(this)\"]</td>"
+
+          # right
+          set param SHOW_HUMIDITY
+          incr prn
+          array_clear options
+          set options(0) "\${stringTableClimateControlRegDisplayTempHumT}"
+          set options(1) "\${stringTableClimateControlRegDisplayTempHumTH}"
+          append html "<td name=\"_expertParam\" class=\"hidden j_showHumidity\">\${stringTableClimateControlRegDisplayTempHum}</td>"
+          append html "<td name=\"_expertParam\" class=\"hidden j_showHumidity\">[get_ComboBox options $param separate_$CHANNEL\_$prn ps $param]</td>"
+        append html "</tr>"
+      }
 
       # left
-      incr prn
       set param BUTTON_RESPONSE_WITHOUT_BACKLIGHT
-      append html "<tr>"
-      append html "<td name=\"expertParam\" class=\"hidden\">\${stringTableButtonResponseWithoutBacklight}</td>"
-      append html "<td name=\"expertParam\" class=\"hidden\">"
-      # append html "[_getCheckBox $CHANNEL '$param' $ps($param) $prn]"
-      append html  "[getCheckBox '$param' $ps($param) $chn $prn]"
-      append html "</td>"
-      append html "</tr>"
+      if { ! [catch {set tmp $ps($param)}]  } {
+        incr prn
+        append html "<tr>"
+        append html "<td name=\"expertParam\" class=\"hidden\">\${stringTableButtonResponseWithoutBacklight}</td>"
+        append html "<td name=\"expertParam\" class=\"hidden\">"
+        # append html "[_getCheckBox $CHANNEL '$param' $ps($param) $prn]"
+        append html  "[getCheckBox '$param' $ps($param) $chn $prn]"
+        append html "</td>"
+        append html "</tr>"
+      }
 
     append html "</table>"
 
@@ -835,15 +840,17 @@ proc getHeatingClimateControlTransceiver {chn p descr address {extraparam ""}} {
     append html "</tr>"
 
     #left
-    incr prn
     set param TEMPERATURE_WINDOW_OPEN
-    append html "<tr><td>\${stringTableTemperatureFallWindowOpen}</td>"
-      append html "<td>[getTextField $param $ps($param) $chn $prn]&nbsp;[getMinMaxValueDescr $param]<input id=\"comfortOld\" type=\"hidden\" value=\"$ps($param)\"</td>"
+    if { ! [catch {set tmp $ps($param)}]  } {
+      incr prn
+      append html "<tr><td>\${stringTableTemperatureFallWindowOpen}</td>"
+        append html "<td>[getTextField $param $ps($param) $chn $prn]&nbsp;[getMinMaxValueDescr $param]<input id=\"comfortOld\" type=\"hidden\" value=\"$ps($param)\"</td>"
 
-      append html "<script type=\"text/javascript\">"
-        append html "jQuery(\"#separate_$CHANNEL\_$prn\").bind(\"blur\",function() {ProofAndSetValue(this.id, this.id, [getMinValue $param], [getMaxValue $param], 1);isEcoLTComfort(this.name);});"
-      append html "</script>"
-    append html "</tr>"
+        append html "<script type=\"text/javascript\">"
+          append html "jQuery(\"#separate_$CHANNEL\_$prn\").bind(\"blur\",function() {ProofAndSetValue(this.id, this.id, [getMinValue $param], [getMaxValue $param], 1);isEcoLTComfort(this.name);});"
+        append html "</script>"
+      append html "</tr>"
+    }
   append html "</table>"
 
   append html "<hr>"
@@ -1494,4 +1501,4 @@ proc getClimateControlFloorDirectTransmitter {chn p descr} {
 
 proc getNoParamatersToSet {} {
   return "<tr><td class=\"CLASS22003\"><div class=\"CLASS22004\">\${deviceAndChannelParamsLblNoParamsToSet}</div></td></tr>"
-}
+}
diff --git a/WebUI/www/config/ic_linkpeerlist.cgi b/WebUI/www/config/ic_linkpeerlist.cgi
@@ -306,6 +306,7 @@ proc put_tablebody {} {
         #Bilder=====
         set sender_parent_type "unknown_device"
         set receiver_parent_type "unknown_device"
+        set sender_type ""
         set sender_index 0
         set receiver_index 0
         catch { set sender_parent_type $sender_descr(PARENT_TYPE) }

diff --git a/WebUI/www/webui/js/lang/de/translate.lang.stringtable.js b/WebUI/www/webui/js/lang/de/translate.lang.stringtable.js
@@ -888,7 +888,7 @@ jQuery.extend(true,langJSON, {
     "stringTableWeatherTemperature" : "Temperatur",
     "stringTableWeatherTitle" : "Wettersensor",
     "stringTableWeatherWindDir" : "Windrichtung",
-    "stringTableWeatherWindDirRange" : "Windrichtung Schwankungsbreite",
+    "stringTableWeatherWindDirRange" : "Windrichtung<br/>Schwankungsbreite",
     "stringTableWeatherWindSpeed" : "Windgeschwindigkeit",
     "stringTableWeatherWindSpeedResultSource" : "Art des Windgeschwindigkeitswertes",
     "stringTableWeatherWindSpeedResultSourceAverage" : "Mittelwert",

diff --git a/WebUI/www/webui/js/lang/en/translate.lang.stringtable.js b/WebUI/www/webui/js/lang/en/translate.lang.stringtable.js
@@ -888,7 +888,7 @@ jQuery.extend(true,langJSON, {
     "stringTableWeatherTemperature" : "Temperature",
     "stringTableWeatherTitle" : "Weather sensor",
     "stringTableWeatherWindDir" : "Wind direction",
-    "stringTableWeatherWindDirRange" : "Wind direction fluctuation range",
+    "stringTableWeatherWindDirRange" : "Wind direction<br/>fluctuation range",
     "stringTableWeatherWindSpeed" : "Wind velocity",
     "stringTableWeatherWindSpeedResultSource" : "Type of wind velocity value",
     "stringTableWeatherWindSpeedResultSourceAverage" : "Average",

diff --git a/WebUI/www/webui/js/lang/tr/translate.lang.stringtable.js b/WebUI/www/webui/js/lang/tr/translate.lang.stringtable.js
@@ -888,7 +888,7 @@ jQuery.extend(true, langJSON, {
     "stringTableWeatherTemperature": "Sicaklik",
     "stringTableWeatherTitle": "Su sens%F6r%FC",
     "stringTableWeatherWindDir": "R%FCzgar y%F6n%FC",
-    "stringTableWeatherWindDirRange": "R%FCzgar y%F6n%FC dalgalanma araligi",
+    "stringTableWeatherWindDirRange": "R%FCzgar y%F6n%FC<br/>dalgalanma araligi",
     "stringTableWeatherWindSpeed": "R%FCzgar hizi",
     "stringTableWeatherWindSpeedResultSource" : "Type of wind velocity value",
     "stringTableWeatherWindSpeedResultSourceAverage" : "Average",

diff --git a/WebUI/www/webui/style.css b/WebUI/www/webui/style.css
@@ -5128,7 +5128,7 @@ application {
 	font-size: 10px;
 	width:220px;
 	height:25px;
-  line-height:25px;
+  /* line-height:25px; problem with controls with a long parameter name */
 }
 
 .CLASS02532a {
@@ -5151,6 +5151,7 @@ application {
 
 .CLASS02534 {
 	float: left;
+  text-align: left;
 }
 
 .CLASS02535 {