Issue #1134 - Templates does not show RHEL and SLES icons when creati…

…ng guests from those distros. - Add SLES icon The written consent to use SUSE logo was approved by [email protected] in February 5, 2020 According to Ciaran only this approval email is enough. We don't need to add this in our license.
kimchi-project · Mar 22, 2020 · 1c554bf · 1c554bf
1 parent f3fbc1e
commit 1c554bf
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 0 deletions.
diff --git a/ui/css/kimchi.css b/ui/css/kimchi.css
@@ -249,6 +249,11 @@
   background-image: url("../images/icon-opensuse.png");
 }
 
+#template-add-window.modal-content h3.iso-title.sles,
+#guest-add-window.modal-content h3.iso-title.sles {
+  background-image: url("../images/icon-sles.png");
+}
+
 #template-add-window.modal-content h3.iso-title.ubuntu,
 #guest-add-window.modal-content h3.iso-title.ubuntu {
   background-image: url("../images/icon-ubuntu.png");
@@ -1047,6 +1052,10 @@
   background-image: url("../images/icon-opensuse.png");
 }
 
+#guest-content-container .distro-icon.icon-sles {
+  background-image: url("../images/icon-sles.png");
+}
+
 #guest-content-container .distro-icon.icon-ubuntu {
   background-image: url("../images/icon-ubuntu.png");
 }
@@ -2159,6 +2168,10 @@ ul {
   background-image: url("../images/icon-opensuse.png");
 }
 
+#templates-root-container .wok-vm-list .distro-icon.icon-sles {
+  background-image: url("../images/icon-sles.png");
+}
+
 #templates-root-container .wok-vm-list .distro-icon.icon-ubuntu {
   background-image: url("../images/icon-ubuntu.png");
 }
@@ -2290,6 +2303,10 @@ ul {
   background-image: url("../images/icon-opensuse.png");
 }
 
+#templates-root-container .wok-vm-gallery .name-distro-icon.icon-sles {
+  background-image: url("../images/icon-sles.png");
+}
+
 #templates-root-container .wok-vm-gallery .name-distro-icon.icon-ubuntu {
   background-image: url("../images/icon-ubuntu.png");
 }

diff --git a/ui/css/src/modules/_guests.scss b/ui/css/src/modules/_guests.scss
@@ -693,6 +693,9 @@
         &.icon-opensuse {
             background-image: url('../images/icon-opensuse.png');
         }
+        &.icon-sles {
+            background-image: url('../images/icon-sles.png');
+        }
         &.icon-ubuntu {
             background-image: url('../images/icon-ubuntu.png');
         }

diff --git a/ui/css/src/modules/_iso-list.scss b/ui/css/src/modules/_iso-list.scss
@@ -133,6 +133,9 @@
         &.opensuse {
             background-image: url('../images/icon-opensuse.png');
         }
+        &.suse {
+            background-image: url('../images/icon-suse.png');
+        }
         &.ubuntu {
             background-image: url('../images/icon-ubuntu.png');
         }

diff --git a/ui/css/src/modules/_templates.scss b/ui/css/src/modules/_templates.scss
@@ -481,6 +481,9 @@ $kimchi-icon-path: '../images';
             &.icon-opensuse {
                 background-image: url('../images/icon-opensuse.png');
             }
+            &.icon-sles {
+                background-image: url('../images/icon-sles.png');
+            }
             &.icon-ubuntu {
                 background-image: url('../images/icon-ubuntu.png');
             }
@@ -596,6 +599,9 @@ $kimchi-icon-path: '../images';
             &.icon-opensuse {
                 background-image: url('../images/icon-opensuse.png');
             }
+            &.icon-sles {
+                background-image: url('../images/icon-sles.png');
+            }
             &.icon-ubuntu {
                 background-image: url('../images/icon-ubuntu.png');
             }

diff --git a/ui/images/icon-sles.png b/ui/images/icon-sles.png
diff --git a/ui/js/src/kimchi.guest_main.js b/ui/js/src/kimchi.guest_main.js
@@ -474,6 +474,10 @@ kimchi.createGuestLi = function(vmObject, prevScreenImage, openMenu) {
             osType.addClass('icon-opensuse');
             osType.attr('val', 'openSUSE');
             osType.html('openSUSE');
+        } else if (vmObject.icon == 'plugins/kimchi/images/icon-sles.png') {
+            osType.addClass('icon-sles');
+            osType.attr('val', 'Suse');
+            osType.html('Suse');
         } else if (vmObject.icon == 'plugins/kimchi/images/icon-gentoo.png') {
             osType.addClass('icon-gentoo');
             osType.attr('val', 'Gentoo');
@@ -502,6 +506,8 @@ kimchi.createGuestLi = function(vmObject, prevScreenImage, openMenu) {
             osName.addClass('icon-centos');
         } else if (vmObject.icon == 'plugins/kimchi/images/icon-opensuse.png') {
             osName.addClass('icon-opensuse');
+        } else if (vmObject.icon == 'plugins/kimchi/images/icon-sles.png') {
+            osName.addClass('icon-sles');
         } else if (vmObject.icon == 'plugins/kimchi/images/icon-gentoo.png') {
             osName.addClass('icon-gentoo');
         } else if (vmObject.icon == 'plugins/kimchi/images/icon-debian.png') {