From 530546a198e982d8c64db7aed47cbb7b8257ae52 Mon Sep 17 00:00:00 2001
From: richa <richa.bisht@suse.com>
Date: Tue, 23 Jul 2024 19:17:21 +0200
Subject: [PATCH 01/16] Review fix ssm subpages (#8899)

* Fixed from read only state
* Fixed SSM subpages layout
* Added change log
* Fixed active and focus state css
---
 .../com/suse/manager/webui/utils/ViewHelper.java   |  6 +++++-
 .../css/susemanager/components/inputs.scss         | 14 +++++++++++++-
 .../branding/css/susemanager/components/text.scss  |  2 +-
 web/html/src/branding/css/susemanager/index.scss   |  2 +-
 .../coco-attestation/CoCoSettingsForm.tsx          |  4 ++--
 web/html/src/core/spa/view-helper.ts               |  3 +++
 ...web.changes.bisht-richa.fix-SSM-subpages-layout |  1 +
 7 files changed, 26 insertions(+), 6 deletions(-)
 create mode 100644 web/spacewalk-web.changes.bisht-richa.fix-SSM-subpages-layout

diff --git a/java/code/src/com/suse/manager/webui/utils/ViewHelper.java b/java/code/src/com/suse/manager/webui/utils/ViewHelper.java
index 4dd2411085b6..4529d139f8ae 100644
--- a/java/code/src/com/suse/manager/webui/utils/ViewHelper.java
+++ b/java/code/src/com/suse/manager/webui/utils/ViewHelper.java
@@ -74,7 +74,11 @@ public enum ViewHelper {
         "/rhn/manager/contentmanagement/projects",
         "/rhn/kickstart/cobbler/DefaultSnippetList.do",
         "/rhn/systems/details/packages/PackageList.do",
-        "/rhn/software/channels/All.do"
+        "/rhn/software/channels/All.do",
+        "rhn/channels/software/Search.do",
+        "/rhn/manager/systems/ssm/coco/settings",
+        "/rhn/systems/ssm/audit/ScheduleXccdf.do",
+        "/rhn/systems/ssm/provisioning/PowerManagementConfiguration.do"
     );
 
     ViewHelper() { }
diff --git a/web/html/src/branding/css/susemanager/components/inputs.scss b/web/html/src/branding/css/susemanager/components/inputs.scss
index 6bd7e242faee..3ba0c876316d 100644
--- a/web/html/src/branding/css/susemanager/components/inputs.scss
+++ b/web/html/src/branding/css/susemanager/components/inputs.scss
@@ -9,7 +9,7 @@ $input-height: 35px;
 
 .form-control,
 .form-control--react-select > div:first-of-type {
-  color: $eos-bc-gray-1000 !important;
+  color: $eos-bc-gray-1000;
   height: $input-height;
   max-width: 100%;
   border: 1px solid $input-border-color !important;
@@ -39,6 +39,7 @@ $input-height: 35px;
     color: $eos-bc-gray-700;
     pointer-events: auto;
     cursor: not-allowed;
+    background: $gray-lighter;
 
     &:focus {
       border-color: $input-border-color !important;
@@ -58,7 +59,9 @@ $input-height: 35px;
   &::placeholder {
     color: $input-placeholder;
     opacity: 1;
+    background: $gray-lighter;
   }
+
 }
 
 .form-control-static {
@@ -66,6 +69,15 @@ $input-height: 35px;
   padding-bottom: 8px;
 }
 
+div.form-control {
+  background: $gray-lighter;
+
+  &:focus,
+  &:active {
+    background: $gray-lighter;
+  }
+}
+
 // TODO: Bind this class to the react-select control once we upgrade react-select, see https://react-select.com/styles#the-classnames-prop
 .form-control--react-select > div:first-of-type {
   &:hover {
diff --git a/web/html/src/branding/css/susemanager/components/text.scss b/web/html/src/branding/css/susemanager/components/text.scss
index 7be543fef13e..029a66f7c805 100644
--- a/web/html/src/branding/css/susemanager/components/text.scss
+++ b/web/html/src/branding/css/susemanager/components/text.scss
@@ -1,7 +1,7 @@
 // These are all leftovers from the old theme, hopefully we can drop most of this over time
 .text-muted {
   &, &:hover, &:focus {
-    color: $eos-bc-gray-100;
+    color: $eos-bc-gray-100!important;
   }
 }
 
diff --git a/web/html/src/branding/css/susemanager/index.scss b/web/html/src/branding/css/susemanager/index.scss
index fb9907af3218..f57003cbd7df 100644
--- a/web/html/src/branding/css/susemanager/index.scss
+++ b/web/html/src/branding/css/susemanager/index.scss
@@ -4,7 +4,6 @@
 @import "../base/tools.scss";
 @import "../base/setup-wizard.scss";
 @import "../base/notifications.scss";
-@import "../base/fixes.scss";
 @import "../base/network.scss";
 @import "../base/inputs.scss";
 @import "../base/forms.scss";
@@ -29,6 +28,7 @@
 @import "./components/pre.scss";
 
 @import "./bootstrap-fixes.scss";
+@import "../base/fixes.scss";
 
 // Responsive overrides
 @import "../base/responsive-rules.scss";
diff --git a/web/html/src/components/coco-attestation/CoCoSettingsForm.tsx b/web/html/src/components/coco-attestation/CoCoSettingsForm.tsx
index d12615abdb1e..1017da55cacd 100644
--- a/web/html/src/components/coco-attestation/CoCoSettingsForm.tsx
+++ b/web/html/src/components/coco-attestation/CoCoSettingsForm.tsx
@@ -94,7 +94,7 @@ class CoCoSettingsForm extends React.Component<Props, State> {
         <BootstrapPanel>
           <div className="form-horizontal">
             <div className="form-group">
-              <div className="col-md-offset-3 col-md-6">
+              <div className="col-md-offset-3 offset-md-3 col-md-6">
                 <Toggler
                   className="checkbox"
                   text={t("Enable attestation")}
@@ -135,7 +135,7 @@ class CoCoSettingsForm extends React.Component<Props, State> {
             </div>
             {this.props.showOnScheduleOption && (
               <div className="form-group">
-                <div className="col-md-offset-3 col-md-6">
+                <div className="col-md-offset-3 offset-md-3 col-md-6">
                   <Toggler
                     className="checkbox"
                     text={t("Peform attestation on a schedule")}
diff --git a/web/html/src/core/spa/view-helper.ts b/web/html/src/core/spa/view-helper.ts
index 36d0347c64f0..f93225622993 100644
--- a/web/html/src/core/spa/view-helper.ts
+++ b/web/html/src/core/spa/view-helper.ts
@@ -19,6 +19,9 @@ const BOOTSTRAP_READY_PAGES: string[] = [
   "/rhn/kickstart/cobbler/DefaultSnippetList.do",
   "/rhn/systems/details/packages/PackageList.do",
   "/rhn/software/channels/All.do",
+  "/rhn/manager/systems/ssm/coco/settings",
+  "/rhn/systems/ssm/audit/ScheduleXccdf.do",
+  "/rhn/systems/ssm/provisioning/PowerManagementConfiguration.do",
 ];
 
 export const onEndNavigate = () => {
diff --git a/web/spacewalk-web.changes.bisht-richa.fix-SSM-subpages-layout b/web/spacewalk-web.changes.bisht-richa.fix-SSM-subpages-layout
new file mode 100644
index 000000000000..2ad9746ad2e3
--- /dev/null
+++ b/web/spacewalk-web.changes.bisht-richa.fix-SSM-subpages-layout
@@ -0,0 +1 @@
+- Fixed layout of SSM subpages in updated theme

From 99d5c0a5c8ab383630c0e7e7c9b86ce16cb161a5 Mon Sep 17 00:00:00 2001
From: richa <richa.bisht@suse.com>
Date: Tue, 23 Jul 2024 19:21:31 +0200
Subject: [PATCH 02/16] Btn info inconsistent (#8907)

* Fixed info button style in new theme
* Added change log
* Fixed spcae error in ViewHelper.java
---
 .../suse/manager/webui/utils/ViewHelper.java    |  6 +++++-
 .../susemanager/components/buttons.suma.scss    | 17 +++++++++++++++++
 .../susemanager/components/buttons.uyuni.scss   | 12 ++++++++++++
 web/html/src/core/spa/view-helper.ts            |  4 ++++
 ...s.bisht-richa.fixed-btn-info-style-new-theme |  1 +
 5 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 web/spacewalk-web.changes.bisht-richa.fixed-btn-info-style-new-theme

diff --git a/java/code/src/com/suse/manager/webui/utils/ViewHelper.java b/java/code/src/com/suse/manager/webui/utils/ViewHelper.java
index 4529d139f8ae..e9cb1cdc8db8 100644
--- a/java/code/src/com/suse/manager/webui/utils/ViewHelper.java
+++ b/java/code/src/com/suse/manager/webui/utils/ViewHelper.java
@@ -78,7 +78,11 @@ public enum ViewHelper {
         "rhn/channels/software/Search.do",
         "/rhn/manager/systems/ssm/coco/settings",
         "/rhn/systems/ssm/audit/ScheduleXccdf.do",
-        "/rhn/systems/ssm/provisioning/PowerManagementConfiguration.do"
+        "/rhn/systems/ssm/provisioning/PowerManagementConfiguration.do",
+        "/rhn/systems/details/kickstart/PowerManagement.do",
+        "/rhn/systems/ssm/provisioning/PowerManagementOperations.do",
+        "/rhn/channels/ChannelDetail.do",
+        "/rhn/software/packages/Details.do"
     );
 
     ViewHelper() { }
diff --git a/web/html/src/branding/css/susemanager/components/buttons.suma.scss b/web/html/src/branding/css/susemanager/components/buttons.suma.scss
index 2e66a71d2c6b..15a7702aa121 100644
--- a/web/html/src/branding/css/susemanager/components/buttons.suma.scss
+++ b/web/html/src/branding/css/susemanager/components/buttons.suma.scss
@@ -149,6 +149,23 @@
   }
 }
 
+.btn-info {
+  &,
+  &:active,
+  &:focus,
+  &:disabled,
+  &.disabled {
+    &,
+    &:hover {
+      border-color: $eos-bc-cerulean-500;
+
+      &:not(:disabled):not(.disabled):not(.text-muted):hover {
+        color: $white;
+      }
+    }
+  }
+}
+
 // Warning shouldn't currently be used anywhere, but cover it just in case
 .btn-warning,
 .btn-danger {
diff --git a/web/html/src/branding/css/susemanager/components/buttons.uyuni.scss b/web/html/src/branding/css/susemanager/components/buttons.uyuni.scss
index 853550875fc7..ba76aecead4a 100644
--- a/web/html/src/branding/css/susemanager/components/buttons.uyuni.scss
+++ b/web/html/src/branding/css/susemanager/components/buttons.uyuni.scss
@@ -60,3 +60,15 @@
     border-color: #d43f3a;
   }
 }
+
+.btn-info {
+  color: #fff;
+  background-color: #5bc0de;
+  border-color: #46b8da;
+  
+  &:hover{
+    color: #fff;
+    background-color: #31b0d5;
+    border-color: #269abc;
+  }
+}
diff --git a/web/html/src/core/spa/view-helper.ts b/web/html/src/core/spa/view-helper.ts
index f93225622993..981bd83d462d 100644
--- a/web/html/src/core/spa/view-helper.ts
+++ b/web/html/src/core/spa/view-helper.ts
@@ -22,6 +22,10 @@ const BOOTSTRAP_READY_PAGES: string[] = [
   "/rhn/manager/systems/ssm/coco/settings",
   "/rhn/systems/ssm/audit/ScheduleXccdf.do",
   "/rhn/systems/ssm/provisioning/PowerManagementConfiguration.do",
+  "/rhn/systems/details/kickstart/PowerManagement.do",
+  "/rhn/systems/ssm/provisioning/PowerManagementOperations.do",
+  "/rhn/channels/ChannelDetail.do",
+  "/rhn/software/packages/Details.do",
 ];
 
 export const onEndNavigate = () => {
diff --git a/web/spacewalk-web.changes.bisht-richa.fixed-btn-info-style-new-theme b/web/spacewalk-web.changes.bisht-richa.fixed-btn-info-style-new-theme
new file mode 100644
index 000000000000..da498b6e9f7b
--- /dev/null
+++ b/web/spacewalk-web.changes.bisht-richa.fixed-btn-info-style-new-theme
@@ -0,0 +1 @@
+- Fixed btn-info style in new theme

From c6473f780ebd604ad670f6b4daf1cfd6f7bf0bae Mon Sep 17 00:00:00 2001
From: richa <richa.bisht@suse.com>
Date: Tue, 23 Jul 2024 19:25:00 +0200
Subject: [PATCH 03/16] Fix broken layout of system formulas configuration page
 (#8919)

---
 .../src/com/suse/manager/webui/utils/ViewHelper.java     | 3 ++-
 .../branding/css/susemanager/components/panels.suma.scss | 9 +++++++++
 .../css/susemanager/components/panels.uyuni.scss         | 9 +++++++++
 web/html/src/core/spa/view-helper.ts                     | 1 +
 ...anges.bisht-richa.fixed-system-formulas-config-layout | 1 +
 5 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 web/spacewalk-web.changes.bisht-richa.fixed-system-formulas-config-layout

diff --git a/java/code/src/com/suse/manager/webui/utils/ViewHelper.java b/java/code/src/com/suse/manager/webui/utils/ViewHelper.java
index e9cb1cdc8db8..ea53f9c2a048 100644
--- a/java/code/src/com/suse/manager/webui/utils/ViewHelper.java
+++ b/java/code/src/com/suse/manager/webui/utils/ViewHelper.java
@@ -82,7 +82,8 @@ public enum ViewHelper {
         "/rhn/systems/details/kickstart/PowerManagement.do",
         "/rhn/systems/ssm/provisioning/PowerManagementOperations.do",
         "/rhn/channels/ChannelDetail.do",
-        "/rhn/software/packages/Details.do"
+        "/rhn/software/packages/Details.do",
+        "/rhn/manager/systems/details/formulas"
     );
 
     ViewHelper() { }
diff --git a/web/html/src/branding/css/susemanager/components/panels.suma.scss b/web/html/src/branding/css/susemanager/components/panels.suma.scss
index c67424bd8f18..9a96cdffcc75 100644
--- a/web/html/src/branding/css/susemanager/components/panels.suma.scss
+++ b/web/html/src/branding/css/susemanager/components/panels.suma.scss
@@ -18,5 +18,14 @@
         border-bottom: none;
       }
     }
+
+    > .panel-body .list-group {
+      border: 1px solid $eos-bc-gray-100;
+
+      .list-group-item:hover {
+        background-color: $eos-bc-gray-100;
+        text-decoration: none;
+      }
+    }
   }
 }
diff --git a/web/html/src/branding/css/susemanager/components/panels.uyuni.scss b/web/html/src/branding/css/susemanager/components/panels.uyuni.scss
index 306a031de751..a251a24940e2 100644
--- a/web/html/src/branding/css/susemanager/components/panels.uyuni.scss
+++ b/web/html/src/branding/css/susemanager/components/panels.uyuni.scss
@@ -20,6 +20,15 @@
         border-bottom: none;
       }
     }
+
+    > .panel-body .list-group {
+      border: 1px solid $eos-bc-gray-100;
+
+      .list-group-item:hover {
+        background-color: $eos-bc-gray-50;
+        text-decoration: none;
+      }
+    }
   }
 
   .panel-footer {
diff --git a/web/html/src/core/spa/view-helper.ts b/web/html/src/core/spa/view-helper.ts
index 981bd83d462d..27e8f30d0a9e 100644
--- a/web/html/src/core/spa/view-helper.ts
+++ b/web/html/src/core/spa/view-helper.ts
@@ -26,6 +26,7 @@ const BOOTSTRAP_READY_PAGES: string[] = [
   "/rhn/systems/ssm/provisioning/PowerManagementOperations.do",
   "/rhn/channels/ChannelDetail.do",
   "/rhn/software/packages/Details.do",
+  "/rhn/manager/systems/details/formulas",
 ];
 
 export const onEndNavigate = () => {
diff --git a/web/spacewalk-web.changes.bisht-richa.fixed-system-formulas-config-layout b/web/spacewalk-web.changes.bisht-richa.fixed-system-formulas-config-layout
new file mode 100644
index 000000000000..e7c3d40355a4
--- /dev/null
+++ b/web/spacewalk-web.changes.bisht-richa.fixed-system-formulas-config-layout
@@ -0,0 +1 @@
+Fixed broken layout of system formulas configuration page

From ee37324f8e4574d9a2522a0a24cc49505abb7956 Mon Sep 17 00:00:00 2001
From: richa <richa.bisht@suse.com>
Date: Tue, 23 Jul 2024 19:28:56 +0200
Subject: [PATCH 04/16] Fixed table footer top border (#8925)

---
 java/code/src/com/suse/manager/webui/utils/ViewHelper.java     | 3 ++-
 web/html/src/branding/css/susemanager/components/panels.scss   | 1 +
 web/html/src/core/spa/view-helper.ts                           | 1 +
 ...k-web.changes.bisht-richa.fixed-missing-table-footer-border | 1 +
 4 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 web/spacewalk-web.changes.bisht-richa.fixed-missing-table-footer-border

diff --git a/java/code/src/com/suse/manager/webui/utils/ViewHelper.java b/java/code/src/com/suse/manager/webui/utils/ViewHelper.java
index ea53f9c2a048..64a942c0d3ef 100644
--- a/java/code/src/com/suse/manager/webui/utils/ViewHelper.java
+++ b/java/code/src/com/suse/manager/webui/utils/ViewHelper.java
@@ -83,7 +83,8 @@ public enum ViewHelper {
         "/rhn/systems/ssm/provisioning/PowerManagementOperations.do",
         "/rhn/channels/ChannelDetail.do",
         "/rhn/software/packages/Details.do",
-        "/rhn/manager/systems/details/formulas"
+        "/rhn/manager/systems/details/formulas",
+        "/rhn/manager/cm/imagestores"
     );
 
     ViewHelper() { }
diff --git a/web/html/src/branding/css/susemanager/components/panels.scss b/web/html/src/branding/css/susemanager/components/panels.scss
index 9052cc009e7e..74453b6499f3 100644
--- a/web/html/src/branding/css/susemanager/components/panels.scss
+++ b/web/html/src/branding/css/susemanager/components/panels.scss
@@ -9,6 +9,7 @@
   .panel-footer {
     padding: 10px 15px;
     background: transparent !important;
+    border-top: 1px solid $eos-bc-gray-100;
 
     &:empty {
       display: none;
diff --git a/web/html/src/core/spa/view-helper.ts b/web/html/src/core/spa/view-helper.ts
index 27e8f30d0a9e..35bce1959b09 100644
--- a/web/html/src/core/spa/view-helper.ts
+++ b/web/html/src/core/spa/view-helper.ts
@@ -27,6 +27,7 @@ const BOOTSTRAP_READY_PAGES: string[] = [
   "/rhn/channels/ChannelDetail.do",
   "/rhn/software/packages/Details.do",
   "/rhn/manager/systems/details/formulas",
+  "/rhn/manager/cm/imagestores",
 ];
 
 export const onEndNavigate = () => {
diff --git a/web/spacewalk-web.changes.bisht-richa.fixed-missing-table-footer-border b/web/spacewalk-web.changes.bisht-richa.fixed-missing-table-footer-border
new file mode 100644
index 000000000000..8c29546a5683
--- /dev/null
+++ b/web/spacewalk-web.changes.bisht-richa.fixed-missing-table-footer-border
@@ -0,0 +1 @@
+- Fixed missing top border in table footer

From 90ea8a84d1feeef2bc34314fa2c2d4f9225e3902 Mon Sep 17 00:00:00 2001
From: richa <richa.bisht@suse.com>
Date: Tue, 23 Jul 2024 19:31:29 +0200
Subject: [PATCH 05/16] Fixed broken layout of system highstate page (#8933)

---
 .../code/src/com/suse/manager/webui/utils/ViewHelper.java | 3 ++-
 .../src/branding/css/susemanager/components/buttons.scss  | 8 ++++++++
 web/html/src/core/spa/view-helper.ts                      | 1 +
 web/html/src/manager/state/display-highstate.tsx          | 2 +-
 ...changes.bisht-richa.fixed-system-highstate-page-layout | 1 +
 5 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 web/spacewalk-web.changes.bisht-richa.fixed-system-highstate-page-layout

diff --git a/java/code/src/com/suse/manager/webui/utils/ViewHelper.java b/java/code/src/com/suse/manager/webui/utils/ViewHelper.java
index 64a942c0d3ef..46eff70b0af2 100644
--- a/java/code/src/com/suse/manager/webui/utils/ViewHelper.java
+++ b/java/code/src/com/suse/manager/webui/utils/ViewHelper.java
@@ -84,7 +84,8 @@ public enum ViewHelper {
         "/rhn/channels/ChannelDetail.do",
         "/rhn/software/packages/Details.do",
         "/rhn/manager/systems/details/formulas",
-        "/rhn/manager/cm/imagestores"
+        "/rhn/manager/cm/imagestores",
+        "/rhn/manager/systems/details/highstate"
     );
 
     ViewHelper() { }
diff --git a/web/html/src/branding/css/susemanager/components/buttons.scss b/web/html/src/branding/css/susemanager/components/buttons.scss
index 54e81df03b27..42cd59aa318c 100644
--- a/web/html/src/branding/css/susemanager/components/buttons.scss
+++ b/web/html/src/branding/css/susemanager/components/buttons.scss
@@ -11,6 +11,14 @@
   }
 }
 
+.btn {
+  &,
+  &:active,
+  &:first-child:active {
+    border-color: transparent;
+  }
+}
+
 .btn,
 .btn-default,
 .btn-primary,
diff --git a/web/html/src/core/spa/view-helper.ts b/web/html/src/core/spa/view-helper.ts
index 35bce1959b09..303d3c204ba2 100644
--- a/web/html/src/core/spa/view-helper.ts
+++ b/web/html/src/core/spa/view-helper.ts
@@ -28,6 +28,7 @@ const BOOTSTRAP_READY_PAGES: string[] = [
   "/rhn/software/packages/Details.do",
   "/rhn/manager/systems/details/formulas",
   "/rhn/manager/cm/imagestores",
+  "/rhn/manager/systems/details/highstate",
 ];
 
 export const onEndNavigate = () => {
diff --git a/web/html/src/manager/state/display-highstate.tsx b/web/html/src/manager/state/display-highstate.tsx
index f0b5e276c5af..dde0cee22204 100644
--- a/web/html/src/manager/state/display-highstate.tsx
+++ b/web/html/src/manager/state/display-highstate.tsx
@@ -5,7 +5,7 @@ import HighstateSummary from "./highstate-summary";
 
 function MinionHighstateSingle({ minion }: { minion: { id: number; name: string } }) {
   return (
-    <div className="row">
+    <div>
       <h3>{t("State Summary for {name}", { name: minion.name })}</h3>
       <HighstateSummary minionId={minion.id} />
     </div>
diff --git a/web/spacewalk-web.changes.bisht-richa.fixed-system-highstate-page-layout b/web/spacewalk-web.changes.bisht-richa.fixed-system-highstate-page-layout
new file mode 100644
index 000000000000..963bdff1060c
--- /dev/null
+++ b/web/spacewalk-web.changes.bisht-richa.fixed-system-highstate-page-layout
@@ -0,0 +1 @@
+- Fixed broken layout of system highstate page

From 6bc7cc01824a569a544dfe564f48c5941a32354f Mon Sep 17 00:00:00 2001
From: richa <richa.bisht@suse.com>
Date: Tue, 23 Jul 2024 19:35:45 +0200
Subject: [PATCH 06/16] Added label css (#8936)

---
 .../suse/manager/webui/utils/ViewHelper.java  |  3 +-
 .../css/susemanager/components/label.scss     | 29 +++++++++++++++++++
 .../src/branding/css/susemanager/index.scss   |  1 +
 web/html/src/core/spa/view-helper.ts          |  1 +
 ...isht-richa.fixed-badge-color-salt-key-page |  1 +
 5 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 web/html/src/branding/css/susemanager/components/label.scss
 create mode 100644 web/spacewalk-web.changes.bisht-richa.fixed-badge-color-salt-key-page

diff --git a/java/code/src/com/suse/manager/webui/utils/ViewHelper.java b/java/code/src/com/suse/manager/webui/utils/ViewHelper.java
index 46eff70b0af2..71ca91b11da4 100644
--- a/java/code/src/com/suse/manager/webui/utils/ViewHelper.java
+++ b/java/code/src/com/suse/manager/webui/utils/ViewHelper.java
@@ -85,7 +85,8 @@ public enum ViewHelper {
         "/rhn/software/packages/Details.do",
         "/rhn/manager/systems/details/formulas",
         "/rhn/manager/cm/imagestores",
-        "/rhn/manager/systems/details/highstate"
+        "/rhn/manager/systems/details/highstate",
+        "/rhn/manager/systems/keys"
     );
 
     ViewHelper() { }
diff --git a/web/html/src/branding/css/susemanager/components/label.scss b/web/html/src/branding/css/susemanager/components/label.scss
new file mode 100644
index 000000000000..06a98cda7295
--- /dev/null
+++ b/web/html/src/branding/css/susemanager/components/label.scss
@@ -0,0 +1,29 @@
+.label {
+  display: inline;
+  padding: 0.2em 0.6em 0.3em;
+  font-size: 75%;
+  font-weight: 700;
+  line-height: 1;
+  color: $eos-bc-gray-1000;
+  text-align: center;
+  white-space: nowrap;
+  vertical-align: baseline;
+  border-radius: 0.25em;
+}
+
+.label-success {
+  background-color: $eos-bc-green-500;
+}
+
+.label-info {
+  background-color: $eos-bc-cerulean-500;
+}
+
+.label-warning {
+  background-color: $eos-bc-yellow-500;
+}
+
+.label-danger {
+  color: $white;
+  background-color: $eos-bc-red-900;
+}
diff --git a/web/html/src/branding/css/susemanager/index.scss b/web/html/src/branding/css/susemanager/index.scss
index f57003cbd7df..6548201f4caf 100644
--- a/web/html/src/branding/css/susemanager/index.scss
+++ b/web/html/src/branding/css/susemanager/index.scss
@@ -26,6 +26,7 @@
 @import "./components/text.scss";
 @import "./components/address.scss";
 @import "./components/pre.scss";
+@import "./components/label.scss";
 
 @import "./bootstrap-fixes.scss";
 @import "../base/fixes.scss";
diff --git a/web/html/src/core/spa/view-helper.ts b/web/html/src/core/spa/view-helper.ts
index 303d3c204ba2..22a9c56ff19e 100644
--- a/web/html/src/core/spa/view-helper.ts
+++ b/web/html/src/core/spa/view-helper.ts
@@ -29,6 +29,7 @@ const BOOTSTRAP_READY_PAGES: string[] = [
   "/rhn/manager/systems/details/formulas",
   "/rhn/manager/cm/imagestores",
   "/rhn/manager/systems/details/highstate",
+  "/rhn/manager/systems/keys",
 ];
 
 export const onEndNavigate = () => {
diff --git a/web/spacewalk-web.changes.bisht-richa.fixed-badge-color-salt-key-page b/web/spacewalk-web.changes.bisht-richa.fixed-badge-color-salt-key-page
new file mode 100644
index 000000000000..a7b6b5e13e17
--- /dev/null
+++ b/web/spacewalk-web.changes.bisht-richa.fixed-badge-color-salt-key-page
@@ -0,0 +1 @@
+- Fixed badege color in salt key table
\ No newline at end of file

From 2c8fa79fc655e71142496b1e98a69e1e2a915094 Mon Sep 17 00:00:00 2001
From: richa <richa.bisht@suse.com>
Date: Tue, 23 Jul 2024 19:38:24 +0200
Subject: [PATCH 07/16] Fixed missing margins in CVE audit (#8947)

---
 .../src/com/suse/manager/webui/utils/ViewHelper.java     | 3 ++-
 web/html/src/branding/css/base/forms.scss                | 9 +++++++++
 web/html/src/core/spa/view-helper.ts                     | 1 +
 ...web.changes.bisht-richa.fixed-missing-margin-cve-list | 1 +
 4 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 web/spacewalk-web.changes.bisht-richa.fixed-missing-margin-cve-list

diff --git a/java/code/src/com/suse/manager/webui/utils/ViewHelper.java b/java/code/src/com/suse/manager/webui/utils/ViewHelper.java
index 71ca91b11da4..0bf6f2c96517 100644
--- a/java/code/src/com/suse/manager/webui/utils/ViewHelper.java
+++ b/java/code/src/com/suse/manager/webui/utils/ViewHelper.java
@@ -86,7 +86,8 @@ public enum ViewHelper {
         "/rhn/manager/systems/details/formulas",
         "/rhn/manager/cm/imagestores",
         "/rhn/manager/systems/details/highstate",
-        "/rhn/manager/systems/keys"
+        "/rhn/manager/systems/keys",
+        "/rhn/manager/audit/cve"
     );
 
     ViewHelper() { }
diff --git a/web/html/src/branding/css/base/forms.scss b/web/html/src/branding/css/base/forms.scss
index b2c94304aa21..49f4ea7aabb5 100644
--- a/web/html/src/branding/css/base/forms.scss
+++ b/web/html/src/branding/css/base/forms.scss
@@ -32,6 +32,15 @@ input[type="checkbox"] {
   margin: 0 5px 0 0;
 }
 
+.checkbox {
+  margin-bottom: 10px;
+  margin-top: 10px;
+
+  & + .checkbox {
+    margin-top: -5px;
+  }
+}
+
 // Here and below, these offer Bootstrap 3 compatibility
 .form-horizontal {
   .control-label {
diff --git a/web/html/src/core/spa/view-helper.ts b/web/html/src/core/spa/view-helper.ts
index 22a9c56ff19e..ee82ef186824 100644
--- a/web/html/src/core/spa/view-helper.ts
+++ b/web/html/src/core/spa/view-helper.ts
@@ -30,6 +30,7 @@ const BOOTSTRAP_READY_PAGES: string[] = [
   "/rhn/manager/cm/imagestores",
   "/rhn/manager/systems/details/highstate",
   "/rhn/manager/systems/keys",
+  "/rhn/manager/audit/cve",
 ];
 
 export const onEndNavigate = () => {
diff --git a/web/spacewalk-web.changes.bisht-richa.fixed-missing-margin-cve-list b/web/spacewalk-web.changes.bisht-richa.fixed-missing-margin-cve-list
new file mode 100644
index 000000000000..2ff92420ff38
--- /dev/null
+++ b/web/spacewalk-web.changes.bisht-richa.fixed-missing-margin-cve-list
@@ -0,0 +1 @@
+- Fixed missing margin in CVE audit list on cve page

From 6719ea0e525a953c43f2e8ec0b35245898c2992a Mon Sep 17 00:00:00 2001
From: richa <richa.bisht@suse.com>
Date: Tue, 23 Jul 2024 19:41:45 +0200
Subject: [PATCH 08/16] Fixed advanced package search page layout (#8956)

---
 .../suse/manager/webui/utils/ViewHelper.java  |  3 +-
 .../WEB-INF/pages/errata/erratasearch.jsp     | 32 ++++++++++++++++---
 ...richa.fixed-advanced-package-search-layout |  1 +
 web/html/src/branding/css/base/tables.scss    |  4 +++
 web/html/src/core/spa/view-helper.ts          |  1 +
 ...richa.fixed-advanced-package-search-layout |  1 +
 6 files changed, 36 insertions(+), 6 deletions(-)
 create mode 100644 java/spacewalk-java.changes.bisht-richa.fixed-advanced-package-search-layout
 create mode 100644 web/spacewalk-web.changes.bisht-richa.fixed-advanced-package-search-layout

diff --git a/java/code/src/com/suse/manager/webui/utils/ViewHelper.java b/java/code/src/com/suse/manager/webui/utils/ViewHelper.java
index 0bf6f2c96517..3750768fbb0d 100644
--- a/java/code/src/com/suse/manager/webui/utils/ViewHelper.java
+++ b/java/code/src/com/suse/manager/webui/utils/ViewHelper.java
@@ -87,7 +87,8 @@ public enum ViewHelper {
         "/rhn/manager/cm/imagestores",
         "/rhn/manager/systems/details/highstate",
         "/rhn/manager/systems/keys",
-        "/rhn/manager/audit/cve"
+        "/rhn/manager/audit/cve",
+        "/rhn/errata/Search.do"
     );
 
     ViewHelper() { }
diff --git a/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp b/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp
index 0e5260c7712b..b8d61c952bf7 100644
--- a/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp
@@ -43,7 +43,11 @@
        <div class="panel-body">
          <table class="table">
            <tr>
-             <td><bean:message key="erratasearch.jsp.searchfor"/></td>
+             <td>
+              <label class="w-100 control-label" for="searchfor">
+                <bean:message key="erratasearch.jsp.searchfor"/>
+              </label>
+            </td>
              <td>
               <div class="row-0">
                 <div class="col-md-5">
@@ -56,7 +60,12 @@
                 </div>
              </td>
            </tr>
-           <tr><td><bean:message key="erratasearch.jsp.whatsearch"/></td>
+           <tr>
+            <td>
+              <label class="w-100 control-label" for="whatsearch">
+                <bean:message key="erratasearch.jsp.whatsearch"/>
+              </label>
+            </td>
              <td>
                 <div class="row-0">
                   <div class="col-md-5">
@@ -72,7 +81,12 @@
                 </div>
              </td>
            </tr>
-           <tr><td><bean:message key="erratasearch.jsp.types_to_search"/></td>
+           <tr>
+            <td>
+              <label class="w-100 control-label" for="typeToSearch">
+                <bean:message key="erratasearch.jsp.types_to_search"/>
+              </label>
+            </td>
              <td>
                 <div class="checkbox icon-wrapper">
                   <html:checkbox property="errata_type_bug">
@@ -95,7 +109,11 @@
             </td>
            </tr>
            <tr>
-            <td><bean:message key="erratasearch.jsp.issue_date"/></td>
+            <td>
+              <label class="w-100 control-label" for="issueDate">
+                <bean:message key="erratasearch.jsp.issue_date"/>
+              </label>
+            </td>
                 <td>
                   <div class="checkbox">
                     <html:checkbox styleId="issueDateOptionsCheckBox" property="optionIssueDateSearch" onclick="javascript:issueDateSearchOptions()" >
@@ -129,7 +147,11 @@
                 </td>
            </tr>
            <tr>
-              <td><label for="fineGrainedlabel"><bean:message key="systemsearch.jsp.finegrainedlabel"/></label></td>
+              <td>
+                <label class="w-100 control-label" for="fineGrainedlabel">
+                  <bean:message key="systemsearch.jsp.finegrainedlabel"/>
+                </label>
+              </td>
               <td>
                 <div class="checkbox">
                   <html:checkbox property="fineGrained" styleId="fineGrainedlabel"> <label for="fineGrainedlabel"><bean:message key="systemsearch.jsp.finegrained"/></label></html:checkbox>
diff --git a/java/spacewalk-java.changes.bisht-richa.fixed-advanced-package-search-layout b/java/spacewalk-java.changes.bisht-richa.fixed-advanced-package-search-layout
new file mode 100644
index 000000000000..5322671eb01b
--- /dev/null
+++ b/java/spacewalk-java.changes.bisht-richa.fixed-advanced-package-search-layout
@@ -0,0 +1 @@
+- Fixed layout of advanced package search page
diff --git a/web/html/src/branding/css/base/tables.scss b/web/html/src/branding/css/base/tables.scss
index a341422c6111..50a443fd9bcb 100644
--- a/web/html/src/branding/css/base/tables.scss
+++ b/web/html/src/branding/css/base/tables.scss
@@ -9,6 +9,10 @@
   > tbody > tr:last-child > * {
     border-bottom-width: 0;
   }
+
+  .table {
+    background-color: $white;
+  }
 }
 
 .table > thead > tr.active > th {
diff --git a/web/html/src/core/spa/view-helper.ts b/web/html/src/core/spa/view-helper.ts
index ee82ef186824..a03a800d9d24 100644
--- a/web/html/src/core/spa/view-helper.ts
+++ b/web/html/src/core/spa/view-helper.ts
@@ -31,6 +31,7 @@ const BOOTSTRAP_READY_PAGES: string[] = [
   "/rhn/manager/systems/details/highstate",
   "/rhn/manager/systems/keys",
   "/rhn/manager/audit/cve",
+  "/rhn/errata/Search.do",
 ];
 
 export const onEndNavigate = () => {
diff --git a/web/spacewalk-web.changes.bisht-richa.fixed-advanced-package-search-layout b/web/spacewalk-web.changes.bisht-richa.fixed-advanced-package-search-layout
new file mode 100644
index 000000000000..5322671eb01b
--- /dev/null
+++ b/web/spacewalk-web.changes.bisht-richa.fixed-advanced-package-search-layout
@@ -0,0 +1 @@
+- Fixed layout of advanced package search page

From 832b98750d171d12f5f026a99d21481a34d3a287 Mon Sep 17 00:00:00 2001
From: richa <richa.bisht@suse.com>
Date: Tue, 23 Jul 2024 19:45:03 +0200
Subject: [PATCH 09/16] Fixed OpenSCAP search page layout (#8960)

---
 .../suse/manager/webui/utils/ViewHelper.java  |   3 +-
 .../WEB-INF/pages/audit/scap/xccdfsearch.jsp  | 230 ++++++++++--------
 web/html/src/core/spa/view-helper.ts          |   1 +
 ...t-richa.fixed-open-scap-search-page-layout |   1 +
 4 files changed, 128 insertions(+), 107 deletions(-)
 create mode 100644 web/spacewalk-web.changes.bisht-richa.fixed-open-scap-search-page-layout

diff --git a/java/code/src/com/suse/manager/webui/utils/ViewHelper.java b/java/code/src/com/suse/manager/webui/utils/ViewHelper.java
index 3750768fbb0d..ac792c9f0a90 100644
--- a/java/code/src/com/suse/manager/webui/utils/ViewHelper.java
+++ b/java/code/src/com/suse/manager/webui/utils/ViewHelper.java
@@ -88,7 +88,8 @@ public enum ViewHelper {
         "/rhn/manager/systems/details/highstate",
         "/rhn/manager/systems/keys",
         "/rhn/manager/audit/cve",
-        "/rhn/errata/Search.do"
+        "/rhn/errata/Search.do",
+        "/rhn/audit/scap/Search.do"
     );
 
     ViewHelper() { }
diff --git a/java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp b/java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp
index bf60433fd312..349972d73ee5 100644
--- a/java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp
+++ b/java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp
@@ -26,116 +26,134 @@
         </rhn:toolbar>
         <p><bean:message key="scapsearch.jsp.summary"/></p>
         <div class="panel panel-default">
-            <div class="panel-heading">
-                <h4><bean:message key="scapsearch.jsp.instructions"/></h4>
-            </div>
-            <div class="panel-body">
-                <html:form styleClass="form-inline" action="/audit/scap/Search.do">
-                    <rhn:csrf/>
-                    <table class="table">
+          <div class="panel-heading">
+            <h4><bean:message key="scapsearch.jsp.instructions"/></h4>
+          </div>
+          <div class="panel-body">
+            <html:form styleClass="form-horizontal" action="/audit/scap/Search.do">
+              <rhn:csrf/>
+              <table class="table">
+                <tr>
+                  <td>
+                    <label class="w-100 control-label" for="searchfor">
+                      <bean:message key="scapsearch.jsp.searchfor"/>:
+                    </label>
+                  </td>
+                  <td>
+                    <div class="row-0">
+                      <div class="col-md-6">
+                        <div class="input-group">
+                          <html:text property="search_string" styleClass="form-control" name="search_string"
+                            value="${search_string}" maxlength="100" accesskey="4"/>
+                            <div class="input-group-btn">
+                              <button type="submit" class="btn btn-default">
+                                <rhn:icon type="header-search" />
+                                <bean:message key="button.search"/>
+                              </button>
+                            </div>
+                        </div>
+                      </div>
+                      <div class="col-md-6"><bean:message key="scapsearch.jsp.whatsearch.tip"/></div>
+                    </div>
+                  </td>
+                </tr>
+                <tr>
+                  <td>
+                    <label class="w-100 control-label" for="withresult">
+                      <bean:message key="scapsearch.jsp.withresult"/>:
+                    </label>
+                  </td>
+                  <td>
+                    <div class="row-0">
+                      <div class="col-md-6">
+                        <html:select styleClass="form-control" property="result_filter">
+                          <html:options collection="allResults" property="label" labelProperty="label"/>
+                        </html:select>
+                      </div>
+                    </div>
+                  </td>
+                </tr>
+                <tr>
+                  <td>
+                    <label class="w-100 control-label" for="wheretosearch">
+                      <bean:message key="systemsearch.jsp.wheretosearch"/>
+                    </label>
+                  </td>
+                  <td>
+                    <div class="radio">
+                      <label for="whereToSearch-all">
+                        <html:radio property="whereToSearch" value="all" styleId="whereToSearch-all"/>
+                        <bean:message key="systemsearch.jsp.searchallsystems"/>
+                      </label>
+                    </div>
+                    <div class="radio">
+                      <label for="whereToSearch-system_list">
+                        <html:radio property="whereToSearch" value="system_list" styleId="whereToSearch-system_list"/>
+                        <bean:message key="systemsearch.jsp.searchSSM"/>
+                      </label>
+                    </div>
+                  </td>
+                </tr>
+                <tr>
+                  <td>
+                    <label class="w-100 control-label" for="scanDate">
+                      <bean:message key="scapsearch.jsp.scan_date"/>:
+                    </label>
+                  </td>
+                  <td>
+                    <div class="checkbox">
+                      <label for="scanDateOptionsCheckBox">
+                        <html:checkbox styleId="scanDateOptionsCheckBox" property="optionScanDateSearch" onclick="javascript:scanDateSearchOptions()">
+                        </html:checkbox>
+                        <bean:message key="scapsearch.jsp.search_by_scan_dates"/>
+                      </label>
+                    </div>
+                    </br>
+                    <div id="scanDateOptions" class="indent">
+                      <table class="table">
                         <tr>
-                            <td class="col-xs-3">
-                                <bean:message key="scapsearch.jsp.searchfor"/>:
-                            </td>
-                            <td class="col-xs-9">
-                                <div class="row-0">
-                                    <div class="col-sm-7">
-                                        <div class="input-group">
-                                    <html:text property="search_string" styleClass="form-control" name="search_string"
-                                               value="${search_string}" maxlength="100" accesskey="4"/>
-                                            <div class="input-group-btn">
-                                                <button type="submit" class="btn btn-default">
-                                        <rhn:icon type="header-search" />
-                                        <bean:message key="button.search"/>
-                                    </button>
-                                </div>
-                                        </div>
-                                    </div>
-                                </div>
-
-                                <small>
-                                    <bean:message key="scapsearch.jsp.whatsearch.tip"/>
-                                </small>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><bean:message key="scapsearch.jsp.withresult"/>:</td>
-                            <td>
-                                <div class="form-group">
-                                    <html:select styleClass="form-control" property="result_filter">
-                                        <html:options collection="allResults" property="label" labelProperty="label"/>
-                                    </html:select>
-                                </div>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><bean:message key="systemsearch.jsp.wheretosearch"/></td>
-                            <td>
-                                <div class="radio">
-                                    <label for="whereToSearch-all">
-                                    <html:radio property="whereToSearch" value="all" styleId="whereToSearch-all"/>
-                                        <bean:message key="systemsearch.jsp.searchallsystems"/>
-                                    </label>
-                                </div>
-                                <div class="radio">
-                                    <label for="whereToSearch-system_list">
-                                    <html:radio property="whereToSearch" value="system_list" styleId="whereToSearch-system_list"/>
-                                        <bean:message key="systemsearch.jsp.searchSSM"/>
-                                    </label>
-                                </div>
-                            </td>
-                        </tr>
-                        <tr><td><bean:message key="scapsearch.jsp.scan_date"/>:</td>
-                            <td>
-                                <div class="checkbox">
-                                    <label for="scanDateOptionsCheckBox">
-                                        <html:checkbox styleId="scanDateOptionsCheckBox" property="optionScanDateSearch" onclick="javascript:scanDateSearchOptions()">
-                                        </html:checkbox>
-                                        <bean:message key="scapsearch.jsp.search_by_scan_dates"/>
-                                    </label>
-                                </div>
-                                </br>
-                                <div id="scanDateOptions" class="indent">
-                                    <table>
-                                        <tr>
-                                            <td><bean:message key="scapsearch.jsp.start_date"/>:</td>
-                                            <td><jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp">
-                                                    <jsp:param name="widget" value="start"/>
-                                                </jsp:include>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td><bean:message key="scapsearch.jsp.end_date"/>:</td>
-                                            <td><jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp">
-                                                    <jsp:param name="widget" value="end"/>
-                                                </jsp:include>
-                                            </td>
-                                        <tr>
-                                    </table>
-                                </div>
-                            </td>
+                          <td><bean:message key="scapsearch.jsp.start_date"/>:</td>
+                          <td><jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp">
+                                <jsp:param name="widget" value="start"/>
+                              </jsp:include>
+                          </td>
                         </tr>
                         <tr>
-                            <td><bean:message key="scapsearch.jsp.show_as"/>:</td>
-                            <td>
-                                <div class="radio">
-                                    <label for="show_as-rr">
-                                    <html:radio property="show_as" value="rr" styleId="show_as-rr"/>
-                                        <bean:message key="scapsearch.jsp.list_rr"/>
-                                    </label>
-                                </div>
-                                <div class="radio">
-                                    <label for="show_as-tr">
-                                    <html:radio property="show_as" value="tr" styleId="show_as-tr"/>
-                                        <bean:message key="scapsearch.jsp.list_tr"/>
-                                    </label>
-                                </div>
-                            </td>
+                          <td><bean:message key="scapsearch.jsp.end_date"/>:</td>
+                          <td><jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp">
+                                  <jsp:param name="widget" value="end"/>
+                              </jsp:include>
+                          </td>
                         </tr>
-                    </table>
-                    <html:hidden property="submitted" value="true"/>
-                </html:form>
-            </div>
+                      </table>
+                    </div>
+                  </td>
+                </tr>
+                <tr>
+                  <td>
+                    <label class="w-100 control-label" for="showAs">
+                      <bean:message key="scapsearch.jsp.show_as"/>:
+                    </label>
+                  </td>
+                  <td>
+                    <div class="radio">
+                      <label for="show_as-rr">
+                      <html:radio property="show_as" value="rr" styleId="show_as-rr"/>
+                        <bean:message key="scapsearch.jsp.list_rr"/>
+                      </label>
+                    </div>
+                    <div class="radio">
+                      <label for="show_as-tr">
+                      <html:radio property="show_as" value="tr" styleId="show_as-tr"/>
+                        <bean:message key="scapsearch.jsp.list_tr"/>
+                      </label>
+                    </div>
+                  </td>
+                </tr>
+              </table>
+              <html:hidden property="submitted" value="true"/>
+            </html:form>
+          </div>
         </div>
         <c:if test="${(search_string != null && search_string != '')}">
             <c:set var="pageList" value="${requestScope.pageList}"/>
diff --git a/web/html/src/core/spa/view-helper.ts b/web/html/src/core/spa/view-helper.ts
index a03a800d9d24..b6d4d55c7e65 100644
--- a/web/html/src/core/spa/view-helper.ts
+++ b/web/html/src/core/spa/view-helper.ts
@@ -32,6 +32,7 @@ const BOOTSTRAP_READY_PAGES: string[] = [
   "/rhn/manager/systems/keys",
   "/rhn/manager/audit/cve",
   "/rhn/errata/Search.do",
+  "/rhn/audit/scap/Search.do",
 ];
 
 export const onEndNavigate = () => {
diff --git a/web/spacewalk-web.changes.bisht-richa.fixed-open-scap-search-page-layout b/web/spacewalk-web.changes.bisht-richa.fixed-open-scap-search-page-layout
new file mode 100644
index 000000000000..da3f0ed73948
--- /dev/null
+++ b/web/spacewalk-web.changes.bisht-richa.fixed-open-scap-search-page-layout
@@ -0,0 +1 @@
+- Fixed OpenSCAP search page layout

From a1dffa5bb7b5142042db67b3e3fc122a5ad567ee Mon Sep 17 00:00:00 2001
From: richa <richa.bisht@suse.com>
Date: Tue, 23 Jul 2024 19:47:05 +0200
Subject: [PATCH 10/16] Fixed double padding in recurring actions (#8963)

---
 .../suse/manager/webui/utils/ViewHelper.java  |   5 +-
 web/html/src/components/icontag.tsx           |   1 +
 web/html/src/core/spa/view-helper.ts          |   3 +
 .../maintenance/details/schedule-details.tsx  | 124 ++++----
 .../list/maintenance-windows-list.tsx         |  57 ++--
 .../recurring/recurring-actions-list.tsx      | 264 +++++++++---------
 ...ha.fixed-double-padding-irecurring-actions |   1 +
 7 files changed, 232 insertions(+), 223 deletions(-)
 create mode 100644 web/spacewalk-web.changes.bisht-richa.fixed-double-padding-irecurring-actions

diff --git a/java/code/src/com/suse/manager/webui/utils/ViewHelper.java b/java/code/src/com/suse/manager/webui/utils/ViewHelper.java
index ac792c9f0a90..f154a2c13045 100644
--- a/java/code/src/com/suse/manager/webui/utils/ViewHelper.java
+++ b/java/code/src/com/suse/manager/webui/utils/ViewHelper.java
@@ -89,7 +89,10 @@ public enum ViewHelper {
         "/rhn/manager/systems/keys",
         "/rhn/manager/audit/cve",
         "/rhn/errata/Search.do",
-        "/rhn/audit/scap/Search.do"
+        "/rhn/audit/scap/Search.do",
+        "/rhn/manager/schedule/recurring-actions",
+        "/rhn/manager/schedule/maintenance/calendars",
+        "/rhn/manager/multiorg/recurring-actions"
     );
 
     ViewHelper() { }
diff --git a/web/html/src/components/icontag.tsx b/web/html/src/components/icontag.tsx
index 308fb15d7dc7..6fe074b9e3c6 100644
--- a/web/html/src/components/icontag.tsx
+++ b/web/html/src/components/icontag.tsx
@@ -116,6 +116,7 @@ function IconTag(props: Props) {
     "sort-down": "fa fa-arrow-circle-down",
     "sort-up": "fa fa-arrow-circle-up",
     spinner: "fa fa-spinner fa-spin",
+    "spacewalk-icon-salt": "fa spacewalk-icon-salt",
     "system-state": "fa spacewalk-icon-salt-add",
     "system-bare-metal-legend": "fa fa-1-5x spacewalk-icon-bare-metal",
     "system-bare-metal": "fa spacewalk-icon-bare-metal",
diff --git a/web/html/src/core/spa/view-helper.ts b/web/html/src/core/spa/view-helper.ts
index b6d4d55c7e65..41a22155e65e 100644
--- a/web/html/src/core/spa/view-helper.ts
+++ b/web/html/src/core/spa/view-helper.ts
@@ -33,6 +33,9 @@ const BOOTSTRAP_READY_PAGES: string[] = [
   "/rhn/manager/audit/cve",
   "/rhn/errata/Search.do",
   "/rhn/audit/scap/Search.do",
+  "/rhn/manager/schedule/recurring-actions",
+  "/rhn/manager/schedule/maintenance/calendars",
+  "/rhn/manager/multiorg/recurring-actions",
 ];
 
 export const onEndNavigate = () => {
diff --git a/web/html/src/manager/maintenance/details/schedule-details.tsx b/web/html/src/manager/maintenance/details/schedule-details.tsx
index 0c73bcb8e8cb..c38e23ae66c3 100644
--- a/web/html/src/manager/maintenance/details/schedule-details.tsx
+++ b/web/html/src/manager/maintenance/details/schedule-details.tsx
@@ -6,11 +6,11 @@ import { WebCalendar } from "manager/maintenance/calendar/web-calendar";
 import { AsyncButton } from "components/buttons";
 import { DeleteDialog } from "components/dialog/DeleteDialog";
 import { ModalButton } from "components/dialog/ModalButton";
+import { IconTag } from "components/icontag";
 import { SystemLink } from "components/links";
 import { Utils as MessagesUtils } from "components/messages";
 import { MessageType } from "components/messages";
 import { BootstrapPanel } from "components/panels/BootstrapPanel";
-import { InnerPanel } from "components/panels/InnerPanel";
 import { TabLabel } from "components/tab-container";
 import { Column } from "components/table/Column";
 import { SearchField } from "components/table/SearchField";
@@ -166,64 +166,72 @@ const SystemPicker = (props: SystemPickerProps) => {
 
   return (
     <>
-      <InnerPanel
-        title={t("Assigned Systems")}
-        icon="fa-desktop"
-        buttons={[
-          <Toggler
-            text={t("Cancel affected actions")}
-            className="btn"
-            handler={() => setCancelActions(!isCancelActions)}
-            value={isCancelActions}
-          />,
-          isCancelActions && selectedSystems.length > 0 ? (
-            <ModalButton
-              target="cancel-confirm"
-              text={t("Save Changes")}
-              className="btn-success"
-              disabled={!hasChanges}
-            />
-          ) : (
-            <AsyncButton action={onAssign} defaultType="btn-success" text={t("Save Changes")} disabled={!hasChanges} />
-          ),
-        ]}
+      <h2>
+        <IconTag type="event-type-system" />
+        {t("Assigned Systems")}
+      </h2>
+      <div className="clearfix mb-3">
+        <div className="pull-right btn-group">
+          {[
+            <Toggler
+              text={t("Cancel affected actions")}
+              className="btn"
+              handler={() => setCancelActions(!isCancelActions)}
+              value={isCancelActions}
+            />,
+            isCancelActions && selectedSystems.length > 0 ? (
+              <ModalButton
+                target="cancel-confirm"
+                text={t("Save Changes")}
+                className="btn-success"
+                disabled={!hasChanges}
+              />
+            ) : (
+              <AsyncButton
+                action={onAssign}
+                defaultType="btn-success"
+                text={t("Save Changes")}
+                disabled={!hasChanges}
+              />
+            ),
+          ]}
+        </div>
+      </div>
+      <Table
+        data="/rhn/manager/api/maintenance/schedule/systems"
+        identifier={(system) => system.id}
+        searchField={<SearchField placeholder={t("Search systems")} />}
+        selectable
+        selectedItems={selectedSystems}
+        onSelect={onSelect}
+        initialSortColumnKey="name"
       >
-        <Table
-          data="/rhn/manager/api/maintenance/schedule/systems"
-          identifier={(system) => system.id}
-          searchField={<SearchField placeholder={t("Search systems")} />}
-          selectable
-          selectedItems={selectedSystems}
-          onSelect={onSelect}
-          initialSortColumnKey="name"
-        >
-          <Column
-            columnKey="name"
-            sortable
-            header={t("System")}
-            cell={(system) => (
-              <SystemLink id={system.id} newWindow>
-                {system.name}
-              </SystemLink>
-            )}
-          />
-          <Column
-            columnKey="scheduleName"
-            sortable
-            header={t("Current Schedule")}
-            cell={(system) =>
-              system.scheduleId &&
-              (system.scheduleId === props.scheduleId ? (
-                <span>{system.scheduleName}</span>
-              ) : (
-                <a href={`/rhn/manager/schedule/maintenance/schedules#/details/${system.scheduleId}`}>
-                  {system.scheduleName}
-                </a>
-              ))
-            }
-          />
-        </Table>
-      </InnerPanel>
+        <Column
+          columnKey="name"
+          sortable
+          header={t("System")}
+          cell={(system) => (
+            <SystemLink id={system.id} newWindow>
+              {system.name}
+            </SystemLink>
+          )}
+        />
+        <Column
+          columnKey="scheduleName"
+          sortable
+          header={t("Current Schedule")}
+          cell={(system) =>
+            system.scheduleId &&
+            (system.scheduleId === props.scheduleId ? (
+              <span>{system.scheduleName}</span>
+            ) : (
+              <a href={`/rhn/manager/schedule/maintenance/schedules#/details/${system.scheduleId}`}>
+                {system.scheduleName}
+              </a>
+            ))
+          }
+        />
+      </Table>
       <CancelActionsDialog id="cancel-confirm" onConfirmAsync={onAssign} />
     </>
   );
diff --git a/web/html/src/manager/maintenance/list/maintenance-windows-list.tsx b/web/html/src/manager/maintenance/list/maintenance-windows-list.tsx
index 3513f0524987..0be899a624f4 100644
--- a/web/html/src/manager/maintenance/list/maintenance-windows-list.tsx
+++ b/web/html/src/manager/maintenance/list/maintenance-windows-list.tsx
@@ -2,7 +2,8 @@ import * as React from "react";
 import { useState } from "react";
 
 import { Button } from "components/buttons";
-import { InnerPanel } from "components/panels/InnerPanel";
+import { IconTag } from "components/icontag";
+import { HelpLink } from "components/utils";
 
 import MaintenanceCalendarList from "./calendar-list";
 import MaintenanceScheduleList from "./schedule-list";
@@ -34,41 +35,37 @@ const MaintenanceWindowsList = (props: MaintenanceListProps) => {
 
   return (
     <div>
-      <InnerPanel
-        title={t("Maintenance") + " " + (type === "schedule" ? t("Schedules") : t("Calendars"))}
-        icon="spacewalk-icon-schedule"
-        buttons={buttons}
-        helpUrl="reference/schedule/maintenance-windows.html"
-        summary={
-          type === "schedule"
+      <>
+        <h1>
+          <IconTag type="header-schedule" />
+          {type === "schedule" ? t("Maintenance Schedules") : t("Maintenance Calendars")}
+          <HelpLink url="reference/schedule/maintenance-windows.html" />
+        </h1>
+        <p>
+          {type === "schedule"
             ? t("Below is a list of Maintenance Schedules available to the current user.")
-            : t("Below is a list of Maintenance Calendars available to the current user.")
-        }
-      >
-        <div className="panel panel-default">
-          <div className="panel-heading">
-            <div>
-              <h3>{t(type === "schedule" ? "Schedules" : "Calendars")}</h3>
-            </div>
-          </div>
-          {(type === "schedule" && (
-            <MaintenanceScheduleList
+            : t("Below is a list of Maintenance Calendars available to the current user.")}
+        </p>
+        <div className="pull-right btn-group">{buttons}</div>
+        <h3>{t(type === "schedule" ? "Schedules" : "Calendars")}</h3>
+
+        {(type === "schedule" && (
+          <MaintenanceScheduleList
+            data={props.data}
+            onSelect={props.onSelect}
+            onEdit={props.onEdit}
+            onDelete={props.onDelete}
+          />
+        )) ||
+          (type === "calendar" && (
+            <MaintenanceCalendarList
               data={props.data}
               onSelect={props.onSelect}
               onEdit={props.onEdit}
               onDelete={props.onDelete}
             />
-          )) ||
-            (type === "calendar" && (
-              <MaintenanceCalendarList
-                data={props.data}
-                onSelect={props.onSelect}
-                onEdit={props.onEdit}
-                onDelete={props.onDelete}
-              />
-            ))}
-        </div>
-      </InnerPanel>
+          ))}
+      </>
     </div>
   );
 };
diff --git a/web/html/src/manager/recurring/recurring-actions-list.tsx b/web/html/src/manager/recurring/recurring-actions-list.tsx
index f9509f7896bb..e1c6d61413c2 100644
--- a/web/html/src/manager/recurring/recurring-actions-list.tsx
+++ b/web/html/src/manager/recurring/recurring-actions-list.tsx
@@ -5,11 +5,12 @@ import { pageSize } from "core/user-preferences";
 import { Button } from "components/buttons";
 import { DeleteDialog } from "components/dialog/DeleteDialog";
 import { ModalButton } from "components/dialog/ModalButton";
+import { IconTag } from "components/icontag";
 import { Utils as MessagesUtils } from "components/messages";
-import { InnerPanel } from "components/panels/InnerPanel";
 import { Column } from "components/table/Column";
 import { Table } from "components/table/Table";
 import { Toggler } from "components/toggler";
+import { HelpLink } from "components/utils";
 
 import { Utils } from "utils/functions";
 import Network from "utils/network";
@@ -108,140 +109,135 @@ class RecurringActionsList extends React.Component<Props, State> {
     ];
 
     return (
-      <InnerPanel
-        title={t("Recurring Actions")}
-        icon="spacewalk-icon-salt"
-        buttons={disableCreate ? [] : buttons}
-        summary={
-          <>
-            <p>{t("The following recurring actions have been created.")}</p>
-            {disableCreate ? (
-              <p>
-                {t(
-                  "To create new recurring actions head to the system, group or organization you want to create the action for."
-                )}
-              </p>
-            ) : null}
-          </>
-        }
-        // We only want to display the help icon in the 'Schedule > Recurring Actions' page so we use disableCreate as
-        // an indicator whether we currently render this page
-        helpUrl={disableCreate ? "reference/schedule/recurring-actions.html" : ""}
-      >
-        <div className="panel panel-default">
-          <div className="panel-heading">
-            <div>
-              <h3>Schedules</h3>
-            </div>
-          </div>
-          <div>
-            <Table
-              selectable={false}
-              data={isFilteredList ? this.state.schedules : "/rhn/manager/api/recurringactions"}
-              identifier={(action) => action.recurringActionId}
-              /* Using 0 to hide table header/footer */
-              initialItemsPerPage={disableCreate ? pageSize : 0}
-              emptyText={t(emptyListText)}
-              searchField={<RecurringActionsSearch />}
-              ref={this.tableRef}
-            >
-              <Column
-                columnKey="active"
-                header={t("Active")}
-                cell={(row) => (
-                  <Toggler
-                    value={row.active}
-                    disabled={isReadOnly(row)}
-                    className="btn"
-                    handler={() => (isReadOnly(row) ? null : this.toggleActive(row))}
-                  />
-                )}
-              />
-              <Column
-                columnClass="text-center"
-                headerClass="text-center"
-                columnKey={isFilteredList ? "scheduleName" : "schedule_name"}
-                comparator={Utils.sortByText}
-                header={t("Schedule Name")}
-                cell={(row) => row.scheduleName}
-              />
-              <Column
-                columnClass="text-center"
-                headerClass="text-center"
-                columnKey="frequency"
-                header={t("Frequency")}
-                cell={(row) => row.cron}
-              />
-              <Column
-                columnClass="text-center"
-                headerClass="text-center"
-                columnKey={isFilteredList ? "targetType" : "target_type"}
-                comparator={Utils.sortByText}
-                header={t("Target Type")}
-                cell={(row) => targetTypeToString(row.targetType)}
+      <>
+        <h1>
+          <IconTag type="spacewalk-icon-salt" />
+          {t(" Recurring Actions ")}
+          <HelpLink url="reference/schedule/recurring-actions.html" />
+        </h1>
+        <p>
+          {
+            <>
+              <p>{t("The following recurring actions have been created.")}</p>
+              {disableCreate ? (
+                <p>
+                  {t(
+                    "To create new recurring actions head to the system, group or organization you want to create the action for."
+                  )}
+                </p>
+              ) : null}
+            </>
+          }
+        </p>
+        {/* We only want to display the help icon in the 'Schedule > Recurring Actions' page so we use disableCreate as */}
+        {/* an indicator whether we currently render this page */}
+        <div className="pull-right btn-group">{disableCreate ? [] : buttons}</div>
+        <h3>Schedules</h3>
+        <Table
+          selectable={false}
+          data={isFilteredList ? this.state.schedules : "/rhn/manager/api/recurringactions"}
+          identifier={(action) => action.recurringActionId}
+          /* Using 0 to hide table header/footer */
+          initialItemsPerPage={disableCreate ? pageSize : 0}
+          emptyText={t(emptyListText)}
+          searchField={<RecurringActionsSearch />}
+          ref={this.tableRef}
+        >
+          <Column
+            columnKey="active"
+            header={t("Active")}
+            cell={(row) => (
+              <Toggler
+                value={row.active}
+                disabled={isReadOnly(row)}
+                className="btn"
+                handler={() => (isReadOnly(row) ? null : this.toggleActive(row))}
               />
-              <Column
-                columnClass="text-center"
-                headerClass="text-center"
-                columnKey={isFilteredList ? "targetName" : "target_name"}
-                comparator={Utils.sortByText}
-                header={t("Target Name")}
-                cell={(row) => targetNameLink(row.targetName, row.targetType, row.targetId, row.targetAccessible)}
-              />
-              <Column
-                columnClass="text-center"
-                headerClass="text-center"
-                columnKey={isFilteredList ? "actionType" : "action_type"}
-                comparator={Utils.sortByText}
-                header={t("Action Type")}
-                cell={(row) => row.actionTypeDescription}
-              />
-              <Column
-                columnClass="text-right"
-                headerClass="text-right"
-                header={t("Actions")}
-                cell={(row) => (
-                  <div className="btn-group">
-                    <Button
-                      className="btn-default btn-sm"
-                      title={t("Details")}
-                      icon="fa-list"
-                      handler={() => {
-                        this.props.onSelect(row);
-                      }}
-                    />
-                    <Button
-                      className="btn-default btn-sm"
-                      title={t("Edit")}
-                      disabled={isReadOnly(row)}
-                      icon="fa-edit"
-                      handler={() => {
-                        this.props.onEdit(row);
-                      }}
-                    />
-                    <ModalButton
-                      className="btn-default btn-sm"
-                      title={t("Delete")}
-                      disabled={isReadOnly(row)}
-                      icon="fa-trash"
-                      target="delete-modal"
-                      item={row}
-                      onClick={(i) => this.selectToDelete(i)}
-                    />
-                  </div>
-                )}
-              />
-            </Table>
-            <DeleteDialog
-              id="delete-modal"
-              title={t("Delete Recurring Action Schedule")}
-              content={t("Are you sure you want to delete the selected item?")}
-              onConfirm={() => this.deleteSchedule(this.state.itemToDelete, this.tableRef)}
-              onClosePopUp={() => this.selectToDelete(null)}
-            />
-          </div>
-        </div>
-      </InnerPanel>
+            )}
+          />
+          <Column
+            columnClass="text-center"
+            headerClass="text-center"
+            columnKey={isFilteredList ? "scheduleName" : "schedule_name"}
+            comparator={Utils.sortByText}
+            header={t("Schedule Name")}
+            cell={(row) => row.scheduleName}
+          />
+          <Column
+            columnClass="text-center"
+            headerClass="text-center"
+            columnKey="frequency"
+            header={t("Frequency")}
+            cell={(row) => row.cron}
+          />
+          <Column
+            columnClass="text-center"
+            headerClass="text-center"
+            columnKey={isFilteredList ? "targetType" : "target_type"}
+            comparator={Utils.sortByText}
+            header={t("Target Type")}
+            cell={(row) => targetTypeToString(row.targetType)}
+          />
+          <Column
+            columnClass="text-center"
+            headerClass="text-center"
+            columnKey={isFilteredList ? "targetName" : "target_name"}
+            comparator={Utils.sortByText}
+            header={t("Target Name")}
+            cell={(row) => targetNameLink(row.targetName, row.targetType, row.targetId, row.targetAccessible)}
+          />
+          <Column
+            columnClass="text-center"
+            headerClass="text-center"
+            columnKey={isFilteredList ? "actionType" : "action_type"}
+            comparator={Utils.sortByText}
+            header={t("Action Type")}
+            cell={(row) => row.actionTypeDescription}
+          />
+          <Column
+            columnClass="text-right"
+            headerClass="text-right"
+            header={t("Actions")}
+            cell={(row) => (
+              <div className="btn-group">
+                <Button
+                  className="btn-default btn-sm"
+                  title={t("Details")}
+                  icon="fa-list"
+                  handler={() => {
+                    this.props.onSelect(row);
+                  }}
+                />
+                <Button
+                  className="btn-default btn-sm"
+                  title={t("Edit")}
+                  disabled={isReadOnly(row)}
+                  icon="fa-edit"
+                  handler={() => {
+                    this.props.onEdit(row);
+                  }}
+                />
+                <ModalButton
+                  className="btn-default btn-sm"
+                  title={t("Delete")}
+                  disabled={isReadOnly(row)}
+                  icon="fa-trash"
+                  target="delete-modal"
+                  item={row}
+                  onClick={(i) => this.selectToDelete(i)}
+                />
+              </div>
+            )}
+          />
+        </Table>
+        <DeleteDialog
+          id="delete-modal"
+          title={t("Delete Recurring Action Schedule")}
+          content={t("Are you sure you want to delete the selected item?")}
+          onConfirm={() => this.deleteSchedule(this.state.itemToDelete, this.tableRef)}
+          onClosePopUp={() => this.selectToDelete(null)}
+        />
+      </>
     );
   }
 }
diff --git a/web/spacewalk-web.changes.bisht-richa.fixed-double-padding-irecurring-actions b/web/spacewalk-web.changes.bisht-richa.fixed-double-padding-irecurring-actions
new file mode 100644
index 000000000000..d03a8af070dc
--- /dev/null
+++ b/web/spacewalk-web.changes.bisht-richa.fixed-double-padding-irecurring-actions
@@ -0,0 +1 @@
+- Fixed double padding in recurring actions table

From b0015012516207c5ad195779d48d2fd6ec1523e8 Mon Sep 17 00:00:00 2001
From: richa <richa.bisht@suse.com>
Date: Tue, 23 Jul 2024 19:50:01 +0200
Subject: [PATCH 11/16] Fixed missing margin between inline radio buttons
 (#8976)

---
 java/code/src/com/suse/manager/webui/utils/ViewHelper.java    | 3 ++-
 web/html/src/branding/css/base/forms.scss                     | 4 ++++
 web/html/src/core/spa/view-helper.ts                          | 1 +
 ...changes.bisht-richa.fixed-margin-maintenance-schedule-page | 1 +
 4 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 web/spacewalk-web.changes.bisht-richa.fixed-margin-maintenance-schedule-page

diff --git a/java/code/src/com/suse/manager/webui/utils/ViewHelper.java b/java/code/src/com/suse/manager/webui/utils/ViewHelper.java
index f154a2c13045..6e275a13ec0e 100644
--- a/java/code/src/com/suse/manager/webui/utils/ViewHelper.java
+++ b/java/code/src/com/suse/manager/webui/utils/ViewHelper.java
@@ -92,7 +92,8 @@ public enum ViewHelper {
         "/rhn/audit/scap/Search.do",
         "/rhn/manager/schedule/recurring-actions",
         "/rhn/manager/schedule/maintenance/calendars",
-        "/rhn/manager/multiorg/recurring-actions"
+        "/rhn/manager/multiorg/recurring-actions",
+        "/rhn/manager/schedule/maintenance/schedules"
     );
 
     ViewHelper() { }
diff --git a/web/html/src/branding/css/base/forms.scss b/web/html/src/branding/css/base/forms.scss
index 49f4ea7aabb5..a3204757cd06 100644
--- a/web/html/src/branding/css/base/forms.scss
+++ b/web/html/src/branding/css/base/forms.scss
@@ -64,6 +64,10 @@ input[type="checkbox"] {
     margin-bottom: 0;
   }
 
+  .radio-inline {
+    margin-right: 20px;
+  }
+
   .radio,
   .checkbox {
     min-height: 28px;
diff --git a/web/html/src/core/spa/view-helper.ts b/web/html/src/core/spa/view-helper.ts
index 41a22155e65e..e63ee4c4412d 100644
--- a/web/html/src/core/spa/view-helper.ts
+++ b/web/html/src/core/spa/view-helper.ts
@@ -36,6 +36,7 @@ const BOOTSTRAP_READY_PAGES: string[] = [
   "/rhn/manager/schedule/recurring-actions",
   "/rhn/manager/schedule/maintenance/calendars",
   "/rhn/manager/multiorg/recurring-actions",
+  "/rhn/manager/schedule/maintenance/schedules",
 ];
 
 export const onEndNavigate = () => {
diff --git a/web/spacewalk-web.changes.bisht-richa.fixed-margin-maintenance-schedule-page b/web/spacewalk-web.changes.bisht-richa.fixed-margin-maintenance-schedule-page
new file mode 100644
index 000000000000..a6b833e7bb22
--- /dev/null
+++ b/web/spacewalk-web.changes.bisht-richa.fixed-margin-maintenance-schedule-page
@@ -0,0 +1 @@
+- Fixed missing margin between inline radio buttons
\ No newline at end of file

From aa301bcafd2f91bf59579237ef334ec0d5926345 Mon Sep 17 00:00:00 2001
From: richa <richa.bisht@suse.com>
Date: Tue, 23 Jul 2024 19:51:47 +0200
Subject: [PATCH 12/16] Fixed broken layout in monitoring page (#8977)

---
 .../suse/manager/webui/utils/ViewHelper.java  |  3 +-
 web/html/src/core/spa/view-helper.ts          |  1 +
 .../manager/admin/config/monitoring-admin.tsx | 40 ++++++++++---------
 ...-richa.fixed-broken-layout-monitoring-page |  1 +
 4 files changed, 25 insertions(+), 20 deletions(-)
 create mode 100644 web/spacewalk-web.changes.bisht-richa.fixed-broken-layout-monitoring-page

diff --git a/java/code/src/com/suse/manager/webui/utils/ViewHelper.java b/java/code/src/com/suse/manager/webui/utils/ViewHelper.java
index 6e275a13ec0e..37430b4ba544 100644
--- a/java/code/src/com/suse/manager/webui/utils/ViewHelper.java
+++ b/java/code/src/com/suse/manager/webui/utils/ViewHelper.java
@@ -93,7 +93,8 @@ public enum ViewHelper {
         "/rhn/manager/schedule/recurring-actions",
         "/rhn/manager/schedule/maintenance/calendars",
         "/rhn/manager/multiorg/recurring-actions",
-        "/rhn/manager/schedule/maintenance/schedules"
+        "/rhn/manager/schedule/maintenance/schedules",
+        "/rhn/manager/admin/config/monitoring"
     );
 
     ViewHelper() { }
diff --git a/web/html/src/core/spa/view-helper.ts b/web/html/src/core/spa/view-helper.ts
index e63ee4c4412d..9c181a446637 100644
--- a/web/html/src/core/spa/view-helper.ts
+++ b/web/html/src/core/spa/view-helper.ts
@@ -37,6 +37,7 @@ const BOOTSTRAP_READY_PAGES: string[] = [
   "/rhn/manager/schedule/maintenance/calendars",
   "/rhn/manager/multiorg/recurring-actions",
   "/rhn/manager/schedule/maintenance/schedules",
+  "/rhn/manager/admin/config/monitoring",
 ];
 
 export const onEndNavigate = () => {
diff --git a/web/html/src/manager/admin/config/monitoring-admin.tsx b/web/html/src/manager/admin/config/monitoring-admin.tsx
index fface374b725..60454a1cb833 100644
--- a/web/html/src/manager/admin/config/monitoring-admin.tsx
+++ b/web/html/src/manager/admin/config/monitoring-admin.tsx
@@ -387,25 +387,27 @@ const MonitoringAdmin = (props: MonitoringAdminProps) => {
           </div>
         }
       >
-        <div className="row" style={{ display: "flex" }}>
-          <div className="col-sm-9">
-            <div className="col-md-4 text-left">
-              <label>{t("Monitoring")}</label>
-            </div>
-            <div className="col-md-8">
-              {exportersStatus ? (
-                <ExportersList exporters={exportersStatus} messages={exportersMessages} />
-              ) : (
-                <ListPlaceholder />
-              )}
-              {restartNeeded ? (
-                <div>
-                  <Icon type="system-reboot" className="text-warning fa-1-5x" />
-                  <a href="/rhn/admin/config/Restart.do?">{t("Restarting")}</a>
-                  {t(" Tomcat and Taskomatic is needed for the configuration changes to take effect.")}
-                </div>
-              ) : null}
-              <ExportersMessages messages={exportersMessages} />
+        <div className="row">
+          <div className="col-md-9">
+            <div className="row">
+              <div className="col-md-4 text-left">
+                <label>{t("Monitoring")}</label>
+              </div>
+              <div className="col-md-8">
+                {exportersStatus ? (
+                  <ExportersList exporters={exportersStatus} messages={exportersMessages} />
+                ) : (
+                  <ListPlaceholder />
+                )}
+                {restartNeeded ? (
+                  <div>
+                    <Icon type="system-reboot" className="text-warning fa-1-5x" />
+                    <a href="/rhn/admin/config/Restart.do?">{t("Restarting")}</a>
+                    {t(" Tomcat and Taskomatic is needed for the configuration changes to take effect.")}
+                  </div>
+                ) : null}
+                <ExportersMessages messages={exportersMessages} />
+              </div>
             </div>
           </div>
           <HelpPanel isUyuni={props.isUyuni} />
diff --git a/web/spacewalk-web.changes.bisht-richa.fixed-broken-layout-monitoring-page b/web/spacewalk-web.changes.bisht-richa.fixed-broken-layout-monitoring-page
new file mode 100644
index 000000000000..8352908214b8
--- /dev/null
+++ b/web/spacewalk-web.changes.bisht-richa.fixed-broken-layout-monitoring-page
@@ -0,0 +1 @@
+- Fixed broken layout in monitoring page

From 89f9345db7c8a8d5984e7e9c76640ace1125004b Mon Sep 17 00:00:00 2001
From: richa <richa.bisht@suse.com>
Date: Tue, 23 Jul 2024 19:54:34 +0200
Subject: [PATCH 13/16] Fixed hidden section issue in new theme (#8987)

---
 .../src/com/suse/manager/webui/utils/ViewHelper.java  |  5 ++++-
 web/html/src/branding/css/base/fixes.scss             | 11 +++++++++++
 web/html/src/core/spa/view-helper.ts                  |  3 +++
 ...-web.changes.bisht-richa.fixed-broken-hidden-class |  1 +
 4 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 web/spacewalk-web.changes.bisht-richa.fixed-broken-hidden-class

diff --git a/java/code/src/com/suse/manager/webui/utils/ViewHelper.java b/java/code/src/com/suse/manager/webui/utils/ViewHelper.java
index 37430b4ba544..aada76a3a949 100644
--- a/java/code/src/com/suse/manager/webui/utils/ViewHelper.java
+++ b/java/code/src/com/suse/manager/webui/utils/ViewHelper.java
@@ -94,7 +94,10 @@ public enum ViewHelper {
         "/rhn/manager/schedule/maintenance/calendars",
         "/rhn/manager/multiorg/recurring-actions",
         "/rhn/manager/schedule/maintenance/schedules",
-        "/rhn/manager/admin/config/monitoring"
+        "/rhn/manager/admin/config/monitoring",
+        "/rhn/admin/config/GeneralConfig.do",
+        "/rhn/manager/admin/config/monitoring",
+        "/rhn/manager/admin/setup/products"
     );
 
     ViewHelper() { }
diff --git a/web/html/src/branding/css/base/fixes.scss b/web/html/src/branding/css/base/fixes.scss
index abd06ef29564..f2efcb6142e7 100644
--- a/web/html/src/branding/css/base/fixes.scss
+++ b/web/html/src/branding/css/base/fixes.scss
@@ -48,3 +48,14 @@ div.checkbox.icon-wrapper i.fa {
 .pull-left {
   float: left !important;
 }
+
+// TODO: Need to replace .hidden class with .d-none
+
+.hidden {
+  @extend .d-none;
+}
+
+.hidden-xs {
+  @extend .d-none;
+  @extend .d-md-block;
+}
diff --git a/web/html/src/core/spa/view-helper.ts b/web/html/src/core/spa/view-helper.ts
index 9c181a446637..28bcb683c1f6 100644
--- a/web/html/src/core/spa/view-helper.ts
+++ b/web/html/src/core/spa/view-helper.ts
@@ -38,6 +38,9 @@ const BOOTSTRAP_READY_PAGES: string[] = [
   "/rhn/manager/multiorg/recurring-actions",
   "/rhn/manager/schedule/maintenance/schedules",
   "/rhn/manager/admin/config/monitoring",
+  "/rhn/admin/config/GeneralConfig.do",
+  "/rhn/manager/admin/config/monitoring",
+  "/rhn/manager/admin/setup/products",
 ];
 
 export const onEndNavigate = () => {
diff --git a/web/spacewalk-web.changes.bisht-richa.fixed-broken-hidden-class b/web/spacewalk-web.changes.bisht-richa.fixed-broken-hidden-class
new file mode 100644
index 000000000000..156765f88c17
--- /dev/null
+++ b/web/spacewalk-web.changes.bisht-richa.fixed-broken-hidden-class
@@ -0,0 +1 @@
+- Fixed hidden section issue in Monitoring and General Configuration pages

From b757f1693cfbf32e813711a0e5d9af944dbc6b2f Mon Sep 17 00:00:00 2001
From: richa <richa.bisht@suse.com>
Date: Tue, 23 Jul 2024 19:56:42 +0200
Subject: [PATCH 14/16] Fixed space between radio button and label (#8996)

* Fixed space between radio button and label
* Removed extra space from file name
* Fixed Inventory Path dropdown box alignment
* Clean code
---
 .../com/suse/manager/webui/utils/ViewHelper.java    |  5 ++++-
 web/html/src/branding/css/base/forms.less           |  4 ++++
 web/html/src/branding/css/base/forms.scss           |  4 ++++
 web/html/src/components/action-schedule.tsx         |  6 ++----
 .../picker/recurring-event-picker.module.css        |  4 ----
 web/html/src/core/spa/view-helper.ts                |  3 +++
 .../manager/minion/ansible/schedule-playbook.tsx    | 13 ++++++-------
 ...hanges.bisht-richa.alignment-radio-buttons-label |  1 +
 8 files changed, 24 insertions(+), 16 deletions(-)
 create mode 100644 web/spacewalk-web.changes.bisht-richa.alignment-radio-buttons-label

diff --git a/java/code/src/com/suse/manager/webui/utils/ViewHelper.java b/java/code/src/com/suse/manager/webui/utils/ViewHelper.java
index aada76a3a949..e7716a4c3741 100644
--- a/java/code/src/com/suse/manager/webui/utils/ViewHelper.java
+++ b/java/code/src/com/suse/manager/webui/utils/ViewHelper.java
@@ -97,7 +97,10 @@ public enum ViewHelper {
         "/rhn/manager/admin/config/monitoring",
         "/rhn/admin/config/GeneralConfig.do",
         "/rhn/manager/admin/config/monitoring",
-        "/rhn/manager/admin/setup/products"
+        "/rhn/manager/admin/setup/products",
+        "/rhn/systems/details/SystemRemoteCommand.do",
+        "/rhn/manager/systems/details/highstate",
+        "/rhn/manager/systems/details/recurring-actions"
     );
 
     ViewHelper() { }
diff --git a/web/html/src/branding/css/base/forms.less b/web/html/src/branding/css/base/forms.less
index 871a79af037d..0d4992102d5b 100644
--- a/web/html/src/branding/css/base/forms.less
+++ b/web/html/src/branding/css/base/forms.less
@@ -36,6 +36,10 @@ input[type="checkbox"] {
     padding-top: 8px;
     margin-bottom: 0;
     text-align: right;
+
+    input[type="radio"] {
+      margin-right: 5px;
+    }
   }
 
   .text {
diff --git a/web/html/src/branding/css/base/forms.scss b/web/html/src/branding/css/base/forms.scss
index a3204757cd06..4933439bbc61 100644
--- a/web/html/src/branding/css/base/forms.scss
+++ b/web/html/src/branding/css/base/forms.scss
@@ -47,6 +47,10 @@ input[type="checkbox"] {
     padding-top: 8px;
     margin-bottom: 0;
     text-align: right;
+
+    input[type="radio"] {
+      margin-right: 5px;
+    }
   }
 
   .text {
diff --git a/web/html/src/components/action-schedule.tsx b/web/html/src/components/action-schedule.tsx
index 6f3583f9a57d..62876ebefde1 100644
--- a/web/html/src/components/action-schedule.tsx
+++ b/web/html/src/components/action-schedule.tsx
@@ -309,10 +309,8 @@ class ActionSchedule extends React.Component<ActionScheduleProps, ActionSchedule
     return (
       <div className="spacewalk-scheduler">
         <div className="form-horizontal">
-          <div className="form-group">
-            {pickers}
-            {this.state.actionChains && this.state.actionChain && this.renderActionChainPicker()}
-          </div>
+          {pickers}
+          {this.state.actionChains && this.state.actionChain && this.renderActionChainPicker()}
         </div>
       </div>
     );
diff --git a/web/html/src/components/picker/recurring-event-picker.module.css b/web/html/src/components/picker/recurring-event-picker.module.css
index edeb5d037328..99d3bf739443 100644
--- a/web/html/src/components/picker/recurring-event-picker.module.css
+++ b/web/html/src/components/picker/recurring-event-picker.module.css
@@ -5,10 +5,6 @@
     align-items: center;
   }
 
-  .radio {
-    padding-left: 5px;
-  }
-
   .helpIcon {
     padding: 0px;
   }
diff --git a/web/html/src/core/spa/view-helper.ts b/web/html/src/core/spa/view-helper.ts
index 28bcb683c1f6..afc24fb15e9f 100644
--- a/web/html/src/core/spa/view-helper.ts
+++ b/web/html/src/core/spa/view-helper.ts
@@ -41,6 +41,9 @@ const BOOTSTRAP_READY_PAGES: string[] = [
   "/rhn/admin/config/GeneralConfig.do",
   "/rhn/manager/admin/config/monitoring",
   "/rhn/manager/admin/setup/products",
+  "/rhn/systems/details/SystemRemoteCommand.do",
+  "/rhn/manager/systems/details/highstate",
+  "/rhn/manager/systems/details/recurring-actions",
 ];
 
 export const onEndNavigate = () => {
diff --git a/web/html/src/manager/minion/ansible/schedule-playbook.tsx b/web/html/src/manager/minion/ansible/schedule-playbook.tsx
index 51ec8c39a55f..d8644466dc65 100644
--- a/web/html/src/manager/minion/ansible/schedule-playbook.tsx
+++ b/web/html/src/manager/minion/ansible/schedule-playbook.tsx
@@ -135,13 +135,12 @@ export default function SchedulePlaybook({ playbook, onBack }: SchedulePlaybookP
                   />
                 </div>
               </div>
-              <div className="col-sm-offset-3 offset-sm-3 col-sm-6">
-                <Check
-                  name="flushCache"
-                  label={t("Flush Ansible fact cache")}
-                  title={t("Clear the fact cache for every host in inventory")}
-                />
-              </div>
+              <Check
+                name="flushCache"
+                label={t("Flush Ansible fact cache")}
+                title={t("Clear the fact cache for every host in inventory")}
+                divClass="col-sm-offset-3 offset-sm-3 col-sm-6"
+              />
             </Form>
           </div>
         </div>
diff --git a/web/spacewalk-web.changes.bisht-richa.alignment-radio-buttons-label b/web/spacewalk-web.changes.bisht-richa.alignment-radio-buttons-label
new file mode 100644
index 000000000000..69f664deecba
--- /dev/null
+++ b/web/spacewalk-web.changes.bisht-richa.alignment-radio-buttons-label
@@ -0,0 +1 @@
+- Fixed space between radio button and label in forms

From ebde18144d6cb095771ecc03d177ae3b6bfe8284 Mon Sep 17 00:00:00 2001
From: richa <richa.bisht@suse.com>
Date: Tue, 23 Jul 2024 19:58:47 +0200
Subject: [PATCH 15/16] Fixed build image page layout in new theme (#9004)

---
 .../suse/manager/webui/utils/ViewHelper.java  |   3 +-
 web/html/src/core/spa/view-helper.ts          |   1 +
 web/html/src/manager/images/image-build.tsx   | 130 ++++++++++--------
 ...es.bisht-richa.fix-build-image-page-layout |   1 +
 4 files changed, 74 insertions(+), 61 deletions(-)
 create mode 100644 web/spacewalk-web.changes.bisht-richa.fix-build-image-page-layout

diff --git a/java/code/src/com/suse/manager/webui/utils/ViewHelper.java b/java/code/src/com/suse/manager/webui/utils/ViewHelper.java
index e7716a4c3741..c5ffb253d5a2 100644
--- a/java/code/src/com/suse/manager/webui/utils/ViewHelper.java
+++ b/java/code/src/com/suse/manager/webui/utils/ViewHelper.java
@@ -100,7 +100,8 @@ public enum ViewHelper {
         "/rhn/manager/admin/setup/products",
         "/rhn/systems/details/SystemRemoteCommand.do",
         "/rhn/manager/systems/details/highstate",
-        "/rhn/manager/systems/details/recurring-actions"
+        "/rhn/manager/systems/details/recurring-actions",
+        "/rhn/manager/cm/build"
     );
 
     ViewHelper() { }
diff --git a/web/html/src/core/spa/view-helper.ts b/web/html/src/core/spa/view-helper.ts
index afc24fb15e9f..3c6b1f199d9e 100644
--- a/web/html/src/core/spa/view-helper.ts
+++ b/web/html/src/core/spa/view-helper.ts
@@ -44,6 +44,7 @@ const BOOTSTRAP_READY_PAGES: string[] = [
   "/rhn/systems/details/SystemRemoteCommand.do",
   "/rhn/manager/systems/details/highstate",
   "/rhn/manager/systems/details/recurring-actions",
+  "/rhn/manager/cm/build",
 ];
 
 export const onEndNavigate = () => {
diff --git a/web/html/src/manager/images/image-build.tsx b/web/html/src/manager/images/image-build.tsx
index bf31e31b629e..e548df5c1963 100644
--- a/web/html/src/manager/images/image-build.tsx
+++ b/web/html/src/manager/images/image-build.tsx
@@ -345,67 +345,77 @@ class BuildImage extends React.Component<Props, State> {
         helpUrl="reference/images/images-build.html"
       >
         <Messages items={this.state.messages} />
-        <Form
-          model={this.state.model}
-          className="image-build-form"
-          onChange={this.onFormChange}
-          onSubmit={this.onBuild}
-          onValidate={this.onValidate}
-          divClass="col-md-7"
-        >
-          <Select
-            name="profileId"
-            required
-            label={t("Image Profile")}
-            onChange={this.handleProfileChange}
-            labelClass="col-md-3"
-            divClass="col-md-9"
-            invalidHint={
-              <span>
-                Image Profile is required.&nbsp;
-                <a href={"/rhn/manager/cm/imageprofiles/create?url_bounce=" + this.getBounceUrl()}>Create a new one</a>.
-              </span>
-            }
-            options={this.state.profiles}
-            getOptionValue={(option) => option.profileId}
-          />
-
-          {this.state.profile.imageType === "dockerfile" && (
-            <Text name="version" label={t("Version")} labelClass="col-md-3" divClass="col-md-9" placeholder="latest" />
-          )}
-
-          <Select
-            name="buildHostId"
-            required
-            label={t("Build Host")}
-            labelClass="col-md-3"
-            divClass="col-md-9"
-            getOptionLabel={(option) => option.name}
-            getOptionValue={(option) => option.id}
-            options={this.state.hosts}
-          />
-
-          <ActionSchedule
-            earliest={this.state.model.earliest}
-            actionChains={window.actionChains}
-            actionType="image.build"
-            onActionChainChanged={this.onActionChainChanged}
-            onDateTimeChanged={this.onDateTimeChanged}
-          />
-
-          <FormGroup>
-            <div className="col-md-offset-3 offset-md-3 col-md-9">
-              <SubmitButton
-                id="submit-btn"
-                className="btn-success"
-                icon="fa-cogs"
-                text={t("Build")}
-                disabled={this.state.isInvalid}
+        <div className="row">
+          <Form
+            model={this.state.model}
+            className="image-build-form col-md-7"
+            onChange={this.onFormChange}
+            onSubmit={this.onBuild}
+            onValidate={this.onValidate}
+          >
+            <Select
+              name="profileId"
+              required
+              label={t("Image Profile")}
+              onChange={this.handleProfileChange}
+              labelClass="col-md-3"
+              divClass="col-md-9"
+              invalidHint={
+                <span>
+                  Image Profile is required.&nbsp;
+                  <a href={"/rhn/manager/cm/imageprofiles/create?url_bounce=" + this.getBounceUrl()}>
+                    Create a new one
+                  </a>
+                  .
+                </span>
+              }
+              options={this.state.profiles}
+              getOptionValue={(option) => option.profileId}
+            />
+
+            {this.state.profile.imageType === "dockerfile" && (
+              <Text
+                name="version"
+                label={t("Version")}
+                labelClass="col-md-3"
+                divClass="col-md-9"
+                placeholder="latest"
               />
-            </div>
-          </FormGroup>
-        </Form>
-        {this.renderProfileSummary()}
+            )}
+
+            <Select
+              name="buildHostId"
+              required
+              label={t("Build Host")}
+              labelClass="col-md-3"
+              divClass="col-md-9"
+              getOptionLabel={(option) => option.name}
+              getOptionValue={(option) => option.id}
+              options={this.state.hosts}
+            />
+
+            <ActionSchedule
+              earliest={this.state.model.earliest}
+              actionChains={window.actionChains}
+              actionType="image.build"
+              onActionChainChanged={this.onActionChainChanged}
+              onDateTimeChanged={this.onDateTimeChanged}
+            />
+
+            <FormGroup>
+              <div className="col-md-offset-3 offset-md-3 col-md-9">
+                <SubmitButton
+                  id="submit-btn"
+                  className="btn-success"
+                  icon="fa-cogs"
+                  text={t("Build")}
+                  disabled={this.state.isInvalid}
+                />
+              </div>
+            </FormGroup>
+          </Form>
+          {this.renderProfileSummary()}
+        </div>
       </TopPanel>
     );
   }
diff --git a/web/spacewalk-web.changes.bisht-richa.fix-build-image-page-layout b/web/spacewalk-web.changes.bisht-richa.fix-build-image-page-layout
new file mode 100644
index 000000000000..0e150e53a942
--- /dev/null
+++ b/web/spacewalk-web.changes.bisht-richa.fix-build-image-page-layout
@@ -0,0 +1 @@
+- Fixed broken layout of build image page

From 3f6b9fc39fe51dc69f7b675a6e5a4703c5879083 Mon Sep 17 00:00:00 2001
From: Karl Tarvas <Etheryte@users.noreply.github.com>
Date: Tue, 23 Jul 2024 21:04:59 +0300
Subject: [PATCH 16/16] Fix schedule creation layouts, disabled input styles,
 input group alignment on the updated theme (#8927)

---
 .../suse/manager/webui/utils/ViewHelper.java  |  4 +-
 .../WEB-INF/pages/admin/scheduleDetail.jsp    |  2 +-
 ...cewalk-java.changes.eth.inputs-and-friends |  1 +
 .../susemanager/components/buttons.suma.scss  |  4 --
 .../css/susemanager/components/inputs.less    | 11 +++++-
 .../css/susemanager/components/inputs.scss    | 38 +++++++++++++++++--
 .../css/susemanager/components/legend.scss    | 13 +++++++
 .../css/susemanager/components/modal.less     |  1 +
 .../css/susemanager/components/modal.scss     |  2 +
 .../src/branding/css/susemanager/index.scss   |  1 +
 .../components/datetime/DateTimePicker.tsx    |  4 +-
 web/html/src/core/spa/view-helper.ts          |  2 +
 ...acewalk-web.changes.eth.inputs-and-friends |  1 +
 13 files changed, 71 insertions(+), 13 deletions(-)
 create mode 100644 java/spacewalk-java.changes.eth.inputs-and-friends
 create mode 100644 web/html/src/branding/css/susemanager/components/legend.scss
 create mode 100644 web/spacewalk-web.changes.eth.inputs-and-friends

diff --git a/java/code/src/com/suse/manager/webui/utils/ViewHelper.java b/java/code/src/com/suse/manager/webui/utils/ViewHelper.java
index c5ffb253d5a2..03c9859d2560 100644
--- a/java/code/src/com/suse/manager/webui/utils/ViewHelper.java
+++ b/java/code/src/com/suse/manager/webui/utils/ViewHelper.java
@@ -101,7 +101,9 @@ public enum ViewHelper {
         "/rhn/systems/details/SystemRemoteCommand.do",
         "/rhn/manager/systems/details/highstate",
         "/rhn/manager/systems/details/recurring-actions",
-        "/rhn/manager/cm/build"
+        "/rhn/manager/cm/build",
+        "/rhn/admin/ScheduleDetail.do",
+        "/rhn/manager/systems/cmd"
     );
 
     ViewHelper() { }
diff --git a/java/code/webapp/WEB-INF/pages/admin/scheduleDetail.jsp b/java/code/webapp/WEB-INF/pages/admin/scheduleDetail.jsp
index a5686b32e1a0..9040905d4309 100644
--- a/java/code/webapp/WEB-INF/pages/admin/scheduleDetail.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/scheduleDetail.jsp
@@ -70,7 +70,7 @@
                     <label for="parent" class="col-lg-3 control-label">
                         <bean:message key="schedule.edit.jsp.frequency"/>:
                     </label>
-                    <div class="">
+                    <div class="col-lg-9">
                         <jsp:include page="/WEB-INF/pages/common/fragments/repeat-task-picker.jspf">
                             <jsp:param name="widget" value="date"/>
                         </jsp:include>
diff --git a/java/spacewalk-java.changes.eth.inputs-and-friends b/java/spacewalk-java.changes.eth.inputs-and-friends
new file mode 100644
index 000000000000..2c2bf35137a8
--- /dev/null
+++ b/java/spacewalk-java.changes.eth.inputs-and-friends
@@ -0,0 +1 @@
+- Fix input alignment and style issues on schedule creation page
diff --git a/web/html/src/branding/css/susemanager/components/buttons.suma.scss b/web/html/src/branding/css/susemanager/components/buttons.suma.scss
index 15a7702aa121..66c8dcda97a3 100644
--- a/web/html/src/branding/css/susemanager/components/buttons.suma.scss
+++ b/web/html/src/branding/css/susemanager/components/buttons.suma.scss
@@ -203,10 +203,6 @@
     bottom: -1px;
     left: -1px;
   }
-
-  &:last-child {
-    margin-left: -1px;
-  }
 }
 
 .btn-group .btn {
diff --git a/web/html/src/branding/css/susemanager/components/inputs.less b/web/html/src/branding/css/susemanager/components/inputs.less
index 521780c59c04..166432c60e82 100644
--- a/web/html/src/branding/css/susemanager/components/inputs.less
+++ b/web/html/src/branding/css/susemanager/components/inputs.less
@@ -53,9 +53,11 @@
 
 // TODO: Bind this class to the react-select control once we upgrade react-select, see https://react-select.com/styles#the-classnames-prop
 .form-control--react-select > div:first-of-type {
-  &:hover {
+  outline: none !important;
+
+  &[class*="--is-focused"],
+  &[class*="--menu-is-open"] {
     border-color: @eos-bc-blue-500 !important;
-    outline: none !important;
   }
 }
 
@@ -72,7 +74,12 @@ select[size] {
 }
 
 .input-group-addon {
+  color: @eos-bc-gray-900;
   border-color: @input-border-color !important;
   background: @gray-lighter;
   font-size: 1em;
+
+  > .fa:first-child:last-child {
+    margin: 0;
+  }
 }
diff --git a/web/html/src/branding/css/susemanager/components/inputs.scss b/web/html/src/branding/css/susemanager/components/inputs.scss
index 3ba0c876316d..5f3568936201 100644
--- a/web/html/src/branding/css/susemanager/components/inputs.scss
+++ b/web/html/src/branding/css/susemanager/components/inputs.scss
@@ -24,6 +24,20 @@ $input-height: 35px;
   &:active {
     background: #fff;
   }
+
+  // This is like writing `div&`, except this nonsense is valid syntax, see https://stackoverflow.com/a/28357148/1470607
+  @at-root #{selector-unify(&, div)},
+  &[disabled],
+  &[readonly],
+  fieldset[disabled] & {
+    background-color: $gray-lighter;
+    opacity: 1;
+  }
+
+  &[disabled],
+  fieldset[disabled] & {
+    cursor: not-allowed;
+  }
 }
 
 .form-control {
@@ -80,9 +94,11 @@ div.form-control {
 
 // TODO: Bind this class to the react-select control once we upgrade react-select, see https://react-select.com/styles#the-classnames-prop
 .form-control--react-select > div:first-of-type {
-  &:hover {
-    border: 1px solid $eos-bc-blue-500 !important;
-    outline: none !important;
+  outline: none !important;
+
+  &[class*="--is-focused"],
+  &[class*="--menu-is-open"] {
+    border-color: $eos-bc-blue-500 !important;
   }
 }
 
@@ -92,6 +108,16 @@ select[size] {
   height: auto;
 }
 
+// We need to manually handle these cases to fix legacy DOM structures
+.input-group {
+  --bs-border-width: 1px;
+}
+
+.input-group-btn:not(:first-child) .btn {
+  border-top-left-radius: 0;
+  border-bottom-left-radius: 0;
+}
+
 .input-group-text {
   --bs-border-width: 1px;
   font-size: 1em;
@@ -106,3 +132,9 @@ select[size] {
 .input-group {
   align-items: center;
 }
+
+.input-group-addon {
+  color: $eos-bc-gray-900;
+  background: $gray-lighter;
+  font-size: 1em;
+}
diff --git a/web/html/src/branding/css/susemanager/components/legend.scss b/web/html/src/branding/css/susemanager/components/legend.scss
new file mode 100644
index 000000000000..3d7840612b1e
--- /dev/null
+++ b/web/html/src/branding/css/susemanager/components/legend.scss
@@ -0,0 +1,13 @@
+// These styles are migrated verbatim from the old theme, please don't use it for new code
+legend {
+  display: block;
+  width: 100%;
+  padding: 0;
+  margin-bottom: 21px;
+  font-size: 21px;
+  line-height: inherit;
+  color: inherit;
+  border: 0;
+  // TODO: Here and elsewhere, standardize border colors after the Bootstrap migration is complete
+  border-bottom: 1px solid #e5e5e5;
+}
diff --git a/web/html/src/branding/css/susemanager/components/modal.less b/web/html/src/branding/css/susemanager/components/modal.less
index 6d6fb90e5e27..7f448c295439 100644
--- a/web/html/src/branding/css/susemanager/components/modal.less
+++ b/web/html/src/branding/css/susemanager/components/modal.less
@@ -42,6 +42,7 @@
 .modal-footer {
   margin: 0;
   padding: 15px;
+  // TODO: Here and elsewhere, standardize border colors after the Bootstrap migration is complete
   border-top: 1px solid #e5e5e5;
 }
 
diff --git a/web/html/src/branding/css/susemanager/components/modal.scss b/web/html/src/branding/css/susemanager/components/modal.scss
index 6ea78ab2c983..43438225cc60 100644
--- a/web/html/src/branding/css/susemanager/components/modal.scss
+++ b/web/html/src/branding/css/susemanager/components/modal.scss
@@ -3,6 +3,7 @@
 }
 
 .modal-header {
+  // TODO: Here and elsewhere, standardize border colors after the Bootstrap migration is complete
   border-bottom: 1px solid #e5e5e5;
   padding: 15px;
 
@@ -57,6 +58,7 @@
 .modal-footer {
   margin: 0;
   padding: 15px;
+  // TODO: Here and elsewhere, standardize border colors after the Bootstrap migration is complete
   border-top: 1px solid #e5e5e5;
 
   .btn + .btn {
diff --git a/web/html/src/branding/css/susemanager/index.scss b/web/html/src/branding/css/susemanager/index.scss
index 6548201f4caf..b768bb8656f0 100644
--- a/web/html/src/branding/css/susemanager/index.scss
+++ b/web/html/src/branding/css/susemanager/index.scss
@@ -27,6 +27,7 @@
 @import "./components/address.scss";
 @import "./components/pre.scss";
 @import "./components/label.scss";
+@import "./components/legend.scss";
 
 @import "./bootstrap-fixes.scss";
 @import "../base/fixes.scss";
diff --git a/web/html/src/components/datetime/DateTimePicker.tsx b/web/html/src/components/datetime/DateTimePicker.tsx
index 174415b5fa91..529bd6956c84 100644
--- a/web/html/src/components/datetime/DateTimePicker.tsx
+++ b/web/html/src/components/datetime/DateTimePicker.tsx
@@ -125,7 +125,7 @@ export const DateTimePicker = (props: Props) => {
               data-picker-type="date"
               onClick={() => openDatePicker()}
             >
-              &nbsp;<i className="fa fa-calendar"></i>
+              <i className="fa fa-calendar"></i>
             </span>
             <ReactDatePicker
               key="date-picker"
@@ -171,7 +171,7 @@ export const DateTimePicker = (props: Props) => {
               data-picker-type="time"
               onClick={openTimePicker}
             >
-              &nbsp;<i className="fa fa-clock-o"></i>
+              <i className="fa fa-clock-o"></i>
             </span>
             <ReactDatePicker
               key="time-picker"
diff --git a/web/html/src/core/spa/view-helper.ts b/web/html/src/core/spa/view-helper.ts
index 3c6b1f199d9e..5bab30661cba 100644
--- a/web/html/src/core/spa/view-helper.ts
+++ b/web/html/src/core/spa/view-helper.ts
@@ -45,6 +45,8 @@ const BOOTSTRAP_READY_PAGES: string[] = [
   "/rhn/manager/systems/details/highstate",
   "/rhn/manager/systems/details/recurring-actions",
   "/rhn/manager/cm/build",
+  "/rhn/admin/ScheduleDetail.do",
+  "/rhn/manager/systems/cmd",
 ];
 
 export const onEndNavigate = () => {
diff --git a/web/spacewalk-web.changes.eth.inputs-and-friends b/web/spacewalk-web.changes.eth.inputs-and-friends
new file mode 100644
index 000000000000..2c2bf35137a8
--- /dev/null
+++ b/web/spacewalk-web.changes.eth.inputs-and-friends
@@ -0,0 +1 @@
+- Fix input alignment and style issues on schedule creation page