revert timeout changes and set correct style classes of the controls …

…on creation (#1513, #2516, @jp112sl)
jens-maus · Nov 18, 2023 · 005b23b · 005b23b
1 parent 0f9e825
commit 005b23b
Show file tree

Hide file tree

Showing 6 changed files with 805 additions and 98,813 deletions.
diff --git a/...root-external/patches/occu/0182-WebUI-Fix-DimmerControl-InitButtonsWithChannelState.patch b/...root-external/patches/occu/0182-WebUI-Fix-DimmerControl-InitButtonsWithChannelState.patch
@@ -0,0 +1,41 @@
+--- occu/WebUI/www/rega/esp/controls/dimmer.fn.orig
++++ occu/WebUI/www/rega/esp/controls/dimmer.fn
+@@ -65,8 +65,10 @@
+
+         WriteLine("<td class='CLASS02529'>");
+           WriteLine("<table width='100%' height='100%' cellspacing='10'>");
+-            WriteLine("<tr><td><div id='"#chnId#"On'  class='ControlBtnOn CLASS02545 j_translate'>${actionStatusControlLblOn}</div></td></tr>");
+-            WriteLine("<tr><td><div id='"#chnId#"Off' class='ControlBtnOff CLASS02545 j_translate'>${actionStatusControlLblOff}</div></td></tr>");
++            string BtnOnState="On"; string BtnOffState="Off";                                                                                                                             
++            if (iState == 0) { BtnOnState="Off"; BtnOffState="On"; }
++            WriteLine("<tr><td><div id='"#chnId#"On'  class='ControlBtn"#BtnOnState#" CLASS02545 j_translate'>${actionStatusControlLblOn}</div></td></tr>");
++            WriteLine("<tr><td><div id='"#chnId#"Off' class='ControlBtn"#BtnOffState#" CLASS02545 j_translate'>${actionStatusControlLblOff}</div></td></tr>");
+           WriteLine("</table>");
+         WriteLine("</td>");
+
+@@ -215,8 +217,10 @@
+
+         WriteLine("<td class='CLASS02529'>");
+           WriteLine("<table width='100%' height='100%' cellspacing='10'>");
+-            WriteLine("<tr><td><div id='"#chnId#"On'  class='ControlBtnOn CLASS02545 j_translate'>${actionStatusControlLblOn}</div></td></tr>");
+-            WriteLine("<tr><td><div id='"#chnId#"Off' class='ControlBtnOff CLASS02545 j_translate'>${actionStatusControlLblOff}</div></td></tr>");
++            string BtnOnState="On"; string BtnOffState="Off";                                                                                                                             
++            if (iState == 0) { BtnOnState="Off"; BtnOffState="On"; }
++            WriteLine("<tr><td><div id='"#chnId#"On'  class='ControlBtn"#BtnOnState#" CLASS02545 j_translate'>${actionStatusControlLblOn}</div></td></tr>");
++            WriteLine("<tr><td><div id='"#chnId#"Off' class='ControlBtn"#BtnOffState#" CLASS02545 j_translate'>${actionStatusControlLblOff}</div></td></tr>");
+           WriteLine("</table>");
+         WriteLine("</td>");
+
+@@ -297,8 +301,10 @@
+
+         WriteLine("<td class='CLASS02529'>");
+           WriteLine("<table width='100%' height='100%' cellspacing='10'>");
+-            WriteLine("<tr><td><div id='"#chnId#"On'  class='ControlBtnOn CLASS02545 j_translate'>${actionStatusControlLblOn}</div></td></tr>");
+-            WriteLine("<tr><td><div id='"#chnId#"Off' class='ControlBtnOff CLASS02545 j_translate'>${actionStatusControlLblOff}</div></td></tr>");
++            string BtnOnState="On"; string BtnOffState="Off";                                                                                                                             
++            if (iState == 0) { BtnOnState="Off"; BtnOffState="On"; }
++            WriteLine("<tr><td><div id='"#chnId#"On'  class='ControlBtn"#BtnOnState#" CLASS02545 j_translate'>${actionStatusControlLblOn}</div></td></tr>");
++            WriteLine("<tr><td><div id='"#chnId#"Off' class='ControlBtn"#BtnOffState#" CLASS02545 j_translate'>${actionStatusControlLblOff}</div></td></tr>");
+           WriteLine("</table>");
+         WriteLine("</td>");
+