From d285f7c8de648b20c7a2dce47f1648acae754e26 Mon Sep 17 00:00:00 2001
From: jp112sdl <>
Date: Wed, 6 Nov 2024 17:32:23 +0100
Subject: [PATCH] solution for #2897

---
 ...UI-Add-NaturalSortOrderInControlTabs.patch |  31 ++
 .../rega/pages/tabs/control/hdevichannels.htm | 316 ++++++++++++++++++
 .../pages/tabs/control/hdevichannels.htm.orig | 315 +++++++++++++++++
 .../rega/pages/tabs/control/hfuncchannels.htm | 270 +++++++++++++++
 .../pages/tabs/control/hfuncchannels.htm.orig | 270 +++++++++++++++
 .../rega/pages/tabs/control/hroomchannels.htm | 271 +++++++++++++++
 .../pages/tabs/control/hroomchannels.htm.orig | 270 +++++++++++++++
 7 files changed, 1743 insertions(+)
 create mode 100644 buildroot-external/patches/occu/0191-WebUI-Add-NaturalSortOrderInControlTabs.patch
 create mode 100755 buildroot-external/patches/occu/0191-WebUI-Add-NaturalSortOrderInControlTabs/occu/WebUI/www/rega/pages/tabs/control/hdevichannels.htm
 create mode 100755 buildroot-external/patches/occu/0191-WebUI-Add-NaturalSortOrderInControlTabs/occu/WebUI/www/rega/pages/tabs/control/hdevichannels.htm.orig
 create mode 100755 buildroot-external/patches/occu/0191-WebUI-Add-NaturalSortOrderInControlTabs/occu/WebUI/www/rega/pages/tabs/control/hfuncchannels.htm
 create mode 100755 buildroot-external/patches/occu/0191-WebUI-Add-NaturalSortOrderInControlTabs/occu/WebUI/www/rega/pages/tabs/control/hfuncchannels.htm.orig
 create mode 100755 buildroot-external/patches/occu/0191-WebUI-Add-NaturalSortOrderInControlTabs/occu/WebUI/www/rega/pages/tabs/control/hroomchannels.htm
 create mode 100755 buildroot-external/patches/occu/0191-WebUI-Add-NaturalSortOrderInControlTabs/occu/WebUI/www/rega/pages/tabs/control/hroomchannels.htm.orig

