From d33a18e01812bcb5c5e308edfeee17105f31fd80 Mon Sep 17 00:00:00 2001
From: Karl Tarvas <Etheryte@users.noreply.github.com>
Date: Wed, 23 Oct 2024 12:01:14 +0300
Subject: [PATCH] Fix font icon style assignment (bsc#1231378) (#9329)

* Revert "Fixed missing pagination buttons icon"

This reverts commit 92190d58008dd9ceebf2f9e73064b12d8d57d5f2.

* Fix font icon style assignment (bsc#1231378)
---
 .../redhat/rhn/frontend/taglibs/list/ListTagUtil.java  | 10 ++++------
 java/spacewalk-java.changes.eth.fa2                    |  1 +
 .../src/branding/css/susemanager/components/icons.less |  8 ++++++++
 .../src/branding/css/susemanager/components/icons.scss |  8 ++++++++
 web/html/src/branding/css/susemanager/index.less       |  1 +
 web/html/src/branding/css/susemanager/index.scss       |  1 +
 web/spacewalk-web.changes.eth.fa2                      |  1 +
 7 files changed, 24 insertions(+), 6 deletions(-)
 create mode 100644 java/spacewalk-java.changes.eth.fa2
 create mode 100644 web/html/src/branding/css/susemanager/components/icons.less
 create mode 100644 web/html/src/branding/css/susemanager/components/icons.scss
 create mode 100644 web/spacewalk-web.changes.eth.fa2

diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java
index 17229167ee2a..2657329b2865 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java
@@ -550,7 +550,9 @@ public static void renderPaginationLinks(PageContext pageContext,
         for (String linkNameIn : linkNames) {
             String[] linkData = links.get(linkNameIn);
             ListTagUtil.write(pageContext, "<button ");
-            ListTagUtil.write(pageContext, "class=\"btn btn-default btn-xs");
+            ListTagUtil.write(pageContext, "class=\"btn btn-default btn-xs ");
+            ListTagUtil.write(pageContext, linkData[0]);
+
             // if the link is disabled...
             if (linkData[1] == null) {
                 ListTagUtil.write(pageContext, " disabled");
@@ -563,11 +565,7 @@ public static void renderPaginationLinks(PageContext pageContext,
             }
             ListTagUtil.write(pageContext, "\" title=\"");
             ListTagUtil.write(pageContext, linkData[3]);
-            ListTagUtil.write(pageContext, "\">");
-            ListTagUtil.write(pageContext, "<i class=\"");
-            ListTagUtil.write(pageContext, linkData[0]);
-            ListTagUtil.write(pageContext, "\"></i>");
-            ListTagUtil.write(pageContext, "</button>");
+            ListTagUtil.write(pageContext, "\"></button>");
         }
         ListTagUtil.write(pageContext, "</div>");
     }
diff --git a/java/spacewalk-java.changes.eth.fa2 b/java/spacewalk-java.changes.eth.fa2
new file mode 100644
index 000000000000..7655cc7748d5
--- /dev/null
+++ b/java/spacewalk-java.changes.eth.fa2
@@ -0,0 +1 @@
+- Ensure icon fonts are loaded correctly on buttons (bsc#1231378)
diff --git a/web/html/src/branding/css/susemanager/components/icons.less b/web/html/src/branding/css/susemanager/components/icons.less
new file mode 100644
index 000000000000..393178cbee7f
--- /dev/null
+++ b/web/html/src/branding/css/susemanager/components/icons.less
@@ -0,0 +1,8 @@
+.fa,
+[class^="fa-"] {
+  font-family: "FontAwesome";
+}
+
+[class*="spacewalk-icon-"] {
+  font-family: "spacewalk-icon";
+}
diff --git a/web/html/src/branding/css/susemanager/components/icons.scss b/web/html/src/branding/css/susemanager/components/icons.scss
new file mode 100644
index 000000000000..393178cbee7f
--- /dev/null
+++ b/web/html/src/branding/css/susemanager/components/icons.scss
@@ -0,0 +1,8 @@
+.fa,
+[class^="fa-"] {
+  font-family: "FontAwesome";
+}
+
+[class*="spacewalk-icon-"] {
+  font-family: "spacewalk-icon";
+}
diff --git a/web/html/src/branding/css/susemanager/index.less b/web/html/src/branding/css/susemanager/index.less
index 9ab7bb8c60a2..2ab30220f611 100644
--- a/web/html/src/branding/css/susemanager/index.less
+++ b/web/html/src/branding/css/susemanager/index.less
@@ -25,6 +25,7 @@
 @import "./components/date-time-picker.less";
 @import "./components/header.less";
 @import "./components/address.less";
+@import "./components/icons.less";
 
 // Responsive overrides
 @import "../base/responsive-rules.less";
diff --git a/web/html/src/branding/css/susemanager/index.scss b/web/html/src/branding/css/susemanager/index.scss
index 9f90d4e75754..e2f84d97b3c4 100644
--- a/web/html/src/branding/css/susemanager/index.scss
+++ b/web/html/src/branding/css/susemanager/index.scss
@@ -31,6 +31,7 @@
 @import "./components/legend.scss";
 @import "./components/help-block.scss";
 @import "./components/collapse.scss";
+@import "./components/icons.scss";
 
 @import "./bootstrap-fixes.scss";
 
diff --git a/web/spacewalk-web.changes.eth.fa2 b/web/spacewalk-web.changes.eth.fa2
new file mode 100644
index 000000000000..7655cc7748d5
--- /dev/null
+++ b/web/spacewalk-web.changes.eth.fa2
@@ -0,0 +1 @@
+- Ensure icon fonts are loaded correctly on buttons (bsc#1231378)