run update-patches.sh to update files accordingly.

jens-maus · Nov 1, 2024 · d726437 · d726437
1 parent e19fd7d
commit d726437
Show file tree

Hide file tree

Showing 3 changed files with 60 additions and 12 deletions.
diff --git a/buildroot-external/patches/occu/0187-WebUI-Fix-GroupEditingIfDevicesInInbox.patch b/buildroot-external/patches/occu/0187-WebUI-Fix-GroupEditingIfDevicesInInbox.patch
@@ -1,6 +1,6 @@
 --- occu/HMserver/opt/HMServer/pages/GroupEditPage.ftl.orig
 +++ occu/HMserver/opt/HMServer/pages/GroupEditPage.ftl
-@@ -305,7 +305,8 @@
+@@ -329,7 +329,8 @@
          {
              ShowWaitAnim();
 
@@ -10,7 +10,7 @@
              HideWaitAnim();
 
              /*
-@@ -544,7 +545,9 @@
+@@ -568,7 +569,9 @@
          });
 
          ko.utils.arrayForEach(viewModel.assignableDevices(), function(item) {

diff --git a/...WebUI-Fix-GroupEditingIfDevicesInInbox/occu/HMserver/opt/HMServer/pages/GroupEditPage.ftl b/...WebUI-Fix-GroupEditingIfDevicesInInbox/occu/HMserver/opt/HMServer/pages/GroupEditPage.ftl
@@ -7,8 +7,12 @@
 </script>
 <!--</head>
 <body>-->
-<form id="groupEditForm" style="display: none">
- <table id="parameter" class="tTable"  border="0" cellpadding="0" cellspacing="0">
+<form id="groupEditForm" style="display: none; width: 100%;">
+ <table id="parameter" class="tTable"  border="0" cellpadding="0" cellspacing="0" style="width:unset;">
+  <colgroup>
+    <col style="width:20%;"/>
+    <col style="width:80%;"/>
+  </colgroup>
   <thead>
   <tr>
       <td class="thCell CLASS04900" >${"$"}{groupParameterName}</td>
@@ -48,7 +52,14 @@
 
   </tbody>
  </table>
- <table class="tTable"  border="0" cellpadding="0" cellspacing="0">
+ <table class="tTable"  border="0" cellpadding="0" cellspacing="0" style="width:unset;">
+ <colgroup>
+   <col style="width:30%;"/>
+   <col style="width:30%;"/>
+   <col style="width:50px;"/>
+   <col style="width:20%;"/>
+   <col style="width:20%;"/>
+ </colgroup>
  <thead>
      <tr>
          <td class="thCell CLASS04900" colspan="5" style="font-size: 16px !important">${"$"}{groupAssignedDevices}</td>
@@ -84,7 +95,14 @@
  </tfoot>
  </table>
 
- <table class="tTable"  border="0" cellpadding="0" cellspacing="0">
+ <table class="tTable"  border="0" cellpadding="0" cellspacing="0" style="width:unset;">
+ <colgroup>
+   <col style="width:30%;"/>
+   <col style="width:30%;"/>
+   <col style="width:50px;"/>
+   <col style="width:20%;"/>
+   <col style="width:20%;"/>
+ </colgroup>
   <thead>
     <tr>
       <td class="thCell CLASS04900" colspan="5" style="font-size: 16px !important">${"$"}{groupAllDevices}</td>
@@ -127,7 +145,13 @@
   </tfoot>
  </table>
 
- <table class="tTable"  border="0" cellpadding="0" cellspacing="0">
+ <table class="tTable"  border="0" cellpadding="0" cellspacing="0" style="width:unset;">
+ <colgroup>
+   <col style="width:30%;"/>
+   <col style="width:30%;"/>
+   <col style="width:50px;"/>
+   <col style="width:40%;"/>
+ </colgroup>
      <thead>
      <tr>
          <td class="thCell CLASS04900" colspan="5" style="font-size: 16px !important">${"$"}{groupLinkedDevices}</td>

diff --git a/...-Fix-GroupEditingIfDevicesInInbox/occu/HMserver/opt/HMServer/pages/GroupEditPage.ftl.orig b/...-Fix-GroupEditingIfDevicesInInbox/occu/HMserver/opt/HMServer/pages/GroupEditPage.ftl.orig
@@ -7,8 +7,12 @@
 </script>
 <!--</head>
 <body>-->
-<form id="groupEditForm" style="display: none">
- <table id="parameter" class="tTable"  border="0" cellpadding="0" cellspacing="0">
+<form id="groupEditForm" style="display: none; width: 100%;">
+ <table id="parameter" class="tTable"  border="0" cellpadding="0" cellspacing="0" style="width:unset;">
+  <colgroup>
+    <col style="width:20%;"/>
+    <col style="width:80%;"/>
+  </colgroup>
   <thead>
   <tr>
       <td class="thCell CLASS04900" >${"$"}{groupParameterName}</td>
@@ -48,7 +52,14 @@
 
   </tbody>
  </table>
- <table class="tTable"  border="0" cellpadding="0" cellspacing="0">
+ <table class="tTable"  border="0" cellpadding="0" cellspacing="0" style="width:unset;">
+ <colgroup>
+   <col style="width:30%;"/>
+   <col style="width:30%;"/>
+   <col style="width:50px;"/>
+   <col style="width:20%;"/>
+   <col style="width:20%;"/>
+ </colgroup>
  <thead>
      <tr>
          <td class="thCell CLASS04900" colspan="5" style="font-size: 16px !important">${"$"}{groupAssignedDevices}</td>
@@ -84,7 +95,14 @@
  </tfoot>
  </table>
 
- <table class="tTable"  border="0" cellpadding="0" cellspacing="0">
+ <table class="tTable"  border="0" cellpadding="0" cellspacing="0" style="width:unset;">
+ <colgroup>
+   <col style="width:30%;"/>
+   <col style="width:30%;"/>
+   <col style="width:50px;"/>
+   <col style="width:20%;"/>
+   <col style="width:20%;"/>
+ </colgroup>
   <thead>
     <tr>
       <td class="thCell CLASS04900" colspan="5" style="font-size: 16px !important">${"$"}{groupAllDevices}</td>
@@ -127,7 +145,13 @@
   </tfoot>
  </table>
 
- <table class="tTable"  border="0" cellpadding="0" cellspacing="0">
+ <table class="tTable"  border="0" cellpadding="0" cellspacing="0" style="width:unset;">
+ <colgroup>
+   <col style="width:30%;"/>
+   <col style="width:30%;"/>
+   <col style="width:50px;"/>
+   <col style="width:40%;"/>
+ </colgroup>
      <thead>
      <tr>
          <td class="thCell CLASS04900" colspan="5" style="font-size: 16px !important">${"$"}{groupLinkedDevices}</td>