Fix dangling old theme reference

uyuni-project · Nov 26, 2024 · 4d2b2ce · 4d2b2ce
1 parent afae4c1
commit 4d2b2ce
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 7 deletions.
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
@@ -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
@@ -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
@@ -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
@@ -0,0 +1 @@
+- Update login page layout
diff --git a/web/spacewalk-web.changes.eth.login b/web/spacewalk-web.changes.eth.login
@@ -0,0 +1 @@
+- Update login page layout