From 966b80ba14c82b1a9ca37f0d55e3426e1ae351db Mon Sep 17 00:00:00 2001
From: Etheryte <karl.tarvas@suse.com>
Date: Mon, 12 Aug 2024 16:37:39 +0300
Subject: [PATCH] Fix http proxy setup page

---
 .../com/suse/manager/webui/utils/ViewHelper.java    |  3 ++-
 .../WEB-INF/pages/admin/setup/proxy-settings.jsp    | 12 ++++++------
 web/html/src/branding/css/base/forms.scss           | 10 +++++++++-
 .../branding/css/susemanager/components/text.scss   | 13 +++++++++++++
 web/html/src/core/spa/view-helper.ts                |  1 +
 5 files changed, 31 insertions(+), 8 deletions(-)

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 984a9e1dbc92..d1dea11be993 100644
--- a/java/code/src/com/suse/manager/webui/utils/ViewHelper.java
+++ b/java/code/src/com/suse/manager/webui/utils/ViewHelper.java
@@ -107,7 +107,8 @@ public enum ViewHelper {
         "/rhn/channels/manage/repos/RepoCreate.do",
         "/rhn/systems/details/Overview",
         "/rhn/manager/formula-catalog",
-        "/rhn/errata/manage/CloneErrata.do"
+        "/rhn/errata/manage/CloneErrata.do",
+        "/rhn/admin/setup/ProxySettings.do"
     );
 
     ViewHelper() { }
diff --git a/java/code/webapp/WEB-INF/pages/admin/setup/proxy-settings.jsp b/java/code/webapp/WEB-INF/pages/admin/setup/proxy-settings.jsp
index 54bde2f7e974..521ac24f407d 100644
--- a/java/code/webapp/WEB-INF/pages/admin/setup/proxy-settings.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/setup/proxy-settings.jsp
@@ -16,22 +16,22 @@
                         <div class="panel-body">
                             <form class="form-horizontal" role="form">
                                 <div class="form-group">
-                                    <label for="http-proxy-input-hostname" class="col-xs-4 control-label">HTTP Proxy Hostname:</label>
-                                    <div class="col-xs-8">
+                                    <label for="http-proxy-input-hostname" class="col-4 control-label">HTTP Proxy Hostname:</label>
+                                    <div class="col-8">
                                         <p class="form-control-static http-proxy-hostname"></p>
                                       <input type="text" class="form-control http-proxy-hostname" id="http-proxy-input-hostname" placeholder="Hostname:Port">
                                     </div>
                                   </div>
                                   <div class="form-group">
-                                    <label for="http-proxy-input-username" class="col-xs-4 control-label">HTTP Proxy Username:</label>
-                                    <div class="col-xs-8">
+                                    <label for="http-proxy-input-username" class="col-4 control-label">HTTP Proxy Username:</label>
+                                    <div class="col-8">
                                         <p class="form-control-static http-proxy-username"></p>
                                       <input type="text" class="form-control http-proxy-username" id="http-proxy-input-username" value="" placeholder="Username">
                                     </div>
                                   </div>
                                   <div class="form-group">
-                                    <label for="http-proxy-input-password" class="col-xs-4 control-label">HTTP Proxy Password:</label>
-                                    <div class="col-xs-8">
+                                    <label for="http-proxy-input-password" class="col-4 control-label">HTTP Proxy Password:</label>
+                                    <div class="col-8">
                                         <p class="form-control-static http-proxy-password"></p>
                                       <input type="password" autocomplete="new-password" class="form-control http-proxy-password" id="http-proxy-input-password" value="" placeholder="Password">
                                     </div>
diff --git a/web/html/src/branding/css/base/forms.scss b/web/html/src/branding/css/base/forms.scss
index f9e314c2124c..94882c8ab3e4 100644
--- a/web/html/src/branding/css/base/forms.scss
+++ b/web/html/src/branding/css/base/forms.scss
@@ -2,6 +2,10 @@
 .form-group {
   display: flex;
   margin-bottom: 10px;
+
+  &:last-child {
+    margin-bottom: 0;
+  }
 }
 
 label {
@@ -33,8 +37,12 @@ input[type="checkbox"] {
 }
 
 .checkbox {
-  margin-bottom: 10px;
   margin-top: 10px;
+  margin-bottom: 10px;
+
+  &:last-child {
+    margin-bottom: 0;
+  }
 
   & + .checkbox {
     margin-top: -5px;
diff --git a/web/html/src/branding/css/susemanager/components/text.scss b/web/html/src/branding/css/susemanager/components/text.scss
index 029a66f7c805..fecf0a1e345d 100644
--- a/web/html/src/branding/css/susemanager/components/text.scss
+++ b/web/html/src/branding/css/susemanager/components/text.scss
@@ -34,3 +34,16 @@
     color: $eos-bc-red-900 !important;
   }
 }
+
+p {
+  margin-top: 0;
+  margin-bottom: 1rem;
+
+  &:last-child {
+    margin-bottom: 0;
+  }
+}
+
+ul {
+  padding-left: 0;
+}
diff --git a/web/html/src/core/spa/view-helper.ts b/web/html/src/core/spa/view-helper.ts
index 6781f948e4f5..6b5b89a136ca 100644
--- a/web/html/src/core/spa/view-helper.ts
+++ b/web/html/src/core/spa/view-helper.ts
@@ -54,6 +54,7 @@ const BOOTSTRAP_READY_PAGES: PathString[] = [
   "/rhn/systems/details/Overview",
   "/rhn/manager/formula-catalog",
   "/rhn/errata/manage/CloneErrata.do",
+  "/rhn/admin/setup/ProxySettings.do",
 ];
 
 export const onEndNavigate = () => {