From 4d2b2ced23496868db245012d98ad57e37de6572 Mon Sep 17 00:00:00 2001
From: Etheryte <karl.tarvas@suse.com>
Date: Tue, 26 Nov 2024 12:38:19 +0100
Subject: [PATCH 1/2] Fix dangling old theme reference

---
 .../manager/webui/controllers/login/templates/login.jade     | 5 ++---
 java/code/webapp/WEB-INF/decorators/layout_error.jsp         | 3 +--
 java/code/webapp/WEB-INF/decorators/layout_head.jsp          | 3 +--
 java/spacewalk-java.changes.eth.login                        | 1 +
 web/spacewalk-web.changes.eth.login                          | 1 +
 5 files changed, 6 insertions(+), 7 deletions(-)
 create mode 100644 java/spacewalk-java.changes.eth.login
 create mode 100644 web/spacewalk-web.changes.eth.login

diff --git a/java/code/src/com/suse/manager/webui/controllers/login/templates/login.jade b/java/code/src/com/suse/manager/webui/controllers/login/templates/login.jade
index ec161dbdb745..5ebba4f786c1 100644
--- a/java/code/src/com/suse/manager/webui/controllers/login/templates/login.jade
+++ b/java/code/src/com/suse/manager/webui/controllers/login/templates/login.jade
@@ -13,8 +13,7 @@ html(lang=window.preferredLocale.replace("_", "-"))
         // import custom fonts/icons styles
         link(rel='stylesheet', href='/fonts/font-spacewalk/css/spacewalk-font.css?cb=#{webBuildtimestamp}')
         // import styles
-        link(rel='stylesheet', href='/css/#{webTheme}.css?cb=#{webBuildtimestamp}', id='web-theme')
-        link(rel='stylesheet', href='/css/updated-#{webTheme}.css?cb=#{webBuildtimestamp}', id='updated-web-theme')
+        link(rel='stylesheet', href='/css/updated-#{webTheme}.css?cb=#{webBuildtimestamp}')
         script(type='text/javascript').
             window.preferredLocale = "#{preferredLocale}";
             window.docsLocale = "#{docsLocale}";
@@ -28,7 +27,7 @@ html(lang=window.preferredLocale.replace("_", "-"))
 
         include /templates/common.jade
 
-        body(class='#{webTheme}' == "uyuni" ? "theme-#{webTheme} old-theme login-page" : "theme-#{webTheme} old-theme")
+        body(class='#{webTheme}' == "uyuni" ? "theme-#{webTheme} new-theme login-page" : "theme-#{webTheme} new-theme")
             #login
 
         +csrfToken
diff --git a/java/code/webapp/WEB-INF/decorators/layout_error.jsp b/java/code/webapp/WEB-INF/decorators/layout_error.jsp
index f701df51d574..7b3c8f42b18e 100644
--- a/java/code/webapp/WEB-INF/decorators/layout_error.jsp
+++ b/java/code/webapp/WEB-INF/decorators/layout_error.jsp
@@ -33,8 +33,7 @@
 
     <c:set var="webTheme" value="${ConfigDefaults.get().getDefaultWebTheme()}"/>
     <!-- import styles -->
-    <link rel="stylesheet" href="/css/${webTheme}.css?cb=${cb_version}" id="web-theme" />
-    <link rel="stylesheet" href="/css/updated-${webTheme}.css?cb=${cb_version}" id="updated-web-theme" />
+    <link rel="stylesheet" href="/css/updated-${webTheme}.css?cb=${cb_version}" />
 
     <!-- expose user preferred language to the application -->
     <c:set var="currentLocale" value="${ConfigDefaults.get().getDefaultLocale()}"/>
diff --git a/java/code/webapp/WEB-INF/decorators/layout_head.jsp b/java/code/webapp/WEB-INF/decorators/layout_head.jsp
index 9b50ee628c5e..0f3657058f35 100644
--- a/java/code/webapp/WEB-INF/decorators/layout_head.jsp
+++ b/java/code/webapp/WEB-INF/decorators/layout_head.jsp
@@ -32,8 +32,7 @@
 
     <!-- import styles -->
     <c:set var="webTheme" value="${GlobalInstanceHolder.USER_PREFERENCE_UTILS.getCurrentWebTheme(pageContext)}"/>
-    <link rel="stylesheet" href="/css/${webTheme}.css?cb=${cb_version}" id="web-theme" />
-    <link rel="stylesheet" href="/css/updated-${webTheme}.css?cb=${cb_version}" id="updated-web-theme" />
+    <link rel="stylesheet" href="/css/updated-${webTheme}.css?cb=${cb_version}" />
     
     <!-- expose user preferred language to the application -->
     <c:set var="currentLocale" value="${GlobalInstanceHolder.USER_PREFERENCE_UTILS.getCurrentLocale(pageContext)}"/>
diff --git a/java/spacewalk-java.changes.eth.login b/java/spacewalk-java.changes.eth.login
new file mode 100644
index 000000000000..89f9aaf41391
--- /dev/null
+++ b/java/spacewalk-java.changes.eth.login
@@ -0,0 +1 @@
+- Update login page layout
diff --git a/web/spacewalk-web.changes.eth.login b/web/spacewalk-web.changes.eth.login
new file mode 100644
index 000000000000..89f9aaf41391
--- /dev/null
+++ b/web/spacewalk-web.changes.eth.login
@@ -0,0 +1 @@
+- Update login page layout

From d749e1f8760a59af63f47a33054e8bc11f78e1d7 Mon Sep 17 00:00:00 2001
From: Etheryte <karl.tarvas@suse.com>
Date: Tue, 26 Nov 2024 14:02:57 +0100
Subject: [PATCH 2/2] Cleanup

---
 web/spacewalk-web.changes.eth.login | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 web/spacewalk-web.changes.eth.login

diff --git a/web/spacewalk-web.changes.eth.login b/web/spacewalk-web.changes.eth.login
deleted file mode 100644
index 89f9aaf41391..000000000000
--- a/web/spacewalk-web.changes.eth.login
+++ /dev/null
@@ -1 +0,0 @@
-- Update login page layout