rel-eng/packages web/spacewalk-web.spec
by Michael Mraka
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 13e0a7fca10d6dd11f39beb622a3967533224cf7
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Dec 13 17:03:27 2013 +0100
Automatic commit of package [spacewalk-web] release [2.1.42-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index 293fdce..6e759f8 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-2.1.41-1 web/
+2.1.42-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index bc49e64..7293d42 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -4,7 +4,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site - Perl modules
Group: Applications/Internet
License: GPLv2
-Version: 2.1.41
+Version: 2.1.42
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk/
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -269,6 +269,10 @@ rm -rf $RPM_BUILD_ROOT
%doc LICENSE
%changelog
+* Fri Dec 13 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.42-1
+- replaced icons with icon tag
+- system group edit properties - linking + cleanup
+
* Wed Dec 11 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.41-1
- updated pxt pages to use <rhn-icon> tag
- updated perl modules to use PXT::HTML->icon()
10 years, 5 months
Changes to 'refs/tags/spacewalk-java-2.1.99-1'
by Michael Mraka
Tag 'spacewalk-java-2.1.99-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-12-13 16:02 +0000
Tagging package [spacewalk-java] version [2.1.99-1] in directory [java/].
Changes since spacecmd-2.1.20-1:
Michael Mraka (2):
replaced icons with icon tag
Automatic commit of package [spacewalk-java] release [2.1.99-1].
---
branding/fonts/font-spacewalk/css/spacewalk-font.css | 4
java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java | 48 +++++++---
java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java | 8 -
java/code/src/com/redhat/rhn/frontend/taglibs/ToolbarTag.java | 19 +--
java/code/src/com/redhat/rhn/frontend/taglibs/list/DataSetManipulator.java | 8 -
java/code/src/com/redhat/rhn/frontend/taglibs/test/ToolbarTagBasicTest.java | 5 -
java/code/webapp/WEB-INF/includes/advertisements/chat-advertisement.jsp | 2
java/code/webapp/WEB-INF/pages/activationkeys/configuration/list.jsp | 2
java/code/webapp/WEB-INF/pages/activationkeys/configuration/rank.jsp | 2
java/code/webapp/WEB-INF/pages/activationkeys/configuration/subscribe.jsp | 2
java/code/webapp/WEB-INF/pages/activationkeys/systems/list.jsp | 2
java/code/webapp/WEB-INF/pages/admin/channelmanagementperms.jsp | 2
java/code/webapp/WEB-INF/pages/admin/channelperms.jsp | 3
java/code/webapp/WEB-INF/pages/admin/config/monitoring.jsp | 2
java/code/webapp/WEB-INF/pages/admin/errata/confirm.jsp | 2
java/code/webapp/WEB-INF/pages/admin/monitoring/config/probe-create.jsp | 2
java/code/webapp/WEB-INF/pages/admin/monitoring/config/probe-edit.jsp | 2
java/code/webapp/WEB-INF/pages/admin/monitoring/config/probes.jsp | 2
java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystems.jsp | 10 +-
java/code/webapp/WEB-INF/pages/admin/multiorg/sat_org_users.jsp | 2
java/code/webapp/WEB-INF/pages/channel/erratalist.jsp | 2
java/code/webapp/WEB-INF/pages/channel/manage/listpatchset.jsp | 2
java/code/webapp/WEB-INF/pages/channel/packagelist.jsp | 2
java/code/webapp/WEB-INF/pages/common/errors/missingcapability.jsp | 2
java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/groups.jspf | 2
java/code/webapp/WEB-INF/pages/common/fragments/admin/channelperms_list.jspf | 4
java/code/webapp/WEB-INF/pages/common/fragments/audit/scap-list-columns.jspf | 3
java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/details-header.jspf | 4
java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/summary.jspf | 8 -
java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablelist.jspf | 2
java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablesummary.jspf | 6 -
java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablewidgets.jspf | 2
java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/copyfile_rows.jsp | 2
java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deploylocal.jspf | 2
java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/details.jspf | 6 -
java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/file_info.jsp | 2
java/code/webapp/WEB-INF/pages/common/fragments/configuration/rankchannels.jspf | 4
java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/configfile_confirm.jspf | 2
java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/configfile_rows.jspf | 12 +-
java/code/webapp/WEB-INF/pages/common/fragments/configuration/ssm/configconfirmlist.jspf | 2
java/code/webapp/WEB-INF/pages/common/fragments/configuration/ssm/configlist.jspf | 2
java/code/webapp/WEB-INF/pages/common/fragments/errata/errata-header.jspf | 6 -
java/code/webapp/WEB-INF/pages/common/fragments/errata/erratadelete.jspf | 6 -
java/code/webapp/WEB-INF/pages/common/fragments/errata/ownedlistdisplay.jspf | 6 -
java/code/webapp/WEB-INF/pages/common/fragments/errata/relevant-errata-list.jspf | 6 -
java/code/webapp/WEB-INF/pages/common/fragments/groups/header.jspf | 6 -
java/code/webapp/WEB-INF/pages/common/fragments/groups/systems.jspf | 2
java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/advanced.jspf | 2
java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/profile-list.jspf | 4
java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/proxy-options.jspf | 2
java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/schedule-options.jspf | 2
java/code/webapp/WEB-INF/pages/common/fragments/package/package_header.jspf | 2
java/code/webapp/WEB-INF/pages/common/fragments/probes/probe-state-column-new.jspf | 10 +-
java/code/webapp/WEB-INF/pages/common/fragments/probes/probe-state-column.jspf | 10 +-
java/code/webapp/WEB-INF/pages/common/fragments/systems/group_listdisplay.jspf | 4
java/code/webapp/WEB-INF/pages/common/fragments/systems/groups.jspf | 2
java/code/webapp/WEB-INF/pages/common/fragments/systems/monitoring_status_groups.jspf | 10 +-
java/code/webapp/WEB-INF/pages/common/fragments/systems/monitoring_status_systems.jspf | 10 +-
java/code/webapp/WEB-INF/pages/common/fragments/user/edit_user_table_rows.jspf | 2
java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/inactiveSystems.jsp | 2
java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/monitoringCritical.jsp | 2
java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/monitoringWarning.jsp | 2
java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/scheduledActions.jsp | 6 -
java/code/webapp/WEB-INF/pages/configuration/channel/deployconfirm.jsp | 2
java/code/webapp/WEB-INF/pages/configuration/files/comparechannel.jsp | 2
java/code/webapp/WEB-INF/pages/configuration/files/comparecopy.jsp | 6 -
java/code/webapp/WEB-INF/pages/configuration/files/copysandbox.jsp | 2
java/code/webapp/WEB-INF/pages/configuration/files/deployconfirm.jsp | 2
java/code/webapp/WEB-INF/pages/configuration/files/diff.jsp | 5 -
java/code/webapp/WEB-INF/pages/configuration/overview/globalconfiglist.jsp | 2
java/code/webapp/WEB-INF/pages/configuration/overview/overview.jsp | 12 +-
java/code/webapp/WEB-INF/pages/configuration/sdc/importfileconfirm.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/ssm/deployconfirm.jsp | 2
java/code/webapp/WEB-INF/pages/configuration/ssm/difffiles.jsp | 6 -
java/code/webapp/WEB-INF/pages/configuration/ssm/diffsystems.jsp | 2
java/code/webapp/WEB-INF/pages/groups/edit.jsp | 2
java/code/webapp/WEB-INF/pages/help/chatindex.jsp | 2
java/code/webapp/WEB-INF/pages/kickstart/kickstarts.jsp | 22 ++--
java/code/webapp/WEB-INF/pages/kickstart/kstrees.jsp | 2
java/code/webapp/WEB-INF/pages/monitoring/probes.jsp | 10 +-
java/code/webapp/WEB-INF/pages/ssm/packageinstallschedule.jsp | 2
java/code/webapp/WEB-INF/pages/ssm/packageremoveschedule.jsp | 2
java/code/webapp/WEB-INF/pages/ssm/packageupgradeschedule.jsp | 2
java/code/webapp/WEB-INF/pages/ssm/packageverifyschedule.jsp | 2
java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp | 18 +--
java/code/webapp/WEB-INF/pages/systems/crashes.jsp | 2
java/code/webapp/WEB-INF/pages/systems/crashnote.jsp | 2
java/code/webapp/WEB-INF/pages/systems/crashnotedelete.jsp | 2
java/code/webapp/WEB-INF/pages/systems/crashnotes.jsp | 2
java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdeleteconfirm.jsp | 2
java/code/webapp/WEB-INF/pages/systems/details/packages/extra-packages-list.jsp | 2
java/code/webapp/WEB-INF/pages/systems/details/packages/packageconfirm.jsp | 2
java/code/webapp/WEB-INF/pages/systems/details/packages/packagelist.jsp | 4
java/code/webapp/WEB-INF/pages/systems/details/packages/packagelist.jspf | 2
java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchconfirm.jsp | 2
java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchinstall.jsp | 2
java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchinstallconfirm.jsp | 2
java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchlist.jsp | 2
java/code/webapp/WEB-INF/pages/systems/details/packages/patchsets/install_patchset.jsp | 2
java/code/webapp/WEB-INF/pages/systems/details/packages/patchsets/patchsetlist.jsp | 2
java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncprofile.jsp | 2
java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncsystem.jsp | 2
java/code/webapp/WEB-INF/pages/systems/details/packages/upgradable.jsp | 2
java/code/webapp/WEB-INF/pages/systems/details/virtualization/images/images.jsp | 2
java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemscompare.jsp | 2
java/code/webapp/WEB-INF/pages/systems/errata.jsp | 2
java/code/webapp/WEB-INF/pages/systems/errataconfirm.jsp | 2
java/code/webapp/WEB-INF/pages/systems/probes/details.jsp | 2
java/code/webapp/WEB-INF/pages/systems/sdc/createcustomdata.jsp | 2
java/code/webapp/WEB-INF/pages/systems/sdc/note_delete.jsp | 2
java/code/webapp/WEB-INF/pages/systems/sdc/note_edit.jsp | 4
java/code/webapp/WEB-INF/pages/systems/sdc/notes.jsp | 2
java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp | 14 +-
java/spacewalk-java.spec | 6 +
rel-eng/packages/spacewalk-java | 2
web/modules/pxt/PXT/HTML.pm | 3
web/modules/sniglets/Sniglets/HTML.pm | 2
117 files changed, 257 insertions(+), 245 deletions(-)
---
10 years, 5 months
2 commits - branding/fonts java/code java/spacewalk-java.spec rel-eng/packages web/modules
by Michael Mraka
branding/fonts/font-spacewalk/css/spacewalk-font.css | 4
java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java | 48 +++++++---
java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java | 8 -
java/code/src/com/redhat/rhn/frontend/taglibs/ToolbarTag.java | 19 +--
java/code/src/com/redhat/rhn/frontend/taglibs/list/DataSetManipulator.java | 8 -
java/code/src/com/redhat/rhn/frontend/taglibs/test/ToolbarTagBasicTest.java | 5 -
java/code/webapp/WEB-INF/includes/advertisements/chat-advertisement.jsp | 2
java/code/webapp/WEB-INF/pages/activationkeys/configuration/list.jsp | 2
java/code/webapp/WEB-INF/pages/activationkeys/configuration/rank.jsp | 2
java/code/webapp/WEB-INF/pages/activationkeys/configuration/subscribe.jsp | 2
java/code/webapp/WEB-INF/pages/activationkeys/systems/list.jsp | 2
java/code/webapp/WEB-INF/pages/admin/channelmanagementperms.jsp | 2
java/code/webapp/WEB-INF/pages/admin/channelperms.jsp | 3
java/code/webapp/WEB-INF/pages/admin/config/monitoring.jsp | 2
java/code/webapp/WEB-INF/pages/admin/errata/confirm.jsp | 2
java/code/webapp/WEB-INF/pages/admin/monitoring/config/probe-create.jsp | 2
java/code/webapp/WEB-INF/pages/admin/monitoring/config/probe-edit.jsp | 2
java/code/webapp/WEB-INF/pages/admin/monitoring/config/probes.jsp | 2
java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystems.jsp | 10 +-
java/code/webapp/WEB-INF/pages/admin/multiorg/sat_org_users.jsp | 2
java/code/webapp/WEB-INF/pages/channel/erratalist.jsp | 2
java/code/webapp/WEB-INF/pages/channel/manage/listpatchset.jsp | 2
java/code/webapp/WEB-INF/pages/channel/packagelist.jsp | 2
java/code/webapp/WEB-INF/pages/common/errors/missingcapability.jsp | 2
java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/groups.jspf | 2
java/code/webapp/WEB-INF/pages/common/fragments/admin/channelperms_list.jspf | 4
java/code/webapp/WEB-INF/pages/common/fragments/audit/scap-list-columns.jspf | 3
java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/details-header.jspf | 4
java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/summary.jspf | 8 -
java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablelist.jspf | 2
java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablesummary.jspf | 6 -
java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablewidgets.jspf | 2
java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/copyfile_rows.jsp | 2
java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deploylocal.jspf | 2
java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/details.jspf | 6 -
java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/file_info.jsp | 2
java/code/webapp/WEB-INF/pages/common/fragments/configuration/rankchannels.jspf | 4
java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/configfile_confirm.jspf | 2
java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/configfile_rows.jspf | 12 +-
java/code/webapp/WEB-INF/pages/common/fragments/configuration/ssm/configconfirmlist.jspf | 2
java/code/webapp/WEB-INF/pages/common/fragments/configuration/ssm/configlist.jspf | 2
java/code/webapp/WEB-INF/pages/common/fragments/errata/errata-header.jspf | 6 -
java/code/webapp/WEB-INF/pages/common/fragments/errata/erratadelete.jspf | 6 -
java/code/webapp/WEB-INF/pages/common/fragments/errata/ownedlistdisplay.jspf | 6 -
java/code/webapp/WEB-INF/pages/common/fragments/errata/relevant-errata-list.jspf | 6 -
java/code/webapp/WEB-INF/pages/common/fragments/groups/header.jspf | 6 -
java/code/webapp/WEB-INF/pages/common/fragments/groups/systems.jspf | 2
java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/advanced.jspf | 2
java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/profile-list.jspf | 4
java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/proxy-options.jspf | 2
java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/schedule-options.jspf | 2
java/code/webapp/WEB-INF/pages/common/fragments/package/package_header.jspf | 2
java/code/webapp/WEB-INF/pages/common/fragments/probes/probe-state-column-new.jspf | 10 +-
java/code/webapp/WEB-INF/pages/common/fragments/probes/probe-state-column.jspf | 10 +-
java/code/webapp/WEB-INF/pages/common/fragments/systems/group_listdisplay.jspf | 4
java/code/webapp/WEB-INF/pages/common/fragments/systems/groups.jspf | 2
java/code/webapp/WEB-INF/pages/common/fragments/systems/monitoring_status_groups.jspf | 10 +-
java/code/webapp/WEB-INF/pages/common/fragments/systems/monitoring_status_systems.jspf | 10 +-
java/code/webapp/WEB-INF/pages/common/fragments/user/edit_user_table_rows.jspf | 2
java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/inactiveSystems.jsp | 2
java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/monitoringCritical.jsp | 2
java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/monitoringWarning.jsp | 2
java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/scheduledActions.jsp | 6 -
java/code/webapp/WEB-INF/pages/configuration/channel/deployconfirm.jsp | 2
java/code/webapp/WEB-INF/pages/configuration/files/comparechannel.jsp | 2
java/code/webapp/WEB-INF/pages/configuration/files/comparecopy.jsp | 6 -
java/code/webapp/WEB-INF/pages/configuration/files/copysandbox.jsp | 2
java/code/webapp/WEB-INF/pages/configuration/files/deployconfirm.jsp | 2
java/code/webapp/WEB-INF/pages/configuration/files/diff.jsp | 5 -
java/code/webapp/WEB-INF/pages/configuration/overview/globalconfiglist.jsp | 2
java/code/webapp/WEB-INF/pages/configuration/overview/overview.jsp | 12 +-
java/code/webapp/WEB-INF/pages/configuration/sdc/importfileconfirm.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/ssm/deployconfirm.jsp | 2
java/code/webapp/WEB-INF/pages/configuration/ssm/difffiles.jsp | 6 -
java/code/webapp/WEB-INF/pages/configuration/ssm/diffsystems.jsp | 2
java/code/webapp/WEB-INF/pages/groups/edit.jsp | 2
java/code/webapp/WEB-INF/pages/help/chatindex.jsp | 2
java/code/webapp/WEB-INF/pages/kickstart/kickstarts.jsp | 22 ++--
java/code/webapp/WEB-INF/pages/kickstart/kstrees.jsp | 2
java/code/webapp/WEB-INF/pages/monitoring/probes.jsp | 10 +-
java/code/webapp/WEB-INF/pages/ssm/packageinstallschedule.jsp | 2
java/code/webapp/WEB-INF/pages/ssm/packageremoveschedule.jsp | 2
java/code/webapp/WEB-INF/pages/ssm/packageupgradeschedule.jsp | 2
java/code/webapp/WEB-INF/pages/ssm/packageverifyschedule.jsp | 2
java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp | 18 +--
java/code/webapp/WEB-INF/pages/systems/crashes.jsp | 2
java/code/webapp/WEB-INF/pages/systems/crashnote.jsp | 2
java/code/webapp/WEB-INF/pages/systems/crashnotedelete.jsp | 2
java/code/webapp/WEB-INF/pages/systems/crashnotes.jsp | 2
java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdeleteconfirm.jsp | 2
java/code/webapp/WEB-INF/pages/systems/details/packages/extra-packages-list.jsp | 2
java/code/webapp/WEB-INF/pages/systems/details/packages/packageconfirm.jsp | 2
java/code/webapp/WEB-INF/pages/systems/details/packages/packagelist.jsp | 4
java/code/webapp/WEB-INF/pages/systems/details/packages/packagelist.jspf | 2
java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchconfirm.jsp | 2
java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchinstall.jsp | 2
java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchinstallconfirm.jsp | 2
java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchlist.jsp | 2
java/code/webapp/WEB-INF/pages/systems/details/packages/patchsets/install_patchset.jsp | 2
java/code/webapp/WEB-INF/pages/systems/details/packages/patchsets/patchsetlist.jsp | 2
java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncprofile.jsp | 2
java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncsystem.jsp | 2
java/code/webapp/WEB-INF/pages/systems/details/packages/upgradable.jsp | 2
java/code/webapp/WEB-INF/pages/systems/details/virtualization/images/images.jsp | 2
java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemscompare.jsp | 2
java/code/webapp/WEB-INF/pages/systems/errata.jsp | 2
java/code/webapp/WEB-INF/pages/systems/errataconfirm.jsp | 2
java/code/webapp/WEB-INF/pages/systems/probes/details.jsp | 2
java/code/webapp/WEB-INF/pages/systems/sdc/createcustomdata.jsp | 2
java/code/webapp/WEB-INF/pages/systems/sdc/note_delete.jsp | 2
java/code/webapp/WEB-INF/pages/systems/sdc/note_edit.jsp | 4
java/code/webapp/WEB-INF/pages/systems/sdc/notes.jsp | 2
java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp | 14 +-
java/spacewalk-java.spec | 6 +
rel-eng/packages/spacewalk-java | 2
web/modules/pxt/PXT/HTML.pm | 3
web/modules/sniglets/Sniglets/HTML.pm | 2
117 files changed, 257 insertions(+), 245 deletions(-)
New commits:
commit fc52b74c75e00ca2a8a7623be114811ba37a4508
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Dec 13 17:02:43 2013 +0100
Automatic commit of package [spacewalk-java] release [2.1.99-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 985c6ea..80745ec 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -28,7 +28,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 2.1.98
+Version: 2.1.99
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -785,6 +785,10 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Fri Dec 13 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.99-1
+- replaced icons with icon tag
+- simplify logic in cfg:channel tag
+
* Thu Dec 12 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.98-1
- replaced icons with icon tag
- system group edit properties - linking + cleanup
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index a19e19b..bdff82c 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-2.1.98-1 java/
+2.1.99-1 java/
commit 6c0e76d347dc8fa7fa487abaeaff67d8804129d1
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Dec 12 15:01:55 2013 +0100
replaced icons with icon tag
diff --git a/branding/fonts/font-spacewalk/css/spacewalk-font.css b/branding/fonts/font-spacewalk/css/spacewalk-font.css
index 9b3c5ba..30d43c2 100644
--- a/branding/fonts/font-spacewalk/css/spacewalk-font.css
+++ b/branding/fonts/font-spacewalk/css/spacewalk-font.css
@@ -122,7 +122,7 @@
.spacewalk-icon-manage-autoinstallations:before {
content: "\e620";
}
-.spacewalk-icon-Software-Channel-Management:before {
+.spacewalk-icon-software-channel-management:before {
content: "\e621";
}
.spacewalk-icon-manage-configuration-files:before {
@@ -161,7 +161,7 @@
.spacewalk-icon-system-groups:before {
content: "\e62e";
}
-.spacewalk-icon-Unentitled:before {
+.spacewalk-icon-unentitled:before {
content: "\e62f";
}
.spacewalk-icon-enhancement:before {
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java
index 0f871fc..88fcb9a 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java
@@ -53,63 +53,85 @@ public class IconTag extends TagSupport {
icons.put("header-activation-key", "fa fa-key");
icons.put("header-channel", "fa spacewalk-icon-software-channels");
icons.put("header-channel-configuration",
- "fa spacewalk-icon-Software-Channel-Management");
+ "fa spacewalk-icon-software-channel-management");
icons.put("header-channel-mapping", "fa fa-retweet");
+ icons.put("header-chat", "fa fa-comment text-primary");
+ icons.put("header-config-system", "fa spacewalk-icon-config-system");
icons.put("header-configuration", "fa spacewalk-icon-manage-configuration-files");
- icons.put("header-crash", "spacewalk-icon-bug-ex");
+ icons.put("header-crash", "fa spacewalk-icon-bug-ex");
icons.put("header-errata", "fa spacewalk-icon-patches");
icons.put("header-errata-add", "fa spacewalk-icon-patch-install");
icons.put("header-errata-del", "fa spacewalk-icon-patch-remove");
icons.put("header-errata-set", "fa spacewalk-icon-patch-set");
icons.put("header-errata-set-add", "fa pacewalk-icon-patchset-install");
icons.put("header-event-history", "fa fa-suitcase");
+ icons.put("header-file", "fa fa-file-text-o");
+ icons.put("header-folder", "fa fa-folder-open-o");
icons.put("header-globe", "fa fa-globe");
+ icons.put("header-help", "fa fa-question-circle");
icons.put("header-info", "fa fa-info-circle");
- icons.put("header-list", "fa fa-list");
icons.put("header-kickstart", "fa fa-rocket");
+ icons.put("header-list", "fa fa-list");
+ icons.put("header-monitoring", "fa fa-1-5x spacewalk-icon-monitoring-status");
icons.put("header-multiorg-big", "fa fa-sitemap fa-3x");
+ icons.put("header-note", "fa spacewalk-icon-note-pin");
icons.put("header-organisation", "fa fa-group");
icons.put("header-package", "fa spacewalk-icon-packages");
+ icons.put("header-package-add", "fa spacewalk-icon-package-add");
+ icons.put("header-package-del", "fa spacewalk-icon-package-delete");
+ icons.put("header-package-extra", "fa spacewalk-icon-package-extra");
+ icons.put("header-package-upgrade", "fa spacewalk-icon-package-upgrade");
icons.put("header-preferences", "fa fa-cogs");
icons.put("header-proxy", "fa spacewalk-icon-proxy");
+ icons.put("header-refresh", "fa fa-refresh");
+ icons.put("header-reloading", "fa fa-refresh fa-spin");
+ icons.put("header-sandbox", "fa spacewalk-icon-sandbox");
+ icons.put("header-schedule", "fa spacewalk-icon-schedule");
icons.put("header-search", "fa fa-search");
icons.put("header-signout", "fa fa-sign-out");
icons.put("header-sitemap", "fa fa-sitemap");
icons.put("header-snapshot", "fa fa-camera");
icons.put("header-snapshot-rollback", "fa spacewalk-icon-snapshot-rollback");
icons.put("header-subscriptions-big", "fa fa-list-alt fa-3x");
+ icons.put("header-symlink", "fa spacewalk-icon-listicon-cfg-symlink");
icons.put("header-system", "fa fa-desktop");
icons.put("header-system-groups", "fa spacewalk-icon-system-groups");
icons.put("header-system-physical", "fa fa-desktop");
icons.put("header-system-virt-guest", "fa spacewalk-icon-virtual-guest");
icons.put("header-system-virt-host", "fa spacewalk-icon-virtual-host");
+ icons.put("header-taskomatic", "fa fa-tachometer");
icons.put("header-user", "fa fa-user");
icons.put("header-users-big", "fa fa-group fa-3x");
- icons.put("header-taskomatic", "fa fa-tachometer");
icons.put("item-add", "fa fa-plus");
icons.put("item-clone", "fa fa-files-o");
icons.put("item-del", "fa fa-trash-o");
- icons.put("item-download", "fa fa-download");
icons.put("item-disabled", "fa fa-circle-o text-muted");
+ icons.put("item-download", "fa fa-download");
+ icons.put("item-download-csv", "fa spacewalk-icon-download-csv");
icons.put("item-enabled", "fa fa-check text-success");
icons.put("item-ssm-add", "fa fa-plus-circle");
icons.put("item-ssm-del", "fa fa-minus-circle");
- icons.put("monitoring-crit", "fa fa-1-5x spacewalk-icon-health text-danger");
- icons.put("monitoring-ok", "fa fa-1-5x spacewalk-icon-health text-success");
- icons.put("monitoring-pending", "fa fa-1-5x spacewalk-icon-health-pending");
- icons.put("monitoring-status", "fa fa-1-5x spacewalk-icon-monitoring-status");
- icons.put("monitoring-unknown", "fa fa-1-5x spacewalk-icon-health-unknown");
- icons.put("monitoring-warn", "fa fa-1-5x spacewalk-icon-health text-warning");
+ icons.put("item-upload", "fa fa-upload");
+ icons.put("monitoring-crit",
+ "fa fa-1-5x spacewalk-icon-monitoring-down text-danger");
+ icons.put("monitoring-ok", "fa fa-1-5x spacewalk-icon-monitoring-ok text-success");
+ icons.put("monitoring-pending", "fa fa-1-5x spacewalk-icon-monitoring-pending");
+ icons.put("monitoring-status", "fa spacewalk-icon-monitoring-status");
+ icons.put("monitoring-unknown", "fa fa-1-5x spacewalk-icon-monitoring-unknown");
+ icons.put("monitoring-warn",
+ "fa fa-1-5x spacewalk-icon-monitoring-warning text-warning");
icons.put("nav-bullet", "fa fa-caret-right");
icons.put("nav-right", "fa fa-arrow-right");
icons.put("nav-up", "fa fa-caret-up");
- icons.put("sandbox", "fa spacewalk-icon-sandbox");
+ icons.put("sort-down", "fa fa-arrow-circle-down");
+ icons.put("sort-up", "fa fa-arrow-circle-up");
icons.put("system-crit", "fa fa-exclamation-circle fa-1-5x text-danger");
icons.put("system-kickstarting", "fa fa-rocket fa-1-5x");
icons.put("system-locked", "fa fa-1-5x spacewalk-icon-locked-system");
icons.put("system-ok", "fa fa-check-circle fa-1-5x text-success");
icons.put("system-physical", "fa fa-desktop fa-1-5x");
- icons.put("system-unentitled", "fa fa-1-5x spacewalk-icon-Unentitled");
+ icons.put("system-reboot", "fa fa-refresh");
+ icons.put("system-unentitled", "fa fa-1-5x spacewalk-icon-unentitled");
icons.put("system-unknown", "fa fa-1-5x spacewalk-icon-unknown-system");
icons.put("system-virt-guest", "fa fa-1-5x spacewalk-icon-virtual-guest");
icons.put("system-virt-host", "fa fa-1-5x spacewalk-icon-virtual-host");
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java
index a54b0a9..8cc47d1 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java
@@ -585,13 +585,13 @@ public class ListDisplayTag extends ListDisplayTagBase {
if (canGoForward || canGoBack) {
out.append(renderPaginationButton(FIRST,
- "fa-fast-backward", " |< ", canGoBack));
- out.append(renderPaginationButton(PREV, "fa-backward",
+ "fa-angle-double-left", " |< ", canGoBack));
+ out.append(renderPaginationButton(PREV, "fa-angle-left",
" < ", canGoBack));
- out.append(renderPaginationButton(NEXT, "fa-forward",
+ out.append(renderPaginationButton(NEXT, "fa-angle-right",
" > ", canGoForward));
out.append(renderPaginationButton(LAST,
- "fa-fast-forward", " >| ", canGoForward));
+ "fa-angle-double-right", " >| ", canGoForward));
}
out.append("</div>\n");
}
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/ToolbarTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/ToolbarTag.java
index 7f9a1c8..a266d99 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/ToolbarTag.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/ToolbarTag.java
@@ -551,20 +551,11 @@ public class ToolbarTag extends TagSupport {
tag.setAttribute("href", getHelpUrl());
tag.setAttribute("target", "_blank");
- HtmlTag stack = new HtmlTag("span");
- stack.setAttribute("class", "fa-stack");
+ HtmlTag help = new HtmlTag("i");
+ help.setAttribute("class", "fa fa-question-circle");
- HtmlTag iBack = new HtmlTag("i");
- iBack.setAttribute("class", "fa fa-circle fa-stack-1x");
- HtmlTag iFront = new HtmlTag("i");
- iFront.setAttribute("class", "fa fa-question fa-stack-1x fa-inverse");
-
- stack.addBody(iBack.renderOpenTag());
- stack.addBody(iBack.renderCloseTag());
- stack.addBody(iFront.renderOpenTag());
- stack.addBody(iFront.renderCloseTag());
-
- tag.addBody(stack);
+ tag.addBody(help.renderOpenTag());
+ tag.addBody(help.renderCloseTag());
return tag.render();
}
return "";
@@ -634,7 +625,7 @@ public class ToolbarTag extends TagSupport {
assertNotEmpty(getUploadUrl())) {
String del = "toolbar.upload." + getUploadType();
- return renderActionLink(getUploadUrl(), del, del, "fa-upload", null);
+ return renderActionLink(getUploadUrl(), del, del, "item-upload", null);
}
return "";
}
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/DataSetManipulator.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/DataSetManipulator.java
index fb005ff..4b2d46e 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/DataSetManipulator.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/DataSetManipulator.java
@@ -65,10 +65,10 @@ public class DataSetManipulator {
private final boolean searchChild;
private String defaultSortAttribute;
- private static final String ICON_FIRST = "fa fa-fast-backward";
- private static final String ICON_PREV = "fa fa-backward";
- private static final String ICON_NEXT = "fa fa-forward";
- private static final String ICON_LAST = "fa fa-fast-forward";
+ private static final String ICON_FIRST = "fa fa-angle-double-left";
+ private static final String ICON_PREV = "fa fa-angle-left";
+ private static final String ICON_NEXT = "fa fa-angle-right";
+ private static final String ICON_LAST = "fa fa-angle-double-right";
/**
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/test/ToolbarTagBasicTest.java b/java/code/src/com/redhat/rhn/frontend/taglibs/test/ToolbarTagBasicTest.java
index 4b72367..d5d7bbb 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/test/ToolbarTagBasicTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/test/ToolbarTagBasicTest.java
@@ -33,10 +33,7 @@ public class ToolbarTagBasicTest extends BaseTestToolbarTag {
"<img src=\"/img/rhn-icon-preferences.gif\" alt=\"Home Icon\" />" +
"<a href=\"/help/provisioning/" +
"s1-sm-your-rhn.html#S2-SM-YOUR-RHN-PREFS\" target=\"_blank\">" +
- "<span class=\"fa-stack\">" +
- "<i class=\"fa fa-circle fa-stack-1x\"></i>" +
- "<i class=\"fa fa-question fa-stack-1x fa-inverse\"></i>" +
- "</span></a></h1></div>";
+ "<i class=\"fa fa-question-circle\"></i></a></h1></div>";
out.setExpectedData(output);
tt.setBase("h1");
diff --git a/java/code/webapp/WEB-INF/includes/advertisements/chat-advertisement.jsp b/java/code/webapp/WEB-INF/includes/advertisements/chat-advertisement.jsp
index 4fcdb25..10f038f 100644
--- a/java/code/webapp/WEB-INF/includes/advertisements/chat-advertisement.jsp
+++ b/java/code/webapp/WEB-INF/includes/advertisements/chat-advertisement.jsp
@@ -1,4 +1,4 @@
<br/>
<a href="http://webchat.freenode.net?channels=#spacewalk" target="_blank">
- <i class="fa fa-comment text-primary" title=""></i>
+ <rhn:icon type="header-chat" title="" />
</a>
diff --git a/java/code/webapp/WEB-INF/pages/activationkeys/configuration/list.jsp b/java/code/webapp/WEB-INF/pages/activationkeys/configuration/list.jsp
index d96a107..0597626 100644
--- a/java/code/webapp/WEB-INF/pages/activationkeys/configuration/list.jsp
+++ b/java/code/webapp/WEB-INF/pages/activationkeys/configuration/list.jsp
@@ -11,7 +11,7 @@
</head>
<body>
<%@ include file="/WEB-INF/pages/common/fragments/activationkeys/common-header.jspf" %>
-<h2><i class="spacewalk-icon-software-channels"></i>
+<h2><rhn:icon type="header-channel" />
<bean:message key="sdc.configlist.jsp.header"/></h2>
<div class="panel panel-default">
<div class="panel-body">
diff --git a/java/code/webapp/WEB-INF/pages/activationkeys/configuration/rank.jsp b/java/code/webapp/WEB-INF/pages/activationkeys/configuration/rank.jsp
index fec57f8..74bdb85 100644
--- a/java/code/webapp/WEB-INF/pages/activationkeys/configuration/rank.jsp
+++ b/java/code/webapp/WEB-INF/pages/activationkeys/configuration/rank.jsp
@@ -15,7 +15,7 @@
action="/activationkeys/configuration/Rank.do?tid=${param.tid}">
<rhn:csrf />
<h2>
- <i class="spacewalk-icon-software-channels"></i>
+ <rhn:icon type="header-channel" />
<bean:message key="sdc.config.rank.jsp.header"/>
</h2>
<c:if test="${not empty param.wizardMode}">
diff --git a/java/code/webapp/WEB-INF/pages/activationkeys/configuration/subscribe.jsp b/java/code/webapp/WEB-INF/pages/activationkeys/configuration/subscribe.jsp
index ee8f483..a36626f 100644
--- a/java/code/webapp/WEB-INF/pages/activationkeys/configuration/subscribe.jsp
+++ b/java/code/webapp/WEB-INF/pages/activationkeys/configuration/subscribe.jsp
@@ -11,7 +11,7 @@
</head>
<body>
<%@ include file="/WEB-INF/pages/common/fragments/activationkeys/common-header.jspf" %>
-<h2><i class="spacewalk-icon-software-channels"></i> <bean:message key="sdc.config.subscriptions.jsp.header"/></h2>
+<h2><rhn:icon type="header-channel" /> <bean:message key="sdc.config.subscriptions.jsp.header"/></h2>
<div class="panel panel-default">
<div class="panel-heading">
diff --git a/java/code/webapp/WEB-INF/pages/activationkeys/systems/list.jsp b/java/code/webapp/WEB-INF/pages/activationkeys/systems/list.jsp
index f1cee44..0e5ef88 100644
--- a/java/code/webapp/WEB-INF/pages/activationkeys/systems/list.jsp
+++ b/java/code/webapp/WEB-INF/pages/activationkeys/systems/list.jsp
@@ -14,7 +14,7 @@
<div class="page-summary">
- <h2><i class="icon-desktop"></i>
+ <h2><rhn:icon type="header-system" />
<bean:message key="Systems"/>
</h2>
<p>
diff --git a/java/code/webapp/WEB-INF/pages/admin/channelmanagementperms.jsp b/java/code/webapp/WEB-INF/pages/admin/channelmanagementperms.jsp
index 25334da..24eead6 100644
--- a/java/code/webapp/WEB-INF/pages/admin/channelmanagementperms.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/channelmanagementperms.jsp
@@ -13,7 +13,7 @@
<p><bean:message key="channelManagementPerms.summary" /></p>
<p>
-(<span class="ok-explanation"><i class="icon-ok" title="Permission granted"></i></span>
+(<rhn:icon type="item-enabled" />
<bean:message key="channelManagementPerms.granted" />)
</p>
diff --git a/java/code/webapp/WEB-INF/pages/admin/channelperms.jsp b/java/code/webapp/WEB-INF/pages/admin/channelperms.jsp
index f7f4503..e9c57e9 100644
--- a/java/code/webapp/WEB-INF/pages/admin/channelperms.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/channelperms.jsp
@@ -13,8 +13,7 @@
<p><bean:message key="channelperms.jsp.summary"/></p>
<p>
-
-(<span class="ok-explanation"><i class="icon-ok" title="<bean:message key='channelperms.jsp.permGranted.short'/>"></i></span>
+(<rhn:icon type="item-enabled" title="<bean:message key='channelperms.jsp.permGranted.short'/>" />
<bean:message key="channelperms.jsp.permGranted" />)
</p>
diff --git a/java/code/webapp/WEB-INF/pages/admin/config/monitoring.jsp b/java/code/webapp/WEB-INF/pages/admin/config/monitoring.jsp
index ba87799..b2bc502 100644
--- a/java/code/webapp/WEB-INF/pages/admin/config/monitoring.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/config/monitoring.jsp
@@ -5,7 +5,7 @@
<html>
<body>
- <rhn:toolbar base="h1" icon="fa-cog"
+ <rhn:toolbar base="h1" icon="header-info"
helpUrl="">
<bean:message key="generalconfig.jsp.header1"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/admin/errata/confirm.jsp b/java/code/webapp/WEB-INF/pages/admin/errata/confirm.jsp
index 824396f..08bbae4 100644
--- a/java/code/webapp/WEB-INF/pages/admin/errata/confirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/errata/confirm.jsp
@@ -46,7 +46,7 @@
<th><bean:message key="syncprofile.jsp.than"/></th>
</tr>
<tr>
- <th><i class="fa spacewalk-icon-schedule" title="<bean:message key='syncprofile.jsp.selection'/>"></i>
+ <th><rhn:icon type="header-schedule" title="<bean:message key='syncprofile.jsp.selection' />" />
</th>
<td>
<jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp">
diff --git a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probe-create.jsp b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probe-create.jsp
index 22bb3e3..0ec5317 100644
--- a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probe-create.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probe-create.jsp
@@ -9,7 +9,7 @@
<meta name="page-decorator" content="none" />
</head>
<body>
- <rhn:toolbar base="h1" icon="fa-cog"
+ <rhn:toolbar base="h1" icon="header-monitoring"
helpUrl="/rhn/help/reference/en-US/s1-sm-monitor.jsp#s2-sm-monitor-psuites">
<bean:message key="probe-create.jsp.header1" arg0="${probeSuite.suiteName}" />
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probe-edit.jsp b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probe-edit.jsp
index dfaba09..0366746 100644
--- a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probe-edit.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probe-edit.jsp
@@ -20,7 +20,7 @@
}
//-->
</script>
- <rhn:toolbar base="h1" icon="fa-cog"
+ <rhn:toolbar base="h1" icon="header-monitoring"
helpUrl="/rhn/help/reference/en-US/s1-sm-monitor.jsp#s2-sm-monitor-psuites">
<bean:message key="probe-edit.jsp.header1"
arg0="${probe.description}"
diff --git a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probes.jsp b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probes.jsp
index 7df0f45..fd322b7 100644
--- a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probes.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probes.jsp
@@ -9,7 +9,7 @@
<html>
<body>
-<rhn:toolbar base="h1" icon="fa-cog"
+<rhn:toolbar base="h1" icon="header-monitoring"
creationUrl="ProbeSuiteProbeCreate.do?suite_id=${suite_id}"
creationType="probe"
helpUrl="/rhn/help/reference/en-US/s1-sm-monitor.jsp#s2-sm-monitor-psuites">
diff --git a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystems.jsp b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystems.jsp
index d44229e..6ac67b1 100644
--- a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystems.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystems.jsp
@@ -32,19 +32,19 @@
<rhn:set value="${current.id}" />
<rhn:column header="probesuitesystems.jsp.state">
<c:if test="${current.status == 'UNKNOWN'}">
- <i class="fa spacewalk-icon-monitoring-unknown" title="<bean:message key='monitoring.status.unknown'/>"></i>
+ <rhn:icon type="monitoring-unknown" title="<bean:message key='monitoring.status.unknown' />" />
</c:if>
<c:if test="${current.status == 'OK'}">
- <i class="fa spacewalk-icon-monitoring-ok" title="<bean:message key='monitoring.status.ok'/>"></i>
+ <rhn:icon type="monitoring-ok" title="<bean:message key='monitoring.status.ok' />" />
</c:if>
<c:if test="${current.status == 'WARNING'}">
- <i class="fa spacewalk-icon-monitoring-warning" title="<bean:message key='monitoring.status.warn'/>"></i>
+ <rhn:icon type="monitoring-warn" title="<bean:message key='monitoring.status.warn' />" />
</c:if>
<c:if test="${current.status == 'PENDING'}">
- <i class="fa spacewalk-icon-monitoring-pending" title="<bean:message key='monitoring.status.pending'/>"></i>
+ <rhn:icon type="monitoring-pending" title="<bean:message key='monitoring.status.pending' />" />
</c:if>
<c:if test="${current.status == 'CRITICAL'}">
- <i class="fa spacewalk-icon-monitoring-down" title="<bean:message key='monitoring.status.critical'/>"></i>
+ <rhn:icon type="monitoring-crit" title="<bean:message key='monitoring.status.critical' />" />
</c:if>
</rhn:column>
<rhn:column header="probesuitesystems.jsp.system">
diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/sat_org_users.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/sat_org_users.jsp
index 2136f55..1841615 100644
--- a/java/code/webapp/WEB-INF/pages/admin/multiorg/sat_org_users.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/sat_org_users.jsp
@@ -70,7 +70,7 @@
<rhn:icon type="item-enabled" />
</c:when>
<c:otherwise>
- <img src="/img/rhn-listicon-unchecked_immutable.gif">
+ <rhn:icon type="item-disabled" />
</c:otherwise>
</c:choose>
</rl:column>
diff --git a/java/code/webapp/WEB-INF/pages/channel/erratalist.jsp b/java/code/webapp/WEB-INF/pages/channel/erratalist.jsp
index 688cc74..001acba 100644
--- a/java/code/webapp/WEB-INF/pages/channel/erratalist.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/erratalist.jsp
@@ -9,7 +9,7 @@
<body>
<%@ include file="/WEB-INF/pages/common/fragments/channel/channel_header.jspf" %>
- <h2><i class="spacewalk-icon-patches"></i> <bean:message key="header.jsp.errata"/></h2>
+ <h2><rhn:icon type="header-errata" /> <bean:message key="header.jsp.errata"/></h2>
<bean:message key="channel.jsp.errata.listtitle"/>
<rl:listset name="errataSet">
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/listpatchset.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/listpatchset.jsp
index 9d43c39..1745854 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/listpatchset.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/listpatchset.jsp
@@ -21,7 +21,7 @@
</div>
<h2>
- <i class="fa spacewalk-icon-patch-set"></i>
+ <rhn:icon type="header-errata-set" />
<bean:message key="channel.manage.patchset.title"/>
</h2>
diff --git a/java/code/webapp/WEB-INF/pages/channel/packagelist.jsp b/java/code/webapp/WEB-INF/pages/channel/packagelist.jsp
index 70160c1..30adf19 100644
--- a/java/code/webapp/WEB-INF/pages/channel/packagelist.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/packagelist.jsp
@@ -9,7 +9,7 @@
<body>
<%@ include file="/WEB-INF/pages/common/fragments/channel/channel_header.jspf" %>
- <h2><i class="spacewalk-icon-packages"></i> <bean:message key="systemlist.jsp.packages"/></h2>
+ <h2><rhn:icon type="header-package" /> <bean:message key="systemlist.jsp.packages"/></h2>
<bean:message key="package.jsp.list"/>
<rl:listset name="packageSet">
diff --git a/java/code/webapp/WEB-INF/pages/common/errors/missingcapability.jsp b/java/code/webapp/WEB-INF/pages/common/errors/missingcapability.jsp
index f687af6..9e778ef 100644
--- a/java/code/webapp/WEB-INF/pages/common/errors/missingcapability.jsp
+++ b/java/code/webapp/WEB-INF/pages/common/errors/missingcapability.jsp
@@ -7,7 +7,7 @@
<rhn:require acl="user_authenticated()">
<h1>
- <i class="fa fa-warning text-warning" title="${rhn:localize('error.common.errorAlt')}"></i>
+ <rhn:icon type="system-warn" />
<bean:message key="missing_capabilities.jsp.header"/>
</h1>
<p><bean:message key="missing_capabilities.jsp.title"/></p>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/groups.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/groups.jspf
index 32c5b07..a806ae2 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/groups.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/groups.jspf
@@ -14,7 +14,7 @@
<div class="page-summary">
- <h2><i class="fa spacewalk-icon-system-groups" title="system group"></i>
+ <h2><rhn:icon type="header-system-groups" title="system group" />
<bean:message key="${param.title_key}"/>
</h2>
<p>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/admin/channelperms_list.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/admin/channelperms_list.jspf
index bc9d69b..3716f17 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/admin/channelperms_list.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/admin/channelperms_list.jspf
@@ -2,10 +2,10 @@
<rhn:listdisplay filterBy="channelperms.jsp.channelname" button="channelperms.jsp.submitpermissions">
<rhn:column header="channelperms.jsp.permission" width="5%">
<c:if test="${userIsChannelAdmin}">
- <i class="icon-ok" title="<bean:message key='channelperms.jsp.permAdmin'/>"></i>
+ <rhn:icon type="item-enabled" title="<bean:message key='channelperms.jsp.permAdmin' />" />
</c:if>
<c:if test="${current.globallySubscribable and not (userIsChannelAdmin)}">
- <i class="icon-ok" title="<bean:message key='channelperms.jsp.permGlobal'/>"></i>
+ <rhn:icon type="item-enabled" title="<bean:message key='channelperms.jsp.permGlobal' />" />
</c:if>
<c:if test="${not (userIsChannelAdmin or current.globallySubscribable)}">
<html:multibox property="selectedChannels">${current.id}</html:multibox>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/audit/scap-list-columns.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/audit/scap-list-columns.jspf
index 1fffb39..e9def0f 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/audit/scap-list-columns.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/audit/scap-list-columns.jspf
@@ -7,8 +7,7 @@
title="<bean:message key='scapdiff.jsp.i.${current.diffIcon}'/>"/></a>
</c:when>
<c:otherwise>
- <i class="spacewalk-icon-unknown-system"
- title="<bean:message key='system.audit.xccdfdetails.jsp.nodiff'/>"/></i>
+ <rhn:icon type="system-unknown" title="<bean:message key='system.audit.xccdfdetails.jsp.nodiff'/>"/>
</c:otherwise>
</c:choose>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/details-header.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/details-header.jspf
index 7451e6f..668bbc8 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/details-header.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/details-header.jspf
@@ -16,7 +16,7 @@
</rhn:toolbar>
</c:if>
<c:if test="${channel.localChannel}">
- <rhn:toolbar base="h1" icon="spacewalk-icon-config-system"
+ <rhn:toolbar base="h1" icon="header-config-system"
iconAlt="config.common.localAlt"
helpUrl="/rhn/help/reference/en-US/s1-sm-configuration.jsp#config-config-channels-channel-details"
deletionUrl="/rhn/configuration/DeleteChannel.do?ccid=${ccid}"
@@ -25,7 +25,7 @@
</rhn:toolbar>
</c:if>
<c:if test="${channel.sandboxChannel}">
- <rhn:toolbar base="h1" icon="spacewalk-icon-sandbox"
+ <rhn:toolbar base="h1" icon="header-sandbox"
iconAlt="config.common.sandboxAlt"
helpUrl="/rhn/help/reference/en-US/s1-sm-configuration.jsp#config-config-channels-channel-details"
deletionUrl="/rhn/configuration/DeleteChannel.do?ccid=${ccid}"
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/summary.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/summary.jspf
index 7d785b6..e600bb4 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/summary.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/summary.jspf
@@ -49,7 +49,7 @@
<c:choose>
<c:when test="${summary.numSystems > 0}">
<td>
- <i class="fa fa-desktop" title="<bean:message key="system.common.systemAlt" />"></i>
+ <rhn:icon type="header-system" title="<bean:message key='system.common.systemAlt' />" />
<a href="/rhn/systems/details/configuration/Overview.do?&sid=${summary.mostRecentSystem.id}">
<c:out value="${summary.mostRecentSystem.name}" />
</a><br />
@@ -68,13 +68,13 @@
<c:when test="${summary.numFiles + summary.numDirs + summary.numSymlinks > 0}">
<c:choose>
<c:when test="${summary.mostRecentMod.configFile.latestConfigRevision.directory}">
- <i class="fa fa-folder-open-o" title="<bean:message key="config.common.dirAlt" />"></i>
+ <rhn:icon type="header-folder" title="<bean:message key='config.common.dirAlt' />" />
</c:when>
<c:when test="${summary.mostRecentMod.configFile.latestConfigRevision.symlink}">
- <i class="fa spacewalk-icon-listicon-cfg-symlink" title="<bean:message key="config.common.symlinkAlt" />"></i>
+ <rhn:icon type="header-symlink" title="<bean:message key='config.common.symlinkAlt' />" />
</c:when>
<c:otherwise>
- <i class="fa fa-file-text-o" title="<bean:message key="config.common.fileAlt" />"></i>
+ <rhn:icon type="header-file" title="<bean:message key='config.common.fileAlt' />" />
</c:otherwise>
</c:choose>
<a href="/rhn/configuration/file/FileDetails.do?cfid=${summary.mostRecentMod.configFile.id}">
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablelist.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablelist.jspf
index d12e57a..a51c473 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablelist.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablelist.jspf
@@ -5,7 +5,7 @@
<rhn:column header="system.common.systemName"
url="/rhn/systems/details/Overview.do?sid=${current.id}">
- <i class="fa fa-desktop"></i>
+ <rhn:icon type="header-system" />
${fn:escapeXml(current.name)}
</rhn:column>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablesummary.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablesummary.jspf
index d09ef51..06c9b12 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablesummary.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablesummary.jspf
@@ -8,16 +8,16 @@
<rhn:column header="summary.jsp.status">
<c:if test="${current.success}">
- <i class="fa fa-check text-success" title="<bean:message key="summary.jsp.okAlt" />"></i>
+ <rhn:icon type="action-ok" title="<bean:message key='summary.jsp.okAlt' />" />
</c:if>
<c:if test="${!current.success}">
- <i class="fa fa-times-circle text-danger" title="<bean:message key="summary.jsp.errorAlt" />"></i>
+ <rhn:icon type="action-failed" title="<bean:message key='summary.jsp.errorAlt' />" />
</c:if>
</rhn:column>
<rhn:column header="system.common.systemName"
url="/rhn/systems/details/configuration/Overview.do?sid=${current.id}">
- <i class="fa fa-desktop" title=""></i> ${current.name}
+ <rhn:icon type="header-system" title="" /> ${current.name}
</rhn:column>
<rhn:column header="summary.jsp.error">
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablewidgets.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablewidgets.jspf
index 6876ae7..770a620 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablewidgets.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablewidgets.jspf
@@ -16,7 +16,7 @@
</tr>
<tr>
<td>
- <i class="fa fa-desktop"></i>
+ <rhn:icon type="header-system" />
</td>
<td>
<jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp">
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/copyfile_rows.jsp b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/copyfile_rows.jsp
index a6ce4c4..800c7e5 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/copyfile_rows.jsp
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/copyfile_rows.jsp
@@ -31,7 +31,7 @@
<rhn:icon type="header-system-physical" title="<bean:message key='config.common.localAlt' />" />
</c:when>
<c:otherwise>
- <i class="fa spacewalk-icon-sandbox" title="<bean:message key="config.common.sandboxAlt" />"></i>
+ <rhn:icon type="header-sandbox" title="<bean:message key='config.common.sandboxAlt' />" />
</c:otherwise>
</c:choose>
${current.nameDisplay}
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deploylocal.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deploylocal.jspf
index 25d7e79..3e14cc8 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deploylocal.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deploylocal.jspf
@@ -51,7 +51,7 @@
</tr>
<tr>
<th>
- <i class="fa spacewalk-icon-schedule" title="<bean:message key='deploy.jsp.selection'/>"></i>
+ <rhn:icon type="header-schedule" title="<bean:message key='deploy.jsp.selection' />" />
</th>
<td>
<jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp">
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/details.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/details.jspf
index 34ebf03..82b0892 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/details.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/details.jspf
@@ -10,13 +10,13 @@
<td>
<c:choose>
<c:when test="${channel.configChannelType.label == 'normal'}">
- <i class="fa spacewalk-icon-software-channels" title="<bean:message key="config.common.globalAlt" />"></i>
+ <rhn:icon type="header-software-channel" title="<bean:message key='config.common.globalAlt' />"/>
</c:when>
<c:when test="${channel.configChannelType.label == 'local_override'}">
- <i class="fa fa-desktop" title="<bean:message key="config.common.localAlt" />"></i>
+ <rhn:icon type="header-system" title="<bean:message key='config.common.localAlt' />"/>
</c:when>
<c:otherwise>
- <i class="fa spacewalk-icon-sandbox" title="<bean:message key="config.common.sandboxAlt" />"></i>
+ <rhn:icon type="header-sandbox" title="<bean:message key='config.common.sandboxAlt' />" />
</c:otherwise>
</c:choose>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/file_info.jsp b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/file_info.jsp
index 97a7def..c11917a 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/file_info.jsp
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/file_info.jsp
@@ -23,7 +23,7 @@
<a href="/rhn/configuration/ChannelOverview.do?ccid=${mychan.id}">
<c:choose>
<c:when test="${mychan.configChannelType.label == 'server_import'}">
- <i class="fa spacewalk-icon-sandbox" title="<bean:message key="config.common.sandboxAlt" />"></i>
+ <rhn:icon type="header-sandbox" title="<bean:message key='config.common.sandboxAlt' />" />
</c:when>
<c:when test="${mychan.configChannelType.label == 'local_override'}">
<rhn:icon type="header-system-physical" title="<bean:message key='config.common.localAlt' />" />
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/rankchannels.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/rankchannels.jspf
index 50cb098..8f94d98 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/rankchannels.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/rankchannels.jspf
@@ -17,10 +17,10 @@
<div class="col-lg-offset-3 col-lg-6">
<div class="btn-group">
<button type="button" title="${rhn:localize('ssm.config.rank.jsp.up')}" class="btn btn-default" value="up" name="dispatch" onclick="return move_selected_up('ranksWidget');">
- <i class="fa fa-arrow-circle-up"></i>
+ <rhn:icon type="sort-up" />
</button>
<button type="button" title="${rhn:localize('ssm.config.rank.jsp.down')}" class="btn btn-default" value="down" name="dispatch" onclick="return move_selected_down('ranksWidget');">
- <i class="fa fa-arrow-circle-down"></i>
+ <rhn:icon type="sort-down" />
</button>
</div>
</div>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/configfile_confirm.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/configfile_confirm.jspf
index 4f5eb68..3f43e60 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/configfile_confirm.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/configfile_confirm.jspf
@@ -23,7 +23,7 @@
<th><bean:message key="sdcconfigconfirm.jsp.usedate"/></th>
</tr>
<tr>
- <th><i class="fa spacewalk-icon-schedule" title="<bean:message key='syncprofile.jsp.selection'/>"></i>
+ <th><rhn:icon type="header-schedule" title="<bean:message key='syncprofile.jsp.selection' />" />
</th>
<td>
<jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp">
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/configfile_rows.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/configfile_rows.jspf
index da741cc..00bd067 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/configfile_rows.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/configfile_rows.jspf
@@ -5,13 +5,13 @@
<rhn:column header="sdcconfigfiles.jsp.filename">
<c:choose>
<c:when test="${current.configFileType == 'file'}">
- <i class="fa fa-file-text-o" title="<bean:message key="config.common.fileAlt" />"></i> ${current.path}
+ <rhn:icon type="header-file" title="<bean:message key='config.common.fileAlt' />"/> ${current.path}
</c:when>
<c:when test="${current.configFileType == 'directory'}">
- <i class="fa fa-folder-open-o" title="<bean:message key="config.common.dirAlt" />"></i> ${current.path}
+ <rhn:icon type="header-folder" title="<bean:message key='config.common.dirAlt' />"/> ${current.path}
</c:when>
<c:otherwise>
- <i class="fa spacewalk-icon-listicon-cfg-symlink" title="<bean:message key="config.common.symlinkAlt" />"></i> ${current.path}
+ <rhn:icon type="header-symlink" title="<bean:message key='config.common.symlinkAlt' />"/> ${current.path}
</c:otherwise>
</c:choose>
</rhn:column>
@@ -25,13 +25,13 @@
url="/rhn/configuration/ChannelOverview.do?ccid=${current.configChannelId}">
<c:choose>
<c:when test="${current.configChannelType == 'normal'}">
- <i class="fa spacewalk-icon-software-channels" title="<bean:message key="config.common.globalAlt" />"></i>
+ <rhn:icon type="header-channel" title="<bean:message key='config.common.globalAlt' />"/>
</c:when>
<c:when test="${current.configChannelType == 'local_override'}">
- <i class="fa fa-desktop" title="<bean:message key="config.common.localAlt" />"></i>
+ <rhn:icon type="header-system" title="<bean:message key='config.common.localAlt' />"/>
</c:when>
<c:otherwise>
- <i class="fa spacewalk-icon-sandbox" title="<bean:message key="config.common.sandboxAlt" />"></i>
+ <rhn:icon type="header-sandbox" title="<bean:message key='config.common.sandboxAlt' />"/>
</c:otherwise>
</c:choose>
${current.channelNameDisplay}
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/ssm/configconfirmlist.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/ssm/configconfirmlist.jspf
index 333248c..c1f7e29 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/ssm/configconfirmlist.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/ssm/configconfirmlist.jspf
@@ -6,7 +6,7 @@
<rhn:listdisplay filterBy="system.common.systemName">
<rhn:column header="system.common.systemName"
url="/rhn/systems/details/configuration/Overview.do?sid=${current.id}">
- <i class="fa fa-desktop" title="<bean:message key='system.common.systemAlt' />"></i>
+ <rhn:icon type="header-system" title="<bean:message key='system.common.systemAlt' />" />
${current.name}
</rhn:column>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/ssm/configlist.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/ssm/configlist.jspf
index 9c06e51..aed702a 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/ssm/configlist.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/ssm/configlist.jspf
@@ -9,7 +9,7 @@
<rhn:set value="${current.id}"/>
<rhn:column header="ssmdiff.jsp.filename">
- <i class="fa fa-file-text-o" title="<bean:message key='config.common.fileAlt' />"></i>
+ <rhn:icon type="header-file" title="<bean:message key='config.common.fileAlt' />" />
${current.path}
</rhn:column>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/errata/errata-header.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/errata/errata-header.jspf
index 2e129b0..1b0c890 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/errata/errata-header.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/errata/errata-header.jspf
@@ -4,7 +4,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<c:if test="${errata.securityAdvisory}">
- <rhn:toolbar base="h1" icon="fa-lock"
+ <rhn:toolbar base="h1" icon="errata-security"
iconAlt="errata-legend.jsp.security"
helpUrl="/rhn/help/reference/en-US/s1-sm-errata.jsp#s3-sm-errata-details">
<c:if test="${empty errata}">
@@ -16,7 +16,7 @@
</rhn:toolbar>
</c:if>
<c:if test="${errata.bugFix}">
- <rhn:toolbar base="h1" icon="fa-bug"
+ <rhn:toolbar base="h1" icon="errata-bugfix"
iconAlt="errata-legend.jsp.bugfix"
helpUrl="/rhn/help/reference/en-US/s1-sm-errata.jsp">
<c:if test="${empty errata}">
@@ -28,7 +28,7 @@
</rhn:toolbar>
</c:if>
<c:if test="${errata.productEnhancement}">
- <rhn:toolbar base="h1" icon=" spacewalk-icon-enhancement"
+ <rhn:toolbar base="h1" icon="errata-enhance"
iconAlt="errata-legend.jsp.enhancement"
helpUrl="/rhn/help/reference/en-US/s1-sm-errata.jsp">
<c:if test="${empty errata}">
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/errata/erratadelete.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/errata/erratadelete.jspf
index 76ba418..c603907 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/errata/erratadelete.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/errata/erratadelete.jspf
@@ -2,13 +2,13 @@
<rhn:listdisplay button="deleteconfirm.jsp.confirm">
<rhn:column header="erratalist.jsp.type">
<c:if test="${current.securityAdvisory}">
- <i class="fa fa-lock"></i>
+ <rhn:icon type="errata-security" />
</c:if>
<c:if test="${current.bugFix}">
- <i class="fa fa-bug"></i>
+ <rhn:icon type="errata-bugfix" />
</c:if>
<c:if test="${current.productEnhancement}">
- <i class="fa spacewalk-icon-enhancement"></i>
+ <rhn:icon type="errata-enhance" />
</c:if>
</rhn:column>
<rhn:column header="erratalist.jsp.advisory">
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/errata/ownedlistdisplay.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/errata/ownedlistdisplay.jspf
index 726c38b..54d1932 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/errata/ownedlistdisplay.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/errata/ownedlistdisplay.jspf
@@ -12,13 +12,13 @@
<rl:column headerkey="erratalist.jsp.type">
<c:if test="${current.securityAdvisory}">
- <i class="fa fa-lock" title="<bean:message key='erratalist.jsp.securityadvisory'/>"></i>
+ <rhn:icon type="errata-security" title="<bean:message key='erratalist.jsp.securityadvisory' />" />
</c:if>
<c:if test="${current.bugFix}">
- <i class="fa fa-bug" title="<bean:message key='erratalist.jsp.bugadvisory'/>"></i>
+ <rhn:icon type="errata-bugfix" title="<bean:message key='erratalist.jsp.bugadvisory' />" />
</c:if>
<c:if test="${current.productEnhancement}">
- <i class="fa spacewalk-icon-enhancement" title="<bean:message key='erratalist.jsp.productenhancementadvisory'/>"></i>
+ <rhn:icon type="errata-enhance" title="<bean:message key='erratalist.jsp.productenhancementadvisory' />" />
</c:if>
</rl:column>
<rl:column headerkey="erratalist.jsp.advisory">
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/errata/relevant-errata-list.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/errata/relevant-errata-list.jspf
index 217f5ec..a50025b 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/errata/relevant-errata-list.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/errata/relevant-errata-list.jspf
@@ -8,13 +8,13 @@
<rl:column headerkey="erratalist.jsp.type" styleclass="text-align: left;">
<c:if test="${current.securityAdvisory}">
- <i class="fa fa-lock" title="<bean:message key='erratalist.jsp.securityadvisory'/>"></i>
+ <rhn:icon type="errata-security" title="<bean:message key='erratalist.jsp.securityadvisory' />" />
</c:if>
<c:if test="${current.bugFix}">
- <i class="fa fa-bug" title="<bean:message key='erratalist.jsp.bugadvisory'/>"></i>
+ <rhn:icon type="errata-bugfix" title="<bean:message key='erratalist.jsp.bugadvisory' />" />
</c:if>
<c:if test="${current.productEnhancement}">
- <i class="fa spacewalk-icon-enhancement" title="<bean:message key='erratalist.jsp.productenhancementadvisory'/>"></i>
+ <rhn:icon type="errata-enhance" title="<bean:message key='erratalist.jsp.productenhancementadvisory' />" />
</c:if>
</rl:column>
<rl:column headerkey="erratalist.jsp.advisory">
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/groups/header.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/groups/header.jspf
index 3d021db..4d1a431 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/groups/header.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/groups/header.jspf
@@ -9,7 +9,7 @@
<div class="spacewalk-toolbar">
<span class="spacewalk-toolbar">
<a href="/network/systems/ssm/work_with_group.pxt?sgid=${systemgroup.id}&pxt_trap=rhn:work_with_group_cb">
- <i class="fa spacewalk-icon-system-groups" title="<bean:message key='toolbar.work.with.group'/>"></i>
+ <rhn:icon type="header-system-groups" title="<bean:message key='toolbar.work.with.group' />" />
<bean:message key="toolbar.work.with.group"/>
</a>
<a href="/network/systems/groups/delete_confirm.pxt?sgid=${systemgroup.id}">
@@ -21,7 +21,7 @@
</div>
<h1>
- <i class="fa spacewalk-icon-system-groups" title="system groups"></i>
+ <rhn:icon type="header-system-groups" title="system groups" />
<c:if test="${empty systemgroup}">
<decorator:getProperty property="meta.name" />
@@ -30,7 +30,7 @@
${fn:escapeXml(systemgroup.name)}
</c:if>
<a href="/rhn/help/reference/en-US/s1-sm-systems.jsp#s2-sm-system-group-list" target="_blank" class="help-title">
- <span class="fa-stack"><i class="fa fa-circle fa-stack-1x"></i><i class="fa fa-question fa-stack-1x fa-inverse"></i></span>
+ <rhn:icon type="header-help" />
</a>
</h1>
</div>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/groups/systems.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/groups/systems.jspf
index 9b2ad08..20c0a79 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/groups/systems.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/groups/systems.jspf
@@ -17,7 +17,7 @@
</rhn:require>
<h2>
- <i class="fa fa-desktop" title="system"></i>
+ <rhn:icon type="header-system" title="system" />
<bean:message key="${param.title_key}"/>
</h2>
<p>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/advanced.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/advanced.jspf
index 3bb1823..469c6a3 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/advanced.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/advanced.jspf
@@ -50,7 +50,7 @@ function enableBondStaticIpAddress() {
<body>
<%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %>
-<h2><i class="fa fa-rocket"></i><bean:message key="kickstart.schedule.heading4.jsp" /></h2>
+<h2><rhn:icon type="header-kickstart" /><bean:message key="kickstart.schedule.heading4.jsp" /></h2>
<c:set var="form" value="${kickstartScheduleWizardForm.map}"/>
<html:form method="POST" action="${actionUrl}">
<rhn:csrf />
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/profile-list.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/profile-list.jspf
index 4b09c3f..b518ef3 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/profile-list.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/profile-list.jspf
@@ -18,10 +18,10 @@
<rl:column headerkey="kickstart.distro.sw_managed.jsp" sortable="true" sortattr="cobbler">
<c:choose>
<c:when test="${current.cobbler}">
- <i class="fa fa-times-circle text-danger"></i>
+ <rhn:icon type="action-failed" />
</c:when>
<c:otherwise>
- <i class="fa fa-check text-success"></i>
+ <rhn:icon type="action-ok" />
</c:otherwise>
</c:choose>
</rl:column>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/proxy-options.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/proxy-options.jspf
index 7cb945d..b687099 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/proxy-options.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/proxy-options.jspf
@@ -15,7 +15,7 @@ function clearChecked(radioGroup) {
<c:if test="${not empty proxies}">
<h2>
- <i class="fa spacewalk-icon-proxy" title="<bean:message key='system.common.proxyAlt' />"></i>
+ <rhn:icon type="header-proxy" title="<bean:message key='system.common.proxyAlt' />" />
<bean:message key="kickstart.schedule.heading.proxy.jsp"/>
</h2>
<c:choose>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/schedule-options.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/schedule-options.jspf
index 8515370..ba2fc55 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/schedule-options.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/schedule-options.jspf
@@ -3,7 +3,7 @@
<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<h2>
- <i class="fa spacewalk-icon-schedule" title="<bean:message key='system.common.scheduleAlt' />"></i>
+ <rhn:icon type="header-schedule" title="<bean:message key='system.common.scheduleAlt' />" />
<bean:message key="kickstart.schedule.heading3.jsp" />
</h2>
<c:choose>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/package/package_header.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/package/package_header.jspf
index c71d238..0ee1a6a 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/package/package_header.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/package/package_header.jspf
@@ -1,7 +1,7 @@
<rhn:toolbar base="h1" icon="header-package" imgAlt="package.jsp.alt">
- <c:out value="${package_name}" escapeXml="true"/><a href="/rhn/help/reference/en-US/s1-sm-channels-packages.jsp" target="_blank" class="help-title"><i class="fa fa-question-circle" title="Help Icon"></i></a>
+ <c:out value="${package_name}" escapeXml="true"/><a href="/rhn/help/reference/en-US/s1-sm-channels-packages.jsp" target="_blank" class="help-title"><rhn:icon type="header-help" title="Help Icon" /></a>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/probes/probe-state-column-new.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/probes/probe-state-column-new.jspf
index b628c70..0da3f9a 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/probes/probe-state-column-new.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/probes/probe-state-column-new.jspf
@@ -5,18 +5,18 @@
headerkey="probedetails.jsp.state"
headerclass="thin-column">
<c:if test="${current.stateString == 'UNKNOWN'}">
- <i class="fa spacewalk-icon-monitoring-unknown" title="<bean:message key='monitoring.status.unknown'/>"></i>
+ <rhn:icon type="monitoring-unknown" title="<bean:message key='monitoring.status.unknown' />" />
</c:if>
<c:if test="${current.stateString == 'OK'}">
- <i class="fa spacewalk-icon-monitoring-ok" title="<bean:message key='monitoring.status.ok'/>"></i>
+ <rhn:icon type="monitoring-ok" title="<bean:message key='monitoring.status.ok' />" />
</c:if>
<c:if test="${current.stateString == 'WARNING'}">
- <i class="fa spacewalk-icon-monitoring-warning" title="<bean:message key='monitoring.status.warn'/>"></i>
+ <rhn:icon type="monitoring-warn" title="<bean:message key='monitoring.status.warn' />" />
</c:if>
<c:if test="${current.stateString == 'PENDING'}">
- <i class="fa spacewalk-icon-monitoring-pending" title="<bean:message key='monitoring.status.pending'/>"></i>
+ <rhn:icon type="monitoring-pending" title="<bean:message key='monitoring.status.pending' />" />
</c:if>
<c:if test="${current.stateString == 'CRITICAL'}">
- <i class="fa spacewalk-icon-monitoring-down" title="<bean:message key='monitoring.status.critical'/>"></i>
+ <rhn:icon type="monitoring-crit" title="<bean:message key='monitoring.status.critical' />" />
</c:if>
</rl:column>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/probes/probe-state-column.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/probes/probe-state-column.jspf
index a0733be..a2fdece 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/probes/probe-state-column.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/probes/probe-state-column.jspf
@@ -1,17 +1,17 @@
<rhn:column header="probedetails.jsp.state">
<c:if test="${current.stateString == 'UNKNOWN'}">
- <i class="fa spacewalk-icon-monitoring-unknown" title="<bean:message key='monitoring.status.unknown'/>"></i>
+ <rhn:icon type="monitoring-unknown" title="<bean:message key='monitoring.status.unknown' />" />
</c:if>
<c:if test="${current.stateString == 'OK'}">
- <i class="fa spacewalk-icon-monitoring-ok" title="<bean:message key='monitoring.status.ok'/>"></i>
+ <rhn:icon type="monitoring-ok" title="<bean:message key='monitoring.status.ok' />" />
</c:if>
<c:if test="${current.stateString == 'WARNING'}">
- <i class="fa spacewalk-icon-monitoring-warning" title="<bean:message key='monitoring.status.warn'/>"></i>
+ <rhn:icon type="monitoring-warn" title="<bean:message key='monitoring.status.warn' />" />
</c:if>
<c:if test="${current.stateString == 'PENDING'}">
- <i class="fa spacewalk-icon-monitoring-pending" title="<bean:message key='monitoring.status.pending'/>"></i>
+ <rhn:icon type="monitoring-pending" title="<bean:message key='monitoring.status.pending' />" />
</c:if>
<c:if test="${current.stateString == 'CRITICAL'}">
- <i class="fa spacewalk-icon-monitoring-down" title="<bean:message key='monitoring.status.critical'/>"></i>
+ <rhn:icon type="monitoring-crit" title="<bean:message key='monitoring.status.critical' />" />
</c:if>
</rhn:column>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/systems/group_listdisplay.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/systems/group_listdisplay.jspf
index 76dc5df..0eb96f4 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/systems/group_listdisplay.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/systems/group_listdisplay.jspf
@@ -32,10 +32,10 @@
<c:choose>
<c:when test="${current.mostSevereErrata == 'Security Advisory'}">
- <i class="fa fa-exclamation-circle text-danger" title="<bean:message key='grouplist.jsp.security'/>"></i>
+ <rhn:icon type="system-crit" title="<bean:message key='grouplist.jsp.security' />" />
</c:when>
<c:when test="${current.mostSevereErrata == 'Bug Fix Advisory' or current.mostSevereErrata == 'Product Enhancement Advisory'}">
- <i class="fa fa-warning text-warning" title="<bean:message key='grouplist.jsp.updates'/>"></i>
+ <rhn:icon type="system-warn" title="<bean:message key='grouplist.jsp.updates' />" />
</c:when>
<c:otherwise>
<rhn:icon type="system-ok" title="<bean:message key='grouplist.jsp.noerrata'/>" />
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/systems/groups.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/systems/groups.jspf
index 1fb250f..a932251 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/systems/groups.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/systems/groups.jspf
@@ -17,7 +17,7 @@
<div class="page-summary">
- <h2><i class="spacewalk-icon-system-groups"></i>
+ <h2><rhn:icon type="header-system-groups" />
<bean:message key="${param.title_key}"/>
</h2>
<p>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/systems/monitoring_status_groups.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/systems/monitoring_status_groups.jspf
index d353a79..3474988 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/systems/monitoring_status_groups.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/systems/monitoring_status_groups.jspf
@@ -10,19 +10,19 @@
<c:out value="<a href=\"/network/systems/groups/probe_list.pxt?sgid=${current.id}\">" escapeXml="false" />
<c:if test="${current.monitoringStatus == 'CRITICAL'}">
- <i class="fa spacewalk-icon-monitoring-down" title="<bean:message key='systemlist.jsp.probecritical'/>"></i>
+ <rhn:icon type="monitoring-crit" title="<bean:message key='systemlist.jsp.probecritical' />" />
</c:if>
<c:if test="${current.monitoringStatus == 'WARNING'}">
- <i class="fa spacewalk-icon-monitoring-warning" title="<bean:message key='systemlist.jsp.probewarning'/>"></i>
+ <rhn:icon type="monitoring-warn" title="<bean:message key='systemlist.jsp.probewarning' />" />
</c:if>
<c:if test="${current.monitoringStatus == 'UNKNOWN'}">
- <i class="fa spacewalk-icon-monitoring-unknown" title="<bean:message key='systemlist.jsp.probeunknown'/>"></i>
+ <rhn:icon type="monitoring-unknown" title="<bean:message key='systemlist.jsp.probeunknown' />" />
</c:if>
<c:if test="${current.monitoringStatus == 'PENDING'}">
- <i class="fa spacewalk-icon-monitoring-pending" title="<bean:message key='systemlist.jsp.probepending'/>"></i>
+ <rhn:icon type="monitoring-pending" title="<bean:message key='systemlist.jsp.probepending' />" />
</c:if>
<c:if test="${current.monitoringStatus == 'OK'}">
- <i class="fa spacewalk-icon-monitoring-ok" title="<bean:message key='systemlist.jsp.probeok'/>"></i>
+ <rhn:icon type="monitoring-ok" title="<bean:message key='systemlist.jsp.probeok' />" />
</c:if>
<c:out value="</a>" escapeXml="false"/>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/systems/monitoring_status_systems.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/systems/monitoring_status_systems.jspf
index 0ea08b1..d42400e 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/systems/monitoring_status_systems.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/systems/monitoring_status_systems.jspf
@@ -13,19 +13,19 @@
<c:out value="<a href=\"/rhn/systems/details/probes/ProbesList.do?sid=${current.id}\">" escapeXml="false"/>
<c:if test="${current.monitoringStatus == 'CRITICAL'}">
- <i class="fa spacewalk-icon-monitoring-down" title="<bean:message key='systemlist.jsp.probecritical'/>"></i>
+ <rhn:icon type="monitoring-crit" title="<bean:message key='systemlist.jsp.probecritical' />" />
</c:if>
<c:if test="${current.monitoringStatus == 'WARNING'}">
- <i class="fa spacewalk-icon-monitoring-warning" title="<bean:message key='systemlist.jsp.probewarning'/>"></i>
+ <rhn:icon type="monitoring-warn" title="<bean:message key='systemlist.jsp.probewarning' />" />
</c:if>
<c:if test="${current.monitoringStatus == 'UNKNOWN'}">
- <i class="fa spacewalk-icon-monitoring-unknown" title="<bean:message key='systemlist.jsp.probeunknown'/>"></i>
+ <rhn:icon type="monitoring-unknown" title="<bean:message key='systemlist.jsp.probeunknown' />" />
</c:if>
<c:if test="${current.monitoringStatus == 'PENDING'}">
- <i class="fa spacewalk-icon-monitoring-pending" title="<bean:message key='systemlist.jsp.probepending'/>"></i>
+ <rhn:icon type="monitoring-pending" title="<bean:message key='systemlist.jsp.probepending' />" />
</c:if>
<c:if test="${current.monitoringStatus == 'OK'}">
- <i class="fa spacewalk-icon-monitoring-ok" title="<bean:message key='systemlist.jsp.probeok'/>"></i>
+ <rhn:icon type="monitoring-ok" title="<bean:message key='systemlist.jsp.probeok' />" />
</c:if>
<c:out value="</a>" escapeXml="false"/>
</rl:column>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/user/edit_user_table_rows.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/user/edit_user_table_rows.jspf
index 3f876ee..60844c6 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/user/edit_user_table_rows.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/user/edit_user_table_rows.jspf
@@ -79,7 +79,7 @@
<c:choose>
<c:when test="${!empty mailableAddress}">
<a class="btn btn-default btn-sm" href="<c:out value="${email_link}"/>">
- <i class="fa fa-refresh"></i>
+ <rhn:icon type="header-refresh" />
<%--
<bean:message key="${email_display}"/>
--%>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/inactiveSystems.jsp b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/inactiveSystems.jsp
index bf7347b..2e48db6 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/inactiveSystems.jsp
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/inactiveSystems.jsp
@@ -19,7 +19,7 @@
domainClass="systems">
<rhn:column header="probesuitesystemsedit.jsp.systemname"
url="/rhn/systems/details/Overview.do?sid=${current.id}">
- <i class="fa fa-question-circle"></i>
+ <rhn:icon type="system-unknown" />
<c:out value="${current.name}" escapeXml="true" />
</rhn:column>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/monitoringCritical.jsp b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/monitoringCritical.jsp
index 78e0eb7..086cc22 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/monitoringCritical.jsp
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/monitoringCritical.jsp
@@ -17,7 +17,7 @@
reflinkkey="yourrhn.jsp.allcriticalprobes"
reflinkkeyarg0="${requestScope.criticalReflinkkeyarg0}">
<rl:column headerkey="yourrhn.jsp.criticalprobes">
- <i class="fa spacewalk-icon-monitoring-down"></i>
+ <rhn:icon type="monitoring-crit" />
<c:out value="${current.description}"/>
</rl:column>
<rl:column headerkey="yourrhn.jsp.systems">
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/monitoringWarning.jsp b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/monitoringWarning.jsp
index 0d3829a..d6bcb3f 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/monitoringWarning.jsp
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/monitoringWarning.jsp
@@ -17,7 +17,7 @@
reflinkkey="yourrhn.jsp.allwarningprobes"
reflinkkeyarg0="${requestScope.warningReflinkkeyarg0}">
<rl:column headerkey="yourrhn.jsp.warningprobes">
- <i class="fa spacewalk-icon-monitoring-warning"></i>
+ <rhn:icon type="monitoring-warn" />
<c:out value="${current.description}"/>
</rl:column>
<rl:column headerkey="yourrhn.jsp.systems">
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/scheduledActions.jsp b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/scheduledActions.jsp
index 97f3b33..93206cd 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/scheduledActions.jsp
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/scheduledActions.jsp
@@ -17,13 +17,13 @@
<rhn:column header="schedulesync.jsp.action">
<c:choose>
<c:when test="${current.actionStatusId == 0 || current.actionStatusId == 1}">
- <i class="fa fa-clock-o" title="<bean:message key='yourrhn.jsp.actions.pending'/>"></i>
+ <rhn:icon type="action-pending" title="<bean:message key='yourrhn.jsp.actions.pending' />" />
</c:when>
<c:when test="${current.actionStatusId == 2}">
- <i class="fa fa-check-circle-o text-success" title="<bean:message key='yourrhn.jsp.actions.completed'/>"></i>
+ <rhn:icon type="action-ok" title="<bean:message key='yourrhn.jsp.actions.completed' />" />
</c:when>
<c:when test="${current.actionStatusId == 3}">
- <i class="fa fa-times-circle-o text-danger" title="<bean:message key='yourrhn.jsp.actions.failed'/>"></i>
+ <rhn:icon type="action-failed" title="<bean:message key='yourrhn.jsp.actions.failed' />" />
</c:when>
<c:otherwise>
<rhn:icon type="system-unknown" title="<bean:message key='yourrhn.jsp.actions.unknown' />" />
diff --git a/java/code/webapp/WEB-INF/pages/configuration/channel/deployconfirm.jsp b/java/code/webapp/WEB-INF/pages/configuration/channel/deployconfirm.jsp
index be72710..81b0194 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/channel/deployconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/channel/deployconfirm.jsp
@@ -82,7 +82,7 @@
<th><bean:message key="deployconfirm.jsp.usedate"/></th>
</tr>
<tr>
- <th><i class="fa spacewalk-icon-schedule" title="<bean:message key='syncprofile.jsp.selection'/>"></i>
+ <th><rhn:icon type="header-schedule" title="<bean:message key='syncprofile.jsp.selection' />" />
</th>
<td>
<jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp">
diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/comparechannel.jsp b/java/code/webapp/WEB-INF/pages/configuration/files/comparechannel.jsp
index d03f45b..e7d8f6d 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/files/comparechannel.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/files/comparechannel.jsp
@@ -36,7 +36,7 @@
</c:if>
<c:if test="${current.type == 'server_import'}">
- <i class="fa spacewalk-icon-sandbox" title="<bean:message key="config.common.sandboxAlt" />"></i>
+ <rhn:icon type="header-sandbox" title="<bean:message key='config.common.sandboxAlt' />" />
${current.name}
</c:if>
</rhn:column>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/comparecopy.jsp b/java/code/webapp/WEB-INF/pages/configuration/files/comparecopy.jsp
index 4a2c974..436e294 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/files/comparecopy.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/files/comparecopy.jsp
@@ -36,13 +36,13 @@
url="/rhn/configuration/file/FileDetails.do?cfid=${current.configFileId}&crid=${current.configRevisionId}">
<c:choose>
<c:when test="${current.configFileType == 'file'}">
- <i class="fa fa-file-text-o" title="<bean:message key="config.common.fileAlt" />"></i>
+ <rhn:icon type="header-file" title="<bean:message key='config.common.fileAlt' />" />
</c:when>
<c:when test="${current.configFileType == 'directory'}">
- <i class="fa fa-folder-open-o" title="<bean:message key="config.common.dirAlt" />"></i>
+ <rhn:icon type="header-folder" title="<bean:message key='config.common.dirAlt' />" />
</c:when>
<c:otherwise>
- <i class="fa spacewalk-icon-listicon-cfg-symlink" title="<bean:message key="config.common.symlinkAlt" />"></i>
+ <rhn:icon type="header-symlink" title="<bean:message key='config.common.symlinkAlt' />" />
</c:otherwise>
</c:choose>
<bean:message key="comparecopy.jsp.revnum" arg0="${current.configRevision}" />
diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/copysandbox.jsp b/java/code/webapp/WEB-INF/pages/configuration/files/copysandbox.jsp
index 00672a9..942184c 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/files/copysandbox.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/files/copysandbox.jsp
@@ -28,7 +28,7 @@
<rhn:column header="copysandbox.jsp.channel"
url="/rhn/systems/details/configuration/ViewModifySandboxPaths.do?sid=${current.id}">
- <i class="fa spacewalk-icon-sandbox" title="<bean:message key="config.common.sandboxAlt" />"></i>
+ <rhn:icon type="header-sandbox" title="<bean:message key='config.common.sandboxAlt' />" />
${fn:escapeXml(current.name)}
</rhn:column>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/deployconfirm.jsp b/java/code/webapp/WEB-INF/pages/configuration/files/deployconfirm.jsp
index 9f8547c..e930b24 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/files/deployconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/files/deployconfirm.jsp
@@ -45,7 +45,7 @@
<th><bean:message key="deploy.jsp.usedate" /></th>
</tr>
<tr>
- <th><i class="fa spacewalk-icon-schedule" title="<bean:message key="deploy.jsp.selection"/>"></i></th>
+ <th><rhn:icon type="header-schedule" title="<bean:message key='deploy.jsp.selection' />" /></th>
<td><jsp:include
page="/WEB-INF/pages/common/fragments/date-picker.jsp" flush="">
<jsp:param name="widget" value="date" />
diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/diff.jsp b/java/code/webapp/WEB-INF/pages/configuration/files/diff.jsp
index d4da237..576f044 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/files/diff.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/files/diff.jsp
@@ -58,8 +58,7 @@
</span>
<span>
<a href="/rhn/configuration/file/DownloadDiff.do?cfid=${file.id}&crid=${revision.id}&ocrid=${orevision.id}">
- <i class="fa fa-download"
- aria-hidden='true'></i>
+ <rhn:icon type="item-download" title='<bean:message key="diff.jsp.downloadAlt" />' />
<bean:message key="diff.jsp.download" />
</a>
</span>
@@ -89,4 +88,4 @@
</c:if>
</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/overview/globalconfiglist.jsp b/java/code/webapp/WEB-INF/pages/configuration/overview/globalconfiglist.jsp
index e487e66..289130c 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/overview/globalconfiglist.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/overview/globalconfiglist.jsp
@@ -29,7 +29,7 @@
<rhn:listdisplay filterBy="globalconfiglist.jsp.name">
<rhn:column header="globalconfiglist.jsp.name"
url="/rhn/configuration/ChannelOverview.do?ccid=${current.id}">
- <i class="spacewalk-icon-software-channels" title="<bean:message key='config.common.globalAlt'/>"></i>
+ <rhn:icon type="header-channel" title="<bean:message key='config.common.globalAlt' />" />
${current.name}
</rhn:column>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/overview/overview.jsp b/java/code/webapp/WEB-INF/pages/configuration/overview/overview.jsp
index db7af56..cab5938 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/overview/overview.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/overview/overview.jsp
@@ -50,15 +50,15 @@
url="/rhn/configuration/file/FileDetails.do?cfid=${current.id}">
<c:choose>
<c:when test="${current.type == 'file'}">
- <i class="fa fa-file-text-o"></i>
+ <rhn:icon type="header-file" />
${fn:escapeXml(current.path)}
</c:when>
<c:when test="${current.type == 'directory'}">
- <i class="fa fa-folder"></i>
+ <rhn:icon type="header-folder" />
${fn:escapeXml(current.path)}
</c:when>
<c:otherwise>
- <i class="fa fa-list-alt"></i>
+ <rhn:icon type="header-symlink" />
${fn:escapeXml(current.path)}
</c:otherwise>
</c:choose>
@@ -68,17 +68,17 @@
url="/rhn/configuration/ChannelOverview.do?ccid=${current.configChannelId}">
<c:if test="${current.configChannelType == 'normal'}">
- <i class="spacewalk-icon-software-channels"></i>
+ <rhn:icon type="header-channel" />
${current.channelNameDisplay}
</c:if>
<c:if test="${current.configChannelType == 'local_override'}">
- <rhn:icon type="header-system-physical" />
+ <rhn:icon type="header-system" />
${current.channelNameDisplay}
</c:if>
<c:if test="${current.configChannelType == 'server_import'}">
- <i class="fa fa-flask"></i>
+ <rhn:icon type="header-sandbox" />
${current.channelNameDisplay}
</c:if>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/importfileconfirm.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/importfileconfirm.jsp
index 9f3e728..98a6708 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/sdc/importfileconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/importfileconfirm.jsp
@@ -49,7 +49,7 @@
${current.channelNameDisplay}
</c:when>
<c:otherwise>
- <i class="fa spacewalk-icon-sandbox" title="<bean:message key="config.common.sandboxAlt" />"></i>
+ <rhn:icon type="header-sandbox" title="<bean:message key='config.common.sandboxAlt' />" />
${current.channelNameDisplay}
</c:otherwise>
</c:choose>
@@ -70,7 +70,7 @@
<th><bean:message key="sdcimportconfirm.jsp.usedate"/></th>
</tr>
<tr>
- <th><i class="fa spacewalk-icon-schedule" title="<bean:message key='syncprofile.jsp.selection'/>"></i>
+ <th><rhn:icon type="header-schedule" title="<bean:message key='syncprofile.jsp.selection' />" />
</th>
<td>
<jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp">
diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/deployconfirm.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/deployconfirm.jsp
index bcc3c18..66b5e83 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/ssm/deployconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/deployconfirm.jsp
@@ -41,7 +41,7 @@
<th><bean:message key="deployconfirm.jsp.usedate"/></th>
</tr>
<tr>
- <th><i class="fa spacewalk-icon-schedule" title="<bean:message key='syncprofile.jsp.selection'/>"></i>
+ <th><rhn:icon type="header-schedule" title="<bean:message key='syncprofile.jsp.selection' />" />
</th>
<td>
<jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp">
diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/difffiles.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/difffiles.jsp
index 439da5d..9cb0140 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/ssm/difffiles.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/difffiles.jsp
@@ -32,15 +32,15 @@
<rhn:column header="difffiles.jsp.filename">
<c:choose>
<c:when test="${current.configFileType == 'file'}">
- <i class="fa fa-file-text-o" title="<bean:message key="config.common.fileAlt" />"></i>
+ <rhn:icon type="header-file" title="<bean:message key='config.common.fileAlt' />" />
<c:out value="${current.path}" />
</c:when>
<c:when test="${current.configFileType == 'directory'}">
- <i class="fa fa-folder-open-o" title="<bean:message key="config.common.dirAlt" />"></i>
+ <rhn:icon type="header-folder" title="<bean:message key='config.common.dirAlt' />" />
<c:out value="${current.path}" />
</c:when>
<c:otherwise>
- <i class="fa spacewalk-icon-listicon-cfg-symlink" title="<bean:message key="config.common.symlinkAlt" />"></i>
+ <rhn:icon type="header-symlink" title="<bean:message key='config.common.symlinkAlt' />" />
</c:otherwise>
</c:choose>
</rhn:column>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/diffsystems.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/diffsystems.jsp
index 0ba4ed3..a29932b 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/ssm/diffsystems.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/diffsystems.jsp
@@ -15,7 +15,7 @@
<div class="page-summary">
<c:set var="beanarg" scope="request">
- <i class="fa fa-file-text-o" title="<bean:message key='config.common.fileAlt' />"></i>
+ <rhn:icon type="header-file" title="<bean:message key='config.common.fileAlt' />" />
${fn:escapeXml(requestScope.filepath)}
</c:set>
<p>
diff --git a/java/code/webapp/WEB-INF/pages/groups/edit.jsp b/java/code/webapp/WEB-INF/pages/groups/edit.jsp
index 20589fa..7a13e88 100644
--- a/java/code/webapp/WEB-INF/pages/groups/edit.jsp
+++ b/java/code/webapp/WEB-INF/pages/groups/edit.jsp
@@ -6,7 +6,7 @@
<html>
<body>
<h1>
- <i class="fa spacewalk-icon-system-groups" title="system group"></i>
+ <rhn:icon type="header-system-groups" title="system group" />
<c:choose>
<c:when test='${empty param.sgid}'>
<bean:message key="systemgroup.create.header"/>
diff --git a/java/code/webapp/WEB-INF/pages/help/chatindex.jsp b/java/code/webapp/WEB-INF/pages/help/chatindex.jsp
index 2edceeb..3872270 100644
--- a/java/code/webapp/WEB-INF/pages/help/chatindex.jsp
+++ b/java/code/webapp/WEB-INF/pages/help/chatindex.jsp
@@ -9,7 +9,7 @@
<script type="text/javascript" src="/javascript/highlander.js"></script>
</head>
<body>
- <h1><i class="icon-question-sign" title="Help"></i><bean:message key="help.jsp.chat"/></h1>
+ <h1><rhn:icon type="header-help" title="Help" /><bean:message key="help.jsp.chat"/></h1>
<p><bean:message key="help.jsp.chatinfo"/></p>
<p><bean:message key="help.jsp.chatlink"/></p>
</body>
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/kickstarts.jsp b/java/code/webapp/WEB-INF/pages/kickstart/kickstarts.jsp
index 0f463c5..ab5f855 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/kickstarts.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/kickstarts.jsp
@@ -50,24 +50,24 @@
</c:if>
</rl:column>
<rl:column bound="false" headerkey="kickstart.jsp.active" sortattr="active">
- <c:if test="${current.active}">
- <rhn:icon type="item-enabled" title="<bean:message key='kickstart.jsp.active' />" />
- </c:if>
- <c:if test="${not current.active}">
- <i class="fa fa-times-circle text-danger" title="<bean:message key='kickstart.jsp.inactive'/>"></i>
- </c:if>
+ <c:if test="${current.active}">
+ <rhn:icon type="item-enabled" title="<bean:message key='kickstart.jsp.active' />" />
+ </c:if>
+ <c:if test="${not current.active}">
+ <rhn:icon type="item-disabled" title="<bean:message key='kickstart.jsp.inactive' />" />
+ </c:if>
</rl:column>
<rl:column headerkey="kickstart.distro.label.jsp" sortattr="treeLabel">
<c:out value="${current.treeLabel}"/>
</rl:column>
- <rl:column headerkey="kickstart.distro.sw_managed.jsp" sortattr="cobbler">
+ <rl:column headerkey="kickstart.distro.sw_managed.jsp" sortattr="cobbler">
<c:choose>
<c:when test="${current.cobbler}">
- <i class="fa fa-times-circle text-danger"></i>
+ <rhn:icon type="item-disabled" />
</c:when>
- <c:otherwise>
- <rhn:icon type="item-enabled" />
- </c:otherwise>
+ <c:otherwise>
+ <rhn:icon type="item-enabled" />
+ </c:otherwise>
</c:choose>
</rl:column>
</rl:list>
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/kstrees.jsp b/java/code/webapp/WEB-INF/pages/kickstart/kstrees.jsp
index 948c628..06e0d45 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/kstrees.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/kstrees.jsp
@@ -43,7 +43,7 @@
<rhn:icon type="item-enabled" />
</c:when>
<c:otherwise>
- <i class="fa fa-times-circle text-danger"></i>
+ <rhn:icon type="item-disabled" />
</c:otherwise>
</c:choose>
</rl:column>
diff --git a/java/code/webapp/WEB-INF/pages/monitoring/probes.jsp b/java/code/webapp/WEB-INF/pages/monitoring/probes.jsp
index 408fae2..14edf5a 100644
--- a/java/code/webapp/WEB-INF/pages/monitoring/probes.jsp
+++ b/java/code/webapp/WEB-INF/pages/monitoring/probes.jsp
@@ -13,11 +13,11 @@
<div class="spacewalk-content-nav">
<ul class="nav nav-tabs">
- <li class="${criticalClass}"><a href="/rhn/monitoring/ProbeList.do?state=CRITICAL"><i class="fa fa-exclamation-circle text-error"></i><bean:message key="Critical"/><span class="badge">${criticalCount}</span></a></li>
- <li class="${warningClass}"><a href="/rhn/monitoring/ProbeList.do?state=WARNING"><i class="fa fa-exclamation-triangle text-warning"></i><bean:message key="Warning"/><span class="badge">${warningCount}</span></a></li>
- <li class="${unknownClass}"><a href="/rhn/monitoring/ProbeList.do?state=UNKNOWN"><i class="fa fa-question-circle text-info"></i><bean:message key="Unknown"/><span class="badge">${unknownCount}</span></a></li>
- <li class="${pendingClass}"><a href="/rhn/monitoring/ProbeList.do?state=PENDING"><i class="fa fa-clock-o text-info"></i><bean:message key="Pending"/><span class="badge">${pendingCount}</span></a></li>
- <li class="${okClass}"><a href="/rhn/monitoring/ProbeList.do?state=OK"><rhn:icon type="item-enabled" /><bean:message key="OK"/><span class="badge">${okCount}</span></a></li>
+ <li class="${criticalClass}"><a href="/rhn/monitoring/ProbeList.do?state=CRITICAL"><rhn:icon type="monitoring-crit" /><bean:message key="Critical"/><span class="badge">${criticalCount}</span></a></li>
+ <li class="${warningClass}"><a href="/rhn/monitoring/ProbeList.do?state=WARNING"><rhn:icon type="monitoring-warn" /><bean:message key="Warning"/><span class="badge">${warningCount}</span></a></li>
+ <li class="${unknownClass}"><a href="/rhn/monitoring/ProbeList.do?state=UNKNOWN"><rhn:icon type="monitoring-unknown" /><bean:message key="Unknown"/><span class="badge">${unknownCount}</span></a></li>
+ <li class="${pendingClass}"><a href="/rhn/monitoring/ProbeList.do?state=PENDING"><rhn:icon type="monitoring-pending" /><bean:message key="Pending"/><span class="badge">${pendingCount}</span></a></li>
+ <li class="${okClass}"><a href="/rhn/monitoring/ProbeList.do?state=OK"><rhn:icon type="monitoring-ok" /><bean:message key="OK"/><span class="badge">${okCount}</span></a></li>
<li class="${allClass}"><a href="/rhn/monitoring/ProbeList.do"><bean:message key="All"/><span class="badge">${allCount}</span></a></li>
</ul>
</div>
diff --git a/java/code/webapp/WEB-INF/pages/ssm/packageinstallschedule.jsp b/java/code/webapp/WEB-INF/pages/ssm/packageinstallschedule.jsp
index 74b0b53..18a1294 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/packageinstallschedule.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/packageinstallschedule.jsp
@@ -56,7 +56,7 @@
<th><bean:message key="confirm.jsp.than"/></th>
</tr>
<tr>
- <th><i class="fa spacewalk-icon-schedule" title="<bean:message key='confirm.jsp.selection'/>"></i>
+ <th><rhn:icon type="header-schedule" title="<bean:message key='confirm.jsp.selection' />" />
</th>
<td>
<jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp">
diff --git a/java/code/webapp/WEB-INF/pages/ssm/packageremoveschedule.jsp b/java/code/webapp/WEB-INF/pages/ssm/packageremoveschedule.jsp
index 6ca55b4..5c8080e 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/packageremoveschedule.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/packageremoveschedule.jsp
@@ -65,7 +65,7 @@
<th><bean:message key="confirm.jsp.than"/></th>
</tr>
<tr>
- <th><i class="fa spacewalk-icon-schedule" title="<bean:message key='confirm.jsp.selection'/>"></i>
+ <th><rhn:icon type="header-schedule" title="<bean:message key='confirm.jsp.selection' />" />
</th>
<td>
<jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp">
diff --git a/java/code/webapp/WEB-INF/pages/ssm/packageupgradeschedule.jsp b/java/code/webapp/WEB-INF/pages/ssm/packageupgradeschedule.jsp
index 355b8d0..2af9008 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/packageupgradeschedule.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/packageupgradeschedule.jsp
@@ -70,7 +70,7 @@
<th><bean:message key="confirm.jsp.than"/></th>
</tr>
<tr>
- <th><i class="fa spacewalk-icon-schedule" title="<bean:message key='confirm.jsp.selection'/>"></i>
+ <th><rhn:icon type="header-schedule" title="<bean:message key='confirm.jsp.selection' />" />
</th>
<td>
<jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp">
diff --git a/java/code/webapp/WEB-INF/pages/ssm/packageverifyschedule.jsp b/java/code/webapp/WEB-INF/pages/ssm/packageverifyschedule.jsp
index f7b7ec5..047cd59 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/packageverifyschedule.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/packageverifyschedule.jsp
@@ -65,7 +65,7 @@
<th><bean:message key="confirm.jsp.than"/></th>
</tr>
<tr>
- <th><i class="fa spacewalk-icon-schedule" title="<bean:message key='confirm.jsp.selection'/>"></i>
+ <th><rhn:icon type="header-schedule" title="<bean:message key='confirm.jsp.selection' />" />
</th>
<td>
<jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp">
diff --git a/java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp b/java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp
index 25cdb85..ba4d686 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp
@@ -17,21 +17,21 @@
<div class="panel panel-default">
<div class="panel-heading">
- <i class="fa fa-desktop fa-fw" title="<bean:message key="ssm.overview.systems" />"></i>
+ <rhn:icon type="header-system" title="<bean:message key='ssm.overview.systems' />" />
<bean:message key="ssm.overview.systems"/>
</div>
<div class="panel-body">
<bean:message key="ssm.overview.systems.list"/>
</div>
<div class="panel-heading">
- <i class="fa spacewalk-icon-patches fa-fw" title="Errata"></i>
+ <rhn:icon type="header-errata" title="Errata" />
<bean:message key="ssm.overview.errata"/>
</div>
<div class="panel-body">
<bean:message key="ssm.overview.errata.schedule"/>
</div>
<div class="panel-heading">
- <i class="fa spacewalk-icon-packages fa-fw" title="<bean:message key='ssm.overview.packages'/>"></i>
+ <rhn:icon type="header-package" title="<bean:message key='ssm.overview.packages' />" />
<bean:message key="ssm.overview.packages"/>
</div>
<div class="panel-body">
@@ -39,7 +39,7 @@
</div>
<rhn:require acl="is(enable_solaris_support)">
<div class="panel-heading">
- <i class="fa spacewalk-icon-patches fa-fw" title="<bean:message key='ssm.overview.patches'/>"></i>
+ <rhn:icon type="header-errata" title="<bean:message key='ssm.overview.patches' />" />
<bean:message key="ssm.overview.patches"/>
</div>
<div class="panel-body">
@@ -47,7 +47,7 @@
<bean:message key="ssm.overview.patches.patches"/>
</div>
<div class="panel-heading">
- <i class="fa spacewalk-icon-patch-set fa-fw" title="<bean:message key='ssm.overview.patch.clusters'/>"></i>
+ <rhn:icon type="header-errata-set" title="<bean:message key='ssm.overview.patch.clusters' />" />
<bean:message key="ssm.overview.patch.clusters"/>
</div>
<div class="panel-body">
@@ -56,7 +56,7 @@
</rhn:require>
<rhn:require acl="user_role(org_admin)">
<div class="panel-heading">
- <i class="fa spacewalk-icon-system-groups fa-fw" title="<bean:message key='ssm.overview.groups'/>"></i>
+ <rhn:icon type="header-system-groups" title="<bean:message key='ssm.overview.groups' />" />
<bean:message key="ssm.overview.groups"/>
</div>
<div class="panel-body">
@@ -64,7 +64,7 @@
</div>
</rhn:require>
<div class="panel-heading">
- <i class="fa spacewalk-icon-software-channels fa-fw" title="<bean:message key='ssm.overview.channels'/>"></i>
+ <rhn:icon type="header-channel" title="<bean:message key='ssm.overview.channels' />" />
<bean:message key="ssm.overview.channels"/>
</div>
<div class="panel-body">
@@ -78,7 +78,7 @@
</div>
<rhn:require acl="org_entitlement(rhn_provisioning);">
<div class="panel-heading">
- <i class="fa fa-rocket fa-fw" title="<bean:message key='ssm.overview.provisioning'/>"></i>
+ <rhn:icon type="header-kickstart" title="<bean:message key='ssm.overview.provisioning' />" />
<bean:message key="ssm.overview.provisioning"/>
</div>
<div class="panel-body">
@@ -90,7 +90,7 @@
</div>
</rhn:require>
<div class="panel-heading">
- <i class="fa fa-suitcase fa-fw" title="<bean:message key='ssm.overview.misc'/>"></i>
+ <rhn:icon type="header-event-history" title="<bean:message key='ssm.overview.misc' />" />
<bean:message key="ssm.overview.misc"/>
</div>
<div class="panel-body">
diff --git a/java/code/webapp/WEB-INF/pages/systems/crashes.jsp b/java/code/webapp/WEB-INF/pages/systems/crashes.jsp
index ea6f37c..ee04bbb 100644
--- a/java/code/webapp/WEB-INF/pages/systems/crashes.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/crashes.jsp
@@ -14,7 +14,7 @@
<%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %>
<h2>
- <i class="fa spacewalk-icon-bug-ex" title="<bean:message key='crashes.jsp.crashes' />"></i>
+ <rhn:icon type="header-crash" title="<bean:message key='crashes.jsp.crashes' />" />
<bean:message key="crashes.jsp.crashes"/>
</h2>
diff --git a/java/code/webapp/WEB-INF/pages/systems/crashnote.jsp b/java/code/webapp/WEB-INF/pages/systems/crashnote.jsp
index 4b508c3..bcdbea2 100644
--- a/java/code/webapp/WEB-INF/pages/systems/crashnote.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/crashnote.jsp
@@ -28,7 +28,7 @@
</span>
</div>
- <i class="fa spacewalk-icon-bug-ex" title="<bean:message key='info.alt.img'/>"></i>
+ <rhn:icon type="header-crash" title="<bean:message key='info.alt.img' />" />
${fn:escapeXml(crash.crash)}
</div>
diff --git a/java/code/webapp/WEB-INF/pages/systems/crashnotedelete.jsp b/java/code/webapp/WEB-INF/pages/systems/crashnotedelete.jsp
index 3ebc23a..5969b65 100644
--- a/java/code/webapp/WEB-INF/pages/systems/crashnotedelete.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/crashnotedelete.jsp
@@ -18,7 +18,7 @@
</a>
</span>
</div>
- <i class="fa spacewalk-icon-bug-ex" title="<bean:message key='info.alt.img'/>"></i>
+ <rhn:icon type="header-crash" title="<bean:message key='info.alt.img' />" />
${fn:escapeXml(crash.crash)}
</div>
diff --git a/java/code/webapp/WEB-INF/pages/systems/crashnotes.jsp b/java/code/webapp/WEB-INF/pages/systems/crashnotes.jsp
index 6e1fb7f..d06c2c6 100644
--- a/java/code/webapp/WEB-INF/pages/systems/crashnotes.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/crashnotes.jsp
@@ -26,7 +26,7 @@
</span>
</div>
- <i class="fa spacewalk-icon-bug-ex" title="<bean:message key='info.alt.img'/>"></i>
+ <rhn:icon type="header-crash" title="<bean:message key='info.alt.img' />" />
${fn:escapeXml(crash.crash)}
</div>
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdeleteconfirm.jsp b/java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdeleteconfirm.jsp
index 1d99218..e418ddb 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdeleteconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdeleteconfirm.jsp
@@ -29,7 +29,7 @@
<rhn:icon type="item-enabled" />
</c:when>
<c:otherwise>
- <img src="/img/rhn-listicon-unchecked_immutable.gif">
+ <rhn:icon type="item-disabled" />
</c:otherwise>
</c:choose>
</rl:column>
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/extra-packages-list.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/extra-packages-list.jsp
index 9e38d98..ebdf872 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/packages/extra-packages-list.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/extra-packages-list.jsp
@@ -15,7 +15,7 @@
<%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %>
<h2>
- <i class="fa spacewalk-icon-package-extra"></i>
+ <rhn:icon type="header-package-extra" />
<bean:message key="packagelist.jsp.extrapackages" />
</h2>
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/packageconfirm.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/packageconfirm.jsp
index abe728d..2ad1ebc 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/packages/packageconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/packageconfirm.jsp
@@ -53,7 +53,7 @@
<th><bean:message key="confirm.jsp.than"/></th>
</tr>
<tr>
- <th><i class="fa spacewalk-icon-schedule" title="<bean:message key='confirm.jsp.selection'/>"></i>
+ <th><rhn:icon type="header-schedule" title="<bean:message key='confirm.jsp.selection' />" />
</th>
<td>
<jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp">
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/packagelist.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/packagelist.jsp
index 2d39237..e35c831 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/packages/packagelist.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/packagelist.jsp
@@ -12,7 +12,7 @@
<rhn:require acl="not system_feature(ftr_package_remove)">
<h2>
- <i class="fa spacewalk-icon-package-delete" title="<bean:message key='errata.common.deletepackageAlt' />"></i>
+ <rhn:icon type="header-package-del" title="<bean:message key='errata.common.deletepackageAlt' />" />
<bean:message key="packagelist.jsp.installedpackages" />
</h2>
<div class="page-summary">
@@ -23,7 +23,7 @@
</rhn:require>
<rhn:require acl="system_feature(ftr_package_remove)">
<h2>
- <i class="fa spacewalk-icon-package-delete" title="<bean:message key='errata.common.deletepackageAlt' />"></i>
+ <rhn:icon type="header-package-del" title="<bean:message key='errata.common.deletepackageAlt' />" />
<bean:message key="packagelist.jsp.removablepackages" />
</h2>
<div class="page-summary">
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/packagelist.jspf b/java/code/webapp/WEB-INF/pages/systems/details/packages/packagelist.jspf
index 92c7f3a..097b322 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/packages/packagelist.jspf
+++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/packagelist.jspf
@@ -10,7 +10,7 @@
<%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %>
<h2>
- <i class="fa spacewalk-icon-package-add" title="<bean:message key='${alt}'/>"></i>
+ <rhn:icon type="header-package-add" />
<bean:message key="${pack_header}" />
</h2>
<div class="page-summary">
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchconfirm.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchconfirm.jsp
index ffb9ff2..1c87bef 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchconfirm.jsp
@@ -11,7 +11,7 @@
<rhn:require acl="is_solaris()">
<h2>
- <i class="fa spacewalk-icon-package-delete"></i>
+ <rhn:icon type="header-package-del" />
<bean:message key="packagelist.jsp.confirmpatch" />
</h2>
<div class="page-summary">
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchinstall.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchinstall.jsp
index 5d2195d..79313a1 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchinstall.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchinstall.jsp
@@ -11,7 +11,7 @@
<rhn:require acl="is_solaris()">
<h2>
- <i class="fa spacewalk-icon-package-add"></i>
+ <rhn:icon type="header-package-add" />
<bean:message key="packagelist.jsp.installablepatches" />
</h2>
<div class="page-summary">
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchinstallconfirm.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchinstallconfirm.jsp
index c287034..d0b395f 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchinstallconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchinstallconfirm.jsp
@@ -11,7 +11,7 @@
<rhn:require acl="is_solaris()">
<h2>
- <i class="fa spacewalk-icon-package-add"></i>
+ <rhn:icon type="header-package-add" />
<bean:message key="packagelist.jsp.confirmpatchinstall" />
</h2>
<div class="page-summary">
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchlist.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchlist.jsp
index 6a1eabf..9d4ec8a 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchlist.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchlist.jsp
@@ -11,7 +11,7 @@
<rhn:require acl="is_solaris()">
<h2>
- <i class="fa spacewalk-icon-package-delete"></i>
+ <rhn:icon type="header-package-del" />
<bean:message key="packagelist.jsp.removablepatches" />
</h2>
<div class="page-summary">
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/patchsets/install_patchset.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/patchsets/install_patchset.jsp
index 08472c6..e944c26 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/packages/patchsets/install_patchset.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/patchsets/install_patchset.jsp
@@ -10,7 +10,7 @@
<%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %>
<h2>
- <i class="fa spacewalk-icon-package-delete"></i>
+ <rhn:icon type="header-package-del" />
<bean:message key="install_patchset.jsp.header" />
</h2>
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/patchsets/patchsetlist.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/patchsets/patchsetlist.jsp
index 311f861..5e750a6 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/packages/patchsets/patchsetlist.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/patchsets/patchsetlist.jsp
@@ -10,7 +10,7 @@
<%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %>
<h2>
- <i class="fa spacewalk-icon-package-delete"></i>
+ <rhn:icon type="header-package-del" />
<bean:message key="patchsetlist.jsp.patchsets" />
</h2>
<div class="page-summary">
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncprofile.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncprofile.jsp
index 5490e28..730a9b4 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncprofile.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncprofile.jsp
@@ -51,7 +51,7 @@
<th><bean:message key="confirm.jsp.than"/></th>
</tr>
<tr>
- <th><i class="fa spacewalk-icon-schedule" title="<bean:message key='confirm.jsp.selection'/>"></i>
+ <th><rhn:icon type="header-schedule" title="<bean:message key='confirm.jsp.selection' />" />
</th>
<td>
<jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp">
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncsystem.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncsystem.jsp
index fbbaeee..bafeb70 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncsystem.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncsystem.jsp
@@ -52,7 +52,7 @@
<th><bean:message key="confirm.jsp.than"/></th>
</tr>
<tr>
- <th><i class="fa spacewalk-icon-schedule" title="<bean:message key='confirm.jsp.selection'/>"></i>
+ <th><rhn:icon type="header-schedule" title="<bean:message key='confirm.jsp.selection' />" />
</th>
<td>
<jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp">
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/upgradable.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/upgradable.jsp
index f27e68b..787bd72 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/packages/upgradable.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/upgradable.jsp
@@ -11,7 +11,7 @@
<%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %>
<h2>
- <i class="fa spacewalk-icon-package-upgrade" title="<bean:message key='errata.common.upgradepackageAlt' />"></i>
+ <rhn:icon type="header-package-upgrade" title="<bean:message key='errata.common.upgradepackageAlt' />" />
<bean:message key="upgradable.jsp.header" />
</h2>
<div class="page-summary">
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/virtualization/images/images.jsp b/java/code/webapp/WEB-INF/pages/systems/details/virtualization/images/images.jsp
index 2dc7f87..bdabbf7 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/virtualization/images/images.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/virtualization/images/images.jsp
@@ -16,7 +16,7 @@
<c:when test="${requestScope.loadAsync == true}">
<div id="images-content">
<div style="padding: 1em;">
- <i class="fa fa-spinner fa-spin"></i>
+ <rhn:icon type="header-reloading" />
<span style="padding-left: 0.3em;">Loading ...</span>
</div>
<script type="text/javascript">
diff --git a/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemscompare.jsp b/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemscompare.jsp
index c11aea4..95bbd76 100644
--- a/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemscompare.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemscompare.jsp
@@ -75,7 +75,7 @@
<div class="text-right">
<hr />
- <button type="submit" class="btn btn-default" name="refresh"><i class="fa fa-refresh"></i> <bean:message key='Refresh Comparison'/></button>
+ <button type="submit" class="btn btn-default" name="refresh"><rhn:icon type="header-refresh" /> <bean:message key='Refresh Comparison'/></button>
</div>
<rhn:submitted/>
<br/>
diff --git a/java/code/webapp/WEB-INF/pages/systems/errata.jsp b/java/code/webapp/WEB-INF/pages/systems/errata.jsp
index 46154ad..6efddfb 100644
--- a/java/code/webapp/WEB-INF/pages/systems/errata.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/errata.jsp
@@ -68,7 +68,7 @@
<c:if test="${requestScope.showApplyErrata == 'false'}">
<rl:column headerkey="emptyspace.jsp" styleclass="text-align: center;">
- <i class="fa fa-clock-o"></i>
+ <rhn:icon type="action-pending" />
</rl:column>
</c:if>
diff --git a/java/code/webapp/WEB-INF/pages/systems/errataconfirm.jsp b/java/code/webapp/WEB-INF/pages/systems/errataconfirm.jsp
index 0a61f37..513d149 100644
--- a/java/code/webapp/WEB-INF/pages/systems/errataconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/errataconfirm.jsp
@@ -65,7 +65,7 @@
<th><bean:message key="syncprofile.jsp.than"/></th>
</tr>
<tr>
- <th><i class="fa spacewalk-icon-schedule" title="<bean:message key='syncprofile.jsp.selection'/>"></i>
+ <th><rhn:icon type="header-schedule" title="<bean:message key='syncprofile.jsp.selection' />" />
</th>
<td>
<jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp">
diff --git a/java/code/webapp/WEB-INF/pages/systems/probes/details.jsp b/java/code/webapp/WEB-INF/pages/systems/probes/details.jsp
index 23efd40..5698a26 100644
--- a/java/code/webapp/WEB-INF/pages/systems/probes/details.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/probes/details.jsp
@@ -126,7 +126,7 @@
<c:if test="${requestScope.show_graph}">
<h2><bean:message key="probedetails.jsp.graph"/></h2>
<img src="/rhn/systems/details/probes/ProbeGraph.do?${requestScope.l10ned_selected_metrics_string}${requestScope.selected_metrics_string}startts=${requestScope.startts}&endts=${requestScope.endts}&sid=${system.id}&probe_id=${probe.id}"/>
- <br><a href="/rhn/systems/details/probes/ProbeGraph.do?lde=1&${requestScope.l10ned_selected_metrics_string}${requestScope.selected_metrics_string}startts=${requestScope.startts}&endts=${requestScope.endts}&sid=${system.id}&probe_id=${probe.id}"><i class="fa spacewalk-icon-download-csv text-primary" title=""></i><bean:message key="listdisplay.csv"/></a>
+ <br><a href="/rhn/systems/details/probes/ProbeGraph.do?lde=1&${requestScope.l10ned_selected_metrics_string}${requestScope.selected_metrics_string}startts=${requestScope.startts}&endts=${requestScope.endts}&sid=${system.id}&probe_id=${probe.id}"><rhn:icon type="item-download-csv" title="" /><bean:message key="listdisplay.csv"/></a>
</c:if>
<c:if test="${requestScope.show_log}">
<h2><bean:message key="probedetails.jsp.eventlog"/></h2>
diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/createcustomdata.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/createcustomdata.jsp
index a180509..b8fa72d 100644
--- a/java/code/webapp/WEB-INF/pages/systems/sdc/createcustomdata.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/sdc/createcustomdata.jsp
@@ -10,7 +10,7 @@
<%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %>
<div class="toolbar-h2">
- <i class="fa fa-info-circle text-primary" title=""></i>
+ <rhn:icon type="header-info" title="" />
<bean:message key="system.jsp.customkey.updatetitle"/>
</div>
diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/note_delete.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/note_delete.jsp
index 934be9d..04652e2 100644
--- a/java/code/webapp/WEB-INF/pages/systems/sdc/note_delete.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/sdc/note_delete.jsp
@@ -7,7 +7,7 @@
<body>
<%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %>
<h2>
- <i class="fa spacewalk-icon-note-pin" title=""></i><bean:message key="sdc.details.notes.delete.header"/>
+ <rhn:icon type="header-note" title="" /><bean:message key="sdc.details.notes.delete.header"/>
</h2>
<div class="page-summary">
<p><bean:message key="sdc.details.notes.delete.confirm"/></p>
diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/note_edit.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/note_edit.jsp
index 0f0f405..420ad2c 100644
--- a/java/code/webapp/WEB-INF/pages/systems/sdc/note_edit.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/sdc/note_edit.jsp
@@ -8,13 +8,13 @@
<%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %>
<c:choose>
<c:when test="${empty param.nid}">
- <rhn:toolbar base="h2" icon="spacewalk-icon-note-pin">
+ <rhn:toolbar base="h2" icon="header-note">
<bean:message key="sdc.details.notes.header"/>
</rhn:toolbar>
<c:set var="urlParam" scope="request" value="sid=${system.id}"/>
</c:when>
<c:otherwise>
- <rhn:toolbar base="h2" icon="spacewalk-icon-note-pin"
+ <rhn:toolbar base="h2" icon="header-note"
deletionUrl="/rhn/systems/details/DeleteNote.do?sid=${system.id}&nid=${n.id}"
deletionType="note">
<bean:message key="sdc.details.notes.header"/>
diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/notes.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/notes.jsp
index 2a862b2..f0be578 100644
--- a/java/code/webapp/WEB-INF/pages/systems/sdc/notes.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/sdc/notes.jsp
@@ -7,7 +7,7 @@
<body>
<%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %>
- <rhn:toolbar base="h2" icon="fa-thumb-tack"
+ <rhn:toolbar base="h2" icon="header-note"
creationUrl="/rhn/systems/details/EditNote.do?sid=${system.id}"
creationType="note">
<bean:message key="sdc.details.notes.header"/>
diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp
index a9bb2aa..67e0719 100644
--- a/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp
@@ -55,7 +55,7 @@
<c:if test="${rebootRequired}">
<div class="systeminfo">
<div class="systeminfo-full">
- <i class="fa fa-refresh text-primary"></i><bean:message key="sdc.details.overview.requires_reboot"/>
+ <rhn:icon type="system-reboot" /><bean:message key="sdc.details.overview.requires_reboot"/>
<bean:message key="sdc.details.overview.schedulereboot" arg0="/network/systems/details/reboot_confirm.pxt?sid=${system.id}"/>
</div>
</div>
@@ -66,10 +66,10 @@
<div class="col-md-6">
<c:choose>
<c:when test="${probeList[0].state == 'CRITICAL'}">
- <i class="fa spacewalk-icon-monitoring-down"></i> <bean:message key="sdc.details.overview.probes.critical" arg0="/rhn/help/reference/en-US/s1-sm-monitor.jsp"/>
+ <rhn:icon type="monitoring-crit" /> <bean:message key="sdc.details.overview.probes.critical" arg0="/rhn/help/reference/en-US/s1-sm-monitor.jsp"/>
</c:when>
<c:otherwise>
- <i class="fa spacewalk-icon-monitoring-warning"></i> <bean:message key="sdc.details.overview.probes.warning" arg0="/rhn/help/reference/en-US/s1-sm-monitor.jsp"/>
+ <rhn:icon type="monitoring-warn" /> <bean:message key="sdc.details.overview.probes.warning" arg0="/rhn/help/reference/en-US/s1-sm-monitor.jsp"/>
</c:otherwise>
</c:choose>
</div>
@@ -77,10 +77,10 @@
<c:forEach items="${probeList}" var="probe">
<c:choose>
<c:when test="${probe.state == 'CRITICAL'}">
- <i class="fa fa-circle text-danger"></i>
+ <rhn:icon type="monitoring-crit" />
</c:when>
<c:otherwise>
- <rhn:icon type="system-warn" />
+ <rhn:icon type="monitoring-warn" />
</c:otherwise>
</c:choose>
<a href="/rhn/systems/details/probes/ProbeDetails.do?sid=${system.id}&probe_id=${probe.id}">${probe.description}</a><br/>
@@ -195,14 +195,14 @@
<td>
<c:choose>
<c:when test="${serverLock != null}">
- <rhn:icon type="errata-security" />
+ <rhn:icon type="system-locked" />
<bean:message key="sdc.details.overview.locked"
arg0="${serverLock.locker.login}"
arg1="${serverLock.reason}" /><br/>
<bean:message key="sdc.details.overview.unlock" arg0="/rhn/systems/details/Overview.do?sid=${system.id}&lock=0"/>
</c:when>
<c:otherwise>
- <i class="fa fa-unlock"></i>
+ <rhn:icon type="system-physical" />
<bean:message key="sdc.details.overview.unlocked"/><br/>
<bean:message key="sdc.details.overview.lock" arg0="/rhn/systems/details/Overview.do?sid=${system.id}&lock=1"/>
</c:otherwise>
diff --git a/web/modules/pxt/PXT/HTML.pm b/web/modules/pxt/PXT/HTML.pm
index e5a15ce..7064042 100644
--- a/web/modules/pxt/PXT/HTML.pm
+++ b/web/modules/pxt/PXT/HTML.pm
@@ -527,6 +527,7 @@ my %rhn_icons = (
"header-errata-set" => "fa spacewalk-icon-patch-set",
"header-errata-set-add" => "fa pacewalk-icon-patchset-install",
"header-event-history" => "fa fa-suitcase",
+ "header-help" => "fa fa-question-circle",
"header-info" => "fa fa-info-circle text-primary",
"header-package" => "fa spacewalk-icon-packages",
"header-preferences" => "fa fa-cogs",
@@ -556,7 +557,7 @@ my %rhn_icons = (
"system-locked" => "fa fa-1-5x spacewalk-icon-locked-system",
"system-ok" => "fa fa-check-circle fa-1-5x text-success",
"system-physical" => "fa fa-desktop fa-1-5x",
- "system-unentitled" => "fa fa-1-5x spacewalk-icon-Unentitled",
+ "system-unentitled" => "fa fa-1-5x spacewalk-icon-unentitled",
"system-unknown" => "fa fa-1-5x spacewalk-icon-unknown-system",
"system-virt-guest" => "fa fa-1-5x spacewalk-icon-virtual-guest",
"system-virt-host" => "fa fa-1-5x spacewalk-icon-virtual-host",
diff --git a/web/modules/sniglets/Sniglets/HTML.pm b/web/modules/sniglets/Sniglets/HTML.pm
index a5eb8c1..421abb5 100644
--- a/web/modules/sniglets/Sniglets/HTML.pm
+++ b/web/modules/sniglets/Sniglets/HTML.pm
@@ -170,7 +170,7 @@ sub rhn_help {
return render_help_link(-user => $pxt->user,
-guide => $guide,
-href => $href,
- -block => qq(<span class="fa-stack"><i class="fa fa-circle fa-stack-1x"></i><i class="fa fa-question fa-stack-1x fa-inverse"></i></span>),
+ -block => PXT::HTML->icon(-type => "header-help"),
-satellite => $params{satellite});
}
10 years, 5 months
Changes to 'refs/tags/spacecmd-2.1.20-1'
by Milan Zazrivec
Tag 'spacecmd-2.1.20-1' created by Milan Zazrivec <mzazrivec(a)redhat.com> at 2013-12-13 15:46 +0000
Tagging package [spacecmd] version [2.1.20-1] in directory [spacecmd/].
Changes since spacecmd-2.1.19-1:
Milan Zazrivec (2):
1009841 - don't attempt to write out 'None'
Automatic commit of package [spacecmd] release [2.1.20-1].
---
rel-eng/packages/spacecmd | 2 +-
spacecmd/spacecmd.spec | 5 ++++-
spacecmd/src/lib/configchannel.py | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
---
10 years, 5 months
2 commits - rel-eng/packages spacecmd/spacecmd.spec spacecmd/src
by Milan Zazrivec
rel-eng/packages/spacecmd | 2 +-
spacecmd/spacecmd.spec | 5 ++++-
spacecmd/src/lib/configchannel.py | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
New commits:
commit 8853f045db4249954267bfc8e7a3959b277bf0cf
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Fri Dec 13 16:46:03 2013 +0100
Automatic commit of package [spacecmd] release [2.1.20-1].
diff --git a/rel-eng/packages/spacecmd b/rel-eng/packages/spacecmd
index b26103f..6a3e09f 100644
--- a/rel-eng/packages/spacecmd
+++ b/rel-eng/packages/spacecmd
@@ -1 +1 @@
-2.1.19-1 spacecmd/
+2.1.20-1 spacecmd/
diff --git a/spacecmd/spacecmd.spec b/spacecmd/spacecmd.spec
index 228f54d..3b81360 100644
--- a/spacecmd/spacecmd.spec
+++ b/spacecmd/spacecmd.spec
@@ -4,7 +4,7 @@
%endif
Name: spacecmd
-Version: 2.1.19
+Version: 2.1.20
Release: 1%{?dist}
Summary: Command-line interface to Spacewalk and Satellite servers
@@ -64,6 +64,9 @@ touch %{buildroot}/%{python_sitelib}/spacecmd/__init__.py
%doc %{_mandir}/man1/spacecmd.1.gz
%changelog
+* Fri Dec 13 2013 Milan Zazrivec <mzazrivec(a)redhat.com> 2.1.20-1
+- 1009841 - don't attempt to write out 'None'
+
* Fri Dec 13 2013 Milan Zazrivec <mzazrivec(a)redhat.com> 2.1.19-1
- 960984 - fix system listing when identified by system id
commit dea26dd6f4ffc1f86655274b536d4d041237194e
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Fri Dec 13 16:44:14 2013 +0100
1009841 - don't attempt to write out 'None'
This is to fix the following error:
ERROR: argument 1 must be string or read-only character buffer, not None
Traceback (most recent call last):
File "/usr/bin/spacecmd", line 133, in ?
shell.print_result(shell.onecmd( precmd ), precmd)
File "/usr/lib64/python2.4/cmd.py", line 219, in onecmd
return func(arg)
File "/usr/lib/python2.4/site-packages/spacecmd/configchannel.py",
line 270, in do_configchannel_backup
of.write( details.get('contents') )
TypeError: argument 1 must be string or read-only character buffer, not None
diff --git a/spacecmd/src/lib/configchannel.py b/spacecmd/src/lib/configchannel.py
index 5153d3f..59a9bcc 100644
--- a/spacecmd/src/lib/configchannel.py
+++ b/spacecmd/src/lib/configchannel.py
@@ -267,7 +267,7 @@ def do_configchannel_backup(self, args):
fh.write( 'md5 = %s\n' % details.get('md5') )
fh.write( 'binary = %s\n' % details.get('binary') )
of = open( dumpfile, 'w' )
- of.write( details.get('contents') )
+ of.write( details.get('contents') or '' )
of.close()
fh.write( '\n' )
10 years, 5 months
Changes to 'refs/tags/spacecmd-2.1.19-1'
by Milan Zazrivec
Tag 'spacecmd-2.1.19-1' created by Milan Zazrivec <mzazrivec(a)redhat.com> at 2013-12-13 15:02 +0000
Tagging package [spacecmd] version [2.1.19-1] in directory [spacecmd/].
Changes since cobbler20-2.0.11-21:
Milan Zazrivec (2):
960984 - fix system listing when identified by system id
Automatic commit of package [spacecmd] release [2.1.19-1].
---
rel-eng/packages/spacecmd | 2 +-
spacecmd/spacecmd.spec | 5 ++++-
spacecmd/src/lib/system.py | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
---
10 years, 5 months
2 commits - rel-eng/packages spacecmd/spacecmd.spec spacecmd/src
by Milan Zazrivec
rel-eng/packages/spacecmd | 2 +-
spacecmd/spacecmd.spec | 5 ++++-
spacecmd/src/lib/system.py | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
New commits:
commit d92b65d19ca16d30b3cfcb884fedd20b0bac9ebe
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Fri Dec 13 16:02:19 2013 +0100
Automatic commit of package [spacecmd] release [2.1.19-1].
diff --git a/rel-eng/packages/spacecmd b/rel-eng/packages/spacecmd
index 85e5616..b26103f 100644
--- a/rel-eng/packages/spacecmd
+++ b/rel-eng/packages/spacecmd
@@ -1 +1 @@
-2.1.18-1 spacecmd/
+2.1.19-1 spacecmd/
diff --git a/spacecmd/spacecmd.spec b/spacecmd/spacecmd.spec
index 2cf3bf4..228f54d 100644
--- a/spacecmd/spacecmd.spec
+++ b/spacecmd/spacecmd.spec
@@ -4,7 +4,7 @@
%endif
Name: spacecmd
-Version: 2.1.18
+Version: 2.1.19
Release: 1%{?dist}
Summary: Command-line interface to Spacewalk and Satellite servers
@@ -64,6 +64,9 @@ touch %{buildroot}/%{python_sitelib}/spacecmd/__init__.py
%doc %{_mandir}/man1/spacecmd.1.gz
%changelog
+* Fri Dec 13 2013 Milan Zazrivec <mzazrivec(a)redhat.com> 2.1.19-1
+- 960984 - fix system listing when identified by system id
+
* Thu Dec 05 2013 Aron Parsons <aronparsons(a)gmail.com> 2.1.18-1
- spacecmd: print repos in softwarechannel_getdetails
- spacecmd: add softwarechannel_listrepos
commit 65efaf38345ccb2dd51b122fb1653c071973eccf
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Fri Dec 13 16:00:49 2013 +0100
960984 - fix system listing when identified by system id
This is to fix the following error:
Traceback (most recent call last):
File "/usr/bin/spacecmd", line 127, in ?
shell.onecmd(shell.precmd(' '.join(args)))
File "/usr/lib64/python2.4/cmd.py", line 219, in onecmd
return func(arg)
File "/usr/lib/python2.4/site-packages/spacecmd/system.py", line 1804,
in do_system_addchildchannels
self.manipulate_child_channels(args)
File "/usr/lib/python2.4/site-packages/spacecmd/system.py", line 96,
in manipulate_child_channels
print '\n'.join(sorted(systems))
TypeError: sequence item 0: expected string, int found
diff --git a/spacecmd/src/lib/system.py b/spacecmd/src/lib/system.py
index 820681b..fd04f27 100644
--- a/spacecmd/src/lib/system.py
+++ b/spacecmd/src/lib/system.py
@@ -94,7 +94,7 @@ def manipulate_child_channels(self, args, remove=False):
print 'Systems'
print '-------'
- print '\n'.join(sorted(systems))
+ print '\n'.join(sorted([str(x) for x in systems]))
print
if remove:
10 years, 5 months
Changes to 'refs/tags/cobbler20-2.0.11-21'
by StephenHerr
Tag 'cobbler20-2.0.11-21' created by Stephen Herr <sherr(a)redhat.com> at 2013-12-12 23:06 +0000
Tagging package [cobbler20] version [2.0.11-21] in directory [spec-tree/cobbler20/].
Changes since spacewalk-java-2.1.98-1:
Benjamin Kruell (1):
1042381 - Add extra options to koan for virt-install
Michael Mraka (1):
fixed unterminated tag
Stephen Herr (3):
Fixing Unknown icon type: "system-virtual-host"
1042363 - make koan virt guest installs work on newer operating systems
Automatic commit of package [cobbler20] minor release [2.0.11-21].
Tomas Kasparek (3):
simplify logic in cfg:channel tag
remove obsolete unit test as tag was rewritten
remove forgotten debug output
---
java/code/src/com/redhat/rhn/frontend/configuration/tags/ConfigChannelTag.java | 156 -
java/code/src/com/redhat/rhn/frontend/configuration/tags/test/ConfigChannelTagTest.java | 200 -
java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java | 1
java/code/webapp/WEB-INF/includes/legends/system-group-legend.jsp | 4
java/code/webapp/WEB-INF/pages/common/fragments/systems/system_list_fragment.jspf | 2
rel-eng/packages/cobbler20 | 2
spec-tree/cobbler20/cobbler20.spec | 10
spec-tree/cobbler20/koan-extra-options.patch | 78
spec-tree/cobbler20/koan-rhel7-virtinst.patch | 1153 ++++++++++
9 files changed, 1274 insertions(+), 332 deletions(-)
---
10 years, 5 months
4 commits - java/code rel-eng/packages spec-tree/cobbler20
by StephenHerr
java/code/webapp/WEB-INF/pages/common/fragments/systems/system_list_fragment.jspf | 2
rel-eng/packages/cobbler20 | 2
spec-tree/cobbler20/cobbler20.spec | 10
spec-tree/cobbler20/koan-extra-options.patch | 78
spec-tree/cobbler20/koan-rhel7-virtinst.patch | 1153 ++++++++++
5 files changed, 1242 insertions(+), 3 deletions(-)
New commits:
commit 8a70e0abf9d40e9d24938abc26b5494313516333
Author: Stephen Herr <sherr(a)redhat.com>
Date: Thu Dec 12 18:06:00 2013 -0500
Automatic commit of package [cobbler20] minor release [2.0.11-21].
diff --git a/rel-eng/packages/cobbler20 b/rel-eng/packages/cobbler20
index 426d8e0..96c66ef 100644
--- a/rel-eng/packages/cobbler20
+++ b/rel-eng/packages/cobbler20
@@ -1 +1 @@
-2.0.11-20 spec-tree/cobbler20/
+2.0.11-21 spec-tree/cobbler20/
diff --git a/spec-tree/cobbler20/cobbler20.spec b/spec-tree/cobbler20/cobbler20.spec
index 5111d80..04b33bb 100644
--- a/spec-tree/cobbler20/cobbler20.spec
+++ b/spec-tree/cobbler20/cobbler20.spec
@@ -7,7 +7,7 @@ Name: cobbler20
License: GPLv2+
AutoReq: no
Version: 2.0.11
-Release: 20%{?dist}
+Release: 21%{?dist}
Source0: cobbler-%{version}.tar.gz
Source1: cobblerd.service
Patch0: catch_cheetah_exception.patch
@@ -464,6 +464,10 @@ Web interface for Cobbler that allows visiting http://server/cobbler_web to conf
%doc AUTHORS COPYING CHANGELOG README
%changelog
+* Thu Dec 12 2013 Stephen Herr <sherr(a)redhat.com> 2.0.11-21
+- 1042381 - Add extra options to koan for virt-install
+- 1042363 - make koan virt guest installs work on newer operating systems
+
* Fri Jul 05 2013 Tomas Kasparek <tkasparek(a)redhat.com> 2.0.11-20
- polishing cobbler20 dependencies for fedora19
commit f8682a73f4aa92c04c3ec724c6da4284641f8dd9
Author: Benjamin Kruell <bkruell(a)redhat.com>
Date: Thu Dec 12 18:05:23 2013 -0500
1042381 - Add extra options to koan for virt-install
diff --git a/spec-tree/cobbler20/cobbler20.spec b/spec-tree/cobbler20/cobbler20.spec
index 3091e1d..5111d80 100644
--- a/spec-tree/cobbler20/cobbler20.spec
+++ b/spec-tree/cobbler20/cobbler20.spec
@@ -15,6 +15,7 @@ Patch1: lvm_storage.patch
Patch2: koan_no_selinux_set.patch
Patch3: buildiso.patch
Patch4: koan-rhel7-virtinst.patch
+Patch5: koan-extra-options.patch
Group: Applications/System
Requires: python >= 2.3
@@ -109,6 +110,7 @@ a XMLRPC API for integration with other applications.
%patch2 -p1
%patch3 -p1
%patch4 -p1
+%patch5 -p1
%build
%{__python} setup.py build
diff --git a/spec-tree/cobbler20/koan-extra-options.patch b/spec-tree/cobbler20/koan-extra-options.patch
new file mode 100644
index 0000000..e890989
--- /dev/null
+++ b/spec-tree/cobbler20/koan-extra-options.patch
@@ -0,0 +1,78 @@
+diff -rupN cobbler-2.0.11-old2/koan/app.py cobbler-2.0.11/koan/app.py
+--- cobbler-2.0.11-old2/koan/app.py 2013-12-12 17:32:03.506122558 -0500
++++ cobbler-2.0.11/koan/app.py 2013-12-12 17:58:14.016155914 -0500
+@@ -189,6 +189,19 @@ def main():
+ p.add_option("", "--qemu-disk-type",
+ dest="qemu_disk_type",
+ help="when used with --virt_type=qemu, add select of disk drivers: ide,scsi,virtio")
++ p.add_option("", "--qemu-net-type",
++ dest="qemu_net_type",
++ help="when used with --virt_type=qemu, select type of network device to use: e1000, ne2k_pci, pcnet, rtl8139, virtio")
++ p.add_option("", "--wait",
++ dest="wait", type='int', default=0, # default to 0 for koan backwards compatibility
++ help="pass the --wait=<INT> argument to virt-install")
++ p.add_option("", "--cpu",
++ dest="cpu",
++ help="pass the --cpu argument to virt-install")
++ p.add_option("", "--noreboot",
++ dest="noreboot", default=False, # default to False for koan backwards compatibility
++ action="store_true",
++ help="pass the --noreboot argument to virt-install")
+
+ (options, args) = p.parse_args()
+
+@@ -218,6 +231,10 @@ def main():
+ k.embed_kickstart = options.embed_kickstart
+ k.virt_auto_boot = options.virt_auto_boot
+ k.qemu_disk_type = options.qemu_disk_type
++ k.qemu_net_type = options.qemu_net_type
++ k.virtinstall_cpu = options.cpu
++ k.virtinstall_wait = options.wait
++ k.virtinstall_noreboot= options.noreboot
+
+ if options.virt_name is not None:
+ k.virt_name = options.virt_name
+@@ -274,6 +291,10 @@ class Koan:
+ self.force_path = None
+ self.qemu_disk_type = None
+ self.virt_auto_boot = None
++ self.qemu_net_type = None
++ self.virtinstall_cpu = None
++ self.virtinstall_wait = None
++ self.virtinstall_noreboot = None
+
+ # This option adds the --copy-default argument to /sbin/grubby
+ # which uses the default boot entry in the grub.conf
+@@ -1161,7 +1182,11 @@ class Koan:
+ bridge = self.virt_bridge,
+ virt_type = self.virt_type,
+ virt_auto_boot = virt_auto_boot,
+- qemu_driver_type = self.qemu_disk_type
++ qemu_driver_type = self.qemu_disk_type,
++ qemu_net_type = self.qemu_net_type,
++ cpu = self.virtinstall_cpu,
++ wait = self.virtinstall_wait,
++ noreboot = self.virtinstall_noreboot
+ )
+
+ print results
+diff -rupN cobbler-2.0.11-old2/koan/virtinstall.py cobbler-2.0.11/koan/virtinstall.py
+--- cobbler-2.0.11-old2/koan/virtinstall.py 2013-12-12 17:32:03.506122558 -0500
++++ cobbler-2.0.11/koan/virtinstall.py 2013-12-12 17:59:49.360826677 -0500
+@@ -162,6 +162,7 @@ def build_commandline(uri,
+ qemu_driver_type=None,
+ qemu_net_type=None,
+ qemu_machine_type=None,
++ cpu=None,
+ wait=0,
+ noreboot=False,
+ osimport=False):
+@@ -404,6 +405,8 @@ def build_commandline(uri,
+ cmd += " "
+
+ cmd += "--wait %d " % int(wait)
++ if cpu:
++ cmd += "--cpu %s " % cpu
+ if noreboot:
+ cmd += "--noreboot "
+ if osimport and not(import_exists):
commit 41c8d59e201a4e1b36d71c6baaead15bc0299eb1
Author: Stephen Herr <sherr(a)redhat.com>
Date: Thu Dec 12 16:55:41 2013 -0500
1042363 - make koan virt guest installs work on newer operating systems
diff --git a/spec-tree/cobbler20/cobbler20.spec b/spec-tree/cobbler20/cobbler20.spec
index 40db059..3091e1d 100644
--- a/spec-tree/cobbler20/cobbler20.spec
+++ b/spec-tree/cobbler20/cobbler20.spec
@@ -14,6 +14,7 @@ Patch0: catch_cheetah_exception.patch
Patch1: lvm_storage.patch
Patch2: koan_no_selinux_set.patch
Patch3: buildiso.patch
+Patch4: koan-rhel7-virtinst.patch
Group: Applications/System
Requires: python >= 2.3
@@ -107,6 +108,7 @@ a XMLRPC API for integration with other applications.
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
%build
%{__python} setup.py build
diff --git a/spec-tree/cobbler20/koan-rhel7-virtinst.patch b/spec-tree/cobbler20/koan-rhel7-virtinst.patch
new file mode 100644
index 0000000..ba36ca9
--- /dev/null
+++ b/spec-tree/cobbler20/koan-rhel7-virtinst.patch
@@ -0,0 +1,1153 @@
+diff -rupN cobbler-2.0.11-old/koan/app.py cobbler-2.0.11/koan/app.py
+--- cobbler-2.0.11-old/koan/app.py 2013-12-12 15:17:32.615190532 -0500
++++ cobbler-2.0.11/koan/app.py 2013-12-12 15:39:12.961416894 -0500
+@@ -555,10 +555,13 @@ class Koan:
+ if not os.path.exists("/usr/bin/qemu-img"):
+ raise InfoException("qemu package needs to be installed")
+ # is libvirt new enough?
+- cmd = sub_process.Popen("rpm -q python-virtinst", stdout=sub_process.PIPE, shell=True)
+- version_str = cmd.communicate()[0]
+- if version_str.find("virtinst-0.1") != -1 or version_str.find("virtinst-0.0") != -1:
+- raise InfoException("need python-virtinst >= 0.2 to do installs for qemu/kvm")
++ # Note: in some newer distros (like Fedora 19) the python-virtinst package has been
++ # subsumed into virt-install. If we don't have one check to see if we have the other.
++ rc, version_str = utils.subprocess_get_response(shlex.split('rpm -q virt-install'), True)
++ if rc != 0:
++ rc, version_str = utils.subprocess_get_response(shlex.split('rpm -q python-virtinst'), True)
++ if rc != 0 or version_str.find("virtinst-0.1") != -1 or version_str.find("virtinst-0.0") != -1:
++ raise InfoException("need python-virtinst >= 0.2 or virt-install package to do installs for qemu/kvm (depending on your OS)")
+
+ # for vmware
+ if self.virt_type == "vmware" or self.virt_type == "vmwarew":
+@@ -1125,7 +1128,10 @@ class Koan:
+ Invoke virt guest-install (or tweaked copy thereof)
+ """
+ pd = profile_data
+- self.load_virt_modules()
++ # importing can't throw exceptions any more, don't put it in a sub-method
++ import xencreate
++ import qcreate
++ import imagecreate
+
+ arch = self.safe_load(pd,'arch','x86')
+ kextra = self.calc_kernel_args(pd)
+@@ -1200,17 +1206,6 @@ class Koan:
+
+ #---------------------------------------------------
+
+- def load_virt_modules(self):
+- try:
+- import xencreate
+- import qcreate
+- import imagecreate
+- except:
+- traceback.print_exc()
+- raise InfoException("no virtualization support available, install python-virtinst?")
+-
+- #---------------------------------------------------
+-
+ def virt_choose(self, pd):
+ fullvirt = False
+ can_poll = None
+@@ -1458,11 +1453,15 @@ class Koan:
+ return "%s/%s-disk%s" % (location, name, offset)
+ elif not os.path.exists(location) and os.path.isdir(os.path.dirname(location)):
+ return location
++ elif not os.path.exists(os.path.dirname(location)):
++ print "- creating: %s" % os.path.dirname(location)
++ os.makedirs(os.path.dirname(location))
++ return location
+ else:
+ if self.force_path:
+ return location
+ else:
+- raise InfoException, "The location %s is an existing file. Consider '--force-path' to overwrite it." % location
++ raise InfoException, "The location %s is an existing file. Consider '--force-path' to overwrite it." % location
+ elif location.startswith("/dev/"):
+ # partition
+ if os.path.exists(location):
+diff -rupN cobbler-2.0.11-old/koan/imagecreate.py cobbler-2.0.11/koan/imagecreate.py
+--- cobbler-2.0.11-old/koan/imagecreate.py 2013-12-12 15:17:32.615190532 -0500
++++ cobbler-2.0.11/koan/imagecreate.py 2013-12-12 15:40:12.385838601 -0500
+@@ -1,7 +1,7 @@
+ """
+ Virtualization installation functions for image based deployment
+
+-Copyright 2008 Red Hat, Inc.
++Copyright 2008 Red Hat, Inc and Others.
+ Bryan Kearney <bkearney(a)redhat.com>
+
+ Original version based on virt-image
+@@ -23,170 +23,9 @@ Foundation, Inc., 51 Franklin Street, Fi
+ 02110-1301 USA
+ """
+
+-import os, sys, time, stat
+-import shutil
+-import random
+-import exceptions
+-import errno
+-import virtinst
+-try:
+- from virtinst import ImageParser, Guest, CapabilitiesParser, VirtualNetworkInterface
+-except:
+- # if this fails, this is ok, the user just won't be able to use image objects...
+- # keeping this dynamic allows this to work on older EL.
+- pass
+-import libvirt
+-
+-import app as koan
+-
+-#FIXME this was copied
+-def random_mac():
+- """
+- from xend/server/netif.py
+- Generate a random MAC address.
+- Uses OUI 00-16-3E, allocated to
+- Xensource, Inc. Last 3 fields are random.
+- return: MAC address string
+- """
+- mac = [ 0x00, 0x16, 0x3e,
+- random.randint(0x00, 0x7f),
+- random.randint(0x00, 0xff),
+- random.randint(0x00, 0xff) ]
+- return ':'.join(map(lambda x: "%02x" % x, mac))
+-
+-
+-def transform_arch(arch):
+- if arch == "i386":
+- return "i686"
+- else:
+- return arch
+-
+-def copy_image(original_file, new_location):
+- shutil.copyfile(original_file, new_location)
+- return new_location
+-
+-
+-def process_disk(image, boot, file, location, target):
+- image_location = copy_image(file, location)
+- # Create the disk
+- disk = ImageParser.Disk()
+- disk.format = "raw"
+- disk.file = image_location
+- disk.use = "user"
+- disk.id = image_location
+- image.storage[disk.id] = disk
+-
+- #Create the drive
+- drive = ImageParser.Drive()
+- drive.id = image_location
+- drive.target = target
+- drive.disk = disk
+- boot.disks.append(drive)
+- #dev api
+- #boot.drives.append(drive)
+-
+-
+-def process_networks(domain, guest, profile_data, bridge):
+- # Create a bridge or default network for every requested nic. If there are more
+- # bridges then nics discard the last one.
+- domain.interface = int(profile_data["network_count"])
+- bridges = []
+- #use the provided bridge first
+- guest_bridge = bridge
+- if guest_bridge is None:
+- guest_bridge = profile_data["virt_bridge"]
+-
+- # Look for commas
+- if (guest_bridge is not None) and (len(guest_bridge.strip()) > 0):
+- if guest_bridge.find(",") == -1:
+- bridges.append(guest_bridge)
+- else:
+- bridges == guest_bridge.split(",")
+-
+- for cnt in range(0,domain.interface):
+- if cnt < len(bridges):
+- nic = VirtualNetworkInterface(random_mac(), type="bridge", bridge = bridges[cnt])
+- #dev api
+- #nic = VirtualNetworkInterface(random_mac(), type="bridge", bridge = bridge, conn=guest.conn)
+- else:
+- default_network = virtinst.util.default_network()
+- #dev api
+- #default_network = virtinst.util.default_network(guest.conn)
+- nic = VirtualNetworkInterface(random_mac(), type=default_network[0], network=default_network[1])
+- guest.nics.append(nic)
+-
+-def start_install(name=None,
+- ram=None,
+- disks=None,
+- uuid=None,
+- extra=None,
+- vcpus=None,
+- profile_data=None,
+- arch=None,
+- no_gfx=False,
+- fullvirt=False,
+- bridge=None,
+- virt_type=None,
+- virt_auto_boot=None,
+- qemu_driver_type=None):
+-
+- #FIXME how to do a non-default connection
+- #Can we drive off of virt-type?
+- connection = None
+-
+- if (virt_type is None ) or (virt_type == "auto"):
+- connection = virtinst.util.default_connection()
+- elif virt_type.lower()[0:3] == "xen":
+- connection = "xen"
+- else:
+- connection = "qemu:///system"
+-
+- connection = libvirt.open(connection)
+- capabilities = virtinst.CapabilitiesParser.parse(connection.getCapabilities())
+- image_arch = transform_arch(arch)
+-
+- image = ImageParser.Image()
+- #dev api
+- #image = ImageParser.Image(filename="") #FIXME, ImageParser should take in None
+- image.name = name
+-
+- domain = ImageParser.Domain()
+- domain.vcpu = vcpus
+- domain.memory = ram
+- image.domain = domain
+-
+- boot = ImageParser.Boot()
+- boot.type = "hvm" #FIXME HARDCODED
+- boot.loader = "hd" #FIXME HARDCODED
+- boot.arch = image_arch
+- domain.boots.append(boot)
+-
+- #FIXME Several issues. Single Disk, type is hardcoded
+- #And there is no way to provision with access to "file"
+- process_disk(image, boot, profile_data["file"], disks[0][0], "hda")
+-
+- #FIXME boot_index??
+- installer = virtinst.ImageInstaller(boot_index = 0, image=image, capabilities=capabilities)
+- guest = virtinst.FullVirtGuest(connection = connection, installer=installer, arch=image_arch)
+-
+- extra = extra.replace("&","&")
+-
+- guest.extraargs = extra
+- guest.set_name(name)
+- guest.set_memory(ram)
+- guest.set_vcpus(vcpus)
+-
+- if not no_gfx:
+- guest.set_graphics("vnc")
+- else:
+- guest.set_graphics(False)
+-
+- if uuid is not None:
+- guest.set_uuid(uuid)
+-
+- process_networks(domain, guest, profile_data, bridge)
+-
+- guest.start_install()
+-
+- return "use virt-manager or reconnect with virsh console %s" % name
+-
++import utils
++import virtinstall
++
++def start_install(*args, **kwargs):
++ cmd = virtinstall.build_commandline("import", *args, **kwargs)
++ utils.subprocess_call(cmd)
+diff -rupN cobbler-2.0.11-old/koan/qcreate.py cobbler-2.0.11/koan/qcreate.py
+--- cobbler-2.0.11-old/koan/qcreate.py 2013-12-12 15:17:32.615190532 -0500
++++ cobbler-2.0.11/koan/qcreate.py 2013-12-12 15:44:15.171562128 -0500
+@@ -1,8 +1,8 @@
+ """
+-Virtualization installation functions.
++Virtualization installation functions.
+
+-Copyright 2007-2008 Red Hat, Inc.
+-Michael DeHaan <mdehaan(a)redhat.com>
++Copyright 2007-2008 Red Hat, Inc and Others.
++Michael DeHaan <michael.dehaan AT gmail>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+@@ -20,193 +20,31 @@ Foundation, Inc., 51 Franklin Street, Fi
+ 02110-1301 USA
+
+ module for creating fullvirt guests via KVM/kqemu/qemu
+-requires python-virtinst-0.200.
++requires python-virtinst-0.200 (or virt-install in later distros).
+ """
+
+-import os, sys, time, stat
+-import tempfile
+-import random
+-from optparse import OptionParser
+-import exceptions
+-import errno
+-import re
+-import tempfile
+-import shutil
+-import virtinst
+-import app as koan
+-try:
+- import subprocess
+-except:
+- import sub_process as subprocess
+ import utils
++import virtinstall
++from xml.dom.minidom import parseString
+
+-def random_mac():
+- """
+- from xend/server/netif.py
+- Generate a random MAC address.
+- Uses OUI 00-16-3E, allocated to
+- Xensource, Inc. Last 3 fields are random.
+- return: MAC address string
+- """
+- mac = [ 0x00, 0x16, 0x3e,
+- random.randint(0x00, 0x7f),
+- random.randint(0x00, 0xff),
+- random.randint(0x00, 0xff) ]
+- return ':'.join(map(lambda x: "%02x" % x, mac))
+-
+-
+-def start_install(name=None,
+- ram=None,
+- disks=None,
+- mac=None,
+- uuid=None,
+- extra=None,
+- vcpus=None,
+- profile_data=None,
+- arch=None,
+- no_gfx=False,
+- fullvirt=True,
+- bridge=None,
+- virt_type=None,
+- virt_auto_boot=False,
+- qemu_driver_type=None):
+-
+- vtype = "qemu"
+- if virtinst.util.is_kvm_capable():
+- vtype = "kvm"
+- arch = None # let virtinst.FullVirtGuest() default to the host arch
+- elif virtinst.util.is_kqemu_capable():
+- vtype = "kqemu"
+- print "- using qemu hypervisor, type=%s" % vtype
+-
+- if arch is not None and arch.lower() in ["x86","i386"]:
+- arch = "i686"
+-
+- guest = virtinst.FullVirtGuest(hypervisorURI="qemu:///system",type=vtype, arch=arch)
+-
+- if not profile_data.has_key("file"):
+- # images don't need to source this
+- if not profile_data.has_key("install_tree"):
+- raise koan.InfoException("Cannot find install source in kickstart file, aborting.")
+-
+-
+- if not profile_data["install_tree"].endswith("/"):
+- profile_data["install_tree"] = profile_data["install_tree"] + "/"
+-
+- # virt manager doesn't like nfs:// and just wants nfs:
+- # (which cobbler should fix anyway)
+- profile_data["install_tree"] = profile_data["install_tree"].replace("nfs://","nfs:")
+-
+- if profile_data.has_key("file"):
+- # this is an image based installation
+- input_path = profile_data["file"]
+- print "- using image location %s" % input_path
+- if input_path.find(":") == -1:
+- # this is not an NFS path
+- guest.cdrom = input_path
+- else:
+- (tempdir, filename) = utils.nfsmount(input_path)
+- guest.cdrom = os.path.join(tempdir, filename)
+-
+- kickstart = profile_data.get("kickstart","")
+- if kickstart != "":
+- # we have a (windows?) answer file we have to provide
+- # to the ISO.
+- print "I want to make a floppy for %s" % kickstart
+- floppy_path = utils.make_floppy(kickstart)
+- guest.disks.append(virtinst.VirtualDisk(device=virtinst.VirtualDisk.DEVICE_FLOPPY, path=floppy_path))
+-
+-
+- else:
+- guest.location = profile_data["install_tree"]
+-
+- extra = extra.replace("&","&")
+- guest.extraargs = extra
+-
+- if profile_data.has_key("breed"):
+- breed = profile_data["breed"]
+- if breed != "other" and breed != "":
+- if breed in [ "debian", "suse", "redhat" ]:
+- guest.set_os_type("linux")
+- elif breed in [ "windows" ]:
+- guest.set_os_type("windows")
+- else:
+- guest.set_os_type("unix")
+- if profile_data.has_key("os_version"):
+- # FIXME: when os_version is not defined and it's linux, do we use generic24/generic26 ?
+- version = profile_data["os_version"]
+- if version != "other" and version != "":
+- try:
+- guest.set_os_variant(version)
+- except:
+- print "- virtinst library does not understand variant %s, treating as generic" % version
+- pass
+-
+- guest.set_name(name)
+- guest.set_memory(ram)
+- guest.set_vcpus(vcpus)
+- # for KVM, we actually can't disable this, since it's the only
+- # console it has other than SDL
+- guest.set_graphics("vnc")
+-
+- if uuid is not None:
+- guest.set_uuid(uuid)
+-
+- for d in disks:
+- print "- adding disk: %s of size %s" % (d[0], d[1])
+- if d[1] != 0 or d[0].startswith("/dev"):
+- guest.disks.append(virtinst.VirtualDisk(d[0], size=d[1], bus=qemu_driver_type))
+- else:
+- raise koan.InfoException("this virtualization type does not work without a disk image, set virt-size in Cobbler to non-zero")
+-
+- if profile_data.has_key("interfaces"):
+-
+- counter = 0
+- interfaces = profile_data["interfaces"].keys()
+- interfaces.sort()
+- vlanpattern = re.compile("[a-zA-Z0-9]+\.[0-9]+")
+- for iname in interfaces:
+- intf = profile_data["interfaces"][iname]
+-
+- if intf["bonding"] == "master" or vlanpattern.match(iname) or iname.find(":") != -1:
+- continue
+-
+- mac = intf["mac_address"]
+- if mac == "":
+- mac = random_mac()
+-
+- if bridge is None:
+- profile_bridge = profile_data["virt_bridge"]
+-
+- intf_bridge = intf["virt_bridge"]
+- if intf_bridge == "":
+- if profile_bridge == "":
+- raise koan.InfoException("virt-bridge setting is not defined in cobbler")
+- intf_bridge = profile_bridge
+- else:
+- if bridge.find(",") == -1:
+- intf_bridge = bridge
+- else:
+- bridges = bridge.split(",")
+- intf_bridge = bridges[counter]
+- nic_obj = virtinst.VirtualNetworkInterface(macaddr=mac, bridge=intf_bridge)
+- guest.nics.append(nic_obj)
+- counter = counter + 1
+-
+- else:
+-
+- if bridge is not None:
+- profile_bridge = bridge
+- else:
+- profile_bridge = profile_data["virt_bridge"]
+-
+- if profile_bridge == "":
+- raise koan.InfoException("virt-bridge setting is not defined in cobbler")
+-
+- nic_obj = virtinst.VirtualNetworkInterface(macaddr=random_mac(), bridge=profile_bridge)
+- guest.nics.append(nic_obj)
+-
+- guest.start_install()
+-
+- return "use virt-manager and connect to qemu to manage guest: %s" % name
+-
++def start_install(*args, **kwargs):
++ if 'arch' in kwargs.keys():
++ kwargs['arch'] = None # use host arch for kvm acceleration
++
++ # Use kvm acceleration if available
++ try:
++ import libvirt
++ except:
++ raise koan.InfoException("package libvirt is required for installing virtual guests")
++ conn = libvirt.openReadOnly(None)
++ # See http://libvirt.org/formatcaps.html
++ capabilities = parseString(conn.getCapabilities())
++ for domain in capabilities.getElementsByTagName("domain"):
++ attributes = dict(domain.attributes.items())
++ if 'type' in attributes.keys() and attributes['type'] == 'kvm':
++ kwargs['virt_type'] = 'kvm'
++ break
++
++ virtinstall.create_image_file(*args, **kwargs)
++ cmd = virtinstall.build_commandline("qemu:///system", *args, **kwargs)
++ utils.subprocess_call(cmd)
+diff -rupN cobbler-2.0.11-old/koan/utils.py cobbler-2.0.11/koan/utils.py
+--- cobbler-2.0.11-old/koan/utils.py 2013-12-12 15:17:32.614190525 -0500
++++ cobbler-2.0.11/koan/utils.py 2013-12-12 15:20:14.298338343 -0500
+@@ -178,6 +178,27 @@ def subprocess_call(cmd,ignore_rc=0):
+ raise InfoException, "command failed (%s)" % rc
+ return rc
+
++def subprocess_get_response(cmd, ignore_rc=False):
++ """
++ Wrapper around subprocess.check_output(...)
++ """
++ print "- %s" % cmd
++ rc = 0
++ result = ""
++ if not ANCIENT_PYTHON:
++ try:
++ result = sub_process.check_output(cmd).strip()
++ except sub_process.CalledProcessError, e:
++ rc = e.returncode
++ result = e.output
++ else:
++ cmd = string.join(cmd, " ")
++ print "cmdstr=(%s)" % cmd
++ rc = os.system(cmd)
++ if not ignore_rc and rc != 0:
++ raise InfoException, "command failed (%s)" % rc
++ return rc, result
++
+ def input_string_or_hash(options,delim=None,allow_multiples=True):
+ """
+ Older cobbler files stored configurations in a flat way, such that all values for strings.
+@@ -267,7 +288,7 @@ def nfsmount(input_path):
+ shutil.rmtree(tempdir, ignore_errors=True)
+ raise koan.InfoException("nfs mount failed: %s" % dirpath)
+ # NOTE: option for a blocking install might be nice, so we could do this
+- # automatically, if supported by python-virtinst
++ # automatically, if supported by virt-install
+ print "after install completes, you may unmount and delete %s" % tempdir
+ return (tempdir, filename)
+
+@@ -516,7 +537,7 @@ def make_floppy(kickstart):
+ if not rc == 0:
+ raise InfoException("umount failed")
+
+- # return the path to the completed disk image to pass to virtinst
++ # return the path to the completed disk image to pass to virt-install
+ return floppy_path
+
+
+diff -rupN cobbler-2.0.11-old/koan/virtinstall.py cobbler-2.0.11/koan/virtinstall.py
+--- cobbler-2.0.11-old/koan/virtinstall.py 1969-12-31 19:00:00.000000000 -0500
++++ cobbler-2.0.11/koan/virtinstall.py 2013-12-12 15:20:14.298338343 -0500
+@@ -0,0 +1,413 @@
++"""
++Virtualization installation functions.
++Currently somewhat Xen/paravirt specific, will evolve later.
++
++Copyright 2006-2008 Red Hat, Inc.
++Michael DeHaan <mdehaan(a)redhat.com>
++
++Original version based on virtguest-install
++Jeremy Katz <katzj(a)redhat.com>
++Option handling added by Andrew Puch <apuch(a)redhat.com>
++Simplified for use as library by koan, Michael DeHaan <mdehaan(a)redhat.com>
++
++This program is free software; you can redistribute it and/or modify
++it under the terms of the GNU General Public License as published by
++the Free Software Foundation; either version 2 of the License, or
++(at your option) any later version.
++
++This program is distributed in the hope that it will be useful,
++but WITHOUT ANY WARRANTY; without even the implied warranty of
++MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++GNU General Public License for more details.
++
++You should have received a copy of the GNU General Public License
++along with this program; if not, write to the Free Software
++Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
++02110-1301 USA
++"""
++
++import os
++import re
++import shlex
++
++import app as koan
++import utils
++
++# The virtinst module will no longer be availabe to import in some
++# distros. We need to get all the info we need from the virt-install
++# command line tool. This should work on both old and new variants,
++# as the virt-install command line tool has always been provided by
++# python-virtinst (and now the new virt-install rpm).
++rc, response = utils.subprocess_get_response(
++ shlex.split('virt-install --version'), True)
++if rc == 0:
++ virtinst_version = response
++else:
++ virtinst_version = None
++
++# This one's trickier. We need a list of supported os varients, but
++# the man page explicitly says not to parse the result of this command.
++# But we need it, and there's no other way to get it. I spoke with the
++# virt-install maintainers and they said the point of that message
++# is that you can't absolutely depend on the output not changing, but
++# at the moment it's the only option for us. Long term plans are for
++# virt-install to switch to libosinfo for OS metadata tracking, which
++# provides a library and tools for querying valid OS values. Until
++# that's available and pervasive the best we can do is to use the
++# module if it's availabe and if not parse the command output.
++supported_variants = set()
++try:
++ from virtinst import osdict
++ for ostype in osdict.OS_TYPES.keys():
++ for variant in osdict.OS_TYPES[ostype]["variants"].keys():
++ supported_variants.add(variant)
++except:
++ try:
++ rc, response = utils.subprocess_get_response(
++ shlex.split('virt-install --os-variant list'))
++ variants = response.split('\n')
++ for variant in variants:
++ supported_variants.add(variant.split()[0])
++ except:
++ pass # No problem, we'll just use generic
++
++def _sanitize_disks(disks):
++ ret = []
++ for d in disks:
++ driver_type = None
++ if len(d) > 2:
++ driver_type = d[2]
++
++ if d[1] != 0 or d[0].startswith("/dev"):
++ ret.append((d[0], d[1], driver_type))
++ else:
++ raise koan.InfoException("this virtualization type does not work without a disk image, set virt-size in Cobbler to non-zero")
++
++ return ret
++
++def _sanitize_nics(nics, bridge, profile_bridge, network_count):
++ ret = []
++
++ if network_count is not None and not nics:
++ # Fill in some stub nics so we can take advantage of the loop logic
++ nics = {}
++ for i in range(int(network_count)):
++ nics["foo%s" % i] = {
++ "interface_type" : "na",
++ "mac_address": None,
++ "virt_bridge": None,
++ }
++
++ if not nics:
++ return ret
++
++ interfaces = nics.keys()
++ interfaces.sort()
++ counter = -1
++ vlanpattern = re.compile("[a-zA-Z0-9]+\.[0-9]+")
++
++ for iname in interfaces:
++ counter = counter + 1
++ intf = nics[iname]
++
++ if (intf["bonding"] == "master" or vlanpattern.match(iname) or iname.find(":") != -1):
++ continue
++
++ mac = intf["mac_address"]
++
++ if not bridge:
++ intf_bridge = intf["virt_bridge"]
++ if intf_bridge == "":
++ if profile_bridge == "":
++ raise koan.InfoException("virt-bridge setting is not defined in cobbler")
++ intf_bridge = profile_bridge
++
++ else:
++ if bridge.find(",") == -1:
++ intf_bridge = bridge
++ else:
++ bridges = bridge.split(",")
++ intf_bridge = bridges[counter]
++
++ ret.append((intf_bridge, mac))
++
++ return ret
++
++def create_image_file(disks=None, **kwargs):
++ disks = _sanitize_disks(disks)
++ for path, size, driver_type in disks:
++ if driver_type is None:
++ continue
++ if os.path.isdir(path) or os.path.exists(path):
++ continue
++ if str(size) == "0":
++ continue
++ utils.create_qemu_image_file(path, size, driver_type)
++
++def build_commandline(uri,
++ name=None,
++ ram=None,
++ disks=None,
++ uuid=None,
++ extra=None,
++ vcpus=None,
++ profile_data=None,
++ arch=None,
++ no_gfx=False,
++ fullvirt=False,
++ bridge=None,
++ virt_type=None,
++ virt_auto_boot=False,
++ virt_pxe_boot=False,
++ qemu_driver_type=None,
++ qemu_net_type=None,
++ qemu_machine_type=None,
++ wait=0,
++ noreboot=False,
++ osimport=False):
++
++ # Set flags for CLI arguments based on the virtinst_version
++ # tuple above. Older versions of python-virtinst don't have
++ # a version easily accessible, so it will be None and we can
++ # easily disable features based on that (RHEL5 and older usually)
++
++ disable_autostart = False
++ disable_virt_type = False
++ disable_boot_opt = False
++ disable_driver_type = False
++ disable_net_model = False
++ disable_machine_type = False
++ oldstyle_macs = False
++ oldstyle_accelerate = False
++
++ if not virtinst_version:
++ print ("- warning: old virt-install detected, a lot of features will be disabled")
++ disable_autostart = True
++ disable_boot_opt = True
++ disable_virt_type = True
++ disable_driver_type = True
++ disable_net_model = True
++ disable_machine_type = True
++ oldstyle_macs = True
++ oldstyle_accelerate = True
++
++ import_exists = False # avoid duplicating --import parameter
++ disable_extra = False # disable --extra-args on --import
++ if osimport:
++ disable_extra = True
++
++ is_import = uri.startswith("import")
++ if is_import:
++ # We use the special value 'import' for imagecreate.py. Since
++ # it is connection agnostic, just let virt-install choose the
++ # best hypervisor.
++ uri = ""
++ fullvirt = None
++
++ is_xen = uri.startswith("xen")
++ is_qemu = uri.startswith("qemu")
++ if is_qemu:
++ if virt_type != "kvm":
++ fullvirt = True
++ else:
++ fullvirt = None
++
++ floppy = None
++ cdrom = None
++ location = None
++ importpath = None
++
++ if is_import:
++ importpath = profile_data.get("file")
++ if not importpath:
++ raise koan.InfoException("Profile 'file' required for image "
++ "install")
++
++ elif profile_data.has_key("file"):
++ if is_xen:
++ raise koan.InfoException("Xen does not work with --image yet")
++
++ # this is an image based installation
++ input_path = profile_data["file"]
++ print "- using image location %s" % input_path
++ if input_path.find(":") == -1:
++ # this is not an NFS path
++ cdrom = input_path
++ else:
++ (tempdir, filename) = utils.nfsmount(input_path)
++ cdrom = os.path.join(tempdir, filename)
++
++ kickstart = profile_data.get("kickstart","")
++ if kickstart != "":
++ # we have a (windows?) answer file we have to provide
++ # to the ISO.
++ print "I want to make a floppy for %s" % kickstart
++ floppy = utils.make_floppy(kickstart)
++ elif is_qemu or is_xen:
++ # images don't need to source this
++ if not profile_data.has_key("install_tree"):
++ raise koan.InfoException("Cannot find install source in kickstart file, aborting.")
++
++ if not profile_data["install_tree"].endswith("/"):
++ profile_data["install_tree"] = profile_data["install_tree"] + "/"
++
++ location = profile_data["install_tree"]
++
++
++ disks = _sanitize_disks(disks)
++ nics = _sanitize_nics(profile_data.get("interfaces"),
++ bridge,
++ profile_data.get("virt_bridge"),
++ profile_data.get("network_count"))
++ if not nics:
++ # for --profile you get one NIC, go define a system if you want more.
++ # FIXME: can mac still be sent on command line in this case?
++
++ if bridge is None:
++ bridge = profile_data["virt_bridge"]
++
++ if bridge == "":
++ raise koan.InfoException("virt-bridge setting is not defined in cobbler")
++ nics = [(bridge, None)]
++
++
++ kernel = profile_data.get("kernel_local")
++ initrd = profile_data.get("initrd_local")
++ breed = profile_data.get("breed")
++ os_version = profile_data.get("os_version")
++ if os_version and breed == "ubuntu":
++ os_version = "ubuntu%s" % os_version
++ if os_version and breed == "debian":
++ os_version = "debian%s" % os_version
++
++ net_model = None
++ disk_bus = None
++ machine_type = None
++
++ if is_qemu:
++ net_model = qemu_net_type
++ disk_bus = qemu_driver_type
++ machine_type = qemu_machine_type
++
++ if machine_type is None:
++ machine_type = "pc"
++
++ cmd = "virt-install "
++ if uri:
++ cmd += "--connect %s " % uri
++
++ cmd += "--name %s " % name
++ cmd += "--ram %s " % ram
++ cmd += "--vcpus %s " % vcpus
++
++ if uuid:
++ cmd += "--uuid %s " % uuid
++
++ if virt_auto_boot and not disable_autostart:
++ cmd += "--autostart "
++
++ if no_gfx:
++ cmd += "--nographics "
++ else:
++ cmd += "--vnc "
++
++ if is_qemu and virt_type:
++ if not disable_virt_type:
++ cmd += "--virt-type %s " % virt_type
++
++ if is_qemu and machine_type and not disable_machine_type:
++ cmd += "--machine %s " % machine_type
++
++ if fullvirt or is_qemu or is_import:
++ if fullvirt is not None:
++ cmd += "--hvm "
++ elif oldstyle_accelerate:
++ cmd += "--accelerate "
++
++ if is_qemu and extra and not(virt_pxe_boot) and not(disable_extra):
++ cmd += ("--extra-args=\"%s\" " % (extra))
++
++ if virt_pxe_boot or is_xen:
++ cmd += "--pxe "
++ elif cdrom:
++ cmd += "--cdrom %s " % cdrom
++ elif location:
++ cmd += "--location %s " % location
++ elif importpath:
++ cmd += "--import "
++ import_exists = True
++
++ if arch:
++ cmd += "--arch %s " % arch
++ else:
++ cmd += "--paravirt "
++ if not disable_boot_opt:
++ cmd += ("--boot kernel=%s,initrd=%s,kernel_args=\"%s\" " %
++ (kernel, initrd, extra))
++ else:
++ if location:
++ cmd += "--location %s " % location
++ if extra:
++ cmd += "--extra-args=\"%s\" " % extra
++
++ if breed and breed != "other":
++ if os_version and os_version != "other":
++ if breed == "suse":
++ suse_version_re = re.compile("^(opensuse[0-9]+)\.([0-9]+)$")
++ if suse_version_re.match(os_version):
++ os_version = suse_version_re.match(os_version).groups()[0]
++ # make sure virt-install knows about our os_version,
++ # otherwise default it to generic26
++ found = False
++ if os_version in supported_variants:
++ cmd += "--os-variant %s " % os_version
++ else:
++ print ("- warning: virt-install doesn't know this os_version, defaulting to generic26")
++ cmd += "--os-variant generic26 "
++ else:
++ distro = "unix"
++ if breed in [ "debian", "suse", "redhat" ]:
++ distro = "linux"
++ elif breed in [ "windows" ]:
++ distro = "windows"
++
++ cmd += "--os-type %s " % distro
++
++ if importpath:
++ # This needs to be the first disk for import to work
++ cmd += "--disk path=%s " % importpath
++
++ for path, size, driver_type in disks:
++ print ("- adding disk: %s of size %s (driver type=%s)" %
++ (path, size, driver_type))
++ cmd += "--disk path=%s" % (path)
++ if str(size) != "0":
++ cmd += ",size=%s" % size
++ if disk_bus:
++ cmd += ",bus=%s" % disk_bus
++ if driver_type and not disable_driver_type:
++ cmd += ",format=%s" % driver_type
++ cmd += " "
++
++ if floppy:
++ cmd += "--disk path=%s,device=floppy " % floppy
++
++ for bridge, mac in nics:
++ cmd += "--network bridge=%s" % bridge
++ if net_model and not disable_net_model:
++ cmd += ",model=%s" % net_model
++ if mac:
++ if oldstyle_macs:
++ cmd += " --mac=%s" % mac
++ else:
++ cmd += ",mac=%s" % mac
++ cmd += " "
++
++ cmd += "--wait %d " % int(wait)
++ if noreboot:
++ cmd += "--noreboot "
++ if osimport and not(import_exists):
++ cmd += "--import "
++ cmd += "--noautoconsole "
++
++ return shlex.split(cmd.strip())
+diff -rupN cobbler-2.0.11-old/koan/xencreate.py cobbler-2.0.11/koan/xencreate.py
+--- cobbler-2.0.11-old/koan/xencreate.py 2013-12-12 15:17:32.615190532 -0500
++++ cobbler-2.0.11/koan/xencreate.py 2013-12-12 15:50:53.335390192 -0500
+@@ -1,14 +1,14 @@
+ """
+-Virtualization installation functions.
++Virtualization installation functions.
+ Currently somewhat Xen/paravirt specific, will evolve later.
+
+-Copyright 2006-2008 Red Hat, Inc.
+-Michael DeHaan <mdehaan(a)redhat.com>
++Copyright 2006-2008 Red Hat, Inc and Others.
++Michael DeHaan <michael.dehaan AT gmail>
+
+ Original version based on virtguest-install
+ Jeremy Katz <katzj(a)redhat.com>
+ Option handling added by Andrew Puch <apuch(a)redhat.com>
+-Simplified for use as library by koan, Michael DeHaan <mdehaan(a)redhat.com>
++Simplified for use as library by koan, Michael DeHaan <michael.dehaan AT gmail>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+@@ -26,168 +26,9 @@ Foundation, Inc., 51 Franklin Street, Fi
+ 02110-1301 USA
+ """
+
+-import os, sys, time, stat
+-import tempfile
+-import random
+-import exceptions
+-import errno
+-import re
+-import virtinst
+-import app as koan
+-
+-try:
+- import virtinst.DistroManager as DistroManager
+-except:
+- # older virtinst, this is probably ok
+- # but we know we can't do Xen fullvirt installs
+- pass
+-import traceback
+-
+-def random_mac():
+- """
+- from xend/server/netif.py
+- Generate a random MAC address.
+- Uses OUI 00-16-3E, allocated to
+- Xensource, Inc. Last 3 fields are random.
+- return: MAC address string
+- """
+- mac = [ 0x00, 0x16, 0x3e,
+- random.randint(0x00, 0x7f),
+- random.randint(0x00, 0xff),
+- random.randint(0x00, 0xff) ]
+- return ':'.join(map(lambda x: "%02x" % x, mac))
+-
+-
+-def start_install(name=None,
+- ram=None,
+- disks=None,
+- uuid=None,
+- extra=None,
+- vcpus=None,
+- profile_data=None,
+- arch=None,
+- no_gfx=False,
+- fullvirt=False,
+- bridge=None,
+- virt_type=None,
+- virt_auto_boot=False,
+- qemu_driver_type=None):
+-
+- if profile_data.has_key("file"):
+- raise koan.InfoException("Xen does not work with --image yet")
+-
+- if fullvirt:
+- # FIXME: add error handling here to explain when it's not supported
+- guest = virtinst.FullVirtGuest(installer=DistroManager.PXEInstaller())
+- else:
+- guest = virtinst.ParaVirtGuest()
+-
+- extra = extra.replace("&","&")
+-
+- if not fullvirt:
+- guest.set_boot((profile_data["kernel_local"], profile_data["initrd_local"]))
+- # fullvirt OS's will get this from the PXE config (managed by Cobbler)
+- guest.extraargs = extra
+- else:
+- print "- fullvirt mode"
+- if profile_data.has_key("breed"):
+- breed = profile_data["breed"]
+- if breed != "other" and breed != "":
+- if breed in [ "debian", "suse", "redhat" ]:
+- guest.set_os_type("linux")
+- elif breed in [ "windows" ]:
+- guest.set_os_type("windows")
+- else:
+- guest.set_os_type("unix")
+- if profile_data.has_key("os_version"):
+- # FIXME: when os_version is not defined and it's linux, do we use generic24/generic26 ?
+- version = profile_data["os_version"]
+- if version != "other" and version != "":
+- try:
+- guest.set_os_variant(version)
+- except:
+- print "- virtinst library does not understand variant %s, treating as generic" % version
+- pass
+-
+-
+- guest.set_name(name)
+- guest.set_memory(ram)
+- guest.set_vcpus(vcpus)
+-
+- if not no_gfx:
+- guest.set_graphics("vnc")
+- else:
+- guest.set_graphics(False)
+-
+- if uuid is not None:
+- guest.set_uuid(uuid)
+-
+- for d in disks:
+- if d[1] != 0 or d[0].startswith("/dev"):
+- guest.disks.append(virtinst.XenDisk(d[0], size=d[1]))
+- else:
+- raise koan.InfoException("this virtualization type does not work without a disk image, set virt-size in Cobbler to non-zero")
+-
+- counter = 0
+-
+- if profile_data.has_key("interfaces"):
+-
+- interfaces = profile_data["interfaces"].keys()
+- interfaces.sort()
+- counter = -1
+- vlanpattern = re.compile("[a-zA-Z0-9]+\.[0-9]+")
+-
+- for iname in interfaces:
+- counter = counter + 1
+- intf = profile_data["interfaces"][iname]
+-
+- if intf["bonding"] == "master" or vlanpattern.match(iname) or iname.find(":") != -1:
+- continue
+-
+- mac = intf["mac_address"]
+- if mac == "":
+- mac = random_mac()
+-
+- if not bridge:
+- profile_bridge = profile_data["virt_bridge"]
+-
+- intf_bridge = intf["virt_bridge"]
+- if intf_bridge == "":
+- if profile_bridge == "":
+- raise koan.InfoException("virt-bridge setting is not defined in cobbler")
+- intf_bridge = profile_bridge
+-
+- else:
+- if bridge.find(",") == -1:
+- intf_bridge = bridge
+- else:
+- bridges = bridge.split(",")
+- intf_bridge = bridges[counter]
+-
+-
+- nic_obj = virtinst.XenNetworkInterface(macaddr=mac, bridge=intf_bridge)
+- guest.nics.append(nic_obj)
+- counter = counter + 1
+-
+- else:
+- # for --profile you just get one NIC, go define a system if you want more.
+- # FIXME: can mac still be sent on command line in this case?
+-
+- if bridge is None:
+- profile_bridge = profile_data["virt_bridge"]
+- else:
+- profile_bridge = bridge
+-
+- if profile_bridge == "":
+- raise koan.InfoException("virt-bridge setting is not defined in cobbler")
+-
+- nic_obj = virtinst.XenNetworkInterface(macaddr=random_mac(), bridge=profile_bridge)
+- guest.nics.append(nic_obj)
+-
+-
+-
+-
+- guest.start_install()
+-
+- return "use virt-manager or reconnect with virsh console %s" % name
+-
++import utils
++import virtinstall
++
++def start_install(*args, **kwargs):
++ cmd = virtinstall.build_commandline("xen:///", *args, **kwargs)
++ utils.subprocess_call(cmd)
commit d23569dcd2dbec57ec358de77da4de828ab81c41
Author: Stephen Herr <sherr(a)redhat.com>
Date: Thu Dec 12 16:32:04 2013 -0500
Fixing Unknown icon type: "system-virtual-host"
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/systems/system_list_fragment.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/systems/system_list_fragment.jspf
index 534fdea..88d1e69 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/systems/system_list_fragment.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/systems/system_list_fragment.jspf
@@ -4,7 +4,7 @@
<rhn:icon type="system-virt-guest" title="<bean:message key='systemlist.jsp.virtguest'/>" />
</c:when>
<c:when test="${current.virtualHost && empty nosystemicons}">
- <rhn:icon type="system-virtual-host" title="<bean:message key='systemlist.jsp.virthost'/>" />
+ <rhn:icon type="system-virt-host" title="<bean:message key='systemlist.jsp.virthost'/>" />
</c:when>
<c:otherwise>
<rhn:icon type="system-physical" title="<bean:message key='systemlist.jsp.nonvirt'/>" />
10 years, 5 months
java/code
by Tomáš Kašpárek
java/code/src/com/redhat/rhn/frontend/configuration/tags/ConfigChannelTag.java | 1 -
1 file changed, 1 deletion(-)
New commits:
commit 25b231c1c187d3e36dcf9b6a15c897ba9bfebf3b
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Thu Dec 12 16:07:23 2013 +0100
remove forgotten debug output
diff --git a/java/code/src/com/redhat/rhn/frontend/configuration/tags/ConfigChannelTag.java b/java/code/src/com/redhat/rhn/frontend/configuration/tags/ConfigChannelTag.java
index d52cca9..4d78001 100644
--- a/java/code/src/com/redhat/rhn/frontend/configuration/tags/ConfigChannelTag.java
+++ b/java/code/src/com/redhat/rhn/frontend/configuration/tags/ConfigChannelTag.java
@@ -126,7 +126,6 @@ public class ConfigChannelTag extends TagSupport {
}
else {
i.setType("sandbox");
- i.setTitle(type);
}
String result = i.renderStartTag();
i.release();
10 years, 5 months