Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Sep 3, 2020
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions COPYING
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,10 @@ The name "Gentoo" and the "g" logo are trademarks of Gentoo Foundation, Inc.
The content, project, site, product or any other type of item with which the
"Gentoo" name is associated is not part of the Gentoo project and is not
directed or managed by Gentoo Foundation, Inc.


Kimchi has a written consent to use SUSE logo as a open source project.
"SUSE" and the SUSE logo are trademarks of SUSE LLC or its subsidiaries or affiliates.
All other trademarks, trade names, or company names referenced herein are used for
identification only and are the property of their respective owners, it should not be
used by commercial means.
17 changes: 17 additions & 0 deletions ui/css/kimchi.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down Expand Up @@ -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");
}
Expand Down Expand Up @@ -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");
}
Expand Down Expand Up @@ -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");
}
Expand Down
3 changes: 3 additions & 0 deletions ui/css/src/modules/_guests.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
}
Expand Down
3 changes: 3 additions & 0 deletions ui/css/src/modules/_iso-list.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,9 @@
&.opensuse {
background-image: url('../images/icon-opensuse.png');
}
&.suse {
background-image: url('../images/icon-sles.png');
}
&.ubuntu {
background-image: url('../images/icon-ubuntu.png');
}
Expand Down
6 changes: 6 additions & 0 deletions ui/css/src/modules/_templates.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
}
Expand Down Expand Up @@ -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');
}
Expand Down
Binary file added ui/images/icon-sles.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions ui/js/src/kimchi.guest_main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down Expand Up @@ -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') {
Expand Down