Rename themes

java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java

@@ -1145,7 +1145,7 @@ public List<String> getWebThemesList() {
      * @return the name of the theme for the webUI
      */
     public String getDefaultWebTheme() {
-        return Config.get().getString(WEB_THEME, "susemanager-light");
+        return Config.get().getString(WEB_THEME, "suse-light");
     }
 
     /**

web/conf/rhn_web.conf

@@ -122,8 +122,8 @@ web.locale = en_US
 web.docs_locale = en
 
 # Set the list of possible webUI style themes name in a comma separated name list
-# susemanager-light,susemanager-dark,uyuni
-web.themes = susemanager-light,susemanager-dark,uyuni
+# suse-light,suse-dark,uyuni
+web.themes = suse-light,suse-dark,uyuni
 
 # Set the default webUI style theme name
 web.theme_default = uyuni

web/html/src/branding/css/base/mixins.scss

@@ -1,8 +1,8 @@
 @mixin onSuma {
-  @if $theme == "susemanager-light" {
+  @if $theme == "suse-light" {
     @content;
   }
-  @if $theme == "susemanager-dark" {
+  @if $theme == "suse-dark" {
     @content;
   }
 }

web/html/src/branding/css/susemanager-dark-variables.scss → web/html/src/branding/css/suse-dark-variables.scss

@@ -1,4 +1,4 @@
-@import "./susemanager-light-variables.scss";
+@import "./suse-light-variables.scss";
 
 $aside-background: $eos-bc-pine-500;
 $aside-menu-text: $eos-bc-white;

web/html/src/branding/css/susemanager-dark.scss → web/html/src/branding/css/suse-dark.scss

@@ -1,4 +1,4 @@
-$theme: "susemanager-dark";
+$theme: "suse-dark";
 
 @import "./base/body.scss";
 
@@ -9,7 +9,7 @@ $theme: "susemanager-dark";
   @import "bootstrap/scss/bootstrap";
 
   @import "./variables.scss";
-  @import "./susemanager-dark-variables.scss";
+  @import "./suse-dark-variables.scss";
 
   display: flex;
   flex-direction: column;

web/html/src/branding/css/susemanager-light.scss → web/html/src/branding/css/suse-light.scss

@@ -1,4 +1,4 @@
-$theme: "susemanager-light";
+$theme: "suse-light";
 
 @import "./base/body.scss";
 
@@ -9,7 +9,7 @@ $theme: "susemanager-light";
   @import "bootstrap/scss/bootstrap";
 
   @import "./variables.scss";
-  @import "./susemanager-light-variables.scss";
+  @import "./suse-light-variables.scss";
 
   display: flex;
   flex-direction: column;

web/html/src/build/webpack.config.js

@@ -103,8 +103,8 @@ module.exports = (env, argv) => {
   return {
     entry: {
       "javascript/manager/main": "./manager/index.ts",
-      "css/updated-susemanager-light": path.resolve(__dirname, "../branding/css/susemanager-light.scss"),
-      "css/updated-susemanager-dark": path.resolve(__dirname, "../branding/css/susemanager-dark.scss"),
+      "css/updated-suse-light": path.resolve(__dirname, "../branding/css/suse-light.scss"),
+      "css/updated-suse-dark": path.resolve(__dirname, "../branding/css/suse-dark.scss"),
       "css/updated-uyuni": path.resolve(__dirname, "../branding/css/uyuni.scss"),
     },
     output: {

web/html/src/core/debugUtils/index.ts

@@ -4,7 +4,7 @@ import { showErrorToastr, showSuccessToastr, showWarningToastr } from "component
 const debugUtils = {
   logTheme() {
     const theme = document.querySelector<HTMLLinkElement>(
-      'link[href^="/css/updated-susemanager-light"],link[href^="/css/updated-susemanager-dark"],link[href^="/css/updated-uyuni"]'
+      'link[href^="/css/updated-suse-light"],link[href^="/css/updated-suse-dark"],link[href^="/css/updated-uyuni"]'
     );
     if (!theme) {
       throw new TypeError("Unable to identify theme");
@@ -13,35 +13,29 @@ const debugUtils = {
   },
   toggleTheme() {
     if (document.body.className.includes("theme-susemanager-")) {
-      document.body.className = document.body.className.replace("theme-susemanager-light", "theme-uyuni");
-      document.body.className = document.body.className.replace("theme-susemanager-dark", "theme-uyuni");
+      document.body.className = document.body.className.replace("theme-suse-light", "theme-uyuni");
+      document.body.className = document.body.className.replace("theme-suse-dark", "theme-uyuni");
     } else if (document.body.className.includes("theme-uyuni")) {
-      document.body.className = document.body.className.replace("theme-uyuni", "theme-susemanager-light");
+      document.body.className = document.body.className.replace("theme-uyuni", "theme-suse-light");
     }
 
-    const sumaLight = document.querySelector('link[href^="/css/updated-susemanager-light"]');
+    const sumaLight = document.querySelector('link[href^="/css/updated-suse-light"]');
     if (sumaLight) {
-      sumaLight.setAttribute(
-        "href",
-        sumaLight.getAttribute("href")!.replace("updated-susemanager-light", "updated-uyuni")
-      );
+      sumaLight.setAttribute("href", sumaLight.getAttribute("href")!.replace("updated-suse-light", "updated-uyuni"));
       this.logTheme();
       return;
     }
 
-    const sumaDark = document.querySelector('link[href^="/css/updated-susemanager-dark"]');
+    const sumaDark = document.querySelector('link[href^="/css/updated-suse-dark"]');
     if (sumaDark) {
-      sumaDark.setAttribute(
-        "href",
-        sumaDark.getAttribute("href")!.replace("updated-susemanager-dark", "updated-uyuni")
-      );
+      sumaDark.setAttribute("href", sumaDark.getAttribute("href")!.replace("updated-suse-dark", "updated-uyuni"));
       this.logTheme();
       return;
     }
 
     const uyuni = document.querySelector('link[href^="/css/updated-uyuni"]');
     if (uyuni) {
-      uyuni.setAttribute("href", uyuni.getAttribute("href")!.replace("updated-uyuni", "updated-susemanager-light"));
+      uyuni.setAttribute("href", uyuni.getAttribute("href")!.replace("updated-uyuni", "updated-suse-light"));
       this.logTheme();
       return;
     }

web/html/src/manager/login/login.tsx

@@ -9,7 +9,7 @@ import withPageWrapper from "components/general/with-page-wrapper";
 import SusemanagerThemeLogin from "./susemanager/login";
 import UyuniThemeLogin from "./uyuni/login";
 
-type Theme = "uyuni" | "susemanager-light" | "susemanager-dark";
+type Theme = "uyuni" | "suse-light" | "suse-dark";
 
 const products = {
   suma: {

web/html/src/styleguide/template.js

@@ -10,7 +10,7 @@ module.exports = {
   head: {
     // Some of these will currently fail due to CORS, but will be obsolete once we move branding into web
     links: [
-      `/css/susemanager-light.css?cb=${noCache}`,
+      `/css/suse-light.css?cb=${noCache}`,
       `/fonts/font-awesome/css/font-awesome.css?cb=${noCache}`,
       `/fonts/font-spacewalk/css/spacewalk-font.css?cb=${noCache}`,
       `/css/jquery.timepicker.css?cb=${noCache}`,

web/spacewalk-web.spec

@@ -205,7 +205,7 @@ popd
 
 # Adjust default theme for SUSE Manager
 %if 0%{?sle_version} && ! (0%{?is_opensuse} || 0%{?rhel} || 0%{?fedora})
-sed -i -e 's/^web.theme_default =.*$/web.theme_default = susemanager-light/' %{buildroot}%{_datadir}/rhn/config-defaults/rhn_web.conf
+sed -i -e 's/^web.theme_default =.*$/web.theme_default = suse-light/' %{buildroot}%{_datadir}/rhn/config-defaults/rhn_web.conf
 %endif
 
 %find_lang spacewalk-web