diff --git a/buildroot-external/patches/occu/0191-WebUI-Add-NaturalSortOrderInControlTabs.patch b/buildroot-external/patches/occu/0191-WebUI-Add-NaturalSortOrderInControlTabs.patch
new file mode 100644
index 0000000000..6622eeb1fb
--- /dev/null
+++ b/buildroot-external/patches/occu/0191-WebUI-Add-NaturalSortOrderInControlTabs.patch
@@ -0,0 +1,31 @@
+--- occu/WebUI/www/rega/pages/tabs/control/hdevichannels.htm.orig
++++ occu/WebUI/www/rega/pages/tabs/control/hdevichannels.htm
+@@ -28,6 +28,7 @@
+           }
+         }
+       }
++      oUser.UserTempViewIDs().SortByName(soAsc,stNatural);
+       firstSort = true;
+     }
+     system.SetSessionVar("sessionTAB1", system.GetVar("id") );
+--- occu/WebUI/www/rega/pages/tabs/control/hfuncchannels.htm.orig
++++ occu/WebUI/www/rega/pages/tabs/control/hfuncchannels.htm
+@@ -16,7 +16,7 @@
+     object oTmpArray = dom.GetObject(system.GetVar("id"));
+     if( oTmpArray )
+     {
+-      oTmpArray.SortByName();
++      oTmpArray.SortByName(soAsc,stNatural);
+       string sTmp;
+       foreach(sTmp,oTmpArray.EnumIDs())
+       {
+--- occu/WebUI/www/rega/pages/tabs/control/hroomchannels.htm.orig
++++ occu/WebUI/www/rega/pages/tabs/control/hroomchannels.htm
+@@ -40,6 +40,7 @@
+         }
+       }
+     }
++    oUser.UserTempViewIDs().SortByName(soAsc,stNatural);
+     firstSort = true;  
+   }
+   system.SetSessionVar("sessionTAB1", system.GetVar("id") );
diff --git a/buildroot-external/patches/occu/0191-WebUI-Add-NaturalSortOrderInControlTabs/occu/WebUI/www/rega/pages/tabs/control/hdevichannels.htm b/buildroot-external/patches/occu/0191-WebUI-Add-NaturalSortOrderInControlTabs/occu/WebUI/www/rega/pages/tabs/control/hdevichannels.htm
new file mode 100755
index 0000000000..45d3693705
--- /dev/null
+++ b/buildroot-external/patches/occu/0191-WebUI-Add-NaturalSortOrderInControlTabs/occu/WebUI/www/rega/pages/tabs/control/hdevichannels.htm
@@ -0,0 +1,316 @@
+<script type="text/javascript" xmlns="http://www.w3.org/1999/html">
+  Cursor.set(Cursor.WAIT);
+   iseInitUpdateArrays();
+  <%
+    boolean firstSort = false;
+    object oUser = dom.GetObject( system.GetSessionVar("sessionUserID") );
+    if( (system.GetSessionVar("sessionCTV")=="true") || (system.GetSessionVar("sessionTAB1") != system.GetVar("id")) )
+    {
+      system.SetSessionVar("sessionLS","");
+      oUser.UserTempViewIDs().RemoveAll();
+      
+      Write('iseClearLastSort();');
+
+      object oTmpArray = dom.GetObject(system.GetVar("id"));
+      if( oTmpArray )
+      {
+        string sTmp;
+        foreach(sTmp,oTmpArray.Channels())
+        {
+          object oTmp = dom.GetObject( sTmp );
+          if( oTmp )
+          {
+            boolean bHasDPs = (oTmp.DPs().EnumEnabledVisibleIDs().Length());
+            if( (bHasDPs) )
+            {
+              oUser.UserTempViewIDs().Add( oTmp.ID() );
+            }
+          }
+        }
+      }
+      oUser.UserTempViewIDs().SortByName(soAsc,stNatural);
+      firstSort = true;
+    }
+    system.SetSessionVar("sessionTAB1", system.GetVar("id") );
+  %>
+  arChns = new Array();
+  chn = null;
+</script>
+
+<img id="ajaxLoad" style="margin: 30px;" alt="Loading..." src="/ise/img/loading.gif" />
+
+<table id="tblHDeviChannel" class="filterTable CLASS03500 j_translate" cellpadding="0" cellspacing="0" border="1" >
+  <colgroup>
+     <col style="width:12%;"/>
+     <col style="width:10%;"/>
+     <col style="width:10%;"/>
+     <col style="width:10%;"/>
+     <col style="width:58%;"/>
+  </colgroup>
+  <tr>
+  <%string sCssName="Sort"; if(system.GetSessionVar("sessionLS")=="name"){sCssName="SortSelected";} %>
+  <th><div id="name" class="pt11 <%Write(sCssName); %>" onclick="IseSort(arChns,'name',true);">${thChannel}</div></th>
+  <%string sCssName="Sort"; if(system.GetSessionVar("sessionLS")=="room"){sCssName="SortSelected";} %>
+  <th><div id="room" class="pt11 <%Write(sCssName); %>" onclick="IseSort(arChns,'room',true);">${thRoom}</div></th>
+  <%string sCssName="Sort"; if(system.GetSessionVar("sessionLS")=="func"){sCssName="SortSelected";} %>
+  <th><div id="func" class="pt11 <%Write(sCssName); %>" onclick="IseSort(arChns,'func',true);">${thFunc}</div></th>
+  <th>${thLastChange}</th>
+  <th>${thControl}</th>
+  </tr>
+  <%
+    Write("<script type='text/javascript'>");
+      Write("translatePage('#tblHDeviChannel');");
+    Write("</script>");
+  %>
+  <tr>
+  <td class="CLASS03501">
+    <div id="btnFilterName" class="FilterBtn">${thFilter}</div>
+    <div class="FilterSubMenu" id="btnFilterNameSub" style="display:none">
+        <input id="ftName" onkeypress="iseSFilterCheckEnterEsc(event.keyCode, 'ftSetNameBtn', 'ftCancelNameBtn')" type="text" size="15" class="CLASS03503" />
+        <div id="ftSetNameBtn" class='FilterSetButton CLASS03504' onclick="setSFilter(fltHD, 'ftName', FIL_NAME);updateTable();$('btnFilterNameSub').hide();" >${filterSet}</div>
+        <div id="ftCancelNameBtn" class='FilterSetButton' onclick="$('btnFilterNameSub').hide();">${filterClose}</div>
+    </div>
+  </td>
+  <td class="CLASS03501">
+    <div id="btnFilterRoom" class="FilterBtn">${thFilter}</div>
+    <div class="FilterSubMenu" id="btnFilterRoomSub" style="display:none">
+      <% 
+        Write("<table class='CLASS03505'>");
+        object obj = dom.GetObject(ID_ROOMS);
+        if ( obj ) {
+          string tmp = "";
+          foreach( tmp, obj.EnumEnabledIDs() ) {
+            object elem = dom.GetObject(tmp);
+            if (elem) {
+              string divId = "rdiv"#tmp;
+                Write("<tr>");
+                  Write("<td  class='CLASS03506'>"#elem.Name()#"</td>");
+                  Write("<td  class='CLASS03506'><input type='checkbox' id='hd"#elem.ID()#"'/></td>");
+                Write("</tr>");
+            }
+          }
+        }
+        Write("</table>");
+        Write("<div class='FilterSetButton' onclick='setAFilter(fltHD, \"rooms\");updateTable();$(\"btnFilterRoomSub\").hide();'>${filterSet}</div>");
+        Write("<div class='FilterSetButton' onclick='$(\"btnFilterRoomSub\").hide();'>${filterClose}</div>");
+      %>
+    </div>
+  </td>
+  <td class="CLASS03501">
+    <div id="btnFilterFunc" class="FilterBtn">${thFilter}</div>
+    <div class="FilterSubMenu" id="btnFilterFuncSub" style="display:none">
+      <% 
+        Write("<table class='CLASS03505'>");
+        object obj = dom.GetObject(ID_FUNCTIONS);
+        if ( obj ) {
+          string tmp = "";
+          foreach( tmp, obj.EnumEnabledIDs() ) {
+            object elem = dom.GetObject(tmp);
+            if (elem) {
+              string divId = "rdiv"#tmp;
+                Write("<tr>");
+                  Write("<td  class='CLASS03506'>"#elem.Name()#"</td>");
+                  Write("<td  class='CLASS03506'><input type='checkbox' id='hd"#elem.ID()#"'/></td>");
+                Write("</tr>");
+            }
+          }
+        }
+        Write("</table>");
+        Write("<div class='FilterSetButton' onclick='setAFilter(fltHD, \"funcs\");updateTable();$(\"btnFilterFuncSub\").hide();'>${filterSet}</div>");
+        Write("<div class='FilterSetButton' onclick='$(\"btnFilterFuncSub\").hide();'>${filterClose}</div>");
+      %>
+    </div>
+  </td>
+  <td class="CLASS03501">
+  </td>
+  <td class="CLASS03501">
+  </td>
+  </tr>
+   <%
+
+    object oUser = dom.GetObject( system.GetSessionVar('sessionUserID'));
+    integer userID = oUser.ID();
+    object user = dom.GetObject(userID);
+    integer virtChnCounter = 0;
+    
+    object device = dom.GetObject(system.GetVar("id"));
+    if (device) {
+      if (device.Visible()) {
+        string sEnumUserIDs = oUser.UserTempViewIDs().EnumIDs();
+        string sEnumUserInternalIDs = "";
+        if( system.IsSessionVar("sessionSIDC") ) {
+          if( system.GetSessionVar("sessionSIDC") == "1" ) {
+           sEnumUserInternalIDs = oUser.UserTempViewIDs().EnumEnabledInternalIDs();
+          }
+        }
+        if( sEnumUserInternalIDs != "" ) {
+          if( sEnumUserIDs != "" ) {
+            sEnumUserIDs = sEnumUserIDs # "\t" # sEnumUserInternalIDs;
+          } else {
+            sEnumUserIDs = sEnumUserInternalIDs;
+          }
+        }
+        string tmp;
+        foreach(tmp, sEnumUserIDs) {
+          object chn = dom.GetObject(tmp);
+          object oDev = dom.GetObject(chn.Device());
+          string oDevHssType = oDev.HssType();
+
+          integer chNumber = chn.ChnNumber();
+
+          ! Determine the name of the interface
+          integer iFaceID = chn.Interface();
+          object oIface = dom.GetObject(iFaceID);
+          string sInterface = oIface.Name();
+
+          boolean bShow = false;
+          if (chn.Visible() && (chn.UserAccessRights(iulOtherThanAdmin) == iarFullAccess)) {
+            bShow = true;
+          }
+         
+          boolean bShowChannel = false;
+          if (user.UserEasyLinkMode() != true) {
+            ! User is expert
+            bShowChannel = true;
+          } else {
+            if (chn.HssType().Find("VIRTUAL_") == -1) {
+                ! not a virtual channel
+                bShowChannel = true;        
+            } else {
+              if (chn.HssType().Find("VIRTUAL_KEY") != -1) { 
+                ! virtual key of the ccu 
+                bShowChannel = true;        
+              }
+            }
+          }
+
+          if ((sInterface != "HmIP-RF") && (sInterface != "VirtualDevices")) {
+            Call("/esp/functions.fn::showHideRFChannel()");
+          } else {
+            Call("/esp/functions.fn::showHideHmIPChannel()");
+          }
+          if( bShow && oDev.ReadyConfig() && bShowChannel )
+          {
+            string trId = device.ID()#tmp;
+            boolean showExtDesc = false;
+            Write("<tr id='"#trId#"'>");
+            if( oUser && oUser.UserLevel() == iulAdmin ) {
+              Write("<td class='GrayBkg CLASS03905' name='devName' onclick='DeviceListPage.showConfiguration(event, \"CHANNEL\", "#chn.ID()#");' onmouseover='this.className=\"DeviceListRow_Highlight\";' onmouseout='this.className=\"DeviceListRow\";'>");
+            } else {
+              Write("<td class='GrayBkg' name='devName'>");
+            }
+
+            Call("/pages/tabs/control/function.fn::ShowExtDesc()");
+
+            if (showExtDesc == false) {
+              Write(chn.Name()#"<br/><br><span name='hssType' class='hidden'>${chType_"#chn.HssType()#"}</span>");
+            }
+
+            Write("</td>");
+            Write("<td class='GrayBkg'>");
+            string rooms = "";
+            string roomTmp = "";
+            string roomIDs = "";
+            foreach(roomTmp, chn.ChnRoom()) {
+              object objTmp = dom.GetObject(roomTmp);
+              rooms = rooms # objTmp.Name() # "<br />";
+              roomIDs = roomIDs # objTmp.ID() # '\t';
+            }
+            Write(rooms);
+            Write("</td>");
+            Write("<td class='GrayBkg'>");
+            string functions = "";
+            string funcTmp = "";
+            string funcIDs = "";
+            foreach(funcTmp, chn.ChnFunction()) {
+              object objTmp = dom.GetObject(funcTmp);
+              functions = functions # objTmp.Name() # "<br />";
+              funcIDs = funcIDs # objTmp.ID() # '\t';
+            }
+            Write(functions);
+            Write("</td>");
+            Write("<td class='GrayBkg'>");
+            
+            Write("<table style='width:100%;'>");
+            Write("<tr><td class='CLASS03502'><span id='tmc"#chn.ID()#"' name='timeStamp'>");
+            
+            integer cId = chn.ID();
+            string sLastTime = "";
+            Call("/esp/system.fn::getLastTime()");
+            Write(sLastTime);
+            
+            Write("</span></td></tr>");
+            Write( '<tr><td style="text-align:center;" class="CLASS03502">' );
+            string sDisplay = 'none';
+            if( chn.WorkingDPState() ) { sDisplay = "inline"; }
+            Write( '<span id="work'#cId#'" style="display:'#sDisplay#';"><img src="/ise/img/pinion_gears_32.png" /></span>' );
+            sDisplay = 'none';
+            if( chn.ExistServiceMsg() ) { sDisplay = "inline"; }
+            Write( '<span id="warn'#cId#'" style="display:'#sDisplay#'"><img name="attention" src="/ise/img/warning.png"/></span>' );
+            Write( '</td></tr></table>' );
+            
+            Write("</td>");
+            Write("<td id='dpc"#chn.ID()#"' class='GrayBkg'>");
+            
+            integer cId = chn.ID();
+            string sCtrlId = "";
+            integer iStatusOnly = 0;
+            boolean bSliderFlag = true;
+            Call("/esp/datapointconfigurator.fn::dcCreate()");
+            
+            Write("</td>");           
+            Write("</tr>");
+            
+            Write("<script type='text/javascript'>");
+            Write("var o = buildObj('"#chn.ID()#"','"#trId#"','"#sCtrlId#"','"#chn.Name()#"','"#rooms#"','"#functions#"','"#roomIDs#"', '"#funcIDs#"');");
+
+            Write("arChns[arChns.length] = o;");
+            Write("if (!fltHD.objPassFilter(o ))");
+            Write("hide(o['trid']);");
+            Call("/esp/system.fn::writeWarnStateJS()");
+            Write("</script>");
+          }
+        }
+      }
+    }
+    
+  %>
+  <script type="text/javascript">
+    Cursor.set(Cursor.NORMAL);
+  </script>
+</table>
+<script type="text/javascript">
+  <%
+    if(firstSort)
+    {
+      Write("//IseSort(arChns,'name',true);");
+    }
+  %>
+  colorFilterBtns(fltHD);
+  var mouseOpts = {
+    onTopOver: function(divToShow) {
+      selectFilters(fltHD, divToShow);
+    }
+  };  
+  new iseSubMenuControl("btnFilterRoom", "btnFilterRoomSub", "divRTD",  {d:2}, mouseOpts, false, true);
+  new iseSubMenuControl("btnFilterName", "btnFilterNameSub", "divRTD",  {d:2}, mouseOpts, false, true);
+  new iseSubMenuControl("btnFilterFunc", "btnFilterFuncSub", "divRTD",  {d:2}, mouseOpts, false, true);
+
+  jQuery("#btnFilterName").click(function(){
+    jQuery("#ftName").focus();
+  });
+
+ jQuery("#ajaxLoad").hide();
+
+ jQuery("[name='attention']").data('powertip', '<div>'+translateKey("lblSeeServiceMessage")+'</div>').powerTip();
+
+  translatePage("#tblHDeviChannel", function () {
+    jQuery("[name='hssType']").each(function(index, elm) {
+      var chText = jQuery(elm).text();
+      if (chText.indexOf("chType_") == -1) {
+        jQuery(elm).show();
+      }
+    });
+  });
+
+</script>
diff --git a/buildroot-external/patches/occu/0191-WebUI-Add-NaturalSortOrderInControlTabs/occu/WebUI/www/rega/pages/tabs/control/hdevichannels.htm.orig b/buildroot-external/patches/occu/0191-WebUI-Add-NaturalSortOrderInControlTabs/occu/WebUI/www/rega/pages/tabs/control/hdevichannels.htm.orig
new file mode 100755
index 0000000000..104f63b314
--- /dev/null
+++ b/buildroot-external/patches/occu/0191-WebUI-Add-NaturalSortOrderInControlTabs/occu/WebUI/www/rega/pages/tabs/control/hdevichannels.htm.orig
@@ -0,0 +1,315 @@
+<script type="text/javascript" xmlns="http://www.w3.org/1999/html">
+  Cursor.set(Cursor.WAIT);
+   iseInitUpdateArrays();
+  <%
+    boolean firstSort = false;
+    object oUser = dom.GetObject( system.GetSessionVar("sessionUserID") );
+    if( (system.GetSessionVar("sessionCTV")=="true") || (system.GetSessionVar("sessionTAB1") != system.GetVar("id")) )
+    {
+      system.SetSessionVar("sessionLS","");
+      oUser.UserTempViewIDs().RemoveAll();
+      
+      Write('iseClearLastSort();');
+
+      object oTmpArray = dom.GetObject(system.GetVar("id"));
+      if( oTmpArray )
+      {
+        string sTmp;
+        foreach(sTmp,oTmpArray.Channels())
+        {
+          object oTmp = dom.GetObject( sTmp );
+          if( oTmp )
+          {
+            boolean bHasDPs = (oTmp.DPs().EnumEnabledVisibleIDs().Length());
+            if( (bHasDPs) )
+            {
+              oUser.UserTempViewIDs().Add( oTmp.ID() );
+            }
+          }
+        }
+      }
+      firstSort = true;
+    }
+    system.SetSessionVar("sessionTAB1", system.GetVar("id") );
+  %>
+  arChns = new Array();
+  chn = null;
+</script>
+
+<img id="ajaxLoad" style="margin: 30px;" alt="Loading..." src="/ise/img/loading.gif" />
+
+<table id="tblHDeviChannel" class="filterTable CLASS03500 j_translate" cellpadding="0" cellspacing="0" border="1" >
+  <colgroup>
+     <col style="width:12%;"/>
+     <col style="width:10%;"/>
+     <col style="width:10%;"/>
+     <col style="width:10%;"/>
+     <col style="width:58%;"/>
+  </colgroup>
+  <tr>
+  <%string sCssName="Sort"; if(system.GetSessionVar("sessionLS")=="name"){sCssName="SortSelected";} %>
+  <th><div id="name" class="pt11 <%Write(sCssName); %>" onclick="IseSort(arChns,'name',true);">${thChannel}</div></th>
+  <%string sCssName="Sort"; if(system.GetSessionVar("sessionLS")=="room"){sCssName="SortSelected";} %>
+  <th><div id="room" class="pt11 <%Write(sCssName); %>" onclick="IseSort(arChns,'room',true);">${thRoom}</div></th>
+  <%string sCssName="Sort"; if(system.GetSessionVar("sessionLS")=="func"){sCssName="SortSelected";} %>
+  <th><div id="func" class="pt11 <%Write(sCssName); %>" onclick="IseSort(arChns,'func',true);">${thFunc}</div></th>
+  <th>${thLastChange}</th>
+  <th>${thControl}</th>
+  </tr>
+  <%
+    Write("<script type='text/javascript'>");
+      Write("translatePage('#tblHDeviChannel');");
+    Write("</script>");
+  %>
+  <tr>
+  <td class="CLASS03501">
+    <div id="btnFilterName" class="FilterBtn">${thFilter}</div>
+    <div class="FilterSubMenu" id="btnFilterNameSub" style="display:none">
+        <input id="ftName" onkeypress="iseSFilterCheckEnterEsc(event.keyCode, 'ftSetNameBtn', 'ftCancelNameBtn')" type="text" size="15" class="CLASS03503" />
+        <div id="ftSetNameBtn" class='FilterSetButton CLASS03504' onclick="setSFilter(fltHD, 'ftName', FIL_NAME);updateTable();$('btnFilterNameSub').hide();" >${filterSet}</div>
+        <div id="ftCancelNameBtn" class='FilterSetButton' onclick="$('btnFilterNameSub').hide();">${filterClose}</div>
+    </div>
+  </td>
+  <td class="CLASS03501">
+    <div id="btnFilterRoom" class="FilterBtn">${thFilter}</div>
+    <div class="FilterSubMenu" id="btnFilterRoomSub" style="display:none">
+      <% 
+        Write("<table class='CLASS03505'>");
+        object obj = dom.GetObject(ID_ROOMS);
+        if ( obj ) {
+          string tmp = "";
+          foreach( tmp, obj.EnumEnabledIDs() ) {
+            object elem = dom.GetObject(tmp);
+            if (elem) {
+              string divId = "rdiv"#tmp;
+                Write("<tr>");
+                  Write("<td  class='CLASS03506'>"#elem.Name()#"</td>");
+                  Write("<td  class='CLASS03506'><input type='checkbox' id='hd"#elem.ID()#"'/></td>");
+                Write("</tr>");
+            }
+          }
+        }
+        Write("</table>");
+        Write("<div class='FilterSetButton' onclick='setAFilter(fltHD, \"rooms\");updateTable();$(\"btnFilterRoomSub\").hide();'>${filterSet}</div>");
+        Write("<div class='FilterSetButton' onclick='$(\"btnFilterRoomSub\").hide();'>${filterClose}</div>");
+      %>
+    </div>
+  </td>
+  <td class="CLASS03501">
+    <div id="btnFilterFunc" class="FilterBtn">${thFilter}</div>
+    <div class="FilterSubMenu" id="btnFilterFuncSub" style="display:none">
+      <% 
+        Write("<table class='CLASS03505'>");
+        object obj = dom.GetObject(ID_FUNCTIONS);
+        if ( obj ) {
+          string tmp = "";
+          foreach( tmp, obj.EnumEnabledIDs() ) {
+            object elem = dom.GetObject(tmp);
+            if (elem) {
+              string divId = "rdiv"#tmp;
+                Write("<tr>");
+                  Write("<td  class='CLASS03506'>"#elem.Name()#"</td>");
+                  Write("<td  class='CLASS03506'><input type='checkbox' id='hd"#elem.ID()#"'/></td>");
+                Write("</tr>");
+            }
+          }
+        }
+        Write("</table>");
+        Write("<div class='FilterSetButton' onclick='setAFilter(fltHD, \"funcs\");updateTable();$(\"btnFilterFuncSub\").hide();'>${filterSet}</div>");
+        Write("<div class='FilterSetButton' onclick='$(\"btnFilterFuncSub\").hide();'>${filterClose}</div>");
+      %>
+    </div>
+  </td>
+  <td class="CLASS03501">
+  </td>
+  <td class="CLASS03501">
+  </td>
+  </tr>
+   <%
+
+    object oUser = dom.GetObject( system.GetSessionVar('sessionUserID'));
+    integer userID = oUser.ID();
+    object user = dom.GetObject(userID);
+    integer virtChnCounter = 0;
+    
+    object device = dom.GetObject(system.GetVar("id"));
+    if (device) {
+      if (device.Visible()) {
+        string sEnumUserIDs = oUser.UserTempViewIDs().EnumIDs();
+        string sEnumUserInternalIDs = "";
+        if( system.IsSessionVar("sessionSIDC") ) {
+          if( system.GetSessionVar("sessionSIDC") == "1" ) {
+           sEnumUserInternalIDs = oUser.UserTempViewIDs().EnumEnabledInternalIDs();
+          }
+        }
+        if( sEnumUserInternalIDs != "" ) {
+          if( sEnumUserIDs != "" ) {
+            sEnumUserIDs = sEnumUserIDs # "\t" # sEnumUserInternalIDs;
+          } else {
+            sEnumUserIDs = sEnumUserInternalIDs;
+          }
+        }
+        string tmp;
+        foreach(tmp, sEnumUserIDs) {
+          object chn = dom.GetObject(tmp);
+          object oDev = dom.GetObject(chn.Device());
+          string oDevHssType = oDev.HssType();
+
+          integer chNumber = chn.ChnNumber();
+
+          ! Determine the name of the interface
+          integer iFaceID = chn.Interface();
+          object oIface = dom.GetObject(iFaceID);
+          string sInterface = oIface.Name();
+
+          boolean bShow = false;
+          if (chn.Visible() && (chn.UserAccessRights(iulOtherThanAdmin) == iarFullAccess)) {
+            bShow = true;
+          }
+         
+          boolean bShowChannel = false;
+          if (user.UserEasyLinkMode() != true) {
+            ! User is expert
+            bShowChannel = true;
+          } else {
+            if (chn.HssType().Find("VIRTUAL_") == -1) {
+                ! not a virtual channel
+                bShowChannel = true;        
+            } else {
+              if (chn.HssType().Find("VIRTUAL_KEY") != -1) { 
+                ! virtual key of the ccu 
+                bShowChannel = true;        
+              }
+            }
+          }
+
+          if ((sInterface != "HmIP-RF") && (sInterface != "VirtualDevices")) {
+            Call("/esp/functions.fn::showHideRFChannel()");
+          } else {
+            Call("/esp/functions.fn::showHideHmIPChannel()");
+          }
+          if( bShow && oDev.ReadyConfig() && bShowChannel )
+          {
+            string trId = device.ID()#tmp;
+            boolean showExtDesc = false;
+            Write("<tr id='"#trId#"'>");
+            if( oUser && oUser.UserLevel() == iulAdmin ) {
+              Write("<td class='GrayBkg CLASS03905' name='devName' onclick='DeviceListPage.showConfiguration(event, \"CHANNEL\", "#chn.ID()#");' onmouseover='this.className=\"DeviceListRow_Highlight\";' onmouseout='this.className=\"DeviceListRow\";'>");
+            } else {
+              Write("<td class='GrayBkg' name='devName'>");
+            }
+
+            Call("/pages/tabs/control/function.fn::ShowExtDesc()");
+
+            if (showExtDesc == false) {
+              Write(chn.Name()#"<br/><br><span name='hssType' class='hidden'>${chType_"#chn.HssType()#"}</span>");
+            }
+
+            Write("</td>");
+            Write("<td class='GrayBkg'>");
+            string rooms = "";
+            string roomTmp = "";
+            string roomIDs = "";
+            foreach(roomTmp, chn.ChnRoom()) {
+              object objTmp = dom.GetObject(roomTmp);
+              rooms = rooms # objTmp.Name() # "<br />";
+              roomIDs = roomIDs # objTmp.ID() # '\t';
+            }
+            Write(rooms);
+            Write("</td>");
+            Write("<td class='GrayBkg'>");
+            string functions = "";
+            string funcTmp = "";
+            string funcIDs = "";
+            foreach(funcTmp, chn.ChnFunction()) {
+              object objTmp = dom.GetObject(funcTmp);
+              functions = functions # objTmp.Name() # "<br />";
+              funcIDs = funcIDs # objTmp.ID() # '\t';
+            }
+            Write(functions);
+            Write("</td>");
+            Write("<td class='GrayBkg'>");
+            
+            Write("<table style='width:100%;'>");
+            Write("<tr><td class='CLASS03502'><span id='tmc"#chn.ID()#"' name='timeStamp'>");
+            
+            integer cId = chn.ID();
+            string sLastTime = "";
+            Call("/esp/system.fn::getLastTime()");
+            Write(sLastTime);
+            
+            Write("</span></td></tr>");
+            Write( '<tr><td style="text-align:center;" class="CLASS03502">' );
+            string sDisplay = 'none';
+            if( chn.WorkingDPState() ) { sDisplay = "inline"; }
+            Write( '<span id="work'#cId#'" style="display:'#sDisplay#';"><img src="/ise/img/pinion_gears_32.png" /></span>' );
+            sDisplay = 'none';
+            if( chn.ExistServiceMsg() ) { sDisplay = "inline"; }
+            Write( '<span id="warn'#cId#'" style="display:'#sDisplay#'"><img name="attention" src="/ise/img/warning.png"/></span>' );
+            Write( '</td></tr></table>' );
+            
+            Write("</td>");
+            Write("<td id='dpc"#chn.ID()#"' class='GrayBkg'>");
+            
+            integer cId = chn.ID();
+            string sCtrlId = "";
+            integer iStatusOnly = 0;
+            boolean bSliderFlag = true;
+            Call("/esp/datapointconfigurator.fn::dcCreate()");
+            
+            Write("</td>");           
+            Write("</tr>");
+            
+            Write("<script type='text/javascript'>");
+            Write("var o = buildObj('"#chn.ID()#"','"#trId#"','"#sCtrlId#"','"#chn.Name()#"','"#rooms#"','"#functions#"','"#roomIDs#"', '"#funcIDs#"');");
+
+            Write("arChns[arChns.length] = o;");
+            Write("if (!fltHD.objPassFilter(o ))");
+            Write("hide(o['trid']);");
+            Call("/esp/system.fn::writeWarnStateJS()");
+            Write("</script>");
+          }
+        }
+      }
+    }
+    
+  %>
+  <script type="text/javascript">
+    Cursor.set(Cursor.NORMAL);
+  </script>
+</table>
+<script type="text/javascript">
+  <%
+    if(firstSort)
+    {
+      Write("//IseSort(arChns,'name',true);");
+    }
+  %>
+  colorFilterBtns(fltHD);
+  var mouseOpts = {
+    onTopOver: function(divToShow) {
+      selectFilters(fltHD, divToShow);
+    }
+  };  
+  new iseSubMenuControl("btnFilterRoom", "btnFilterRoomSub", "divRTD",  {d:2}, mouseOpts, false, true);
+  new iseSubMenuControl("btnFilterName", "btnFilterNameSub", "divRTD",  {d:2}, mouseOpts, false, true);
+  new iseSubMenuControl("btnFilterFunc", "btnFilterFuncSub", "divRTD",  {d:2}, mouseOpts, false, true);
+
+  jQuery("#btnFilterName").click(function(){
+    jQuery("#ftName").focus();
+  });
+
+ jQuery("#ajaxLoad").hide();
+
+ jQuery("[name='attention']").data('powertip', '<div>'+translateKey("lblSeeServiceMessage")+'</div>').powerTip();
+
+  translatePage("#tblHDeviChannel", function () {
+    jQuery("[name='hssType']").each(function(index, elm) {
+      var chText = jQuery(elm).text();
+      if (chText.indexOf("chType_") == -1) {
+        jQuery(elm).show();
+      }
+    });
+  });
+
+</script>
diff --git a/buildroot-external/patches/occu/0191-WebUI-Add-NaturalSortOrderInControlTabs/occu/WebUI/www/rega/pages/tabs/control/hfuncchannels.htm b/buildroot-external/patches/occu/0191-WebUI-Add-NaturalSortOrderInControlTabs/occu/WebUI/www/rega/pages/tabs/control/hfuncchannels.htm
new file mode 100755
index 0000000000..69725cde11
--- /dev/null
+++ b/buildroot-external/patches/occu/0191-WebUI-Add-NaturalSortOrderInControlTabs/occu/WebUI/www/rega/pages/tabs/control/hfuncchannels.htm
@@ -0,0 +1,270 @@
+<script type="text/javascript">
+  Cursor.set(Cursor.WAIT);
+  iseInitUpdateArrays();
+
+<%
+  boolean firstSort = false;
+  
+  object oUser = dom.GetObject( system.GetSessionVar("sessionUserID") );
+  if( (system.GetSessionVar("sessionCTV")=="true") || (system.GetSessionVar("sessionTAB1") != system.GetVar("id")) )
+  {
+    system.SetSessionVar("sessionLS","");
+    oUser.UserTempViewIDs().RemoveAll();
+    
+    Write('iseClearLastSort();');
+
+    object oTmpArray = dom.GetObject(system.GetVar("id"));
+    if( oTmpArray )
+    {
+      oTmpArray.SortByName(soAsc,stNatural);
+      string sTmp;
+      foreach(sTmp,oTmpArray.EnumIDs())
+      {
+        object oTmp = dom.GetObject( sTmp );
+        if( oTmp )
+        {
+          boolean bHasDPs = (oTmp.DPs().EnumEnabledVisibleIDs().Length());
+          boolean bIsSysVarDP = false;
+          object oTmpDP = dom.GetObject( oTmp.DefaultDPWrite() );
+          if( oTmpDP )
+          {
+            ! This prevents that a channel linked with a system variable is visible in the function list
+            ! The Weather-Channel e. g. is of the type VARDP.
+            ! bIsSysVarDP = ( oTmpDP.IsTypeOf( OT_VARDP ) || oTmpDP.IsTypeOf( OT_ALARMDP ) );
+            bIsSysVarDP = oTmpDP.IsTypeOf( OT_ALARMDP ) ;
+          }
+          if( (bHasDPs) && (!bIsSysVarDP) )
+          {
+            oUser.UserTempViewIDs().Add( oTmp.ID() );
+          }
+        }
+      }
+    }
+    firstSort = true;
+  }
+  system.SetSessionVar("sessionTAB1", system.GetVar("id") );
+%>
+
+  arChns = new Array();
+  chn = null;
+</script>
+<table id="tblHFuncChannels" class="filterTable CLASS03800 j_translate" cellpadding="0" cellspacing="0" border="1">
+  
+  <colgroup>
+     <col style="width:15%;"/>
+     <col style="width:15%;"/>
+     <col style="width:15%;"/>
+     <col style="width:55%;"/>
+  </colgroup>
+  
+  <tr>
+  <%string sCssName="Sort"; if(system.GetSessionVar("sessionLS")=="name"){sCssName="SortSelected";} %>
+  <th><div id="name" class="pt11 <%Write(sCssName); %>" onclick="IseSort(arChns,'name',true);">${thName}</div></th>
+  <%string sCssName="Sort"; if(system.GetSessionVar("sessionLS")=="room"){sCssName="SortSelected";} %>
+  <th><div id="room" class="pt11 <%Write(sCssName); %>" onclick="IseSort(arChns,'room',true);">${thRoom}</div></th>
+  <th>${thLastChange}</th>
+  <th>${thControl}</th>
+  </tr>
+  
+  <tr>
+  <td class="CLASS03801">
+    <div id="btnFilterName" class="FilterBtn">${thFilter}</div>
+    <div class="FilterSubMenu" id="btnFilterNameSub" style="display:none">
+        <input id="ftName" onkeypress="iseSFilterCheckEnterEsc(event.keyCode, 'ftSetNameBtn', 'ftCancelNameBtn')" type="text" size="15" class="CLASS03803" />
+        <div id="ftSetNameBtn" class='FilterSetButton CLASS03804' onclick="setSFilter(fltHF, 'ftName', FIL_NAME);updateTable();$('btnFilterNameSub').hide();" >${filterSet}</div>
+        <div id="ftCancelNameBtn" class='FilterSetButton' onclick="$('btnFilterNameSub').hide();">${filterClose}</div>
+    </div>
+  </td>
+  <td class="CLASS03801">
+    <div id="btnFilterRoom" class="FilterBtn">${thFilter}</div>
+    <div class="FilterSubMenu" id="btnFilterRoomSub" style="display:none">
+      <% 
+        Write("<table class='CLASS03805'>");
+        object obj = dom.GetObject(ID_ROOMS);
+        if ( obj ) {
+          string tmp = "";
+          foreach( tmp, obj.EnumEnabledIDs() ) {
+            object elem = dom.GetObject(tmp);
+            if (elem) {
+              string divId = "rdiv"#tmp;
+                Write("<tr>");
+                  Write("<td  class='CLASS03806'>"#elem.Name()#"</td>");
+                  Write("<td  class='CLASS03806'><input type='checkbox' id='hr"#elem.ID()#"'/></td>");
+                Write("</tr>");
+            }
+          }
+        }
+        Write("</table>");
+        Write("<div class='FilterSetButton' onclick='setAFilter(fltHF, \"rooms\");updateTable();$(\"btnFilterRoomSub\").hide();'>${filterSet}</div>");
+        Write("<div class='FilterSetButton' onclick='$(\"btnFilterRoomSub\").hide();'>${filterClose}</div>");
+      %>
+    </div>
+  </td>
+  <td class="CLASS03801">
+  </td>
+  <td class="CLASS03801">
+  </td>
+  </tr>
+  <!-- script type="text/javascript">translatePage("#tblHFuncChannels");</script-->
+   <%
+
+    object oUser = dom.GetObject( system.GetSessionVar('sessionUserID'));
+    integer userID = oUser.ID();
+    object user = dom.GetObject(userID);
+
+
+    object func = dom.GetObject(system.GetVar("id"));
+    if (func) {
+      if (func.Visible()) {
+        string sEnumUserIDs = oUser.UserTempViewIDs().EnumIDs();
+        string sEnumUserInternalIDs = oUser.UserTempViewIDs().EnumEnabledInternalIDs();
+        if( sEnumUserInternalIDs != "" ) {
+          if( sEnumUserIDs != "" ) {
+            sEnumUserIDs = sEnumUserIDs # "\t" # sEnumUserInternalIDs;
+          } else {
+            sEnumUserIDs = sEnumUserInternalIDs;
+          }
+        }
+        string tmp;
+        foreach(tmp, sEnumUserIDs) {
+          string trId = func.ID()#tmp;
+          Write("<tr id='"#trId#"'>");
+          object chn = dom.GetObject(tmp);
+          object oDev = dom.GetObject(chn.Device());
+
+          string oDevHssType = oDev.HssType();
+          integer chNumber = chn.ChnNumber();
+
+          ! Determine the name of the interface
+          integer iFaceID = chn.Interface();
+          object oIface = dom.GetObject(iFaceID);
+          string sInterface = oIface.Name();
+
+          
+          boolean bShow = false;
+          if (chn.Visible() && (chn.UserAccessRights(iulOtherThanAdmin) == iarFullAccess)) {
+            bShow = true;
+          }
+
+          if( bShow && chn.ReadyConfig() && oDev.ReadyConfig())
+          {
+            boolean showExtDesc = false;
+            if( oUser && oUser.UserLevel() == iulAdmin ) {
+              Write("<td class='GrayBkg CLASS04007' onclick='DeviceListPage.showConfiguration(event, \"CHANNEL\", "#chn.ID()#");' onmouseover='this.className=\"DeviceListRow_Highlight\";' onmouseout='this.className=\"DeviceListRow\";'>");
+            } else {
+              Write("<td class='GrayBkg'>");
+            }
+
+            Call("/pages/tabs/control/function.fn::ShowExtDesc()");
+
+            if (showExtDesc == false) {
+              Write(chn.Name()#"<br/><br><span name='hssType' class='hidden'>${chType_"#chn.HssType()#"}</span>");
+            }
+
+            Write("</td>");
+            Write("<td  class='GrayBkg'>");
+            string rooms = "";
+            string roomTmp = "";
+            string roomIDs = "";
+            foreach(roomTmp, chn.ChnRoom()) {
+              object objTmp = dom.GetObject(roomTmp);
+              rooms = rooms # objTmp.Name() # "<br />";
+              roomIDs = roomIDs # objTmp.ID() # '\t';
+            }
+            Write(rooms);
+            Write("</td>");
+            Write("<td class='GrayBkg'>");
+            
+            Write("<table style='width:100%;'>");
+            Write("<tr><td class='CLASS03802'><span id='tmc"#chn.ID()#"'><br /><br />");
+            
+            integer cId = chn.ID();
+            string sLastTime = "";
+            Call("/esp/system.fn::getLastTime()");
+            if (sLastTime == "") { Write("&nbsp;"); }
+            else {Write(sLastTime);}
+            
+            Write("</span></td></tr>");
+            Write( '<tr><td style="text-align:center;" class="CLASS03802">' );
+            string sDisplay = 'none';
+            if( chn.WorkingDPState() ) { sDisplay = "inline"; }
+            Write( '<span id="work'#cId#'" style="display:'#sDisplay#';"><img src="/ise/img/pinion_gears_32.png" /></span>' );
+            sDisplay = 'none';
+            if( chn.ExistServiceMsg() ) { sDisplay = "inline"; }
+            Write( '<span id="warn'#cId#'" style="display:'#sDisplay#'"><img name="attention" src="/ise/img/warning.png" /></span>' );
+            Write( '</td></tr></table>' );
+            
+            Write("</td>");
+            Write("<td id='dpc"#chn.ID()#"' class='WhiteBkg'>");
+            
+            integer cId = chn.ID();
+            string sCtrlId = "";
+            integer iStatusOnly = 0;
+            boolean bSliderFlag = true;            
+            Call("/esp/datapointconfigurator.fn::dcCreate()");
+            
+            Write("</td>");
+            Write("</tr>");
+            
+            Write("<script type='text/javascript'>");
+            Write("chn = new Object();");
+            Write("chn['id'] = '"#chn.ID()#"';");
+            Write("chn['ctrlId'] = '"#sCtrlId#"';");
+            Write("chn['name'] = '"#chn.Name()#"';");
+            Write("chn['room'] = '"#rooms#"';");
+            Write("chn['fltOpts'] = new Object();");
+            Write("chn['fltOpts']['rooms'] = '"#roomIDs#"';");
+            Write("chn['trid'] = '"#trId#"';");
+            Write("arChns[arChns.length] = chn;");
+            Write("if (!fltHF.objPassFilter(chn ))");
+              Write("hide(chn['trid']);");
+            Call("/esp/system.fn::writeWarnStateJS()"); 
+            Write("</script>");
+          }
+        }
+      }
+    }
+    
+  %>    
+  <script type="text/javascript">
+    Cursor.set(Cursor.NORMAL);
+  </script>
+</table>
+
+
+<script type="text/javascript">
+
+  <%
+    if(firstSort)
+    {
+      Write("//IseSort(arChns, 'name', true);");
+    }
+  %>
+
+  colorFilterBtns(fltHF);
+  var mouseOpts = {
+    onTopOver: function(divToShow) {
+      selectFilters(fltHF, divToShow);
+    }
+  };
+  
+  new iseSubMenuControl("btnFilterRoom", "btnFilterRoomSub", "divHTF",  {d:2}, mouseOpts, false, true);
+  new iseSubMenuControl("btnFilterName", "btnFilterNameSub", "divHTF",  {d:2}, mouseOpts, false, true);
+
+  jQuery("#btnFilterName").click(function(){
+    jQuery("#ftName").focus();
+  });
+
+  jQuery("[name='attention']").data('powertip', '<div>'+translateKey("lblSeeServiceMessage")+'</div>').powerTip();
+
+  translatePage("#tblHFuncChannels", function () {
+    jQuery("[name='hssType']").each(function(index, elm) {
+      var chText = jQuery(elm).text();
+      if (chText.indexOf("chType_") == -1) {
+        jQuery(elm).show();
+      }
+    });
+  });
+
+  jQuery("#btnFilterRoomSub").draggable();
+</script>
\ No newline at end of file
diff --git a/buildroot-external/patches/occu/0191-WebUI-Add-NaturalSortOrderInControlTabs/occu/WebUI/www/rega/pages/tabs/control/hfuncchannels.htm.orig b/buildroot-external/patches/occu/0191-WebUI-Add-NaturalSortOrderInControlTabs/occu/WebUI/www/rega/pages/tabs/control/hfuncchannels.htm.orig
new file mode 100755
index 0000000000..bcb5df96c9
--- /dev/null
+++ b/buildroot-external/patches/occu/0191-WebUI-Add-NaturalSortOrderInControlTabs/occu/WebUI/www/rega/pages/tabs/control/hfuncchannels.htm.orig
@@ -0,0 +1,270 @@
+<script type="text/javascript">
+  Cursor.set(Cursor.WAIT);
+  iseInitUpdateArrays();
+
+<%
+  boolean firstSort = false;
+  
+  object oUser = dom.GetObject( system.GetSessionVar("sessionUserID") );
+  if( (system.GetSessionVar("sessionCTV")=="true") || (system.GetSessionVar("sessionTAB1") != system.GetVar("id")) )
+  {
+    system.SetSessionVar("sessionLS","");
+    oUser.UserTempViewIDs().RemoveAll();
+    
+    Write('iseClearLastSort();');
+
+    object oTmpArray = dom.GetObject(system.GetVar("id"));
+    if( oTmpArray )
+    {
+      oTmpArray.SortByName();
+      string sTmp;
+      foreach(sTmp,oTmpArray.EnumIDs())
+      {
+        object oTmp = dom.GetObject( sTmp );
+        if( oTmp )
+        {
+          boolean bHasDPs = (oTmp.DPs().EnumEnabledVisibleIDs().Length());
+          boolean bIsSysVarDP = false;
+          object oTmpDP = dom.GetObject( oTmp.DefaultDPWrite() );
+          if( oTmpDP )
+          {
+            ! This prevents that a channel linked with a system variable is visible in the function list
+            ! The Weather-Channel e. g. is of the type VARDP.
+            ! bIsSysVarDP = ( oTmpDP.IsTypeOf( OT_VARDP ) || oTmpDP.IsTypeOf( OT_ALARMDP ) );
+            bIsSysVarDP = oTmpDP.IsTypeOf( OT_ALARMDP ) ;
+          }
+          if( (bHasDPs) && (!bIsSysVarDP) )
+          {
+            oUser.UserTempViewIDs().Add( oTmp.ID() );
+          }
+        }
+      }
+    }
+    firstSort = true;
+  }
+  system.SetSessionVar("sessionTAB1", system.GetVar("id") );
+%>
+
+  arChns = new Array();
+  chn = null;
+</script>
+<table id="tblHFuncChannels" class="filterTable CLASS03800 j_translate" cellpadding="0" cellspacing="0" border="1">
+  
+  <colgroup>
+     <col style="width:15%;"/>
+     <col style="width:15%;"/>
+     <col style="width:15%;"/>
+     <col style="width:55%;"/>
+  </colgroup>
+  
+  <tr>
+  <%string sCssName="Sort"; if(system.GetSessionVar("sessionLS")=="name"){sCssName="SortSelected";} %>
+  <th><div id="name" class="pt11 <%Write(sCssName); %>" onclick="IseSort(arChns,'name',true);">${thName}</div></th>
+  <%string sCssName="Sort"; if(system.GetSessionVar("sessionLS")=="room"){sCssName="SortSelected";} %>
+  <th><div id="room" class="pt11 <%Write(sCssName); %>" onclick="IseSort(arChns,'room',true);">${thRoom}</div></th>
+  <th>${thLastChange}</th>
+  <th>${thControl}</th>
+  </tr>
+  
+  <tr>
+  <td class="CLASS03801">
+    <div id="btnFilterName" class="FilterBtn">${thFilter}</div>
+    <div class="FilterSubMenu" id="btnFilterNameSub" style="display:none">
+        <input id="ftName" onkeypress="iseSFilterCheckEnterEsc(event.keyCode, 'ftSetNameBtn', 'ftCancelNameBtn')" type="text" size="15" class="CLASS03803" />
+        <div id="ftSetNameBtn" class='FilterSetButton CLASS03804' onclick="setSFilter(fltHF, 'ftName', FIL_NAME);updateTable();$('btnFilterNameSub').hide();" >${filterSet}</div>
+        <div id="ftCancelNameBtn" class='FilterSetButton' onclick="$('btnFilterNameSub').hide();">${filterClose}</div>
+    </div>
+  </td>
+  <td class="CLASS03801">
+    <div id="btnFilterRoom" class="FilterBtn">${thFilter}</div>
+    <div class="FilterSubMenu" id="btnFilterRoomSub" style="display:none">
+      <% 
+        Write("<table class='CLASS03805'>");
+        object obj = dom.GetObject(ID_ROOMS);
+        if ( obj ) {
+          string tmp = "";
+          foreach( tmp, obj.EnumEnabledIDs() ) {
+            object elem = dom.GetObject(tmp);
+            if (elem) {
+              string divId = "rdiv"#tmp;
+                Write("<tr>");
+                  Write("<td  class='CLASS03806'>"#elem.Name()#"</td>");
+                  Write("<td  class='CLASS03806'><input type='checkbox' id='hr"#elem.ID()#"'/></td>");
+                Write("</tr>");
+            }
+          }
+        }
+        Write("</table>");
+        Write("<div class='FilterSetButton' onclick='setAFilter(fltHF, \"rooms\");updateTable();$(\"btnFilterRoomSub\").hide();'>${filterSet}</div>");
+        Write("<div class='FilterSetButton' onclick='$(\"btnFilterRoomSub\").hide();'>${filterClose}</div>");
+      %>
+    </div>
+  </td>
+  <td class="CLASS03801">
+  </td>
+  <td class="CLASS03801">
+  </td>
+  </tr>
+  <!-- script type="text/javascript">translatePage("#tblHFuncChannels");</script-->
+   <%
+
+    object oUser = dom.GetObject( system.GetSessionVar('sessionUserID'));
+    integer userID = oUser.ID();
+    object user = dom.GetObject(userID);
+
+
+    object func = dom.GetObject(system.GetVar("id"));
+    if (func) {
+      if (func.Visible()) {
+        string sEnumUserIDs = oUser.UserTempViewIDs().EnumIDs();
+        string sEnumUserInternalIDs = oUser.UserTempViewIDs().EnumEnabledInternalIDs();
+        if( sEnumUserInternalIDs != "" ) {
+          if( sEnumUserIDs != "" ) {
+            sEnumUserIDs = sEnumUserIDs # "\t" # sEnumUserInternalIDs;
+          } else {
+            sEnumUserIDs = sEnumUserInternalIDs;
+          }
+        }
+        string tmp;
+        foreach(tmp, sEnumUserIDs) {
+          string trId = func.ID()#tmp;
+          Write("<tr id='"#trId#"'>");
+          object chn = dom.GetObject(tmp);
+          object oDev = dom.GetObject(chn.Device());
+
+          string oDevHssType = oDev.HssType();
+          integer chNumber = chn.ChnNumber();
+
+          ! Determine the name of the interface
+          integer iFaceID = chn.Interface();
+          object oIface = dom.GetObject(iFaceID);
+          string sInterface = oIface.Name();
+
+          
+          boolean bShow = false;
+          if (chn.Visible() && (chn.UserAccessRights(iulOtherThanAdmin) == iarFullAccess)) {
+            bShow = true;
+          }
+
+          if( bShow && chn.ReadyConfig() && oDev.ReadyConfig())
+          {
+            boolean showExtDesc = false;
+            if( oUser && oUser.UserLevel() == iulAdmin ) {
+              Write("<td class='GrayBkg CLASS04007' onclick='DeviceListPage.showConfiguration(event, \"CHANNEL\", "#chn.ID()#");' onmouseover='this.className=\"DeviceListRow_Highlight\";' onmouseout='this.className=\"DeviceListRow\";'>");
+            } else {
+              Write("<td class='GrayBkg'>");
+            }
+
+            Call("/pages/tabs/control/function.fn::ShowExtDesc()");
+
+            if (showExtDesc == false) {
+              Write(chn.Name()#"<br/><br><span name='hssType' class='hidden'>${chType_"#chn.HssType()#"}</span>");
+            }
+
+            Write("</td>");
+            Write("<td  class='GrayBkg'>");
+            string rooms = "";
+            string roomTmp = "";
+            string roomIDs = "";
+            foreach(roomTmp, chn.ChnRoom()) {
+              object objTmp = dom.GetObject(roomTmp);
+              rooms = rooms # objTmp.Name() # "<br />";
+              roomIDs = roomIDs # objTmp.ID() # '\t';
+            }
+            Write(rooms);
+            Write("</td>");
+            Write("<td class='GrayBkg'>");
+            
+            Write("<table style='width:100%;'>");
+            Write("<tr><td class='CLASS03802'><span id='tmc"#chn.ID()#"'><br /><br />");
+            
+            integer cId = chn.ID();
+            string sLastTime = "";
+            Call("/esp/system.fn::getLastTime()");
+            if (sLastTime == "") { Write("&nbsp;"); }
+            else {Write(sLastTime);}
+            
+            Write("</span></td></tr>");
+            Write( '<tr><td style="text-align:center;" class="CLASS03802">' );
+            string sDisplay = 'none';
+            if( chn.WorkingDPState() ) { sDisplay = "inline"; }
+            Write( '<span id="work'#cId#'" style="display:'#sDisplay#';"><img src="/ise/img/pinion_gears_32.png" /></span>' );
+            sDisplay = 'none';
+            if( chn.ExistServiceMsg() ) { sDisplay = "inline"; }
+            Write( '<span id="warn'#cId#'" style="display:'#sDisplay#'"><img name="attention" src="/ise/img/warning.png" /></span>' );
+            Write( '</td></tr></table>' );
+            
+            Write("</td>");
+            Write("<td id='dpc"#chn.ID()#"' class='WhiteBkg'>");
+            
+            integer cId = chn.ID();
+            string sCtrlId = "";
+            integer iStatusOnly = 0;
+            boolean bSliderFlag = true;            
+            Call("/esp/datapointconfigurator.fn::dcCreate()");
+            
+            Write("</td>");
+            Write("</tr>");
+            
+            Write("<script type='text/javascript'>");
+            Write("chn = new Object();");
+            Write("chn['id'] = '"#chn.ID()#"';");
+            Write("chn['ctrlId'] = '"#sCtrlId#"';");
+            Write("chn['name'] = '"#chn.Name()#"';");
+            Write("chn['room'] = '"#rooms#"';");
+            Write("chn['fltOpts'] = new Object();");
+            Write("chn['fltOpts']['rooms'] = '"#roomIDs#"';");
+            Write("chn['trid'] = '"#trId#"';");
+            Write("arChns[arChns.length] = chn;");
+            Write("if (!fltHF.objPassFilter(chn ))");
+              Write("hide(chn['trid']);");
+            Call("/esp/system.fn::writeWarnStateJS()"); 
+            Write("</script>");
+          }
+        }
+      }
+    }
+    
+  %>    
+  <script type="text/javascript">
+    Cursor.set(Cursor.NORMAL);
+  </script>
+</table>
+
+
+<script type="text/javascript">
+
+  <%
+    if(firstSort)
+    {
+      Write("//IseSort(arChns, 'name', true);");
+    }
+  %>
+
+  colorFilterBtns(fltHF);
+  var mouseOpts = {
+    onTopOver: function(divToShow) {
+      selectFilters(fltHF, divToShow);
+    }
+  };
+  
+  new iseSubMenuControl("btnFilterRoom", "btnFilterRoomSub", "divHTF",  {d:2}, mouseOpts, false, true);
+  new iseSubMenuControl("btnFilterName", "btnFilterNameSub", "divHTF",  {d:2}, mouseOpts, false, true);
+
+  jQuery("#btnFilterName").click(function(){
+    jQuery("#ftName").focus();
+  });
+
+  jQuery("[name='attention']").data('powertip', '<div>'+translateKey("lblSeeServiceMessage")+'</div>').powerTip();
+
+  translatePage("#tblHFuncChannels", function () {
+    jQuery("[name='hssType']").each(function(index, elm) {
+      var chText = jQuery(elm).text();
+      if (chText.indexOf("chType_") == -1) {
+        jQuery(elm).show();
+      }
+    });
+  });
+
+  jQuery("#btnFilterRoomSub").draggable();
+</script>
\ No newline at end of file
diff --git a/buildroot-external/patches/occu/0191-WebUI-Add-NaturalSortOrderInControlTabs/occu/WebUI/www/rega/pages/tabs/control/hroomchannels.htm b/buildroot-external/patches/occu/0191-WebUI-Add-NaturalSortOrderInControlTabs/occu/WebUI/www/rega/pages/tabs/control/hroomchannels.htm
new file mode 100755
index 0000000000..5974cba187
--- /dev/null
+++ b/buildroot-external/patches/occu/0191-WebUI-Add-NaturalSortOrderInControlTabs/occu/WebUI/www/rega/pages/tabs/control/hroomchannels.htm
@@ -0,0 +1,271 @@
+<script type="text/javascript">
+  Cursor.set(Cursor.WAIT);
+  // INIT UPDATE ARRAYS FOR UPDATEUI
+  iseInitUpdateArrays();
+
+<%
+  boolean firstSort = false;
+  object oUser = dom.GetObject( system.GetSessionVar("sessionUserID") );
+  if( (system.GetSessionVar("sessionCTV")=="true") || (system.GetSessionVar("sessionTAB1") != system.GetVar("id")) )
+  {
+    system.SetSessionVar("sessionLS","");
+    oUser.UserTempViewIDs().RemoveAll();
+    
+    Write('iseClearLastSort();');
+
+    object oTmpArray = dom.GetObject(system.GetVar("id"));
+    if( oTmpArray )
+    {
+      oTmpArray.SortByName();
+      string sTmp;
+      foreach(sTmp,oTmpArray.EnumIDs())
+      {
+        object oTmp = dom.GetObject( sTmp );
+        if( oTmp )
+        {
+          boolean bHasDPs = (oTmp.DPs().EnumEnabledVisibleIDs().Length());
+          boolean bIsSysVarDP = false;
+          object oTmpDP = dom.GetObject( oTmp.DefaultDPWrite() );
+          if( oTmpDP )
+          {
+            ! This prevents that a channel linked with a system variable is visible in the room list
+            ! The Weather-Channel e. g. is of the type VARDP.
+            ! bIsSysVarDP = ( oTmpDP.IsTypeOf( OT_VARDP ) || oTmpDP.IsTypeOf( OT_ALARMDP ) );
+            bIsSysVarDP = oTmpDP.IsTypeOf( OT_ALARMDP ) ;
+          }
+          if( (bHasDPs) && (!bIsSysVarDP) )
+          {
+            oUser.UserTempViewIDs().Add( oTmp.ID() );
+          }
+        }
+      }
+    }
+    oUser.UserTempViewIDs().SortByName(soAsc,stNatural);
+    firstSort = true;  
+  }
+  system.SetSessionVar("sessionTAB1", system.GetVar("id") );
+%>
+
+  arChns = new Array();
+  chn = null;
+</script>
+
+<table id="tblHRoomChannels" class="filterTable CLASS03600 j_translate" cellpadding="0" cellspacing="0" border="1" >
+  <colgroup>
+     <col style="width:15%;"/>
+     <col style="width:15%;"/>
+     <col style="width:15%;"/>
+     <col style="width:55%;"/>
+  </colgroup>
+  <tr>
+  <%string sCssName="Sort"; if(system.GetSessionVar("sessionLS")=="name"){sCssName="SortSelected";} %>
+  <th><div id="name" class="pt11 <%Write(sCssName); %>" onclick="IseSort(arChns,'name',true);">${thName}</div></th>
+  <%string sCssName="Sort"; if(system.GetSessionVar("sessionLS")=="func"){sCssName="SortSelected";} %>
+  <th><div id="func" class="pt11 <%Write(sCssName); %>" onclick="IseSort(arChns,'func',true);">${thFunc}</div></th>
+  <th>${thLastChange}</th>
+  <th>${thControl}</th>
+  </tr>
+  
+  <tr>
+  <td class='CLASS03601'>
+    <div id="btnFilterName" class="FilterBtn">Filter</div>
+    <div class="FilterSubMenu" id="btnFilterNameSub" style="display:none">
+        <input id="ftName" onkeypress="iseSFilterCheckEnterEsc(event.keyCode, 'ftSetNameBtn', 'ftCancelNameBtn')" type="text" size="15" class="CLASS03603" />
+        <div id="ftSetNameBtn" class='FilterSetButton CLASS03604' onclick="setSFilter(fltHR, 'ftName', FIL_NAME);updateTable();$('btnFilterNameSub').hide();" >${filterSet}</div>
+        <div id="ftCancelNameBtn" class='FilterSetButton' onclick="$('btnFilterNameSub').hide();">${filterClose}</div>
+    </div>
+  </td>
+  <td class='CLASS03601'>
+    <div id="btnFilterFunc" class="FilterBtn">${thFilter}</div>
+    <div class="FilterSubMenu" id="btnFilterFuncSub" style="display:none">
+      <% 
+        Write("<table class='CLASS03605'>");
+        object obj = dom.GetObject(ID_FUNCTIONS);
+        if ( obj )
+        {
+          string tmp = "";
+          foreach( tmp, obj.EnumEnabledIDs() )
+          {
+            object elem = dom.GetObject(tmp);
+            if (elem)
+            {
+              string divId = "rdiv"#tmp;
+                Write("<tr>");
+                  Write("<td  class='CLASS03606'>"#elem.Name()#"</td>");
+                  Write("<td  class='CLASS03606'><input type='checkbox' id='ff"#elem.ID()#"'/></td>");
+                Write("</tr>");
+            }
+          }
+        }
+        Write("</table>");
+        Write("<div class='FilterSetButton' onclick='setAFilter(fltHR, \"funcs\");updateTable();$(\"btnFilterFuncSub\").hide();'>${filterSet}</div>");
+        Write("<div class='FilterSetButton' onclick='$(\"btnFilterFuncSub\").hide();'>${filterClose}</div>");
+      %>
+    </div>
+  </td>
+  <td class='CLASS03601'>
+  </td>
+  <td class='CLASS03601'>
+  </td>
+  </tr>
+    <script type="text/javascript">translatePage("#tblHRoomChannels");</script>
+  
+  <%
+
+  object oUser = dom.GetObject( system.GetSessionVar('sessionUserID'));
+  integer userID = oUser.ID();
+  object user = dom.GetObject(userID);
+
+    object room = dom.GetObject(system.GetVar("id"));
+    if (room)
+    {
+      if (room.Visible())
+      {
+        string sEnumUserIDs = oUser.UserTempViewIDs().EnumIDs();
+        string sEnumUserInternalIDs = oUser.UserTempViewIDs().EnumEnabledInternalIDs();
+        if( sEnumUserInternalIDs != "" ) {
+          if( sEnumUserIDs != "" ) {
+            sEnumUserIDs = sEnumUserIDs # "\t" # sEnumUserInternalIDs;
+          } else {
+            sEnumUserIDs = sEnumUserInternalIDs;
+          }
+        }
+        string tmp;
+        foreach(tmp, sEnumUserIDs)
+        {
+          object chn = dom.GetObject(tmp);
+          object oDev = dom.GetObject(chn.Device());
+
+          string oDevHssType = oDev.HssType();
+          integer chNumber = chn.ChnNumber();
+
+          ! Determine the name of the interface
+          integer iFaceID = chn.Interface();
+          object oIface = dom.GetObject(iFaceID);
+          string sInterface = oIface.Name();
+          
+          boolean bShow = false;
+          if (chn.Visible() && (chn.UserAccessRights(iulOtherThanAdmin) == iarFullAccess)) {
+            bShow = true;
+          }
+
+          if( bShow && chn.ReadyConfig() && oDev.ReadyConfig())
+          {
+            string trId = room.ID()#tmp;
+            boolean showExtDesc = false;
+            Write("<tr id='"#trId#"'>");
+            if( oUser && oUser.UserLevel() == iulAdmin ) {
+              Write("<td class='GrayBkg CLASS04007' onclick='DeviceListPage.showConfiguration(event, \"CHANNEL\", "#chn.ID()#");' onmouseover='this.className=\"DeviceListRow_Highlight\";' onmouseout='this.className=\"DeviceListRow\";'>");
+            } else {
+              Write("<td class='GrayBkg'>");
+            }
+
+            Call("/pages/tabs/control/function.fn::ShowExtDesc()");
+
+            if (showExtDesc == false) {
+              Write(chn.Name()#"<br/><br><span name='hssType' class='hidden'>${chType_"#chn.HssType()#"}</span>");
+            }
+
+
+            Write("</td>");
+            Write("<td class='GrayBkg'>");
+            string functions = "";
+            string funcTmp = "";
+            string funcIDs = "";
+            foreach(funcTmp, chn.ChnFunction()) {
+              object objTmp = dom.GetObject(funcTmp);
+              functions = functions # objTmp.Name() # "<br />";
+              funcIDs = funcIDs # objTmp.ID() #'\t';
+            }
+            Write(functions);
+            Write("</td>");
+            Write("<td class='GrayBkg'>");
+            
+            Write("<table style='width:100%;'>");
+            Write("<tr><td class='CLASS03602'><div id='tmc"#chn.ID()#"'><br /><br />");
+            
+            integer cId = chn.ID();
+            string sLastTime = "";
+            integer iStatusOnly = 0;
+            Call("/esp/system.fn::getLastTime()");
+            Write(sLastTime);
+            
+            Write("</div></td></tr>");
+            Write( '<tr><td style="text-align:center;" class="CLASS03602">' );
+            string sDisplay = 'none';
+            if( chn.WorkingDPState() ) { sDisplay = "inline"; }
+            Write( '<span id="work'#cId#'" style="display:'#sDisplay#';"><img src="/ise/img/pinion_gears_32.png" /></span>' );
+            sDisplay = 'none';
+            if( chn.ExistServiceMsg() ) { sDisplay = "inline"; }
+            Write( '<span id="warn'#cId#'" style="display:'#sDisplay#'"><img name="attention" src="/ise/img/warning.png" /></span>' );
+            Write( '</td></tr></table>' );
+            
+            Write("</td>");
+            Write("<td id='dpc"#chn.ID()#"' class='WhiteBkg'>");
+            
+            integer cId = chn.ID();
+            string sCtrlId = "";
+            boolean bSliderFlag = true;            
+            Call("/esp/datapointconfigurator.fn::dcCreate()");
+            
+            Write("</td>");
+            Write("</tr>");
+            
+            Write("<script type='text/javascript'>");
+            Write("chn = new Object();");
+            Write("chn['id'] = '"#chn.ID()#"';");
+            Write("chn['ctrlId'] = '"#sCtrlId#"';");
+            Write("chn['name'] = '"#chn.Name()#"';");
+            Write("chn['func'] = '"#functions#"';");
+            Write("chn['fltOpts'] = new Object();");
+            Write("chn['fltOpts']['funcs'] = '"#funcIDs#"';");
+            Write("chn['trid'] = '"#trId#"';");
+            Write("arChns[arChns.length] = chn;");
+            Write("if (!fltHR.objPassFilter(chn ))");
+                Write("hide(chn['trid']);");
+            Call("/esp/system.fn::writeWarnStateJS()");
+            Write("</script>");
+          }
+        }
+      }
+    }
+  %> 
+  <script type="text/javascript">
+    Cursor.set(Cursor.NORMAL);
+  </script>   
+</table>
+
+<script type="text/javascript">
+
+  <%
+    if(firstSort)
+    {
+      Write("//IseSort(arChns, 'name', true);");
+    }
+  %>
+
+  colorFilterBtns(fltHR);
+  var mouseOpts = {
+    onTopOver: function(divToShow) {
+      selectFilters(fltHR, divToShow);
+    }
+  };
+  new iseSubMenuControl("btnFilterFunc", "btnFilterFuncSub", "divHTR",  {d:2}, mouseOpts, false, true);
+  new iseSubMenuControl("btnFilterName", "btnFilterNameSub", "divHTR",  {d:2}, mouseOpts, false, true);
+
+  jQuery("#btnFilterName").click(function(){
+    jQuery("#ftName").focus();
+  });
+
+  jQuery("[name='attention']").data('powertip', '<div>'+translateKey("lblSeeServiceMessage")+'</div>').powerTip();
+
+  translatePage("#tblHRoomChannels", function () {
+    jQuery("[name='hssType']").each(function(index, elm) {
+      var chText = jQuery(elm).text();
+      if (chText.indexOf("chType_") == -1) {
+        jQuery(elm).show();
+      }
+    });
+  });
+
+</script>
diff --git a/buildroot-external/patches/occu/0191-WebUI-Add-NaturalSortOrderInControlTabs/occu/WebUI/www/rega/pages/tabs/control/hroomchannels.htm.orig b/buildroot-external/patches/occu/0191-WebUI-Add-NaturalSortOrderInControlTabs/occu/WebUI/www/rega/pages/tabs/control/hroomchannels.htm.orig
new file mode 100755
index 0000000000..a7fab963a9
--- /dev/null
+++ b/buildroot-external/patches/occu/0191-WebUI-Add-NaturalSortOrderInControlTabs/occu/WebUI/www/rega/pages/tabs/control/hroomchannels.htm.orig
@@ -0,0 +1,270 @@
+<script type="text/javascript">
+  Cursor.set(Cursor.WAIT);
+  // INIT UPDATE ARRAYS FOR UPDATEUI
+  iseInitUpdateArrays();
+
+<%
+  boolean firstSort = false;
+  object oUser = dom.GetObject( system.GetSessionVar("sessionUserID") );
+  if( (system.GetSessionVar("sessionCTV")=="true") || (system.GetSessionVar("sessionTAB1") != system.GetVar("id")) )
+  {
+    system.SetSessionVar("sessionLS","");
+    oUser.UserTempViewIDs().RemoveAll();
+    
+    Write('iseClearLastSort();');
+
+    object oTmpArray = dom.GetObject(system.GetVar("id"));
+    if( oTmpArray )
+    {
+      oTmpArray.SortByName();
+      string sTmp;
+      foreach(sTmp,oTmpArray.EnumIDs())
+      {
+        object oTmp = dom.GetObject( sTmp );
+        if( oTmp )
+        {
+          boolean bHasDPs = (oTmp.DPs().EnumEnabledVisibleIDs().Length());
+          boolean bIsSysVarDP = false;
+          object oTmpDP = dom.GetObject( oTmp.DefaultDPWrite() );
+          if( oTmpDP )
+          {
+            ! This prevents that a channel linked with a system variable is visible in the room list
+            ! The Weather-Channel e. g. is of the type VARDP.
+            ! bIsSysVarDP = ( oTmpDP.IsTypeOf( OT_VARDP ) || oTmpDP.IsTypeOf( OT_ALARMDP ) );
+            bIsSysVarDP = oTmpDP.IsTypeOf( OT_ALARMDP ) ;
+          }
+          if( (bHasDPs) && (!bIsSysVarDP) )
+          {
+            oUser.UserTempViewIDs().Add( oTmp.ID() );
+          }
+        }
+      }
+    }
+    firstSort = true;  
+  }
+  system.SetSessionVar("sessionTAB1", system.GetVar("id") );
+%>
+
+  arChns = new Array();
+  chn = null;
+</script>
+
+<table id="tblHRoomChannels" class="filterTable CLASS03600 j_translate" cellpadding="0" cellspacing="0" border="1" >
+  <colgroup>
+     <col style="width:15%;"/>
+     <col style="width:15%;"/>
+     <col style="width:15%;"/>
+     <col style="width:55%;"/>
+  </colgroup>
+  <tr>
+  <%string sCssName="Sort"; if(system.GetSessionVar("sessionLS")=="name"){sCssName="SortSelected";} %>
+  <th><div id="name" class="pt11 <%Write(sCssName); %>" onclick="IseSort(arChns,'name',true);">${thName}</div></th>
+  <%string sCssName="Sort"; if(system.GetSessionVar("sessionLS")=="func"){sCssName="SortSelected";} %>
+  <th><div id="func" class="pt11 <%Write(sCssName); %>" onclick="IseSort(arChns,'func',true);">${thFunc}</div></th>
+  <th>${thLastChange}</th>
+  <th>${thControl}</th>
+  </tr>
+  
+  <tr>
+  <td class='CLASS03601'>
+    <div id="btnFilterName" class="FilterBtn">Filter</div>
+    <div class="FilterSubMenu" id="btnFilterNameSub" style="display:none">
+        <input id="ftName" onkeypress="iseSFilterCheckEnterEsc(event.keyCode, 'ftSetNameBtn', 'ftCancelNameBtn')" type="text" size="15" class="CLASS03603" />
+        <div id="ftSetNameBtn" class='FilterSetButton CLASS03604' onclick="setSFilter(fltHR, 'ftName', FIL_NAME);updateTable();$('btnFilterNameSub').hide();" >${filterSet}</div>
+        <div id="ftCancelNameBtn" class='FilterSetButton' onclick="$('btnFilterNameSub').hide();">${filterClose}</div>
+    </div>
+  </td>
+  <td class='CLASS03601'>
+    <div id="btnFilterFunc" class="FilterBtn">${thFilter}</div>
+    <div class="FilterSubMenu" id="btnFilterFuncSub" style="display:none">
+      <% 
+        Write("<table class='CLASS03605'>");
+        object obj = dom.GetObject(ID_FUNCTIONS);
+        if ( obj )
+        {
+          string tmp = "";
+          foreach( tmp, obj.EnumEnabledIDs() )
+          {
+            object elem = dom.GetObject(tmp);
+            if (elem)
+            {
+              string divId = "rdiv"#tmp;
+                Write("<tr>");
+                  Write("<td  class='CLASS03606'>"#elem.Name()#"</td>");
+                  Write("<td  class='CLASS03606'><input type='checkbox' id='ff"#elem.ID()#"'/></td>");
+                Write("</tr>");
+            }
+          }
+        }
+        Write("</table>");
+        Write("<div class='FilterSetButton' onclick='setAFilter(fltHR, \"funcs\");updateTable();$(\"btnFilterFuncSub\").hide();'>${filterSet}</div>");
+        Write("<div class='FilterSetButton' onclick='$(\"btnFilterFuncSub\").hide();'>${filterClose}</div>");
+      %>
+    </div>
+  </td>
+  <td class='CLASS03601'>
+  </td>
+  <td class='CLASS03601'>
+  </td>
+  </tr>
+    <script type="text/javascript">translatePage("#tblHRoomChannels");</script>
+  
+  <%
+
+  object oUser = dom.GetObject( system.GetSessionVar('sessionUserID'));
+  integer userID = oUser.ID();
+  object user = dom.GetObject(userID);
+
+    object room = dom.GetObject(system.GetVar("id"));
+    if (room)
+    {
+      if (room.Visible())
+      {
+        string sEnumUserIDs = oUser.UserTempViewIDs().EnumIDs();
+        string sEnumUserInternalIDs = oUser.UserTempViewIDs().EnumEnabledInternalIDs();
+        if( sEnumUserInternalIDs != "" ) {
+          if( sEnumUserIDs != "" ) {
+            sEnumUserIDs = sEnumUserIDs # "\t" # sEnumUserInternalIDs;
+          } else {
+            sEnumUserIDs = sEnumUserInternalIDs;
+          }
+        }
+        string tmp;
+        foreach(tmp, sEnumUserIDs)
+        {
+          object chn = dom.GetObject(tmp);
+          object oDev = dom.GetObject(chn.Device());
+
+          string oDevHssType = oDev.HssType();
+          integer chNumber = chn.ChnNumber();
+
+          ! Determine the name of the interface
+          integer iFaceID = chn.Interface();
+          object oIface = dom.GetObject(iFaceID);
+          string sInterface = oIface.Name();
+          
+          boolean bShow = false;
+          if (chn.Visible() && (chn.UserAccessRights(iulOtherThanAdmin) == iarFullAccess)) {
+            bShow = true;
+          }
+
+          if( bShow && chn.ReadyConfig() && oDev.ReadyConfig())
+          {
+            string trId = room.ID()#tmp;
+            boolean showExtDesc = false;
+            Write("<tr id='"#trId#"'>");
+            if( oUser && oUser.UserLevel() == iulAdmin ) {
+              Write("<td class='GrayBkg CLASS04007' onclick='DeviceListPage.showConfiguration(event, \"CHANNEL\", "#chn.ID()#");' onmouseover='this.className=\"DeviceListRow_Highlight\";' onmouseout='this.className=\"DeviceListRow\";'>");
+            } else {
+              Write("<td class='GrayBkg'>");
+            }
+
+            Call("/pages/tabs/control/function.fn::ShowExtDesc()");
+
+            if (showExtDesc == false) {
+              Write(chn.Name()#"<br/><br><span name='hssType' class='hidden'>${chType_"#chn.HssType()#"}</span>");
+            }
+
+
+            Write("</td>");
+            Write("<td class='GrayBkg'>");
+            string functions = "";
+            string funcTmp = "";
+            string funcIDs = "";
+            foreach(funcTmp, chn.ChnFunction()) {
+              object objTmp = dom.GetObject(funcTmp);
+              functions = functions # objTmp.Name() # "<br />";
+              funcIDs = funcIDs # objTmp.ID() #'\t';
+            }
+            Write(functions);
+            Write("</td>");
+            Write("<td class='GrayBkg'>");
+            
+            Write("<table style='width:100%;'>");
+            Write("<tr><td class='CLASS03602'><div id='tmc"#chn.ID()#"'><br /><br />");
+            
+            integer cId = chn.ID();
+            string sLastTime = "";
+            integer iStatusOnly = 0;
+            Call("/esp/system.fn::getLastTime()");
+            Write(sLastTime);
+            
+            Write("</div></td></tr>");
+            Write( '<tr><td style="text-align:center;" class="CLASS03602">' );
+            string sDisplay = 'none';
+            if( chn.WorkingDPState() ) { sDisplay = "inline"; }
+            Write( '<span id="work'#cId#'" style="display:'#sDisplay#';"><img src="/ise/img/pinion_gears_32.png" /></span>' );
+            sDisplay = 'none';
+            if( chn.ExistServiceMsg() ) { sDisplay = "inline"; }
+            Write( '<span id="warn'#cId#'" style="display:'#sDisplay#'"><img name="attention" src="/ise/img/warning.png" /></span>' );
+            Write( '</td></tr></table>' );
+            
+            Write("</td>");
+            Write("<td id='dpc"#chn.ID()#"' class='WhiteBkg'>");
+            
+            integer cId = chn.ID();
+            string sCtrlId = "";
+            boolean bSliderFlag = true;            
+            Call("/esp/datapointconfigurator.fn::dcCreate()");
+            
+            Write("</td>");
+            Write("</tr>");
+            
+            Write("<script type='text/javascript'>");
+            Write("chn = new Object();");
+            Write("chn['id'] = '"#chn.ID()#"';");
+            Write("chn['ctrlId'] = '"#sCtrlId#"';");
+            Write("chn['name'] = '"#chn.Name()#"';");
+            Write("chn['func'] = '"#functions#"';");
+            Write("chn['fltOpts'] = new Object();");
+            Write("chn['fltOpts']['funcs'] = '"#funcIDs#"';");
+            Write("chn['trid'] = '"#trId#"';");
+            Write("arChns[arChns.length] = chn;");
+            Write("if (!fltHR.objPassFilter(chn ))");
+                Write("hide(chn['trid']);");
+            Call("/esp/system.fn::writeWarnStateJS()");
+            Write("</script>");
+          }
+        }
+      }
+    }
+  %> 
+  <script type="text/javascript">
+    Cursor.set(Cursor.NORMAL);
+  </script>   
+</table>
+
+<script type="text/javascript">
+
+  <%
+    if(firstSort)
+    {
+      Write("//IseSort(arChns, 'name', true);");
+    }
+  %>
+
+  colorFilterBtns(fltHR);
+  var mouseOpts = {
+    onTopOver: function(divToShow) {
+      selectFilters(fltHR, divToShow);
+    }
+  };
+  new iseSubMenuControl("btnFilterFunc", "btnFilterFuncSub", "divHTR",  {d:2}, mouseOpts, false, true);
+  new iseSubMenuControl("btnFilterName", "btnFilterNameSub", "divHTR",  {d:2}, mouseOpts, false, true);
+
+  jQuery("#btnFilterName").click(function(){
+    jQuery("#ftName").focus();
+  });
+
+  jQuery("[name='attention']").data('powertip', '<div>'+translateKey("lblSeeServiceMessage")+'</div>').powerTip();
+
+  translatePage("#tblHRoomChannels", function () {
+    jQuery("[name='hssType']").each(function(index, elm) {
+      var chText = jQuery(elm).text();
+      if (chText.indexOf("chType_") == -1) {
+        jQuery(elm).show();
+      }
+    });
+  });
+
+</script>