java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java
| 101 +++++++---
java/code/src/com/redhat/rhn/frontend/taglibs/ToolbarTag.java
| 31 +--
java/code/webapp/WEB-INF/includes/header.jsp
| 2
java/code/webapp/WEB-INF/includes/legends/errata-legend.jsp
| 3
java/code/webapp/WEB-INF/includes/legends/probes-list-legend.jsp
| 1
java/code/webapp/WEB-INF/includes/legends/system-legend.jsp
| 2
java/code/webapp/WEB-INF/includes/legends/yourrhn-legend.jsp
| 6
java/code/webapp/WEB-INF/pages/activationkeys/create.jsp
| 2
java/code/webapp/WEB-INF/pages/activationkeys/delete.jsp
| 2
java/code/webapp/WEB-INF/pages/activationkeys/list.jsp
| 2
java/code/webapp/WEB-INF/pages/admin/addresses.jsp
| 2
java/code/webapp/WEB-INF/pages/admin/bunchDetail.jsp
| 2
java/code/webapp/WEB-INF/pages/admin/config/bootstrap.jsp
| 2
java/code/webapp/WEB-INF/pages/admin/config/certificate.jsp
| 2
java/code/webapp/WEB-INF/pages/admin/config/cobbler.jsp
| 2
java/code/webapp/WEB-INF/pages/admin/config/general.jsp
| 2
java/code/webapp/WEB-INF/pages/admin/config/multiorg.jsp
| 2
java/code/webapp/WEB-INF/pages/admin/config/restart.jsp
| 2
java/code/webapp/WEB-INF/pages/admin/deleteSchedule.jsp
| 2
java/code/webapp/WEB-INF/pages/admin/disableself.jsp
| 2
java/code/webapp/WEB-INF/pages/admin/disableselfconfirm.jsp
| 2
java/code/webapp/WEB-INF/pages/admin/iss/confirmmastersremove.jsp
| 2
java/code/webapp/WEB-INF/pages/admin/iss/confirmslaveremove.jsp
| 2
java/code/webapp/WEB-INF/pages/admin/iss/editmaster.jsp
| 4
java/code/webapp/WEB-INF/pages/admin/iss/editslave.jsp
| 4
java/code/webapp/WEB-INF/pages/admin/iss/master.jsp
| 2
java/code/webapp/WEB-INF/pages/admin/iss/slave.jsp
| 2
java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filtercreate.jsp
| 2
java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filteredit.jsp
| 2
java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filters.jsp
| 2
java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/methods.jsp
| 2
java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitecreate.jsp
| 2
java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuiteedit.jsp
| 2
java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuites.jsp
| 2
java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesremoveconfirm.jsp
| 2
java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystems.jsp
| 2
java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystemsedit.jsp
| 2
java/code/webapp/WEB-INF/pages/admin/multiorg/configuration.jsp
| 4
java/code/webapp/WEB-INF/pages/admin/multiorg/entitlementorgs.jsp
| 2
java/code/webapp/WEB-INF/pages/admin/multiorg/org_delete.jsp
| 2
java/code/webapp/WEB-INF/pages/admin/multiorg/org_users.jsp
| 4
java/code/webapp/WEB-INF/pages/admin/multiorg/organizations.jsp
| 2
java/code/webapp/WEB-INF/pages/admin/multiorg/orgdetails.jsp
| 4
java/code/webapp/WEB-INF/pages/admin/multiorg/orgsoftwaresubs.jsp
| 4
java/code/webapp/WEB-INF/pages/admin/multiorg/orgsystemsubs.jsp
| 4
java/code/webapp/WEB-INF/pages/admin/multiorg/orgtrust.jsp
| 2
java/code/webapp/WEB-INF/pages/admin/multiorg/orgtrustconfirm.jsp
| 2
java/code/webapp/WEB-INF/pages/admin/multiorg/sat_org_users.jsp
| 2
java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlementdetails.jsp
| 2
java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlements.jsp
| 2
java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlementsubs.jsp
| 2
java/code/webapp/WEB-INF/pages/admin/multiorg/sys_entitlements.jsp
| 2
java/code/webapp/WEB-INF/pages/admin/multiorg/system_entitlement_details.jsp
| 2
java/code/webapp/WEB-INF/pages/admin/scheduleDetail.jsp
| 2
java/code/webapp/WEB-INF/pages/admin/schedules.jsp
| 2
java/code/webapp/WEB-INF/pages/admin/taskStatus.jsp
| 2
java/code/webapp/WEB-INF/pages/admin/users/activelist.jsp
| 2
java/code/webapp/WEB-INF/pages/admin/users/deleteuser.jsp
| 2
java/code/webapp/WEB-INF/pages/admin/users/disabledlist.jsp
| 2
java/code/webapp/WEB-INF/pages/admin/users/disableuser.jsp
| 2
java/code/webapp/WEB-INF/pages/admin/users/userconfirm.jsp
| 2
java/code/webapp/WEB-INF/pages/admin/users/userlist.jsp
| 2
java/code/webapp/WEB-INF/pages/audit/auditsearch.jsp
| 2
java/code/webapp/WEB-INF/pages/audit/auditview.jsp
| 2
java/code/webapp/WEB-INF/pages/audit/listxccdf.jsp
| 2
java/code/webapp/WEB-INF/pages/audit/machine.jsp
| 2
java/code/webapp/WEB-INF/pages/audit/overview.jsp
| 2
java/code/webapp/WEB-INF/pages/audit/scap/xccdfdiff.jsp
| 2
java/code/webapp/WEB-INF/pages/audit/scap/xccdfdiffsubmit.jsp
| 2
java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp
| 2
java/code/webapp/WEB-INF/pages/channel/all.jsp
| 2
java/code/webapp/WEB-INF/pages/channel/channel_family_tree.jsp
| 2
java/code/webapp/WEB-INF/pages/channel/custom.jsp
| 2
java/code/webapp/WEB-INF/pages/channel/entitlements.jsp
| 2
java/code/webapp/WEB-INF/pages/channel/manage/delete.jsp
| 2
java/code/webapp/WEB-INF/pages/channel/manage/distchannelmap.jsp
| 2
java/code/webapp/WEB-INF/pages/channel/manage/distchannelmapdelete.jsp
| 2
java/code/webapp/WEB-INF/pages/channel/manage/distchannelmapedit.jsp
| 4
java/code/webapp/WEB-INF/pages/channel/manage/edit.jsp
| 2
java/code/webapp/WEB-INF/pages/channel/manage/manage.jsp
| 2
java/code/webapp/WEB-INF/pages/channel/manage/package/confirmdeletepackages.jsp
| 2
java/code/webapp/WEB-INF/pages/channel/manage/package/listremovecustompackages.jsp
| 2
java/code/webapp/WEB-INF/pages/channel/manage/repo/deleteconfirm.jsp
| 2
java/code/webapp/WEB-INF/pages/channel/manage/repo/repodetails.jsp
| 4
java/code/webapp/WEB-INF/pages/channel/manage/repo/repos.jsp
| 2
java/code/webapp/WEB-INF/pages/channel/packagesearch.jsp
| 2
java/code/webapp/WEB-INF/pages/channel/popular.jsp
| 2
java/code/webapp/WEB-INF/pages/channel/retired.jsp
| 2
java/code/webapp/WEB-INF/pages/channel/shared.jsp
| 2
java/code/webapp/WEB-INF/pages/channel/vendor.jsp
| 2
java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/common-header.jspf
| 2
java/code/webapp/WEB-INF/pages/common/fragments/channel/channel_header.jspf
| 2
java/code/webapp/WEB-INF/pages/common/fragments/channel/manage/manage_channel_header.jspf
| 2
java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/details-header.jspf
| 2
java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/summary.jspf
| 2
java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/details.jspf
| 2
java/code/webapp/WEB-INF/pages/common/fragments/errata/ownedlistdisplay.jspf
| 2
java/code/webapp/WEB-INF/pages/common/fragments/groups/header.jspf
| 2
java/code/webapp/WEB-INF/pages/common/fragments/kickstart/advanced/header.jspf
| 2
java/code/webapp/WEB-INF/pages/common/fragments/kickstart/clone.jspf
| 2
java/code/webapp/WEB-INF/pages/common/fragments/kickstart/kickstart-toolbar.jspf
| 2
java/code/webapp/WEB-INF/pages/common/fragments/package/package_header.jspf
| 2
java/code/webapp/WEB-INF/pages/common/fragments/profile/header.jspf
| 2
java/code/webapp/WEB-INF/pages/common/fragments/ssm/header.jspf
| 2
java/code/webapp/WEB-INF/pages/common/fragments/user/user-header.jspf
| 2
java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/recentlyRegistered.jsp
| 2
java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/scheduledActions.jsp
| 2
java/code/webapp/WEB-INF/pages/configuration/overview/globalconfiglist.jsp
| 2
java/code/webapp/WEB-INF/pages/configuration/overview/globalfilelist.jsp
| 2
java/code/webapp/WEB-INF/pages/configuration/overview/localfilelist.jsp
| 2
java/code/webapp/WEB-INF/pages/configuration/overview/managedsystems.jsp
| 2
java/code/webapp/WEB-INF/pages/configuration/overview/overview.jsp
| 4
java/code/webapp/WEB-INF/pages/configuration/overview/targetsystems.jsp
| 2
java/code/webapp/WEB-INF/pages/configuration/sdc/deployfile.jsp
| 2
java/code/webapp/WEB-INF/pages/configuration/sdc/deployfileconfirm.jsp
| 2
java/code/webapp/WEB-INF/pages/configuration/sdc/difffile.jsp
| 2
java/code/webapp/WEB-INF/pages/configuration/sdc/difffileconfirm.jsp
| 2
java/code/webapp/WEB-INF/pages/configuration/sdc/importfile.jsp
| 2
java/code/webapp/WEB-INF/pages/configuration/sdc/importfileconfirm.jsp
| 2
java/code/webapp/WEB-INF/pages/credentials/delete.jsp
| 2
java/code/webapp/WEB-INF/pages/credentials/edit.jsp
| 2
java/code/webapp/WEB-INF/pages/errata/addchannelpackagepush.jsp
| 2
java/code/webapp/WEB-INF/pages/errata/addchannels.jsp
| 2
java/code/webapp/WEB-INF/pages/errata/addpackagepackagepush.jsp
| 2
java/code/webapp/WEB-INF/pages/errata/all.jsp
| 2
java/code/webapp/WEB-INF/pages/errata/cloneerrata.jsp
| 2
java/code/webapp/WEB-INF/pages/errata/create.jsp
| 2
java/code/webapp/WEB-INF/pages/errata/delete.jsp
| 2
java/code/webapp/WEB-INF/pages/errata/edit.jsp
| 2
java/code/webapp/WEB-INF/pages/errata/editchannels.jsp
| 2
java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp
| 2
java/code/webapp/WEB-INF/pages/errata/notify.jsp
| 2
java/code/webapp/WEB-INF/pages/errata/packagepush.jsp
| 2
java/code/webapp/WEB-INF/pages/errata/packages/add.jsp
| 2
java/code/webapp/WEB-INF/pages/errata/packages/confirm.jsp
| 2
java/code/webapp/WEB-INF/pages/errata/packages/list.jsp
| 2
java/code/webapp/WEB-INF/pages/errata/packages/packages.jsp
| 2
java/code/webapp/WEB-INF/pages/errata/packages/remove.jsp
| 2
java/code/webapp/WEB-INF/pages/errata/published.jsp
| 2
java/code/webapp/WEB-INF/pages/errata/relevant.jsp
| 2
java/code/webapp/WEB-INF/pages/errata/unpublished.jsp
| 2
java/code/webapp/WEB-INF/pages/help/docsearch.jsp
| 2
java/code/webapp/WEB-INF/pages/keys/cryptokeydeleteconfirm.jsp
| 2
java/code/webapp/WEB-INF/pages/keys/keycreate.jsp
| 2
java/code/webapp/WEB-INF/pages/keys/keyedit.jsp
| 2
java/code/webapp/WEB-INF/pages/keys/keys.jsp
| 2
java/code/webapp/WEB-INF/pages/kickstart/cobbler/deleteconfirm.jsp
| 2
java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippetdetails.jsp
| 4
java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippets.jsp
| 2
java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippetview.jsp
| 2
java/code/webapp/WEB-INF/pages/kickstart/kickstartoverview.jsp
| 2
java/code/webapp/WEB-INF/pages/kickstart/kickstartranges.jsp
| 2
java/code/webapp/WEB-INF/pages/kickstart/kickstarts.jsp
| 2
java/code/webapp/WEB-INF/pages/kickstart/kickstarttreevariables.jsp
| 2
java/code/webapp/WEB-INF/pages/kickstart/kstrees.jsp
| 4
java/code/webapp/WEB-INF/pages/kickstart/scriptdelete.jsp
| 2
java/code/webapp/WEB-INF/pages/kickstart/scriptedit.jsp
| 2
java/code/webapp/WEB-INF/pages/kickstart/scripts.jsp
| 2
java/code/webapp/WEB-INF/pages/kickstart/treecreate.jsp
| 2
java/code/webapp/WEB-INF/pages/kickstart/treedelete-confirm.jsp
| 2
java/code/webapp/WEB-INF/pages/kickstart/treeedit.jsp
| 2
java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/advanced/create.jsp
| 2
java/code/webapp/WEB-INF/pages/monitoring/probes.jsp
| 2
java/code/webapp/WEB-INF/pages/multiorg/channels/consumed.jsp
| 2
java/code/webapp/WEB-INF/pages/multiorg/channels/orglist.jsp
| 2
java/code/webapp/WEB-INF/pages/multiorg/channels/provided.jsp
| 2
java/code/webapp/WEB-INF/pages/multiorg/organizations.jsp
| 2
java/code/webapp/WEB-INF/pages/multiorg/orgtrustdetails.jsp
| 2
java/code/webapp/WEB-INF/pages/profiles/list.jsp
| 2
java/code/webapp/WEB-INF/pages/schedule/archivedactions.jsp
| 2
java/code/webapp/WEB-INF/pages/schedule/completedactions.jsp
| 2
java/code/webapp/WEB-INF/pages/schedule/failedactions.jsp
| 2
java/code/webapp/WEB-INF/pages/schedule/pendingactions.jsp
| 2
java/code/webapp/WEB-INF/pages/software/downloads/download.jsp
| 2
java/code/webapp/WEB-INF/pages/software/packages/packagenameoverview.jsp
| 2
java/code/webapp/WEB-INF/pages/ssm/view-log-details.jsp
| 2
java/code/webapp/WEB-INF/pages/ssm/view-log.jsp
| 2
java/code/webapp/WEB-INF/pages/systems/crashdelete.jsp
| 2
java/code/webapp/WEB-INF/pages/systems/crashdetail.jsp
| 2
java/code/webapp/WEB-INF/pages/systems/crashfiles.jsp
| 2
java/code/webapp/WEB-INF/pages/systems/crashnote.jsp
| 6
java/code/webapp/WEB-INF/pages/systems/crashnotedelete.jsp
| 3
java/code/webapp/WEB-INF/pages/systems/customkey/createkey.jsp
| 2
java/code/webapp/WEB-INF/pages/systems/customkey/deletekey.jsp
| 2
java/code/webapp/WEB-INF/pages/systems/customkey/listcustomkeys.jsp
| 2
java/code/webapp/WEB-INF/pages/systems/customkey/updatekey.jsp
| 2
java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp
| 3
java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/compareprofiles.jsp
| 2
java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystems.jsp
| 2
java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemscompare.jsp
| 2
java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemsdelete.jsp
| 2
java/code/webapp/WEB-INF/pages/systems/entitlements/entitlements.jsp
| 2
java/code/webapp/WEB-INF/pages/systems/entitlements/flexguests.jsp
| 2
java/code/webapp/WEB-INF/pages/systems/entitlements/guestlimited.jsp
| 2
java/code/webapp/WEB-INF/pages/systems/entitlements/guestunlimited.jsp
| 2
java/code/webapp/WEB-INF/pages/systems/entitlements/physicalhosts.jsp
| 2
java/code/webapp/WEB-INF/pages/systems/extra-packages-systems-list.jsp
| 2
java/code/webapp/WEB-INF/pages/systems/grouplist.jsp
| 2
java/code/webapp/WEB-INF/pages/systems/inactivelist.jsp
| 2
java/code/webapp/WEB-INF/pages/systems/outofdatelist.jsp
| 2
java/code/webapp/WEB-INF/pages/systems/overview.jsp
| 2
java/code/webapp/WEB-INF/pages/systems/physicallist.jsp
| 2
java/code/webapp/WEB-INF/pages/systems/probes/create.jsp
| 2
java/code/webapp/WEB-INF/pages/systems/probes/details.jsp
| 4
java/code/webapp/WEB-INF/pages/systems/probes/edit.jsp
| 2
java/code/webapp/WEB-INF/pages/systems/probes/index.jsp
| 2
java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservation_create.jsp
| 2
java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservation_edit.jsp
| 2
java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservation_list.jsp
| 2
java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservationlistconfirm.jsp
| 2
java/code/webapp/WEB-INF/pages/systems/proxylist.jsp
| 2
java/code/webapp/WEB-INF/pages/systems/registeredlist.jsp
| 4
java/code/webapp/WEB-INF/pages/systems/requiringrebootlist.jsp
| 2
java/code/webapp/WEB-INF/pages/systems/sdc/listcustomdata.jsp
| 2
java/code/webapp/WEB-INF/pages/systems/sdc/updatecustomdata.jsp
| 2
java/code/webapp/WEB-INF/pages/systems/softwarecrashesoverview.jsp
| 2
java/code/webapp/WEB-INF/pages/systems/softwarecrashuuiddetails.jsp
| 2
java/code/webapp/WEB-INF/pages/systems/systemcurrency.jsp
| 2
java/code/webapp/WEB-INF/pages/systems/systemlist.jsp
| 2
java/code/webapp/WEB-INF/pages/systems/systemsearch.jsp
| 2
java/code/webapp/WEB-INF/pages/systems/unentitledlist.jsp
| 2
java/code/webapp/WEB-INF/pages/systems/ungroupedlist.jsp
| 2
java/code/webapp/WEB-INF/pages/systems/virtuallist.jsp
| 2
java/code/webapp/WEB-INF/pages/user/create/usercreate.jsp
| 2
java/code/webapp/WEB-INF/pages/user/edit/localepreference.jsp
| 2
java/code/webapp/WEB-INF/pages/user/edit/yourchangeemail.jsp
| 2
java/code/webapp/WEB-INF/pages/user/edit/yourdetails.jsp
| 2
java/code/webapp/WEB-INF/pages/user/edit/yourpreferences.jsp
| 2
java/code/webapp/WEB-INF/pages/yourrhn.jsp
| 2
229 files changed, 333 insertions(+), 291 deletions(-)
New commits:
commit 3f73e97f181333234bb16895a8f5a536ff8acc1f
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Wed Dec 11 16:17:06 2013 +0100
use new icon aliases in rhn:toolbar tag
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 3190bb6..7f9a1c8 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/ToolbarTag.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/ToolbarTag.java
@@ -603,7 +603,7 @@ public class ToolbarTag extends TagSupport {
String create = "toolbar.create." + getCreationType();
return renderActionLink(getCreationUrl(), create,
- create, "fa-plus", null);
+ create, "item-add", null);
}
return "";
}
@@ -614,7 +614,7 @@ public class ToolbarTag extends TagSupport {
String clone = "toolbar.clone." + getCloneType();
return renderActionLink(getCloneUrl(), clone,
- clone, "fa-files-o", null);
+ clone, "item-clone", null);
}
return "";
}
@@ -624,7 +624,7 @@ public class ToolbarTag extends TagSupport {
assertNotEmpty(getDeletionUrl())) {
String del = "toolbar.delete." + getDeletionType();
- return renderActionLink(getDeletionUrl(), del, del, "fa-trash-o",
null);
+ return renderActionLink(getDeletionUrl(), del, del, "item-del",
null);
}
return "";
}
diff --git a/java/code/webapp/WEB-INF/includes/header.jsp
b/java/code/webapp/WEB-INF/includes/header.jsp
index 476c24b..9c0e89f 100644
--- a/java/code/webapp/WEB-INF/includes/header.jsp
+++ b/java/code/webapp/WEB-INF/includes/header.jsp
@@ -29,7 +29,7 @@
</ul>
<ul class="nav nav-pills">
<li>
- <a href="/rhn/account/UserDetails.do"><i class="fa
fa-user"></i><c:out escapeXml="true"
value="${requestScope.session.user.login}" /></a>
+ <a href="/rhn/account/UserDetails.do"><rhn:icon
type="header-user" /><c:out escapeXml="true"
value="${requestScope.session.user.login}" /></a>
</li>
<li class="hidden-sm hidden-xs hidden-md">
<span class="spacewalk-header-non-link"><i class="fa
fa-sitemap"></i><c:out escapeXml="true"
value="${requestScope.session.user.org.name}" /></span>
diff --git a/java/code/webapp/WEB-INF/includes/legends/system-legend.jsp
b/java/code/webapp/WEB-INF/includes/legends/system-legend.jsp
index 4715244..8c62cb4 100644
--- a/java/code/webapp/WEB-INF/includes/legends/system-legend.jsp
+++ b/java/code/webapp/WEB-INF/includes/legends/system-legend.jsp
@@ -14,7 +14,7 @@
<rhn:require acl="org_entitlement(rhn_provisioning)">
<li><rhn:icon type="system-kickstarting" /><bean:message
key="system-legend.jsp.kickstarting"/></li>
</rhn:require>
- <li><rhn:icon type="actions-pending" /><bean:message
key="system-legend.jsp.pending"/></li>
+ <li><rhn:icon type="action-pending" /><bean:message
key="system-legend.jsp.pending"/></li>
<li><rhn:icon type="system-unentitled" /><bean:message
key="system-legend.jsp.unentitled"/></li>
<rhn:require acl="org_entitlement(rhn_monitor)">
<li><rhn:icon type="monitoring-status" /><bean:message
key="system-legend.jsp.monitoring"/></li>
diff --git a/java/code/webapp/WEB-INF/includes/legends/yourrhn-legend.jsp
b/java/code/webapp/WEB-INF/includes/legends/yourrhn-legend.jsp
index bba804f..d0342dc 100644
--- a/java/code/webapp/WEB-INF/includes/legends/yourrhn-legend.jsp
+++ b/java/code/webapp/WEB-INF/includes/legends/yourrhn-legend.jsp
@@ -14,9 +14,9 @@
<rhn:require acl="org_entitlement(rhn_provisioning)">
<li><rhn:icon type="system-kickstarting" /><bean:message
key="system-legend.jsp.kickstarting" /></li>
</rhn:require>
- <li><rhn:icon type="actions-pending" /><bean:message
key="system-legend.jsp.pending" /></li>
- <li><rhn:icon type="actions-failed" /><bean:message
key="yourrhn-legend.jsp.failedactions" /></li>
- <li><rhn:icon type="actions-ok" /><bean:message
key="yourrhn-legend.jsp.completedactions" /></li>
+ <li><rhn:icon type="action-pending" /><bean:message
key="system-legend.jsp.pending" /></li>
+ <li><rhn:icon type="action-failed" /><bean:message
key="yourrhn-legend.jsp.failedactions" /></li>
+ <li><rhn:icon type="action-ok" /><bean:message
key="yourrhn-legend.jsp.completedactions" /></li>
<rhn:require acl="show_monitoring();"
mixins="com.redhat.rhn.common.security.acl.MonitoringAclHandler">
<li><rhn:icon type="monitoring-status" /><bean:message
key="system-legend.jsp.monitoring" /></li>
</rhn:require>
diff --git a/java/code/webapp/WEB-INF/pages/activationkeys/create.jsp
b/java/code/webapp/WEB-INF/pages/activationkeys/create.jsp
index a1fff22..8da2f74 100644
--- a/java/code/webapp/WEB-INF/pages/activationkeys/create.jsp
+++ b/java/code/webapp/WEB-INF/pages/activationkeys/create.jsp
@@ -4,7 +4,7 @@
<%@ taglib
uri="http://struts.apache.org/tags-html" prefix="html"
%>
<html:html>
<body>
- <rhn:toolbar base="h1" icon="fa-key"
+ <rhn:toolbar base="h1" icon="header-activation-key"
imgAlt="activation-keys.common.alt"
helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s2-sm-systems-activation-keys"
diff --git
a/java/code/webapp/WEB-INF/pages/activationkeys/delete.jsp
b/java/code/webapp/WEB-INF/pages/activationkeys/delete.jsp
index 4bb8647..f0433c5 100644
--- a/java/code/webapp/WEB-INF/pages/activationkeys/delete.jsp
+++ b/java/code/webapp/WEB-INF/pages/activationkeys/delete.jsp
@@ -4,7 +4,7 @@
<%@ taglib
uri="http://struts.apache.org/tags-html" prefix="html"
%>
<html:html>
<body>
- <rhn:toolbar base="h1" icon="fa-key"
+ <rhn:toolbar base="h1" icon="header-activation-key"
imgAlt="activation-keys.common.alt"
helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s2-sm-systems-activation-keys"
diff --git
a/java/code/webapp/WEB-INF/pages/activationkeys/list.jsp
b/java/code/webapp/WEB-INF/pages/activationkeys/list.jsp
index 2e882f5..800f396 100644
--- a/java/code/webapp/WEB-INF/pages/activationkeys/list.jsp
+++ b/java/code/webapp/WEB-INF/pages/activationkeys/list.jsp
@@ -9,7 +9,7 @@
<meta name="name" value="activationkeys.jsp.header" />
</head>
<body>
-<rhn:toolbar base="h1" icon="fa-key"
+<rhn:toolbar base="h1" icon="header-activation-key"
imgAlt="activation-keys.common.alt"
creationUrl="/rhn/activationkeys/Create.do"
creationType="activationkeys"
diff --git a/java/code/webapp/WEB-INF/pages/admin/addresses.jsp
b/java/code/webapp/WEB-INF/pages/admin/addresses.jsp
index 98aadd1..fc5d878 100644
--- a/java/code/webapp/WEB-INF/pages/admin/addresses.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/addresses.jsp
@@ -8,7 +8,7 @@
<meta name="page-decorator" content="none" />
</head>
<body>
- <rhn:toolbar base="h1" icon="fa-user"
+ <rhn:toolbar base="h1" icon="header-user"
imgAlt="users.jsp.imgAlt"
helpUrl="/rhn/help/reference/en-US/s1-sm-your-rhn.jsp#s2-sm-your-rhn-account">
<bean:message key="Addresses" />
diff --git a/java/code/webapp/WEB-INF/pages/admin/bunchDetail.jsp
b/java/code/webapp/WEB-INF/pages/admin/bunchDetail.jsp
index 3a98f1e..9f52034 100644
--- a/java/code/webapp/WEB-INF/pages/admin/bunchDetail.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/bunchDetail.jsp
@@ -9,7 +9,7 @@
<html>
<body>
-<rhn:toolbar base="h1" icon="fa-tachometer">
+<rhn:toolbar base="h1" icon="header-taskomatic">
<bean:message key="bunch.edit.jsp.toolbar"
arg0="${label}"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/admin/config/bootstrap.jsp
b/java/code/webapp/WEB-INF/pages/admin/config/bootstrap.jsp
index 2b13f9d..da55096 100644
--- a/java/code/webapp/WEB-INF/pages/admin/config/bootstrap.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/config/bootstrap.jsp
@@ -5,7 +5,7 @@
<html:html>
<body>
- <rhn:toolbar base="h1" icon="fa-info-circle"
imgAlt="info.alt.img">
+ <rhn:toolbar base="h1" icon="header-info"
imgAlt="info.alt.img">
<bean:message key="bootstrap.jsp.toolbar"/>
</rhn:toolbar>
<p><bean:message key="bootstrap.jsp.summary"/></p>
diff --git a/java/code/webapp/WEB-INF/pages/admin/config/certificate.jsp
b/java/code/webapp/WEB-INF/pages/admin/config/certificate.jsp
index d4eca02..2100127 100644
--- a/java/code/webapp/WEB-INF/pages/admin/config/certificate.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/config/certificate.jsp
@@ -5,7 +5,7 @@
<html:html>
<body>
- <rhn:toolbar base="h1" icon="fa-info-circle"
imgAlt="info.alt.img">
+ <rhn:toolbar base="h1" icon="header-info"
imgAlt="info.alt.img">
<bean:message key="certificate.jsp.toolbar"/>
</rhn:toolbar>
<p><bean:message key="certificate.jsp.summary"/></p>
diff --git a/java/code/webapp/WEB-INF/pages/admin/config/cobbler.jsp
b/java/code/webapp/WEB-INF/pages/admin/config/cobbler.jsp
index 2f7af79..7f13047 100644
--- a/java/code/webapp/WEB-INF/pages/admin/config/cobbler.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/config/cobbler.jsp
@@ -6,7 +6,7 @@
<html:html >
<body>
- <rhn:toolbar base="h1" icon="fa-info-circle"
imgAlt="info.alt.img">
+ <rhn:toolbar base="h1" icon="header-info"
imgAlt="info.alt.img">
<bean:message key="cobbler.jsp.toolbar"/>
</rhn:toolbar>
<p>
diff --git a/java/code/webapp/WEB-INF/pages/admin/config/general.jsp
b/java/code/webapp/WEB-INF/pages/admin/config/general.jsp
index 9c4a08a..2532a86 100644
--- a/java/code/webapp/WEB-INF/pages/admin/config/general.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/config/general.jsp
@@ -5,7 +5,7 @@
<html:html>
<body>
- <rhn:toolbar base="h1" icon="fa-info-circle"
imgAlt="info.alt.img">
+ <rhn:toolbar base="h1" icon="header-info"
imgAlt="info.alt.img">
<bean:message key="general.jsp.toolbar"/>
</rhn:toolbar>
<p><bean:message key="general.jsp.summary"/></p>
diff --git a/java/code/webapp/WEB-INF/pages/admin/config/multiorg.jsp
b/java/code/webapp/WEB-INF/pages/admin/config/multiorg.jsp
index 3af8924..52f1c7d 100644
--- a/java/code/webapp/WEB-INF/pages/admin/config/multiorg.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/config/multiorg.jsp
@@ -5,7 +5,7 @@
<html:html >
<body>
-<rhn:toolbar base="h1" icon="fa-info-circle"
imgAlt="info.alt.img">
+<rhn:toolbar base="h1" icon="header-info"
imgAlt="info.alt.img">
<bean:message key="general.jsp.org.toolbar"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/admin/config/restart.jsp
b/java/code/webapp/WEB-INF/pages/admin/config/restart.jsp
index e943e0e..5d78621 100644
--- a/java/code/webapp/WEB-INF/pages/admin/config/restart.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/config/restart.jsp
@@ -11,7 +11,7 @@
</c:if>
</head>
<body <c:if test="${requestScope.restart ==
'true'}">onload="checkConnection(${requestScope.restartDelay})"</c:if>
>
- <rhn:toolbar base="h1" icon="fa-info-circle"
imgAlt="info.alt.img">
+ <rhn:toolbar base="h1" icon="header-info"
imgAlt="info.alt.img">
<bean:message key="restart.jsp.toolbar"/>
</rhn:toolbar>
<p>
diff --git a/java/code/webapp/WEB-INF/pages/admin/deleteSchedule.jsp
b/java/code/webapp/WEB-INF/pages/admin/deleteSchedule.jsp
index a3d9359..1187e48 100644
--- a/java/code/webapp/WEB-INF/pages/admin/deleteSchedule.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/deleteSchedule.jsp
@@ -5,7 +5,7 @@
<html>
<body>
-<rhn:toolbar base="h1"
icon="spacewalk-icon-software-channels">
+<rhn:toolbar base="h1" icon="header-channel">
<bean:message key="schedule.edit.jsp.toolbar"
arg0="${schedulename}"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/admin/disableself.jsp
b/java/code/webapp/WEB-INF/pages/admin/disableself.jsp
index f3ed444..c33cbff 100644
--- a/java/code/webapp/WEB-INF/pages/admin/disableself.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/disableself.jsp
@@ -5,7 +5,7 @@
<html>
<body>
- <rhn:toolbar base="h1" icon="fa-user"
imgAlt="users.jsp.imgAlt">
+ <rhn:toolbar base="h1" icon="header-user"
imgAlt="users.jsp.imgAlt">
<bean:message key="disableself.jsp.account_deactivation" />
</rhn:toolbar>
<form method="post" name="rhn_list"
action="/rhn/account/AccountDeactivationSubmit.do">
diff --git a/java/code/webapp/WEB-INF/pages/admin/disableselfconfirm.jsp
b/java/code/webapp/WEB-INF/pages/admin/disableselfconfirm.jsp
index ba3b0ff..ca93b6a 100644
--- a/java/code/webapp/WEB-INF/pages/admin/disableselfconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/disableselfconfirm.jsp
@@ -5,7 +5,7 @@
<html>
<body>
- <rhn:toolbar base="h1" icon="fa-user">
+ <rhn:toolbar base="h1" icon="header-user">
<bean:message key="disableselfconfirm.jsp.warning_question"
/>
</rhn:toolbar>
<form method="POST" name="rhn_list"
action="/rhn/account/AccountDeactivationConfirm.do">
diff --git a/java/code/webapp/WEB-INF/pages/admin/iss/confirmmastersremove.jsp
b/java/code/webapp/WEB-INF/pages/admin/iss/confirmmastersremove.jsp
index cbcf9e2..f334d0e 100644
--- a/java/code/webapp/WEB-INF/pages/admin/iss/confirmmastersremove.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/iss/confirmmastersremove.jsp
@@ -5,7 +5,7 @@
<%@ taglib
uri="http://struts.apache.org/tags-html"
prefix="html"%>
<html:html>
<body>
- <rhn:toolbar base="h1" icon="fa-info-circle">
+ <rhn:toolbar base="h1" icon="header-info">
<bean:message key="iss.confirmmasterremove.jsp.toolbar" />
</rhn:toolbar>
<p><bean:message key="iss.confirmmasterremove.jsp.areyousure"
/></p>
diff --git a/java/code/webapp/WEB-INF/pages/admin/iss/confirmslaveremove.jsp
b/java/code/webapp/WEB-INF/pages/admin/iss/confirmslaveremove.jsp
index eedde45..c090206 100644
--- a/java/code/webapp/WEB-INF/pages/admin/iss/confirmslaveremove.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/iss/confirmslaveremove.jsp
@@ -5,7 +5,7 @@
<%@ taglib
uri="http://struts.apache.org/tags-html"
prefix="html"%>
<html:html>
<body>
- <rhn:toolbar base="h1" icon="fa-info-circle">
+ <rhn:toolbar base="h1" icon="header-info">
<bean:message key="iss.confirmslaveremove.jsp.toolbar" />
</rhn:toolbar>
<p><bean:message key="iss.confirmslaveremove.jsp.areyousure"
/></p>
diff --git a/java/code/webapp/WEB-INF/pages/admin/iss/editmaster.jsp
b/java/code/webapp/WEB-INF/pages/admin/iss/editmaster.jsp
index 6030b29..bcc267d 100644
--- a/java/code/webapp/WEB-INF/pages/admin/iss/editmaster.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/iss/editmaster.jsp
@@ -7,14 +7,14 @@
<body>
<c:choose>
<c:when test="${requestScope.id > 0}">
- <rhn:toolbar base="h1" icon="fa-info-circle"
+ <rhn:toolbar base="h1" icon="header-info"
deletionUrl="/rhn/admin/iss/RemoveMasterConfirm.do?mid=${requestScope.id}"
deletionType="master"
deletionAcl="user_role(satellite_admin)">
<bean:message key="iss.editmaster.jsp.toolbar" />
</rhn:toolbar>
</c:when>
<c:otherwise>
- <rhn:toolbar base="h1" icon="fa-info-circle">
+ <rhn:toolbar base="h1" icon="header-info">
<bean:message key="iss.editmaster.jsp.toolbar" />
</rhn:toolbar>
</c:otherwise>
diff --git a/java/code/webapp/WEB-INF/pages/admin/iss/editslave.jsp
b/java/code/webapp/WEB-INF/pages/admin/iss/editslave.jsp
index c1b19a1..ba5fe34 100644
--- a/java/code/webapp/WEB-INF/pages/admin/iss/editslave.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/iss/editslave.jsp
@@ -7,14 +7,14 @@
<body>
<c:choose>
<c:when test="${requestScope.sid > 0}">
- <rhn:toolbar base="h1" icon="fa-info-circle"
+ <rhn:toolbar base="h1" icon="header-info"
deletionUrl="/rhn/admin/iss/RemoveSlaveConfirm.do?sid=${requestScope.sid}"
deletionType="slave"
deletionAcl="user_role(satellite_admin)">
<bean:message key="iss.editslave.jsp.toolbar" />
</rhn:toolbar>
</c:when>
<c:otherwise>
- <rhn:toolbar base="h1" icon="fa-info-circle">
+ <rhn:toolbar base="h1" icon="header-info">
<bean:message key="iss.editslave.jsp.toolbar" />
</rhn:toolbar>
</c:otherwise>
diff --git a/java/code/webapp/WEB-INF/pages/admin/iss/master.jsp
b/java/code/webapp/WEB-INF/pages/admin/iss/master.jsp
index 6dc1be0..e85e59f 100644
--- a/java/code/webapp/WEB-INF/pages/admin/iss/master.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/iss/master.jsp
@@ -6,7 +6,7 @@
<html:html>
<body>
- <rhn:toolbar base="h1" icon="fa-info-circle"
+ <rhn:toolbar base="h1" icon="header-info"
creationUrl="/rhn/admin/iss/EditSlave.do"
creationType="slave"
creationAcl="user_role(satellite_admin)">
<bean:message key="iss.master.jsp.toolbar" />
diff --git a/java/code/webapp/WEB-INF/pages/admin/iss/slave.jsp
b/java/code/webapp/WEB-INF/pages/admin/iss/slave.jsp
index 49033a5..ee0cc23 100644
--- a/java/code/webapp/WEB-INF/pages/admin/iss/slave.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/iss/slave.jsp
@@ -5,7 +5,7 @@
<%@ taglib
uri="http://struts.apache.org/tags-html"
prefix="html"%>
<html:html>
<body>
- <rhn:toolbar base="h1" icon="fa-info-circle"
+ <rhn:toolbar base="h1" icon="header-info"
creationUrl="/rhn/admin/iss/EditMaster.do"
creationType="master"
creationAcl="user_role(satellite_admin)">
<bean:message key="iss.slave.jsp.toolbar" />
diff --git
a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filtercreate.jsp
b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filtercreate.jsp
index 314ca41..4546a5a 100644
---
a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filtercreate.jsp
+++
b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filtercreate.jsp
@@ -10,7 +10,7 @@
<meta name="page-decorator" content="none" />
</head>
<body>
-<rhn:toolbar base="h1" icon="spacewalk-icon-system-groups"
+<rhn:toolbar base="h1" icon="header-system-groups"
helpUrl="/rhn/help/reference/en-US/s1-sm-monitor.jsp#s2-sm-monitor-notif">
<bean:message key="filtercreate.jsp.header1" />
</rhn:toolbar>
diff --git
a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filteredit.jsp
b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filteredit.jsp
index 3efff40..b191f57 100644
--- a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filteredit.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filteredit.jsp
@@ -10,7 +10,7 @@
<meta name="page-decorator" content="none" />
</head>
<body>
-<rhn:toolbar base="h1" icon="spacewalk-icon-system-groups"
+<rhn:toolbar base="h1" icon="header-system-groups"
helpUrl="/rhn/help/reference/en-US/s1-sm-monitor.jsp#s2-sm-monitor-notif">
<bean:message key="filteredit.jsp.header1" />
</rhn:toolbar>
diff --git
a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filters.jsp
b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filters.jsp
index 1a82b1c..c2075c2 100644
--- a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filters.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filters.jsp
@@ -7,7 +7,7 @@
<html>
<body>
-<rhn:toolbar base="h1" icon="spacewalk-icon-system-groups"
+<rhn:toolbar base="h1" icon="header-system-groups"
creationUrl="FilterCreate.do"
creationType="filter"
helpUrl="/rhn/help/reference/en-US/s1-sm-monitor.jsp#s2-sm-monitor-notif">
diff --git
a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/methods.jsp
b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/methods.jsp
index e7e8286..4be9584 100644
--- a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/methods.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/methods.jsp
@@ -6,7 +6,7 @@
<html>
<body>
-<rhn:toolbar base="h1" icon="fa-info-circle">
+<rhn:toolbar base="h1" icon="header-info">
<bean:message key="methods.jsp.toolbar"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitecreate.jsp
b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitecreate.jsp
index 0759880..4335b7c 100644
--- a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitecreate.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitecreate.jsp
@@ -10,7 +10,7 @@
<meta name="page-decorator" content="none" />
</head>
<body>
- <rhn:toolbar base="h1"
icon="spacewalk-icon-system-groups"
+ <rhn:toolbar base="h1" icon="header-system-groups"
helpUrl="/rhn/help/reference/en-US/s1-sm-monitor.jsp#s2-sm-monitor-psuites">
<bean:message key="probesuitecreate.jsp.header1" />
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuiteedit.jsp
b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuiteedit.jsp
index 712e29b..4c4d299 100644
--- a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuiteedit.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuiteedit.jsp
@@ -10,7 +10,7 @@
<meta name="page-decorator" content="none" />
</head>
<body>
- <rhn:toolbar base="h1"
icon="spacewalk-icon-system-groups"
+ <rhn:toolbar base="h1" icon="header-system-groups"
helpUrl="/rhn/help/reference/en-US/s1-sm-monitor.jsp#s2-sm-monitor-psuites">
<bean:message key="probesuiteedit.jsp.header1"
arg0="${probeSuite.suiteName}" />
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuites.jsp
b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuites.jsp
index 850eccf..983303b 100644
--- a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuites.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuites.jsp
@@ -9,7 +9,7 @@
<html>
<body>
-<rhn:toolbar base="h1" icon="spacewalk-icon-system-groups"
+<rhn:toolbar base="h1" icon="header-system-groups"
creationUrl="ProbeSuiteCreate.do"
creationType="probesuite"
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/probesuitesremoveconfirm.jsp
b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesremoveconfirm.jsp
index 86d36b3..7b64062 100644
--- a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesremoveconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesremoveconfirm.jsp
@@ -7,7 +7,7 @@
<html>
<body>
-<rhn:toolbar base="h1" icon="spacewalk-icon-system-groups"
+<rhn:toolbar base="h1" icon="header-system-groups"
helpUrl="/rhn/help/reference/en-US/s1-sm-monitor.jsp#s2-sm-monitor-psuites">
<bean:message key="probesuitesremoveconfirm.jsp.header1"/>
</rhn:toolbar>
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 27b3b25..d44229e 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
@@ -6,7 +6,7 @@
<html>
<body>
-<rhn:toolbar base="h1" icon="spacewalk-icon-system-groups"
+<rhn:toolbar base="h1" icon="header-system-groups"
creationUrl="ProbeSuiteSystemsEdit.do?suite_id=${probeSuite.id}"
creationType="probesuitesystem"
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/probesuitesystemsedit.jsp
b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystemsedit.jsp
index f5f9f4c..059d0cd 100644
--- a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystemsedit.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystemsedit.jsp
@@ -7,7 +7,7 @@
<html>
<body>
- <rhn:toolbar base="h1" icon="spacewalk-icon-system-groups"
+ <rhn:toolbar base="h1" icon="header-system-groups"
helpUrl="/rhn/help/reference/en-US/s1-sm-monitor.jsp#s2-sm-monitor-psuites">
<bean:message key="probesuitesystemsedit.jsp.header1"
arg0="${probeSuite.suiteName}" />
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/configuration.jsp
b/java/code/webapp/WEB-INF/pages/admin/multiorg/configuration.jsp
index b1ddbee..ade2c98 100644
--- a/java/code/webapp/WEB-INF/pages/admin/multiorg/configuration.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/configuration.jsp
@@ -18,7 +18,7 @@ function modifyUploadCheckbox(checkbox) {
<body>
<c:choose>
<c:when test="${param.oid != 1}">
- <rhn:toolbar base="h1" icon="fa-group"
+ <rhn:toolbar base="h1" icon="header-organisation"
miscUrl="${url}"
miscAcl="user_role(org_admin)"
miscText="${text}"
@@ -32,7 +32,7 @@ function modifyUploadCheckbox(checkbox) {
</rhn:toolbar>
</c:when>
<c:otherwise>
- <rhn:toolbar base="h1" icon="fa-group"
+ <rhn:toolbar base="h1" icon="header-organisation"
miscUrl="${url}"
miscAcl="user_role(org_admin)"
miscText="${text}"
diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/entitlementorgs.jsp
b/java/code/webapp/WEB-INF/pages/admin/multiorg/entitlementorgs.jsp
index e907916..ab5ffad 100644
--- a/java/code/webapp/WEB-INF/pages/admin/multiorg/entitlementorgs.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/entitlementorgs.jsp
@@ -13,7 +13,7 @@
</script>
</head>
<body>
- <rhn:toolbar base="h1" icon="spacewalk-icon-software-channels"
+ <rhn:toolbar base="h1" icon="header-channel"
miscUrl="${url}"
miscAcl="user_role(org_admin)"
miscText="${text}"
diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/org_delete.jsp
b/java/code/webapp/WEB-INF/pages/admin/multiorg/org_delete.jsp
index 906f08a..5a8f4c4 100644
--- a/java/code/webapp/WEB-INF/pages/admin/multiorg/org_delete.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/org_delete.jsp
@@ -6,7 +6,7 @@
<html>
<body>
- <rhn:toolbar base="h1" icon="fa-group">
+ <rhn:toolbar base="h1" icon="header-organisation">
<bean:message key="orgdelete.jsp.header1"
arg0="${orgName}"/>
</rhn:toolbar>
<rhn:dialogmenu mindepth="0" maxdepth="1"
diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/org_users.jsp
b/java/code/webapp/WEB-INF/pages/admin/multiorg/org_users.jsp
index 1347201..5cf962c 100644
--- a/java/code/webapp/WEB-INF/pages/admin/multiorg/org_users.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/org_users.jsp
@@ -8,7 +8,7 @@
<body>
<c:choose>
<c:when test="${param.oid != 1}">
-<rhn:toolbar base="h1" icon="fa-group"
+<rhn:toolbar base="h1" icon="header-organisation"
miscUrl="${url}"
miscAcl="user_role(org_admin)"
miscText="${text}"
@@ -22,7 +22,7 @@
</rhn:toolbar>
</c:when>
<c:otherwise>
-<rhn:toolbar base="h1" icon="fa-group"
+<rhn:toolbar base="h1" icon="header-organisation"
miscUrl="${url}"
miscAcl="user_role(org_admin)"
miscText="${text}"
diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/organizations.jsp
b/java/code/webapp/WEB-INF/pages/admin/multiorg/organizations.jsp
index 756fadf..6ece022 100644
--- a/java/code/webapp/WEB-INF/pages/admin/multiorg/organizations.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/organizations.jsp
@@ -6,7 +6,7 @@
<html>
<body>
-<rhn:toolbar base="h1" icon="fa-group"
+<rhn:toolbar base="h1" icon="header-organisation"
creationUrl="/rhn/admin/multiorg/OrgCreate.do"
creationType="org">
<bean:message key="organizations.jsp.toolbar"/>
diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgdetails.jsp
b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgdetails.jsp
index 42a44bd..97bf073 100644
--- a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgdetails.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgdetails.jsp
@@ -8,7 +8,7 @@
<body>
<c:choose>
<c:when test="${param.oid != 1}">
- <rhn:toolbar base="h1" icon="fa-group"
+ <rhn:toolbar base="h1" icon="header-organisation"
miscUrl="${url}"
miscAcl="user_role(org_admin)"
miscText="${text}"
@@ -22,7 +22,7 @@
</rhn:toolbar>
</c:when>
<c:otherwise>
- <rhn:toolbar base="h1" icon="fa-group"
+ <rhn:toolbar base="h1" icon="header-organisation"
miscUrl="${url}"
miscAcl="user_role(org_admin)"
miscText="${text}"
diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgsoftwaresubs.jsp
b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgsoftwaresubs.jsp
index 7606e67..6a2e0b0 100644
--- a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgsoftwaresubs.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgsoftwaresubs.jsp
@@ -8,7 +8,7 @@
<body>
<c:choose>
<c:when test="${param.oid != 1}">
-<rhn:toolbar base="h1" icon="fa-group"
+<rhn:toolbar base="h1" icon="header-organisation"
miscUrl="${url}"
miscAcl="user_role(org_admin)"
miscText="${text}"
@@ -22,7 +22,7 @@
</rhn:toolbar>
</c:when>
<c:otherwise>
-<rhn:toolbar base="h1" icon="fa-group"
+<rhn:toolbar base="h1" icon="header-organisation"
miscUrl="${url}"
miscAcl="user_role(org_admin)"
miscText="${text}"
diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgsystemsubs.jsp
b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgsystemsubs.jsp
index 96f8b7d..23a52b4 100644
--- a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgsystemsubs.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgsystemsubs.jsp
@@ -9,7 +9,7 @@
<body>
<c:choose>
<c:when test="${param.oid != 1}">
- <rhn:toolbar base="h1" icon="fa-group"
+ <rhn:toolbar base="h1" icon="header-organisation"
miscUrl="${url}"
miscAcl="user_role(org_admin)"
miscText="${text}"
@@ -23,7 +23,7 @@
</rhn:toolbar>
</c:when>
<c:otherwise>
- <rhn:toolbar base="h1" icon="fa-group"
+ <rhn:toolbar base="h1" icon="header-organisation"
miscUrl="${url}"
miscAcl="user_role(org_admin)"
miscText="${text}"
diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgtrust.jsp
b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgtrust.jsp
index e395f58..3dffea4 100644
--- a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgtrust.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgtrust.jsp
@@ -7,7 +7,7 @@
<body>
<rhn:toolbar
base="h1"
- icon="fa-group"
+ icon="header-organisation"
miscUrl="${url}"
miscAcl="user_role(org_admin)"
miscText="${text}"
diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgtrustconfirm.jsp
b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgtrustconfirm.jsp
index 540e780..e81f8b8 100644
--- a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgtrustconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgtrustconfirm.jsp
@@ -8,7 +8,7 @@
<body>
<rhn:toolbar
base="h1"
- icon="fa-group"
+ icon="header-organisation"
miscUrl="${url}"
miscAcl="user_role(org_admin)"
miscText="${text}"
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 dad92db..f17cfe4 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
@@ -6,7 +6,7 @@
<html>
<body>
-<rhn:toolbar base="h1" icon="fa-group"
+<rhn:toolbar base="h1" icon="header-organisation"
miscUrl="${url}"
miscAcl="user_role(org_admin)"
miscText="${text}"
diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlementdetails.jsp
b/java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlementdetails.jsp
index 786bc59..128271e 100644
--- a/java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlementdetails.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlementdetails.jsp
@@ -8,7 +8,7 @@
<head>
</head>
<body>
-<rhn:toolbar base="h1" icon="spacewalk-icon-software-channels"
+<rhn:toolbar base="h1" icon="header-channel"
miscUrl="${url}"
miscAcl="user_role(org_admin)"
miscText="${text}"
diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlements.jsp
b/java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlements.jsp
index 9b807ad..61a3c08 100644
--- a/java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlements.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlements.jsp
@@ -8,7 +8,7 @@
<head>
</head>
<body>
-<rhn:toolbar base="h1" icon="spacewalk-icon-software-channels"
+<rhn:toolbar base="h1" icon="header-channel"
miscUrl="${url}"
miscAcl="user_role(org_admin)"
miscText="${text}"
diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlementsubs.jsp
b/java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlementsubs.jsp
index 3d6bec0..561350f 100644
--- a/java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlementsubs.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlementsubs.jsp
@@ -10,7 +10,7 @@
</head>
<body>
-<rhn:toolbar base="h1" icon="spacewalk-icon-software-channels"
+<rhn:toolbar base="h1" icon="header-channel"
miscUrl="${url}"
miscAcl="user_role(org_admin)"
miscText="${text}"
diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/sys_entitlements.jsp
b/java/code/webapp/WEB-INF/pages/admin/multiorg/sys_entitlements.jsp
index 0a3931e..6093690 100644
--- a/java/code/webapp/WEB-INF/pages/admin/multiorg/sys_entitlements.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/sys_entitlements.jsp
@@ -6,7 +6,7 @@
<html>
<body>
-<rhn:toolbar base="h1"
icon="spacewalk-icon-manage-entitlements-subscriptions"
+<rhn:toolbar base="h1" icon="header-system"
miscUrl="${url}"
miscAcl="user_role(org_admin)"
miscText="${text}"
diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/system_entitlement_details.jsp
b/java/code/webapp/WEB-INF/pages/admin/multiorg/system_entitlement_details.jsp
index bc6ce53..d27e747 100644
--- a/java/code/webapp/WEB-INF/pages/admin/multiorg/system_entitlement_details.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/system_entitlement_details.jsp
@@ -7,7 +7,7 @@
<head>
</head>
<body>
-<rhn:toolbar base="h1" icon="fa-desktop"
+<rhn:toolbar base="h1" icon="header-system"
miscUrl="${url}"
miscAcl="user_role(org_admin)"
miscText="${text}"
diff --git a/java/code/webapp/WEB-INF/pages/admin/scheduleDetail.jsp
b/java/code/webapp/WEB-INF/pages/admin/scheduleDetail.jsp
index ad1e320..82ec134 100644
--- a/java/code/webapp/WEB-INF/pages/admin/scheduleDetail.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/scheduleDetail.jsp
@@ -6,7 +6,7 @@
<html>
<body>
- <rhn:toolbar base="h1"
icon="spacewalk-icon-software-channels"
+ <rhn:toolbar base="h1" icon="header-channel"
deletionUrl="/rhn/admin/DeleteSchedule.do?schid=${param.schid}"
deletionAcl="user_role(satellite_admin);
formvar_exists(schid)"
deletionType="schedule">
diff --git a/java/code/webapp/WEB-INF/pages/admin/schedules.jsp
b/java/code/webapp/WEB-INF/pages/admin/schedules.jsp
index 3f60dcd..9f484cd 100644
--- a/java/code/webapp/WEB-INF/pages/admin/schedules.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/schedules.jsp
@@ -9,7 +9,7 @@
<html>
<body>
-<rhn:toolbar base="h1" icon="fa-tachometer"
+<rhn:toolbar base="h1" icon="header-taskomatic"
imgAlt="channels.overview.toolbar.imgAlt"
creationUrl="/rhn/admin/ScheduleDetail.do"
creationType="schedule"
diff --git a/java/code/webapp/WEB-INF/pages/admin/taskStatus.jsp
b/java/code/webapp/WEB-INF/pages/admin/taskStatus.jsp
index 5537d0b..eb532e5 100644
--- a/java/code/webapp/WEB-INF/pages/admin/taskStatus.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/taskStatus.jsp
@@ -6,7 +6,7 @@
<html>
<body>
-<rhn:toolbar base="h1" icon="fa-tachometer"
+<rhn:toolbar base="h1" icon="header-taskomatic"
helpUrl="">
<bean:message key="task.status.title"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/admin/users/activelist.jsp
b/java/code/webapp/WEB-INF/pages/admin/users/activelist.jsp
index fa347b8..2bed06b 100644
--- a/java/code/webapp/WEB-INF/pages/admin/users/activelist.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/users/activelist.jsp
@@ -10,7 +10,7 @@
<meta name="page-decorator" content="none" />
</head>
<body>
-<rhn:toolbar base="h1" icon="fa-user"
imgAlt="users.jsp.imgAlt"
+<rhn:toolbar base="h1" icon="header-user"
imgAlt="users.jsp.imgAlt"
helpUrl="/rhn/help/reference/en-US/s1-sm-users.jsp#s2-sm-user-active"
creationUrl="/rhn/users/CreateUser.do?account_type=into_org"
creationType="user">
diff --git a/java/code/webapp/WEB-INF/pages/admin/users/deleteuser.jsp
b/java/code/webapp/WEB-INF/pages/admin/users/deleteuser.jsp
index 79551fc..2ff8492 100644
--- a/java/code/webapp/WEB-INF/pages/admin/users/deleteuser.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/users/deleteuser.jsp
@@ -5,7 +5,7 @@
<html>
<body>
- <rhn:toolbar base="h1" icon="fa-user"
imgAlt="users.jsp.imgAlt">
+ <rhn:toolbar base="h1" icon="header-user"
imgAlt="users.jsp.imgAlt">
<c:out escapeXml="true" value="${targetuser.login}"
/>
</rhn:toolbar>
<form method="POST"
action="/rhn/users/DeleteUserSubmit.do?uid=${param.uid}">
diff --git a/java/code/webapp/WEB-INF/pages/admin/users/disabledlist.jsp
b/java/code/webapp/WEB-INF/pages/admin/users/disabledlist.jsp
index c89baa9..60baefe 100644
--- a/java/code/webapp/WEB-INF/pages/admin/users/disabledlist.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/users/disabledlist.jsp
@@ -10,7 +10,7 @@
<meta name="page-decorator" content="none" />
</head>
<body>
-<rhn:toolbar base="h1" icon="fa-user"
imgAlt="users.jsp.imgAlt"
+<rhn:toolbar base="h1" icon="header-user"
imgAlt="users.jsp.imgAlt"
helpUrl="/rhn/help/reference/en-US/s1-sm-users.jsp#s2-sm-users-deactivated"
creationUrl="/rhn/users/CreateUser.do?account_type=into_org"
creationType="user">
diff --git a/java/code/webapp/WEB-INF/pages/admin/users/disableuser.jsp
b/java/code/webapp/WEB-INF/pages/admin/users/disableuser.jsp
index 41430a4..92be6c4 100644
--- a/java/code/webapp/WEB-INF/pages/admin/users/disableuser.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/users/disableuser.jsp
@@ -5,7 +5,7 @@
<html>
<body>
- <rhn:toolbar base="h1" icon="fa-user"
imgAlt="users.jsp.imgAlt">
+ <rhn:toolbar base="h1" icon="header-user"
imgAlt="users.jsp.imgAlt">
<c:out escapeXml="true" value="${targetuser.login}"
/>
</rhn:toolbar>
<form method="POST"
action="/rhn/users/DisableUserSubmit.do?uid=${param.uid}">
diff --git a/java/code/webapp/WEB-INF/pages/admin/users/userconfirm.jsp
b/java/code/webapp/WEB-INF/pages/admin/users/userconfirm.jsp
index 0d579f9..d5b3faa 100644
--- a/java/code/webapp/WEB-INF/pages/admin/users/userconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/users/userconfirm.jsp
@@ -10,7 +10,7 @@
<meta name="name" value="Users" />
</head>
<body>
-<rhn:toolbar base="h1" icon="fa-user"
+<rhn:toolbar base="h1" icon="header-user"
helpUrl="/rhn/help/reference/en-US/s1-sm-users.jsp">
<bean:message key="userconfirm.jsp.header" />
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/admin/users/userlist.jsp
b/java/code/webapp/WEB-INF/pages/admin/users/userlist.jsp
index 5fa8206..45f94ca 100644
--- a/java/code/webapp/WEB-INF/pages/admin/users/userlist.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/users/userlist.jsp
@@ -10,7 +10,7 @@
<meta name="page-decorator" content="none" />
</head>
<body>
-<rhn:toolbar base="h1" icon="fa-user"
imgAlt="users.jsp.imgAlt"
+<rhn:toolbar base="h1" icon="header-user"
imgAlt="users.jsp.imgAlt"
helpUrl="/rhn/help/reference/en-US/s1-sm-users.jsp#s2-sm-users-all"
creationUrl="/rhn/users/CreateUser.do?account_type=into_org"
creationType="user">
diff --git a/java/code/webapp/WEB-INF/pages/audit/auditsearch.jsp
b/java/code/webapp/WEB-INF/pages/audit/auditsearch.jsp
index 1846671..e2e247c 100644
--- a/java/code/webapp/WEB-INF/pages/audit/auditsearch.jsp
+++ b/java/code/webapp/WEB-INF/pages/audit/auditsearch.jsp
@@ -11,7 +11,7 @@
</head>
<body>
-<rhn:toolbar base="h1" icon="fa-desktop"
+<rhn:toolbar base="h1" icon="header-system"
helpUrl="/rhn/help/reference/en-US/s2-sm-system-overview.jsp">
<bean:message key="auditsearch.jsp.header"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/audit/auditview.jsp
b/java/code/webapp/WEB-INF/pages/audit/auditview.jsp
index c1de88f..2b4e812 100644
--- a/java/code/webapp/WEB-INF/pages/audit/auditview.jsp
+++ b/java/code/webapp/WEB-INF/pages/audit/auditview.jsp
@@ -15,7 +15,7 @@
</head>
<body>
-<rhn:toolbar base="h1" icon="fa-desktop"
imgAlt="audit.jsp.alt"
+<rhn:toolbar base="h1" icon="header-system"
imgAlt="audit.jsp.alt"
helpUrl="/rhn/help/reference/en-US/s2-sm-system-overview.jsp">
<bean:message key="auditsearch.jsp.header"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/audit/listxccdf.jsp
b/java/code/webapp/WEB-INF/pages/audit/listxccdf.jsp
index 730fa1c..4edf3bc 100644
--- a/java/code/webapp/WEB-INF/pages/audit/listxccdf.jsp
+++ b/java/code/webapp/WEB-INF/pages/audit/listxccdf.jsp
@@ -13,7 +13,7 @@
<body>
-<rhn:toolbar base="h1" icon="fa-desktop"
imgAlt="audit.jsp.alt">
+<rhn:toolbar base="h1" icon="header-system"
imgAlt="audit.jsp.alt">
<bean:message key="system.audit.listscap.jsp.overview"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/audit/machine.jsp
b/java/code/webapp/WEB-INF/pages/audit/machine.jsp
index 224a7f2..5e7f32d 100644
--- a/java/code/webapp/WEB-INF/pages/audit/machine.jsp
+++ b/java/code/webapp/WEB-INF/pages/audit/machine.jsp
@@ -11,7 +11,7 @@
</head>
<body>
-<rhn:toolbar base="h1" icon="fa-desktop"
imgAlt="audit.jsp.alt"
+<rhn:toolbar base="h1" icon="header-system"
imgAlt="audit.jsp.alt"
helpUrl="/rhn/help/reference/en-US/s2-sm-system-overview.jsp">
<bean:message key="audit.overview.jsp.header"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/audit/overview.jsp
b/java/code/webapp/WEB-INF/pages/audit/overview.jsp
index 968f703..dacda63 100644
--- a/java/code/webapp/WEB-INF/pages/audit/overview.jsp
+++ b/java/code/webapp/WEB-INF/pages/audit/overview.jsp
@@ -11,7 +11,7 @@
</head>
<body>
-<rhn:toolbar base="h1" icon="fa-desktop"
imgAlt="audit.jsp.alt"
+<rhn:toolbar base="h1" icon="header-system"
imgAlt="audit.jsp.alt"
helpUrl="/rhn/help/reference/en-US/s2-sm-system-overview.jsp">
<bean:message key="audit.overview.jsp.header"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/audit/scap/xccdfdiff.jsp
b/java/code/webapp/WEB-INF/pages/audit/scap/xccdfdiff.jsp
index 29ebba1..2bb904e 100644
--- a/java/code/webapp/WEB-INF/pages/audit/scap/xccdfdiff.jsp
+++ b/java/code/webapp/WEB-INF/pages/audit/scap/xccdfdiff.jsp
@@ -10,7 +10,7 @@
</head>
<body>
-<rhn:toolbar base="h1" icon="fa-search">
+<rhn:toolbar base="h1" icon="header-search">
<bean:message key="scapdiff.jsp.toolbar"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/audit/scap/xccdfdiffsubmit.jsp
b/java/code/webapp/WEB-INF/pages/audit/scap/xccdfdiffsubmit.jsp
index 74e7680..d3c7ee2 100644
--- a/java/code/webapp/WEB-INF/pages/audit/scap/xccdfdiffsubmit.jsp
+++ b/java/code/webapp/WEB-INF/pages/audit/scap/xccdfdiffsubmit.jsp
@@ -21,7 +21,7 @@ div.differs {
</head>
<body>
-<rhn:toolbar base="h1" icon="fa-search"
imgAlt="search.alt.img">
+<rhn:toolbar base="h1" icon="header-search"
imgAlt="search.alt.img">
<bean:message key="scapdiff.jsp.toolbar"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp
b/java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp
index b5e442e..df95677 100644
--- a/java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp
+++ b/java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp
@@ -20,7 +20,7 @@
</script>
</head>
<body>
- <rhn:toolbar base="h1" icon="fa-search">
+ <rhn:toolbar base="h1" icon="header-search">
<bean:message key="scapsearch.jsp.toolbar"/>
</rhn:toolbar>
<p><bean:message key="scapsearch.jsp.summary"/></p>
diff --git a/java/code/webapp/WEB-INF/pages/channel/all.jsp
b/java/code/webapp/WEB-INF/pages/channel/all.jsp
index 46b12cc..cff2920 100644
--- a/java/code/webapp/WEB-INF/pages/channel/all.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/all.jsp
@@ -17,7 +17,7 @@ function showFiltered() {
</head>
<body onLoad="onLoadStuff(4); showFiltered();">
-<rhn:toolbar base="h1" icon="spacewalk-icon-software-channels"
+<rhn:toolbar base="h1" icon="header-channel"
helpUrl="/rhn/help/reference/en-US/s1-sm-channels-packages.jsp"
>
<bean:message key="channels.all.jsp.toolbar"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/channel/channel_family_tree.jsp
b/java/code/webapp/WEB-INF/pages/channel/channel_family_tree.jsp
index 0f43c0d..4c49b2e 100644
--- a/java/code/webapp/WEB-INF/pages/channel/channel_family_tree.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/channel_family_tree.jsp
@@ -10,7 +10,7 @@
</head>
<body onLoad="onLoadStuff(3); showAllRows();">
-<rhn:toolbar base="h1" icon="spacewalk-icon-software-channels"
imgAlt="channels.jsp.alt">
+<rhn:toolbar base="h1" icon="header-channel"
imgAlt="channels.jsp.alt">
${requestScope.familyName}
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/channel/custom.jsp
b/java/code/webapp/WEB-INF/pages/channel/custom.jsp
index d4e6e19..f635f5d 100644
--- a/java/code/webapp/WEB-INF/pages/channel/custom.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/custom.jsp
@@ -17,7 +17,7 @@ function showFiltered() {
</head>
<body onLoad="onLoadStuff(3); showFiltered();">
-<rhn:toolbar base="h1" icon="spacewalk-icon-software-channels"
imgAlt="channels.overview.toolbar.imgAlt">
+<rhn:toolbar base="h1" icon="header-channel"
imgAlt="channels.overview.toolbar.imgAlt">
<bean:message key="channel.nav.custom"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/channel/entitlements.jsp
b/java/code/webapp/WEB-INF/pages/channel/entitlements.jsp
index 14f15eb..0e3ccd4 100644
--- a/java/code/webapp/WEB-INF/pages/channel/entitlements.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/entitlements.jsp
@@ -11,7 +11,7 @@
<meta name="page-decorator" content="none" />
</head>
<body>
-<rhn:toolbar base="h1" icon="spacewalk-icon-software-channels"
+<rhn:toolbar base="h1" icon="header-channel"
helpUrl="/rhn/help/reference/en-US/s1-sm-your-rhn.jsp#s2-sm-systems-entitlements"
imgAlt="channels.jsp.alt">
<bean:message key="entitlements.jsp.header"/>
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/delete.jsp
b/java/code/webapp/WEB-INF/pages/channel/manage/delete.jsp
index 002eb5d..1ff78a3 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/delete.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/delete.jsp
@@ -5,7 +5,7 @@
<html>
<body>
- <rhn:toolbar base="h1"
icon="spacewalk-icon-software-channels">
+ <rhn:toolbar base="h1" icon="header-channel">
<bean:message key="channel.delete.jsp.toolbar"
arg0="${channel.name}"/>
</rhn:toolbar>
<rhn:dialogmenu mindepth="0" maxdepth="1"
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/distchannelmap.jsp
b/java/code/webapp/WEB-INF/pages/channel/manage/distchannelmap.jsp
index 09aed22..75a9478 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/distchannelmap.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/distchannelmap.jsp
@@ -11,7 +11,7 @@
</head>
<body>
-<rhn:toolbar base="h1" icon="fa-retweet"
+<rhn:toolbar base="h1" icon="header-channel-mapping"
creationUrl="DistChannelMapEdit.do"
creationType="distchannelmap"
iconAlt="info.alt.img">
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/distchannelmapdelete.jsp
b/java/code/webapp/WEB-INF/pages/channel/manage/distchannelmapdelete.jsp
index a2ec909..d4f4554 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/distchannelmapdelete.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/distchannelmapdelete.jsp
@@ -5,7 +5,7 @@
<html:html >
<body>
- <rhn:toolbar base="h1" icon="fa-retweet"
iconAlt="info.alt.img">
+ <rhn:toolbar base="h1" icon="header-channel-mapping"
iconAlt="info.alt.img">
<bean:message key="distchannelmap.jsp.delete"/>
</rhn:toolbar>
<h2><bean:message key="distchannelmap.jsp.delete"/></h2>
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/distchannelmapedit.jsp
b/java/code/webapp/WEB-INF/pages/channel/manage/distchannelmapedit.jsp
index 5faf499..fa4233e 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/distchannelmapedit.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/distchannelmapedit.jsp
@@ -7,13 +7,13 @@
<body>
<c:choose>
<c:when test="${empty dcm}">
- <rhn:toolbar base="h1" icon="fa-retweet"
iconAlt="info.alt.img">
+ <rhn:toolbar base="h1"
icon="header-channel-mapping" iconAlt="info.alt.img">
<bean:message key="distchannelmap.jsp.create"/>
</rhn:toolbar>
<h2><bean:message
key="distchannelmap.jsp.create"/></h2>
</c:when>
<c:otherwise>
- <rhn:toolbar base="h1" icon="fa-retweet"
iconAlt="info.alt.img"
+ <rhn:toolbar base="h1"
icon="header-channel-mapping" iconAlt="info.alt.img"
deletionUrl="DistChannelMapDelete.do?dcm=${dcm}"
deletionType="distchannelmap">
<bean:message key="distchannelmap.jsp.update"/>
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/edit.jsp
b/java/code/webapp/WEB-INF/pages/channel/manage/edit.jsp
index 034b0dc..b601a63 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/edit.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/edit.jsp
@@ -19,7 +19,7 @@
document.getElementById("checksum").value =
baseChannelChecksums[document.getElementById("parent").value];
}
</script>
- <rhn:toolbar base="h1"
icon="spacewalk-icon-software-channels"
+ <rhn:toolbar base="h1" icon="header-channel"
deletionUrl="/rhn/channels/manage/Delete.do?cid=${param.cid}"
deletionAcl="user_role(channel_admin);
formvar_exists(cid)"
deletionType="software.channel">
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/manage.jsp
b/java/code/webapp/WEB-INF/pages/channel/manage/manage.jsp
index 86bec48..ba5a8cb 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/manage.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/manage.jsp
@@ -6,7 +6,7 @@
<html>
<body>
-<rhn:toolbar base="h1" icon="spacewalk-icon-software-channels"
+<rhn:toolbar base="h1" icon="header-channel"
imgAlt="channels.overview.toolbar.imgAlt"
creationUrl="/rhn/channels/manage/Edit.do"
creationType="channel"
diff --git
a/java/code/webapp/WEB-INF/pages/channel/manage/package/confirmdeletepackages.jsp
b/java/code/webapp/WEB-INF/pages/channel/manage/package/confirmdeletepackages.jsp
index eac5c20..4337e82 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/package/confirmdeletepackages.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/package/confirmdeletepackages.jsp
@@ -11,7 +11,7 @@
</head>
<body>
-<rhn:toolbar base="h1" icon="spacewalk-icon-packages"
iconAlt="overview.jsp.alt"
+<rhn:toolbar base="h1" icon="header-package"
iconAlt="overview.jsp.alt"
helpUrl="/rhn/help/getting-started/en-US/sect-Getting_Started_Guide-Channel_Management-Creating_and_Managing_Custom_Channels-Removing_Software_Packages.jsp">
<bean:message key="channel.jsp.manage.package.title"/>
</rhn:toolbar>
diff --git
a/java/code/webapp/WEB-INF/pages/channel/manage/package/listremovecustompackages.jsp
b/java/code/webapp/WEB-INF/pages/channel/manage/package/listremovecustompackages.jsp
index 5e1b2bf..1aeb8a3 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/package/listremovecustompackages.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/package/listremovecustompackages.jsp
@@ -21,7 +21,7 @@
</script>
</head>
<body>
-<rhn:toolbar base="h1" icon="spacewalk-icon-packages"
iconAlt="overview.jsp.alt"
+<rhn:toolbar base="h1" icon="header-package"
iconAlt="overview.jsp.alt"
helpUrl="/rhn/help/getting-started/en-US/sect-Getting_Started_Guide-Channel_Management-Creating_and_Managing_Custom_Channels-Removing_Software_Packages.jsp">
<bean:message key="channel.jsp.manage.package.title"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/repo/deleteconfirm.jsp
b/java/code/webapp/WEB-INF/pages/channel/manage/repo/deleteconfirm.jsp
index a628222..e4e02b5 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/repo/deleteconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/repo/deleteconfirm.jsp
@@ -6,7 +6,7 @@
<html>
<body>
-<rhn:toolbar base="h1" icon="fa-info-circle"
imgAlt="info.alt.img">
+<rhn:toolbar base="h1" icon="header-info"
imgAlt="info.alt.img">
<c:out value="${requestScope.label}"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/repo/repodetails.jsp
b/java/code/webapp/WEB-INF/pages/channel/manage/repo/repodetails.jsp
index e546e26..fb5ef93 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/repo/repodetails.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/repo/repodetails.jsp
@@ -7,13 +7,13 @@
<body>
<c:choose>
<c:when test = "${not empty requestScope.create_mode}">
- <rhn:toolbar base="h1" icon="fa-info-circle"
imgAlt="info.alt.img">
+ <rhn:toolbar base="h1" icon="header-info"
imgAlt="info.alt.img">
<bean:message key="repos.jsp.toolbar"/>
</rhn:toolbar>
<h2><bean:message
key="repos.jsp.header2"/></h2>
</c:when>
<c:otherwise>
- <rhn:toolbar base="h1" icon="fa-info-circle"
imgAlt="info.alt.img"
+ <rhn:toolbar base="h1" icon="header-info"
imgAlt="info.alt.img"
deletionUrl="RepoDelete.do?id=${requestScope.repo.id}"
deletionType="repos">
<c:out value="${requestScope.repo.label}"/>
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/repo/repos.jsp
b/java/code/webapp/WEB-INF/pages/channel/manage/repo/repos.jsp
index 016531b..8cab07b 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/repo/repos.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/repo/repos.jsp
@@ -6,7 +6,7 @@
<html>
<body>
-<rhn:toolbar base="h1" icon="fa-info-circle"
+<rhn:toolbar base="h1" icon="header-info"
creationUrl="RepoCreate.do"
creationType="repos"
imgAlt="info.alt.img">
diff --git a/java/code/webapp/WEB-INF/pages/channel/packagesearch.jsp
b/java/code/webapp/WEB-INF/pages/channel/packagesearch.jsp
index 5b777ad..5a46003 100644
--- a/java/code/webapp/WEB-INF/pages/channel/packagesearch.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/packagesearch.jsp
@@ -9,7 +9,7 @@
<script type="text/javascript"
src="/javascript/highlander.js"></script>
</head>
<body>
- <rhn:toolbar base="h1" icon="fa-search"
+ <rhn:toolbar base="h1" icon="header-search"
helpUrl="/rhn/help/reference/en-US/s1-sm-channels-packages.jsp#s2-sm-software-search">
<bean:message key="packagesearch.jsp.toolbar"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/channel/popular.jsp
b/java/code/webapp/WEB-INF/pages/channel/popular.jsp
index 4cd3baa..fb24ab4 100644
--- a/java/code/webapp/WEB-INF/pages/channel/popular.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/popular.jsp
@@ -17,7 +17,7 @@ function showFiltered() {
</head>
<body onLoad="onLoadStuff(3); showFiltered();">
-<rhn:toolbar base="h1"
icon="spacewalk-icon-software-channels">
+<rhn:toolbar base="h1" icon="header-channel">
<bean:message key="channel.nav.popular"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/channel/retired.jsp
b/java/code/webapp/WEB-INF/pages/channel/retired.jsp
index 4fbed78..0f896bf 100644
--- a/java/code/webapp/WEB-INF/pages/channel/retired.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/retired.jsp
@@ -17,7 +17,7 @@ function showFiltered() {
</head>
<body onLoad="onLoadStuff(3); showFiltered();">
-<rhn:toolbar base="h1" icon="spacewalk-icon-software-channels"
imgAlt="channels.overview.toolbar.imgAlt">
+<rhn:toolbar base="h1" icon="header-channel"
imgAlt="channels.overview.toolbar.imgAlt">
<bean:message key="channels.retired.jsp.toolbar"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/channel/shared.jsp
b/java/code/webapp/WEB-INF/pages/channel/shared.jsp
index dc876d5..b8a884a 100644
--- a/java/code/webapp/WEB-INF/pages/channel/shared.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/shared.jsp
@@ -19,7 +19,7 @@ function showFiltered() {
<body onLoad="onLoadStuff(4); showFiltered();">
<rhn:toolbar
base="h1"
- icon="spacewalk-icon-software-channels"
+ icon="header-channel"
imgAlt="channels.overview.toolbar.imgAlt">
<bean:message key="channel.nav.shared"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/channel/vendor.jsp
b/java/code/webapp/WEB-INF/pages/channel/vendor.jsp
index b4b98a3..4aaa46b 100644
--- a/java/code/webapp/WEB-INF/pages/channel/vendor.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/vendor.jsp
@@ -17,7 +17,7 @@ function showFiltered() {
</head>
<body onLoad="onLoadStuff(3); showFiltered();">
-<rhn:toolbar base="h1" icon="spacewalk-icon-software-channels"
imgAlt="channels.overview.toolbar.imgAlt">
+<rhn:toolbar base="h1" icon="header-channel"
imgAlt="channels.overview.toolbar.imgAlt">
<bean:message key="channel.nav.vendor"/>
</rhn:toolbar>
diff --git
a/java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/common-header.jspf
b/java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/common-header.jspf
index 3032817..a2bc14d 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/common-header.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/common-header.jspf
@@ -1,6 +1,6 @@
<%@ taglib
uri="http://struts.apache.org/tags-html" prefix="html"
%>
<%@ taglib
uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<rhn:toolbar base="h1" icon="fa-key"
+<rhn:toolbar base="h1" icon="header-activation-key"
imgAlt="activation-keys.common.alt"
helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s2-sm-systems-activation-keys"
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/channel/channel_header.jspf
b/java/code/webapp/WEB-INF/pages/common/fragments/channel/channel_header.jspf
index a471235..fdd2287 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/channel/channel_header.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/channel/channel_header.jspf
@@ -1,6 +1,6 @@
-<rhn:toolbar base="h1" icon="spacewalk-icon-software-channels"
imgAlt="channels.jsp.alt">
+<rhn:toolbar base="h1" icon="header-channel"
imgAlt="channels.jsp.alt">
<c:out value="${channel_name}" escapeXml="true"/>
</rhn:toolbar>
diff --git
a/java/code/webapp/WEB-INF/pages/common/fragments/channel/manage/manage_channel_header.jspf
b/java/code/webapp/WEB-INF/pages/common/fragments/channel/manage/manage_channel_header.jspf
index 7b08071..5332d8e 100644
---
a/java/code/webapp/WEB-INF/pages/common/fragments/channel/manage/manage_channel_header.jspf
+++
b/java/code/webapp/WEB-INF/pages/common/fragments/channel/manage/manage_channel_header.jspf
@@ -1,4 +1,4 @@
-<rhn:toolbar base="h1" icon="spacewalk-icon-software-channels"
+<rhn:toolbar base="h1" icon="header-channel"
imgAlt="overview.jsp.alt"
helpUrl="/rhn/help/reference/en-US/s1-sm-channels-packages.jsp#s2-sm-channel-manage"
deletionUrl="/rhn/channels/manage/Delete.do?cid=${cid}"
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 db3c3f2..0046fd4 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
@@ -35,7 +35,7 @@
</c:if>
</c:when>
<c:otherwise>
- <rhn:toolbar base="h1"
icon="spacewalk-icon-Software-Channel-Management"
+ <rhn:toolbar base="h1" icon="header-configuration"
imgAlt="config.common.globalAlt"
helpUrl="/rhn/help/reference/en-US/s1-sm-configuration.jsp#config-config-channels-channel-details">
<bean:message key="channelOverview.jsp.newToolbar" />
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 2d4c3d4..7d785b6 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
@@ -88,7 +88,7 @@
<rhn:require acl="user_role(org_admin)">
<a
href="/rhn/users/UserDetails.do?uid=${summary.mostRecentMod.configFile.latestConfigRevision.changedBy.id}">
</rhn:require>
- <i class="fa fa-user" title="<bean:message
key='user.common.userAlt' />"></i>
+ <rhn:icon type="header-user" title="<bean:message
key='user.common.userAlt' />" />
<c:out
value="${summary.mostRecentMod.configFile.latestConfigRevision.changedBy.login}"
/>
<rhn:require acl="user_role(org_admin)">
</a>
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 2b2af09..34ebf03 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
@@ -49,7 +49,7 @@
* the login of the user
--%>
<c:set var="beanarg" scope="request">
- <i class="fa fa-user" title="<bean:message
key='user.common.userAlt' />"></i>
+ <rhn:icon type="header-user" title="<bean:message
key='user.common.userAlt' />" />
<rhn:require acl="user_role(org_admin)">
<a href="/rhn/users/UserDetails.do?uid=${lastUserId}">
</rhn:require>
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 012eb28..726c38b 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
@@ -39,7 +39,7 @@
<button type="submit"
name="dispatch"
class="btn btn-default">
- <i class="fa fa-trash-o"></i> <bean:message
key="erratalist.jsp.deleteerrata"/>
+ <rhn:icon type="item-del" /> <bean:message
key="erratalist.jsp.deleteerrata"/>
</button>
</div>
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 67aa370..3d021db 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
@@ -13,7 +13,7 @@
<bean:message key="toolbar.work.with.group"/>
</a>
<a
href="/network/systems/groups/delete_confirm.pxt?sgid=${systemgroup.id}">
- <i class="fa fa-trash-o" title="<bean:message
key='toolbar.delete.systemgroup'/>" ></i>
+ <rhn:icon type="item-del" title="<bean:message
key='toolbar.delete.systemgroup'/>" />
<bean:message key="toolbar.delete.systemgroup"/>
</a>
diff --git
a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/advanced/header.jspf
b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/advanced/header.jspf
index 5ee0a77..dd20f07 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/advanced/header.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/advanced/header.jspf
@@ -2,7 +2,7 @@
<%@ taglib
uri="http://struts.apache.org/tags-bean" prefix="bean"
%>
<%@ taglib
uri="http://java.sun.com/jsp/jstl/functions"
prefix="fn" %>
<%@ taglib
uri="http://struts.apache.org/tags-html" prefix="html"
%>
-<rhn:toolbar base="h1" icon="fa-rocket"
+<rhn:toolbar base="h1" icon="header-kickstart"
imgAlt="system.common.kickstartAlt"
deletionUrl="/rhn/kickstart/KickstartDeleteAdvanced.do?ksid=${ksdata.id}"
deletionType="kickstart"
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/clone.jspf
b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/clone.jspf
index 6630d07..e36e10f 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/clone.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/clone.jspf
@@ -6,7 +6,7 @@
<html>
<body>
-<rhn:toolbar base="h1" icon="fa-rocket"
imgAlt="system.common.kickstartAlt">
+<rhn:toolbar base="h1" icon="header-kickstart"
imgAlt="system.common.kickstartAlt">
<bean:message key="kickstart.clone.jsp.header1"
arg0="${ksdata.label}"/>
</rhn:toolbar>
diff --git
a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/kickstart-toolbar.jspf
b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/kickstart-toolbar.jspf
index 0004723..e71f8fc 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/kickstart-toolbar.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/kickstart-toolbar.jspf
@@ -1,7 +1,7 @@
<%@ taglib
uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib
uri="http://struts.apache.org/tags-bean" prefix="bean"
%>
<%@ taglib
uri="http://java.sun.com/jsp/jstl/functions"
prefix="fn" %>
-<rhn:toolbar base="h1" icon="fa-rocket"
+<rhn:toolbar base="h1" icon="header-kickstart"
imgAlt="system.common.kickstartAlt"
deletionUrl="/rhn/kickstart/KickstartDelete.do?ksid=${ksdata.id}"
deletionType="kickstart"
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 ed1566c..c71d238 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,6 +1,6 @@
-<rhn:toolbar base="h1" icon="spacewalk-icon-packages"
imgAlt="package.jsp.alt">
+<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>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/profile/header.jspf
b/java/code/webapp/WEB-INF/pages/common/fragments/profile/header.jspf
index 6a0a25a..6834e10 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/profile/header.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/profile/header.jspf
@@ -3,7 +3,7 @@
<%@ taglib
uri="http://java.sun.com/jsp/jstl/core" prefix="c"
%>
<rhn:toolbar base="h1"
- icon="spacewalk-icon-packages"
+ icon="header-package"
imgAlt="profile.list.header.alt"
deletionUrl="/rhn/profiles/Delete.do?prid=${param.prid}"
deletionType="profile">
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/ssm/header.jspf
b/java/code/webapp/WEB-INF/pages/common/fragments/ssm/header.jspf
index 8aa8965..40b94cb 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/ssm/header.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/ssm/header.jspf
@@ -3,7 +3,7 @@
<%@ taglib
uri="http://java.sun.com/jsp/jstl/core" prefix="c"
%>
<rhn:toolbar base="h1"
- icon="spacewalk-icon-system-groups"
+ icon="header-system-groups"
imgAlt="ssm.jsp.imgAlt"
helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s2-sm-ssm">
<bean:message key="ssm.jsp.header" />
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/user/user-header.jspf
b/java/code/webapp/WEB-INF/pages/common/fragments/user/user-header.jspf
index f06f8c8..9f9c59d 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/user/user-header.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/user/user-header.jspf
@@ -14,7 +14,7 @@
<c:set var="icon" value="fa-plus-circle" />
</c:if>
-<rhn:toolbar base="h1" icon="fa-user"
+<rhn:toolbar base="h1" icon="header-user"
helpUrl="/rhn/help/reference/en-US/s1-sm-users.jsp#s3-sm-user-active-details"
miscUrl="${url}"
miscAcl="user_role(org_admin)"
diff --git
a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/recentlyRegistered.jsp
b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/recentlyRegistered.jsp
index ea23966..ca57deb 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/recentlyRegistered.jsp
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/recentlyRegistered.jsp
@@ -55,7 +55,7 @@
<c:choose>
<c:when test="${current.creatorName != null}">
- <i class="fa fa-user" title="<bean:message
key='yourrhn.jsp.user.alt'/>"></i>
+ <rhn:icon type="header-user" title="<bean:message
key='yourrhn.jsp.user.alt'/>" />
<c:out value="${current.creatorName}"/>
</c:when>
<c:otherwise>
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 7f8c33a..8e2d6cd 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
@@ -36,7 +36,7 @@
style="text-align: center;">
<c:choose>
<c:when test="${current.userName != ''}">
- <i class="fa fa-user" title="<bean:message
key='yourrhn.jsp.user.alt'/>"></i>
+ <rhn:icon type="header-user" title="<bean:message
key='yourrhn.jsp.user.alt'/>" />
${current.userName}
</c:when>
<c:otherwise>
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 777ae4c..4f2e6f2 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/overview/globalconfiglist.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/overview/globalconfiglist.jsp
@@ -9,7 +9,7 @@
<meta name="page-decorator" content="none" />
</head>
<body>
-<rhn:toolbar base="h1"
icon="spacewalk-icon-Software-Channel-Management"
+<rhn:toolbar base="h1" icon="header-configuration"
helpUrl="/rhn/help/reference/en-US/s1-sm-configuration.jsp#configuration-files-central"
creationUrl="/rhn/configuration/ChannelCreate.do?editing=true"
creationType="configchannel"
diff --git a/java/code/webapp/WEB-INF/pages/configuration/overview/globalfilelist.jsp
b/java/code/webapp/WEB-INF/pages/configuration/overview/globalfilelist.jsp
index 3b5de25..7eb8605 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/overview/globalfilelist.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/overview/globalfilelist.jsp
@@ -8,7 +8,7 @@
<html>
<body>
-<rhn:toolbar base="h1"
icon="spacewalk-icon-manage-configuration-file"
+<rhn:toolbar base="h1" icon="header-configuration"
helpUrl="/rhn/help/reference/en-US/s1-sm-configuration.jsp#configuration-files-central">
<bean:message key="globalfilelist.jsp.toolbar"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/overview/localfilelist.jsp
b/java/code/webapp/WEB-INF/pages/configuration/overview/localfilelist.jsp
index a5a8bdb..81b3f2a 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/overview/localfilelist.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/overview/localfilelist.jsp
@@ -7,7 +7,7 @@
<html>
<body>
-<rhn:toolbar base="h1"
icon="spacewalk-icon-manage-configuration-file"
+<rhn:toolbar base="h1" icon="header-configuration"
helpUrl="/rhn/help/reference/en-US/s1-sm-configuration.jsp#configuration-files-local">
<bean:message key="localfilelist.jsp.toolbar"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/overview/managedsystems.jsp
b/java/code/webapp/WEB-INF/pages/configuration/overview/managedsystems.jsp
index 0272e62..4c8438b 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/overview/managedsystems.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/overview/managedsystems.jsp
@@ -9,7 +9,7 @@
<meta name="page-decorator" content="none" />
</head>
<body>
-<rhn:toolbar base="h1" icon="fa-desktop"
+<rhn:toolbar base="h1" icon="header-system"
helpUrl="/rhn/help/reference/en-US/s1-sm-configuration.jsp#config-systems"
>
<bean:message key="managedsystems.jsp.toolbar"/>
</rhn:toolbar>
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 48051ea..ddaa6b5 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/overview/overview.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/overview/overview.jsp
@@ -11,7 +11,7 @@
</head>
<body>
-<rhn:toolbar base="h1" icon="fa-cog"
imgAlt="config.jsp.imgAlt"
+<rhn:toolbar base="h1" icon="header-configuration"
imgAlt="config.jsp.imgAlt"
helpUrl="/rhn/help/reference/en-US/s1-sm-configuration.jsp#configuration-overview"
>
<bean:message key="configoverview.jsp.toolbar"/>
</rhn:toolbar>
@@ -118,7 +118,7 @@
<rhn:column header="configoverview.jsp.scheduledBy"
url="/rhn/users/UserDetails.do?uid=${current.scheduledById}"
renderUrl="${requestScope.is_admin}">
- <i class="fa fa-user" title="<bean:message
key="user.common.userAlt" />"></i>
+ <rhn:icon type="header-user" title="<bean:message
key='user.common.userAlt' />" />
${fn:escapeXml(current.scheduledByName)}
</rhn:column>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/overview/targetsystems.jsp
b/java/code/webapp/WEB-INF/pages/configuration/overview/targetsystems.jsp
index e0756f2..19bdd96 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/overview/targetsystems.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/overview/targetsystems.jsp
@@ -8,7 +8,7 @@
<html>
<body>
-<rhn:toolbar base="h1" icon="fa-desktop"
+<rhn:toolbar base="h1" icon="header-system"
helpUrl="/rhn/help/reference/en-US/s1-sm-configuration.jsp#config-systems">
<bean:message key="targetsystems.jsp.toolbar" />
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/deployfile.jsp
b/java/code/webapp/WEB-INF/pages/configuration/sdc/deployfile.jsp
index af0f667..fabd669 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/sdc/deployfile.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/deployfile.jsp
@@ -12,7 +12,7 @@
<%@ include
file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %>
<rhn:toolbar base="h2"
- icon="fa-desktop"
+ icon="header-system"
imgAlt="system.common.systemAlt">
<bean:message key="sdcdeployfile.jsp.header"
arg0="${system.name}"/>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/deployfileconfirm.jsp
b/java/code/webapp/WEB-INF/pages/configuration/sdc/deployfileconfirm.jsp
index 8a55e1f..f6d4d09 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/sdc/deployfileconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/deployfileconfirm.jsp
@@ -12,7 +12,7 @@
<body>
<%@ include
file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %>
-<rhn:toolbar base="h2" icon="fa-desktop" >
+<rhn:toolbar base="h2" icon="header-system" >
<bean:message key="sdcdeployconfirm.jsp.header"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/difffile.jsp
b/java/code/webapp/WEB-INF/pages/configuration/sdc/difffile.jsp
index aae9599..14c35c0 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/sdc/difffile.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/difffile.jsp
@@ -13,7 +13,7 @@
<%@ include
file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %>
<rhn:toolbar base="h2"
- icon="fa-desktop"
+ icon="header-system"
imgAlt="system.common.systemAlt">
<bean:message key="sdcdifffile.jsp.header"
arg0="${fn:escapeXml(system.name)}"/>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/difffileconfirm.jsp
b/java/code/webapp/WEB-INF/pages/configuration/sdc/difffileconfirm.jsp
index b87c03f..e12bebe 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/sdc/difffileconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/difffileconfirm.jsp
@@ -12,7 +12,7 @@
<body>
<%@ include
file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %>
-<rhn:toolbar base="h2" icon="fa-desktop" >
+<rhn:toolbar base="h2" icon="header-system" >
<bean:message key="sdcdiffconfirm.jsp.header"
arg0="${fn:escapeXml(system.name)}"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/importfile.jsp
b/java/code/webapp/WEB-INF/pages/configuration/sdc/importfile.jsp
index 16168f1..9ccc96c 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/sdc/importfile.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/importfile.jsp
@@ -13,7 +13,7 @@
<%@ include
file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %>
<rhn:toolbar base="h2"
- icon="fa-desktop"
+ icon="header-system"
imgAlt="system.common.systemAlt">
<bean:message key="sdcimportfile.jsp.header"
arg0="${fn:escapeXml(system.name)}"/>
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 007058a..3121346 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/sdc/importfileconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/importfileconfirm.jsp
@@ -11,7 +11,7 @@
<body>
<%@ include
file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %>
-<rhn:toolbar base="h2" icon="fa-desktop" >
+<rhn:toolbar base="h2" icon="header-system" >
<bean:message key="sdcimportconfirm.jsp.header" />
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/credentials/delete.jsp
b/java/code/webapp/WEB-INF/pages/credentials/delete.jsp
index 3bb8146..6a38b0b 100644
--- a/java/code/webapp/WEB-INF/pages/credentials/delete.jsp
+++ b/java/code/webapp/WEB-INF/pages/credentials/delete.jsp
@@ -5,7 +5,7 @@
<html>
<body>
- <rhn:toolbar base="h1" icon="fa-user"
imgAlt="users.jsp.imgAlt"
+ <rhn:toolbar base="h1" icon="header-user"
imgAlt="users.jsp.imgAlt"
helpUrl="/rhn/help/reference/en-US/s1-sm-your-rhn.jsp#s2-sm-your-rhn-account">
<bean:message key="credentials.jsp.delete.dispatch" />
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/credentials/edit.jsp
b/java/code/webapp/WEB-INF/pages/credentials/edit.jsp
index d6afbec..41085da 100644
--- a/java/code/webapp/WEB-INF/pages/credentials/edit.jsp
+++ b/java/code/webapp/WEB-INF/pages/credentials/edit.jsp
@@ -6,7 +6,7 @@
<html>
<body>
- <rhn:toolbar base="h1" icon="fa-user"
imgAlt="users.jsp.imgAlt"
+ <rhn:toolbar base="h1" icon="header-user"
imgAlt="users.jsp.imgAlt"
helpUrl="/rhn/help/reference/en-US/s1-sm-your-rhn.jsp#s2-sm-your-rhn-account"
deletionUrl="/rhn/account/DeleteCredentials.do"
deletionType="credentials">
diff --git a/java/code/webapp/WEB-INF/pages/errata/addchannelpackagepush.jsp
b/java/code/webapp/WEB-INF/pages/errata/addchannelpackagepush.jsp
index 8f948a3..811b93b 100644
--- a/java/code/webapp/WEB-INF/pages/errata/addchannelpackagepush.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/addchannelpackagepush.jsp
@@ -9,7 +9,7 @@
<meta name="page-decorator" content="none" />
</head>
<body>
-<rhn:toolbar base="h1" icon="spacewalk-icon-patches"
+<rhn:toolbar base="h1" icon="header-errata"
helpUrl="/rhn/help/getting-started/en-US/chap-Getting_Started_Guide-Errata_Management.jsp">
<bean:message key="errata.publish.toolbar"/> <c:out
value="${advisory}" />
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/errata/addchannels.jsp
b/java/code/webapp/WEB-INF/pages/errata/addchannels.jsp
index 5bd7c98..49ccba8 100644
--- a/java/code/webapp/WEB-INF/pages/errata/addchannels.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/addchannels.jsp
@@ -9,7 +9,7 @@
<meta name="page-decorator" content="none" />
</head>
<body>
-<rhn:toolbar base="h1" icon="spacewalk-icon-patches"
+<rhn:toolbar base="h1" icon="header-errata"
helpUrl="/rhn/help/getting-started/en-US/chap-Getting_Started_Guide-Errata_Management.jsp">
<bean:message key="errata.publish.toolbar"/> <c:out
value="${advisory}" />
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/errata/addpackagepackagepush.jsp
b/java/code/webapp/WEB-INF/pages/errata/addpackagepackagepush.jsp
index eab21c0..61b476f 100644
--- a/java/code/webapp/WEB-INF/pages/errata/addpackagepackagepush.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/addpackagepackagepush.jsp
@@ -9,7 +9,7 @@
<meta name="page-decorator" content="none" />
</head>
<body>
-<rhn:toolbar base="h1" icon="spacewalk-icon-patches"
+<rhn:toolbar base="h1" icon="header-errata"
helpUrl="/rhn/help/getting-started/en-US/chap-Getting_Started_Guide-Errata_Management.jsp">
<bean:message key="errata.publish.toolbar"/> <c:out
value="${advisory}" />
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/errata/all.jsp
b/java/code/webapp/WEB-INF/pages/errata/all.jsp
index 912d2db..c127855 100644
--- a/java/code/webapp/WEB-INF/pages/errata/all.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/all.jsp
@@ -10,7 +10,7 @@
<meta name="page-decorator" content="none" />
</head>
<body>
-<rhn:toolbar base="h1" icon="spacewalk-icon-patches"
iconAlt="errata.common.errataAlt"
+<rhn:toolbar base="h1" icon="header-errata"
iconAlt="errata.common.errataAlt"
helpUrl="/rhn/help/reference/en-US/s1-sm-errata.jsp#s2-sm-all-errata">
<bean:message key="erratalist.jsp.allerrata"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/errata/cloneerrata.jsp
b/java/code/webapp/WEB-INF/pages/errata/cloneerrata.jsp
index e82175b..c06d15d 100644
--- a/java/code/webapp/WEB-INF/pages/errata/cloneerrata.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/cloneerrata.jsp
@@ -6,7 +6,7 @@
<html:html >
<body>
-<rhn:toolbar base="h1" icon="spacewalk-icon-patches"
+<rhn:toolbar base="h1" icon="header-errata"
helpUrl="/rhn/help/getting-started/en-US/sect-Getting_Started_Guide-Errata_Management-Cloning_Errata.jsp">
<bean:message key="cloneerrata.jsp.erratamanagement"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/errata/create.jsp
b/java/code/webapp/WEB-INF/pages/errata/create.jsp
index d68dd2b..d81acd0 100644
--- a/java/code/webapp/WEB-INF/pages/errata/create.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/create.jsp
@@ -8,7 +8,7 @@
<meta name="page-decorator" content="none" />
</head>
<body>
- <rhn:toolbar base="h1" icon="spacewalk-icon-patches"
iconAlt="errata.common.errataAlt"
+ <rhn:toolbar base="h1" icon="header-errata"
iconAlt="errata.common.errataAlt"
helpUrl="/rhn/help/getting-started/en-US/chap-Getting_Started_Guide-Errata_Management.jsp#sect-Getting_Started_Guide-Errata_Management-Creating_and_Editing_Errata">
<bean:message key="erratalist.jsp.erratamgmt"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/errata/delete.jsp
b/java/code/webapp/WEB-INF/pages/errata/delete.jsp
index c0c68ac..af56461 100644
--- a/java/code/webapp/WEB-INF/pages/errata/delete.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/delete.jsp
@@ -9,7 +9,7 @@
<meta name="page-decorator" content="none" />
</head>
<body>
-<rhn:toolbar base="h1" icon="spacewalk-icon-patches"
iconAlt="errata.common.errataAlt"
+<rhn:toolbar base="h1" icon="header-errata"
iconAlt="errata.common.errataAlt"
helpUrl="/rhn/help/getting-started/en-US/chap-Getting_Started_Guide-Errata_Management.jsp#sect-Getting_Started_Guide-Errata_Management-Creating_and_Editing_Errata">
<bean:message key="errata.edit.toolbar"/> <c:out
value="${errata.advisory}" />
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/errata/edit.jsp
b/java/code/webapp/WEB-INF/pages/errata/edit.jsp
index df4621d..858c54a 100644
--- a/java/code/webapp/WEB-INF/pages/errata/edit.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/edit.jsp
@@ -9,7 +9,7 @@
<meta name="page-decorator" content="none" />
</head>
<body>
- <rhn:toolbar base="h1" icon="spacewalk-icon-patches"
iconAlt="errata.common.errataAlt"
+ <rhn:toolbar base="h1" icon="header-errata"
iconAlt="errata.common.errataAlt"
helpUrl="/rhn/help/getting-started/en-US/chap-Getting_Started_Guide-Errata_Management.jsp#sect-Getting_Started_Guide-Errata_Management-Creating_and_Editing_Errata"
deletionUrl="/rhn/errata/manage/Delete.do?eid=${param.eid}"
deletionType="errata">
diff --git a/java/code/webapp/WEB-INF/pages/errata/editchannels.jsp
b/java/code/webapp/WEB-INF/pages/errata/editchannels.jsp
index df2b450..98516ac 100644
--- a/java/code/webapp/WEB-INF/pages/errata/editchannels.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/editchannels.jsp
@@ -9,7 +9,7 @@
<meta name="page-decorator" content="none" />
</head>
<body>
-<rhn:toolbar base="h1" icon="spacewalk-icon-patches"
iconAlt="errata.common.errataAlt"
+<rhn:toolbar base="h1" icon="header-errata"
iconAlt="errata.common.errataAlt"
helpUrl="/rhn/help/getting-started/en-US/chap-Getting_Started_Guide-Errata_Management.jsp#sect-Getting_Started_Guide-Errata_Management-Creating_and_Editing_Errata">
<bean:message key="errata.edit.toolbar"/> <c:out
value="${advisory}" />
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp
b/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp
index 7a1f9db..6dd6f40 100644
--- a/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp
@@ -25,7 +25,7 @@
</head>
<body>
-<rhn:toolbar base="h1" icon="fa-search"
+<rhn:toolbar base="h1" icon="header-search"
helpUrl="/rhn/help/reference/en-US/s1-sm-errata.jsp#s2-sm-errata-search">
<bean:message key="erratasearch.jsp.toolbar"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/errata/notify.jsp
b/java/code/webapp/WEB-INF/pages/errata/notify.jsp
index c2c234b..5ab452e 100644
--- a/java/code/webapp/WEB-INF/pages/errata/notify.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/notify.jsp
@@ -9,7 +9,7 @@
<meta name="page-decorator" content="none" />
</head>
<body>
-<rhn:toolbar base="h1" icon="spacewalk-icon-patches"
+<rhn:toolbar base="h1" icon="header-errata"
helpUrl="/rhn/help/getting-started/en-US/chap-Getting_Started_Guide-Errata_Management.jsp#sect-Getting_Started_Guide-Errata_Management-Creating_and_Editing_Errata"
deletionUrl="/rhn/errata/Delete.do?eid=${param.eid}"
deletionType="errata">
diff --git a/java/code/webapp/WEB-INF/pages/errata/packagepush.jsp
b/java/code/webapp/WEB-INF/pages/errata/packagepush.jsp
index 796e4a0..dd790de 100644
--- a/java/code/webapp/WEB-INF/pages/errata/packagepush.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/packagepush.jsp
@@ -10,7 +10,7 @@
</head>
<body>
-<rhn:toolbar base="h1" icon="spacewalk-icon-patches"
+<rhn:toolbar base="h1" icon="header-errata"
helpUrl="/rhn/help/getting-started/en-US/chap-Getting_Started_Guide-Errata_Management.jsp">
<bean:message key="errata.publish.toolbar"/> <c:out
value="${advisory}" />
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/errata/packages/add.jsp
b/java/code/webapp/WEB-INF/pages/errata/packages/add.jsp
index c0518bd..f2ea892 100644
--- a/java/code/webapp/WEB-INF/pages/errata/packages/add.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/packages/add.jsp
@@ -22,7 +22,7 @@
</head>
<body>
-<rhn:toolbar base="h1" icon="spacewalk-icon-patches"
iconAlt="errata.common.errataAlt"
+<rhn:toolbar base="h1" icon="header-errata"
iconAlt="errata.common.errataAlt"
helpUrl="/rhn/help/getting-started/en-US/chap-Getting_Started_Guide-Errata_Management.jsp#sect-Getting_Started_Guide-Errata_Management-Creating_and_Editing_Errata">
<bean:message key="errata.edit.toolbar"/> <c:out
value="${advisory}" />
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/errata/packages/confirm.jsp
b/java/code/webapp/WEB-INF/pages/errata/packages/confirm.jsp
index f0b52b4..721d2d1 100644
--- a/java/code/webapp/WEB-INF/pages/errata/packages/confirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/packages/confirm.jsp
@@ -10,7 +10,7 @@
<meta name="page-decorator" content="none" />
</head>
<body>
-<rhn:toolbar base="h1" icon="spacewalk-icon-patches"
+<rhn:toolbar base="h1" icon="header-errata"
helpUrl="/rhn/help/getting-started/en-US/chap-Getting_Started_Guide-Errata_Management.jsp#sect-Getting_Started_Guide-Errata_Management-Creating_and_Editing_Errata">
<bean:message key="errata.edit.toolbar"/> <c:out
value="${advisory}" />
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/errata/packages/list.jsp
b/java/code/webapp/WEB-INF/pages/errata/packages/list.jsp
index d9b2968..34198c9 100644
--- a/java/code/webapp/WEB-INF/pages/errata/packages/list.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/packages/list.jsp
@@ -9,7 +9,7 @@
<meta name="page-decorator" content="none" />
</head>
<body>
-<rhn:toolbar base="h1" icon="spacewalk-icon-patches"
iconAlt="errata.common.errataAlt"
+<rhn:toolbar base="h1" icon="header-errata"
iconAlt="errata.common.errataAlt"
helpUrl="/rhn/help/getting-started/en-US/chap-Getting_Started_Guide-Errata_Management.jsp#sect-Getting_Started_Guide-Errata_Management-Creating_and_Editing_Errata">
<bean:message key="errata.edit.toolbar"/> <c:out
value="${advisory}" />
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/errata/packages/packages.jsp
b/java/code/webapp/WEB-INF/pages/errata/packages/packages.jsp
index 6231e0a..fb3f782 100644
--- a/java/code/webapp/WEB-INF/pages/errata/packages/packages.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/packages/packages.jsp
@@ -10,7 +10,7 @@
</head>
<body>
-<rhn:toolbar base="h1" icon="spacewalk-icon-patches"
iconAlt="errata.common.errataAlt"
+<rhn:toolbar base="h1" icon="header-errata"
iconAlt="errata.common.errataAlt"
helpUrl="/rhn/help/getting-started/en-US/chap-Getting_Started_Guide-Errata_Management.jsp#sect-Getting_Started_Guide-Errata_Management-Creating_and_Editing_Errata">
<bean:message key="errata.edit.toolbar"/> <c:out
value="${advisory}" />
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/errata/packages/remove.jsp
b/java/code/webapp/WEB-INF/pages/errata/packages/remove.jsp
index f991ddb..d85c492 100644
--- a/java/code/webapp/WEB-INF/pages/errata/packages/remove.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/packages/remove.jsp
@@ -9,7 +9,7 @@
<meta name="page-decorator" content="none" />
</head>
<body>
-<rhn:toolbar base="h1" icon="spacewalk-icon-patches"
+<rhn:toolbar base="h1" icon="header-errata"
helpUrl="/rhn/help/getting-started/en-US/chap-Getting_Started_Guide-Errata_Management.jsp#sect-Getting_Started_Guide-Errata_Management-Creating_and_Editing_Errata">
<bean:message key="errata.edit.toolbar"/> <c:out
value="${advisory}" />
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/errata/published.jsp
b/java/code/webapp/WEB-INF/pages/errata/published.jsp
index 8f53ab8..512228d 100644
--- a/java/code/webapp/WEB-INF/pages/errata/published.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/published.jsp
@@ -9,7 +9,7 @@
<meta name="page-decorator" content="none" />
</head>
<body>
-<rhn:toolbar base="h1" icon="spacewalk-icon-patches"
iconAlt="errata.common.errataAlt"
+<rhn:toolbar base="h1" icon="header-errata"
iconAlt="errata.common.errataAlt"
helpUrl="/rhn/help/getting-started/en-US/chap-Getting_Started_Guide-Errata_Management.jsp"
creationUrl="/rhn/errata/manage/Create.do"
creationType="erratum">
diff --git a/java/code/webapp/WEB-INF/pages/errata/relevant.jsp
b/java/code/webapp/WEB-INF/pages/errata/relevant.jsp
index 8216f91..a569793 100644
--- a/java/code/webapp/WEB-INF/pages/errata/relevant.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/relevant.jsp
@@ -10,7 +10,7 @@
<meta name="page-decorator" content="none" />
</head>
<body>
-<rhn:toolbar base="h1" icon="spacewalk-icon-patches"
iconAlt="errata.common.errataAlt"
+<rhn:toolbar base="h1" icon="header-errata"
iconAlt="errata.common.errataAlt"
helpUrl="/rhn/help/reference/en-US/s1-sm-errata.jsp#s2-sm-applicable-errata">
<bean:message key="erratalist.jsp.relevanterrata"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/errata/unpublished.jsp
b/java/code/webapp/WEB-INF/pages/errata/unpublished.jsp
index f0c1021..7f27835 100644
--- a/java/code/webapp/WEB-INF/pages/errata/unpublished.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/unpublished.jsp
@@ -9,7 +9,7 @@
<meta name="page-decorator" content="none" />
</head>
<body>
-<rhn:toolbar base="h1" icon="spacewalk-icon-patches"
iconAlt="errata.common.errataAlt"
+<rhn:toolbar base="h1" icon="header-errata"
iconAlt="errata.common.errataAlt"
helpUrl="/rhn/help/getting-started/en-US/chap-Getting_Started_Guide-Errata_Management.jsp"
creationUrl="/rhn/errata/manage/Create.do"
creationType="erratum">
diff --git a/java/code/webapp/WEB-INF/pages/help/docsearch.jsp
b/java/code/webapp/WEB-INF/pages/help/docsearch.jsp
index 4007480..89609e7 100644
--- a/java/code/webapp/WEB-INF/pages/help/docsearch.jsp
+++ b/java/code/webapp/WEB-INF/pages/help/docsearch.jsp
@@ -10,7 +10,7 @@
<script type="text/javascript"
src="/javascript/highlander.js"></script>
</head>
<body>
-<rhn:toolbar base="h1" icon="fa-search"
imgAlt="docsearch.jsp.imgAlt"
+<rhn:toolbar base="h1" icon="header-search"
imgAlt="docsearch.jsp.imgAlt"
helpUrl="">
<bean:message key="docsearch.jsp.toolbar"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/keys/cryptokeydeleteconfirm.jsp
b/java/code/webapp/WEB-INF/pages/keys/cryptokeydeleteconfirm.jsp
index 92f38e8..7550e37 100644
--- a/java/code/webapp/WEB-INF/pages/keys/cryptokeydeleteconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/keys/cryptokeydeleteconfirm.jsp
@@ -6,7 +6,7 @@
<html>
<body>
-<rhn:toolbar base="h1" icon="fa-rocket"
imgAlt="kickstarts.alt.img">
+<rhn:toolbar base="h1" icon="header-kickstart"
imgAlt="kickstarts.alt.img">
<bean:message key="keydelete.jsp.toolbar"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/keys/keycreate.jsp
b/java/code/webapp/WEB-INF/pages/keys/keycreate.jsp
index 763c20b..6443135 100644
--- a/java/code/webapp/WEB-INF/pages/keys/keycreate.jsp
+++ b/java/code/webapp/WEB-INF/pages/keys/keycreate.jsp
@@ -5,7 +5,7 @@
<html:html>
<body>
- <rhn:toolbar base="h1" icon="fa-info-circle"
imgAlt="info.alt.img">
+ <rhn:toolbar base="h1" icon="header-info"
imgAlt="info.alt.img">
<bean:message key="keycreate.jsp.toolbar"/>
</rhn:toolbar>
<bean:message key="keycreate.jsp.summary"/>
diff --git a/java/code/webapp/WEB-INF/pages/keys/keyedit.jsp
b/java/code/webapp/WEB-INF/pages/keys/keyedit.jsp
index e06c23c..f1564ba 100644
--- a/java/code/webapp/WEB-INF/pages/keys/keyedit.jsp
+++ b/java/code/webapp/WEB-INF/pages/keys/keyedit.jsp
@@ -6,7 +6,7 @@
<html>
<body>
- <rhn:toolbar base="h1" icon="fa-info-circle"
imgAlt="system.common.kickstartAlt"
+ <rhn:toolbar base="h1" icon="header-info"
imgAlt="system.common.kickstartAlt"
deletionUrl="/rhn/keys/CryptoKeyDelete.do?key_id=${cryptoKey.id}"
deletionType="CryptoKeyDelete">
<bean:message key="keyedit.jsp.toolbar"/>
diff --git a/java/code/webapp/WEB-INF/pages/keys/keys.jsp
b/java/code/webapp/WEB-INF/pages/keys/keys.jsp
index 8a1485c..6a1baf0 100644
--- a/java/code/webapp/WEB-INF/pages/keys/keys.jsp
+++ b/java/code/webapp/WEB-INF/pages/keys/keys.jsp
@@ -7,7 +7,7 @@
<html>
<body>
-<rhn:toolbar base="h1" icon="fa-info-circle"
+<rhn:toolbar base="h1" icon="header-info"
creationUrl="CryptoKeyCreate.do"
creationType="keys"
imgAlt="info.alt.img">
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/cobbler/deleteconfirm.jsp
b/java/code/webapp/WEB-INF/pages/kickstart/cobbler/deleteconfirm.jsp
index 8a7b880..ba4898e 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/cobbler/deleteconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/cobbler/deleteconfirm.jsp
@@ -6,7 +6,7 @@
<html>
<body>
-<rhn:toolbar base="h1" icon="fa-rocket"
imgAlt="kickstarts.alt.img">
+<rhn:toolbar base="h1" icon="header-kickstart"
imgAlt="kickstarts.alt.img">
<c:out value="${requestScope.snippet.displayName}"/>
</rhn:toolbar>
<h2><bean:message key="cobbler.snippet.delete"/></h2>
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippetdetails.jsp
b/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippetdetails.jsp
index c54cece..f95c39d 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippetdetails.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippetdetails.jsp
@@ -11,14 +11,14 @@
<body>
<c:choose>
<c:when test = "${not empty requestScope.create_mode}">
- <rhn:toolbar base="h1" icon="fa-info-circle"
imgAlt="info.alt.img">
+ <rhn:toolbar base="h1" icon="header-info"
imgAlt="info.alt.img">
<bean:message key="snippetcreate.jsp.toolbar"/>
</rhn:toolbar>
<h2><bean:message
key="snippetcreate.jsp.header2"/></h2>
</c:when>
<c:otherwise>
<rhn:toolbar base="h1"
- icon="fa-info-circle"
+ icon="header-info"
imgAlt="info.alt.img"
deletionUrl="CobblerSnippetDelete.do?name=${cobblerSnippetsForm.map.name}"
deletionType="snippets">
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippets.jsp
b/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippets.jsp
index dc259bc..72224a5 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippets.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippets.jsp
@@ -6,7 +6,7 @@
<html>
<body>
-<rhn:toolbar base="h1" icon="fa-info-circle"
+<rhn:toolbar base="h1" icon="header-info"
creationUrl="CobblerSnippetCreate.do"
creationType="snippets"
iconAlt="info.alt.img">
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippetview.jsp
b/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippetview.jsp
index a85e2ff..5b13c9f 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippetview.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippetview.jsp
@@ -9,7 +9,7 @@
<html:html >
<body>
-<rhn:toolbar base="h1" icon="fa-info-circle"
imgAlt="info.alt.img">
+<rhn:toolbar base="h1" icon="header-info"
imgAlt="info.alt.img">
${requestScope.snippet.displayName}
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/kickstartoverview.jsp
b/java/code/webapp/WEB-INF/pages/kickstart/kickstartoverview.jsp
index 75bf60e..f0d0653 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/kickstartoverview.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/kickstartoverview.jsp
@@ -7,7 +7,7 @@
<html>
<body>
-<rhn:toolbar base="h1" icon="fa-rocket"
+<rhn:toolbar base="h1" icon="header-kickstart"
creationUrl="/rhn/kickstart/CreateProfileWizard.do"
creationType="kickstart"
imgAlt="kickstarts.alt.img"
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/kickstartranges.jsp
b/java/code/webapp/WEB-INF/pages/kickstart/kickstartranges.jsp
index 1d8fb28..c7b215d 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/kickstartranges.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/kickstartranges.jsp
@@ -7,7 +7,7 @@
<html:html >
<body>
-<rhn:toolbar base="h1" icon="fa-rocket"
imgAlt="kickstarts.alt.img">
+<rhn:toolbar base="h1" icon="header-kickstart"
imgAlt="kickstarts.alt.img">
<bean:message key="kickstartranges.jsp.toolbar"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/kickstarts.jsp
b/java/code/webapp/WEB-INF/pages/kickstart/kickstarts.jsp
index 19c63e8..3b33956 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/kickstarts.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/kickstarts.jsp
@@ -7,7 +7,7 @@
<html:html >
<body>
-<rhn:toolbar base="h1" icon="fa-rocket"
+<rhn:toolbar base="h1" icon="header-kickstart"
creationUrl="/rhn/kickstart/CreateProfileWizard.do"
creationType="kickstart"
imgAlt="kickstarts.alt.img"
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/kickstarttreevariables.jsp
b/java/code/webapp/WEB-INF/pages/kickstart/kickstarttreevariables.jsp
index 7b6fb6d..9ec69e1 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/kickstarttreevariables.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/kickstarttreevariables.jsp
@@ -5,7 +5,7 @@
<html:html >
<body>
-<rhn:toolbar base="h1" icon="fa-rocket"
+<rhn:toolbar base="h1" icon="header-kickstart"
deletionUrl="/rhn/kickstart/TreeDelete.do?kstid=${kstid}"
deletionType="deleteTree"
imgAlt="kickstarts.alt.img">
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/kstrees.jsp
b/java/code/webapp/WEB-INF/pages/kickstart/kstrees.jsp
index 96a3548..e70582b 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/kstrees.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/kstrees.jsp
@@ -7,10 +7,10 @@
<html>
<body>
-<rhn:toolbar base="h1" miscIcon="fa-plus"
+<rhn:toolbar base="h1" miscIcon="item-add"
miscText="kickstart.kickstartable_distro_create_new.jsp"
miscUrl="TreeCreate.do"
- icon="fa-rocket"
+ icon="header-kickstart"
iconAlt="kickstarts.alt.img">
<bean:message key="kickstart.kickstartable_distributions.jsp" />
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/scriptdelete.jsp
b/java/code/webapp/WEB-INF/pages/kickstart/scriptdelete.jsp
index d053342..ad8ad8f 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/scriptdelete.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/scriptdelete.jsp
@@ -6,7 +6,7 @@
<html>
<body>
-<rhn:toolbar base="h1" icon="fa-rocket">
+<rhn:toolbar base="h1" icon="header-kickstart">
<bean:message key="kickstartdelete.jsp.header1"
arg0="${ksdata.label}"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/scriptedit.jsp
b/java/code/webapp/WEB-INF/pages/kickstart/scriptedit.jsp
index 2373cb5..6de135d 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/scriptedit.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/scriptedit.jsp
@@ -11,7 +11,7 @@
<html>
<body>
-<rhn:toolbar base="h1" icon="fa-rocket"
+<rhn:toolbar base="h1" icon="header-kickstart"
deletionUrl="/rhn/kickstart/KickstartScriptDelete.do?kssid=${kssid}&ksid=${ksdata.id}"
deletionType="kickstartscript" >
<bean:message key="kickstartdetails.jsp.header1"
arg0="${fn:escapeXml(ksdata.label)}"/>
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/scripts.jsp
b/java/code/webapp/WEB-INF/pages/kickstart/scripts.jsp
index 8934012..9b704b2 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/scripts.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/scripts.jsp
@@ -8,7 +8,7 @@
<html:html >
<body>
<c:if test="${! empty kickstart_scripts}">
- <rhn:toolbar base="h1" icon="fa-rocket"
+ <rhn:toolbar base="h1" icon="header-kickstart"
creationUrl="/rhn/kickstart/KickstartScriptCreate.do?ksid=${ksdata.id}"
creationType="kickstartscript"
miscUrl="/rhn/kickstart/KickstartScriptOrder.do?ksid=${ksdata.id}"
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/treecreate.jsp
b/java/code/webapp/WEB-INF/pages/kickstart/treecreate.jsp
index a7eac1a..f6ab713 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/treecreate.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/treecreate.jsp
@@ -9,7 +9,7 @@
<meta http-equiv="Pragma" content="no-cache" />
</head>
<body>
- <rhn:toolbar base="h1" icon="fa-info-circle"
imgAlt="info.alt.img">
+ <rhn:toolbar base="h1" icon="header-info"
imgAlt="info.alt.img">
<bean:message key="treecreate.jsp.toolbar"/>
</rhn:toolbar>
<bean:message key="treecreate.jsp.header1"/>
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/treedelete-confirm.jsp
b/java/code/webapp/WEB-INF/pages/kickstart/treedelete-confirm.jsp
index 83f8661..a519c67 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/treedelete-confirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/treedelete-confirm.jsp
@@ -15,7 +15,7 @@
</div>
</c:if>
-<rhn:toolbar base="h1" icon="fa-rocket"
imgAlt="system.common.kickstartAlt">
+<rhn:toolbar base="h1" icon="header-kickstart"
imgAlt="system.common.kickstartAlt">
<bean:message key="distro-delete.jsp.header1"
arg0="${kstree.label}"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/treeedit.jsp
b/java/code/webapp/WEB-INF/pages/kickstart/treeedit.jsp
index c5e8226..b8ac198 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/treeedit.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/treeedit.jsp
@@ -12,7 +12,7 @@
</head>
<body>
-<rhn:toolbar base="h1" icon="fa-rocket"
+<rhn:toolbar base="h1" icon="header-kickstart"
deletionUrl="/rhn/kickstart/TreeDelete.do?kstid=${kstree.id}"
deletionType="deleteTree"
imgAlt="kickstarts.alt.img">
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/advanced/create.jsp
b/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/advanced/create.jsp
index 6bd6d14..d49d068 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/advanced/create.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/advanced/create.jsp
@@ -20,7 +20,7 @@ function clickNewestTree(obj) {
</script>
</head>
<body>
- <rhn:toolbar base="h1" icon="fa-rocket"
+ <rhn:toolbar base="h1" icon="header-kickstart"
imgAlt="system.common.kickstartAlt">
<bean:message key ="kickstart.advanced.jsp.create"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/monitoring/probes.jsp
b/java/code/webapp/WEB-INF/pages/monitoring/probes.jsp
index a03b872..6af12b8 100644
--- a/java/code/webapp/WEB-INF/pages/monitoring/probes.jsp
+++ b/java/code/webapp/WEB-INF/pages/monitoring/probes.jsp
@@ -7,7 +7,7 @@
<html>
<body>
-<rhn:toolbar base="h1" icon="fa-info-circle">
+<rhn:toolbar base="h1" icon="header-info">
<bean:message key="probes.jsp.toolbar"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/multiorg/channels/consumed.jsp
b/java/code/webapp/WEB-INF/pages/multiorg/channels/consumed.jsp
index 8aa7b3c..62b724f 100644
--- a/java/code/webapp/WEB-INF/pages/multiorg/channels/consumed.jsp
+++ b/java/code/webapp/WEB-INF/pages/multiorg/channels/consumed.jsp
@@ -17,7 +17,7 @@ function showFiltered() {
</head>
<body onLoad="onLoadStuff(3); showFiltered();">
-<rhn:toolbar base="h1" icon="fa-group">
+<rhn:toolbar base="h1" icon="header-organisation">
${trustorg}
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/multiorg/channels/orglist.jsp
b/java/code/webapp/WEB-INF/pages/multiorg/channels/orglist.jsp
index a99ed95..6fa27cb 100644
--- a/java/code/webapp/WEB-INF/pages/multiorg/channels/orglist.jsp
+++ b/java/code/webapp/WEB-INF/pages/multiorg/channels/orglist.jsp
@@ -9,7 +9,7 @@
<meta name="name" value="activationkeys.jsp.header" />
</head>
<body>
-<rhn:toolbar base="h1" icon="spacewalk-icon-software-channels"
+<rhn:toolbar base="h1" icon="header-channel"
deletionUrl="/rhn/channels/manage/Delete.do?cid=${param.cid}"
deletionAcl="user_role(channel_admin); formvar_exists(cid)"
deletionType="software.channel">
diff --git a/java/code/webapp/WEB-INF/pages/multiorg/channels/provided.jsp
b/java/code/webapp/WEB-INF/pages/multiorg/channels/provided.jsp
index a83c24b..9295736 100644
--- a/java/code/webapp/WEB-INF/pages/multiorg/channels/provided.jsp
+++ b/java/code/webapp/WEB-INF/pages/multiorg/channels/provided.jsp
@@ -17,7 +17,7 @@ function showFiltered() {
</head>
<body onLoad="onLoadStuff(3); showFiltered();">
-<rhn:toolbar base="h1" icon="fa-group">
+<rhn:toolbar base="h1" icon="header-organisation">
${trustorg}
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/multiorg/organizations.jsp
b/java/code/webapp/WEB-INF/pages/multiorg/organizations.jsp
index ed50eb3..d975860 100644
--- a/java/code/webapp/WEB-INF/pages/multiorg/organizations.jsp
+++ b/java/code/webapp/WEB-INF/pages/multiorg/organizations.jsp
@@ -9,7 +9,7 @@
<c:set var="pageList" value="${requestScope.pageList}" />
-<rhn:toolbar base="h1" icon="fa-group" >
+<rhn:toolbar base="h1" icon="header-organisation" >
<bean:message key="organizations.jsp.toolbar"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/multiorg/orgtrustdetails.jsp
b/java/code/webapp/WEB-INF/pages/multiorg/orgtrustdetails.jsp
index 61ca921..112cf90 100644
--- a/java/code/webapp/WEB-INF/pages/multiorg/orgtrustdetails.jsp
+++ b/java/code/webapp/WEB-INF/pages/multiorg/orgtrustdetails.jsp
@@ -5,7 +5,7 @@
<html:html >
<body>
- <rhn:toolbar base="h1" icon="fa-group" >
+ <rhn:toolbar base="h1" icon="header-organisation" >
${orgtrust}
</rhn:toolbar>
<rhn:dialogmenu mindepth="0" maxdepth="3"
diff --git a/java/code/webapp/WEB-INF/pages/profiles/list.jsp
b/java/code/webapp/WEB-INF/pages/profiles/list.jsp
index 0478513..2b61ceb 100644
--- a/java/code/webapp/WEB-INF/pages/profiles/list.jsp
+++ b/java/code/webapp/WEB-INF/pages/profiles/list.jsp
@@ -8,7 +8,7 @@
<html>
<body>
<rhn:toolbar base="h1"
- icon="spacewalk-icon-packages"
+ icon="header-package"
imgAlt="profile.list.header.alt">
<bean:message key="profile.list.header" />
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/schedule/archivedactions.jsp
b/java/code/webapp/WEB-INF/pages/schedule/archivedactions.jsp
index 0ceae08..45f0847 100644
--- a/java/code/webapp/WEB-INF/pages/schedule/archivedactions.jsp
+++ b/java/code/webapp/WEB-INF/pages/schedule/archivedactions.jsp
@@ -9,7 +9,7 @@
<html>
<body>
- <rhn:toolbar base="h1" icon="fa-clock-o"
+ <rhn:toolbar base="h1" icon="header-action"
imgAlt="actions.jsp.imgAlt"
helpUrl="/rhn/help/reference/en-US/s1-sm-actions.jsp#s2-sm-action-arch">
<bean:message key="archivedactions.jsp.archived_actions"/>
diff --git a/java/code/webapp/WEB-INF/pages/schedule/completedactions.jsp
b/java/code/webapp/WEB-INF/pages/schedule/completedactions.jsp
index 8a500c1..d61a677 100644
--- a/java/code/webapp/WEB-INF/pages/schedule/completedactions.jsp
+++ b/java/code/webapp/WEB-INF/pages/schedule/completedactions.jsp
@@ -8,7 +8,7 @@
<html>
<body>
-<rhn:toolbar base="h1" icon="fa-clock-o"
+<rhn:toolbar base="h1" icon="header-action"
imgAlt="actions.jsp.imgAlt"
helpUrl="/rhn/help/reference/en-US/s1-sm-actions.jsp#s2-sm-action-comp">
<bean:message key="completedactions.jsp.completed_actions"/>
diff --git a/java/code/webapp/WEB-INF/pages/schedule/failedactions.jsp
b/java/code/webapp/WEB-INF/pages/schedule/failedactions.jsp
index 25d87f4..785e65d 100644
--- a/java/code/webapp/WEB-INF/pages/schedule/failedactions.jsp
+++ b/java/code/webapp/WEB-INF/pages/schedule/failedactions.jsp
@@ -7,7 +7,7 @@
<html>
<body>
-<rhn:toolbar base="h1" icon="fa-clock-o"
+<rhn:toolbar base="h1" icon="header-action"
imgAlt="actions.jsp.imgAlt"
helpUrl="/rhn/help/reference/en-US/s1-sm-actions.jsp#s2-sm-action-fail">
<bean:message key="failedactions.jsp.failed_actions"/>
diff --git a/java/code/webapp/WEB-INF/pages/schedule/pendingactions.jsp
b/java/code/webapp/WEB-INF/pages/schedule/pendingactions.jsp
index f5b599d..2aa364f 100644
--- a/java/code/webapp/WEB-INF/pages/schedule/pendingactions.jsp
+++ b/java/code/webapp/WEB-INF/pages/schedule/pendingactions.jsp
@@ -7,7 +7,7 @@
<html>
<body>
-<rhn:toolbar base="h1" icon="fa-clock-o"
+<rhn:toolbar base="h1" icon="header-action"
imgAlt="actions.jsp.imgAlt"
helpUrl="/rhn/help/reference/en-US/s1-sm-actions.jsp#s2-sm-action-pend">
<bean:message key="pendingactions.jsp.pending_actions"/>
diff --git a/java/code/webapp/WEB-INF/pages/software/downloads/download.jsp
b/java/code/webapp/WEB-INF/pages/software/downloads/download.jsp
index d372785..cbc2711 100644
--- a/java/code/webapp/WEB-INF/pages/software/downloads/download.jsp
+++ b/java/code/webapp/WEB-INF/pages/software/downloads/download.jsp
@@ -9,7 +9,7 @@
<script src="/javascript/iso_download.js"
type="text/javascript"> </script>
</head>
<body>
-<rhn:toolbar base="h1" icon="spacewalk-icon-software-channels"
imgAlt="common.download.channelAlt">
+<rhn:toolbar base="h1" icon="header-channel"
imgAlt="common.download.channelAlt">
<c:choose>
<c:when test="${empty channel}">
<decorator:getProperty property="meta.name" />
diff --git a/java/code/webapp/WEB-INF/pages/software/packages/packagenameoverview.jsp
b/java/code/webapp/WEB-INF/pages/software/packages/packagenameoverview.jsp
index 1b8ee78..0f8caa1 100644
--- a/java/code/webapp/WEB-INF/pages/software/packages/packagenameoverview.jsp
+++ b/java/code/webapp/WEB-INF/pages/software/packages/packagenameoverview.jsp
@@ -7,7 +7,7 @@
<html>
<body>
-<rhn:toolbar base="h1" icon="spacewalk-icon-packages"
imgAlt="packagesearch.jsp.imgAlt"
+<rhn:toolbar base="h1" icon="header-package"
imgAlt="packagesearch.jsp.imgAlt"
helpUrl="/rhn/help/reference/en-US/s1-sm-channels-packages.jsp#s2-sm-software-search">
<bean:message key="packagesbyname.jsp.toolbar"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/ssm/view-log-details.jsp
b/java/code/webapp/WEB-INF/pages/ssm/view-log-details.jsp
index 8c36695..ab8713a 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/view-log-details.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/view-log-details.jsp
@@ -8,7 +8,7 @@
<html>
<body>
<rhn:toolbar base="h1"
- icon="spacewalk-icon-system-groups"
+ icon="header-system-groups"
imgAlt="ssm.jsp.imgAlt"
helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s2-sm-ssm">
<bean:message key="ssm.jsp.header" />
diff --git a/java/code/webapp/WEB-INF/pages/ssm/view-log.jsp
b/java/code/webapp/WEB-INF/pages/ssm/view-log.jsp
index 6215409..70c8dcc 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/view-log.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/view-log.jsp
@@ -8,7 +8,7 @@
<html>
<body>
<rhn:toolbar base="h1"
- icon="spacewalk-icon-system-groups"
+ icon="header-system-groups"
imgAlt="ssm.jsp.imgAlt"
helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s2-sm-ssm">
<bean:message key="ssm.jsp.header" />
diff --git a/java/code/webapp/WEB-INF/pages/systems/crashdelete.jsp
b/java/code/webapp/WEB-INF/pages/systems/crashdelete.jsp
index 50b45c3..2624156 100644
--- a/java/code/webapp/WEB-INF/pages/systems/crashdelete.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/crashdelete.jsp
@@ -11,7 +11,7 @@
<br/>
- <rhn:toolbar base="h2" icon="spacewalk-icon-bug-ex"
iconAlt="info.alt.img">
+ <rhn:toolbar base="h2" icon="header-crash"
iconAlt="info.alt.img">
${fn:escapeXml(crash.crash)}
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/systems/crashdetail.jsp
b/java/code/webapp/WEB-INF/pages/systems/crashdetail.jsp
index dbc1998..1dd4bfd 100644
--- a/java/code/webapp/WEB-INF/pages/systems/crashdetail.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/crashdetail.jsp
@@ -12,7 +12,7 @@
<br/>
- <rhn:toolbar base="h2" icon="spacewalk-icon-bug-ex"
iconAlt="info.alt.img"
+ <rhn:toolbar base="h2" icon="header-crash"
iconAlt="info.alt.img"
deletionUrl="SoftwareCrashDelete.do?crid=${crid}&sid=${sid}"
deletionType="crash">
${fn:escapeXml(crash.crash)}
diff --git a/java/code/webapp/WEB-INF/pages/systems/crashfiles.jsp
b/java/code/webapp/WEB-INF/pages/systems/crashfiles.jsp
index 7e2e4a8..4b6c5cc 100644
--- a/java/code/webapp/WEB-INF/pages/systems/crashfiles.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/crashfiles.jsp
@@ -12,7 +12,7 @@
<%@ include
file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %>
<br/>
- <rhn:toolbar base="h2" icon="spacewalk-icon-bug-ex"
iconAlt="info.alt.img"
+ <rhn:toolbar base="h2" icon="header-crash"
iconAlt="info.alt.img"
deletionUrl="SoftwareCrashDelete.do?crid=${crid}&sid=${sid}"
deletionType="crash">
${fn:escapeXml(crash.crash)}
diff --git a/java/code/webapp/WEB-INF/pages/systems/crashnote.jsp
b/java/code/webapp/WEB-INF/pages/systems/crashnote.jsp
index 0bc1d94..4b508c3 100644
--- a/java/code/webapp/WEB-INF/pages/systems/crashnote.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/crashnote.jsp
@@ -15,16 +15,14 @@
<c:choose>
<c:when test="${not empty param.cnid}">
<a
href="/rhn/systems/details/DeleteCrashNote.do?sid=${sid}&crid=${crid}&cnid=${cnid}">
- <i class="fa fa-trash-o"
- title="<bean:message
key='toolbar.delete.note'/>" ></i>
+ <rhn:icon type="item-del"
title="<bean:message key='toolbar.delete.note'/>" />
<bean:message key="toolbar.delete.note"/>
</a>
|
</c:when>
</c:choose>
<a
href="/rhn/systems/details/SoftwareCrashDelete.do?crid=${crid}&sid=${sid}">
- <i class="fa fa-trash-o"
- title="<bean:message
key='toolbar.delete.crash'/>" ></i>
+ <rhn:icon type="item-del" title="<bean:message
key='toolbar.delete.crash'/>" />
<bean:message key="toolbar.delete.crash"/>
</a>
diff --git a/java/code/webapp/WEB-INF/pages/systems/crashnotedelete.jsp
b/java/code/webapp/WEB-INF/pages/systems/crashnotedelete.jsp
index 20104e0..3ebc23a 100644
--- a/java/code/webapp/WEB-INF/pages/systems/crashnotedelete.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/crashnotedelete.jsp
@@ -13,8 +13,7 @@
<div class="toolbar">
<span class="toolbar">
<a
href="/rhn/systems/details/SoftwareCrashDelete.do?crid=${crid}&sid=${sid}">
- <i class="fa fa-trash-o"
- title="<bean:message
key="toolbar.delete.crash"/>" ></i>
+ <rhn:icon type="item-del" title="<bean:message
key='toolbar.delete.crash'/>" />
<bean:message key="toolbar.delete.crash"/>
</a>
</span>
diff --git a/java/code/webapp/WEB-INF/pages/systems/customkey/createkey.jsp
b/java/code/webapp/WEB-INF/pages/systems/customkey/createkey.jsp
index 565de4a..ce4d2c5 100644
--- a/java/code/webapp/WEB-INF/pages/systems/customkey/createkey.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/customkey/createkey.jsp
@@ -6,7 +6,7 @@
<html:html>
<body>
- <rhn:toolbar base="h1" icon="fa-key"
+ <rhn:toolbar base="h1" icon="header-activation-key"
helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s2-sm-system-cust-info">
<bean:message key="system.jsp.customkey.createtitle"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/systems/customkey/deletekey.jsp
b/java/code/webapp/WEB-INF/pages/systems/customkey/deletekey.jsp
index fbfd9e1..28df3b6 100644
--- a/java/code/webapp/WEB-INF/pages/systems/customkey/deletekey.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/customkey/deletekey.jsp
@@ -6,7 +6,7 @@
<html:html >
<body>
- <rhn:toolbar base="h1" icon="fa-key"
+ <rhn:toolbar base="h1" icon="header-activation-key"
helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s2-sm-system-cust-info">
<bean:message key="system.jsp.customkey.deletetitle"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/systems/customkey/listcustomkeys.jsp
b/java/code/webapp/WEB-INF/pages/systems/customkey/listcustomkeys.jsp
index d8c5fac..ef7d3be 100644
--- a/java/code/webapp/WEB-INF/pages/systems/customkey/listcustomkeys.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/customkey/listcustomkeys.jsp
@@ -8,7 +8,7 @@
<html:html >
<body>
- <rhn:toolbar base="h1" icon="fa-key"
+ <rhn:toolbar base="h1" icon="header-activation-key"
creationUrl="/rhn/systems/customdata/CreateCustomKey.do"
creationType="customkey">
<bean:message key="system.jsp.customkey.title"/>
diff --git a/java/code/webapp/WEB-INF/pages/systems/customkey/updatekey.jsp
b/java/code/webapp/WEB-INF/pages/systems/customkey/updatekey.jsp
index e775985..3b46d71 100644
--- a/java/code/webapp/WEB-INF/pages/systems/customkey/updatekey.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/customkey/updatekey.jsp
@@ -6,7 +6,7 @@
<html:html >
<body>
- <rhn:toolbar base="h1" icon="fa-key"
+ <rhn:toolbar base="h1" icon="header-activation-key"
helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s2-sm-system-cust-info"
deletionUrl="/rhn/systems/customdata/DeleteCustomKey.do?cikid=${cikid}"
deletionType="customkey">
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp
b/java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp
index 3fbc911..6da67f1 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp
@@ -30,8 +30,7 @@
<c:if test="${testResult.deletable}">
<a
href="/rhn/systems/details/audit/XccdfDeleteConfirm.do?sid=${param.sid}&xid=${testResult.id}">
- <i class="fa fa-trash-o"
- title="<bean:message
key='system.audit.xccdfdelete'/>"></i>
+ <rhn:icon type="item-del" title="<bean:message
key='system.audit.xccdfdelete'/>" />
<bean:message key="system.audit.xccdfdelete"/>
</a>
|
diff --git
a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/compareprofiles.jsp
b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/compareprofiles.jsp
index 30d3a22..717e831 100644
---
a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/compareprofiles.jsp
+++
b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/compareprofiles.jsp
@@ -9,7 +9,7 @@
<body>
<%@ include
file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %>
-<rhn:toolbar base="h2" icon="spacewalk-icon-packages"
+<rhn:toolbar base="h2" icon="header-package"
deletionUrl="/rhn/systems/details/packages/profiles/DeleteProfile.do?sid=${param.sid}&prid=${param.prid}"
deletionType="profile">
<bean:message key="compare.jsp.compareto"
arg0="${requestScope.profilename}" />
diff --git a/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystems.jsp
b/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystems.jsp
index 4df08a0..1fb25ed 100644
--- a/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystems.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystems.jsp
@@ -10,7 +10,7 @@
<meta name="page-decorator" content="none" />
</head>
<body>
-<rhn:toolbar base="h1" icon="fa-desktop"
imgAlt="system.common.systemAlt"
+<rhn:toolbar base="h1" icon="header-system"
imgAlt="system.common.systemAlt"
helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s3-sm-system-list-ood">
<bean:message key="duplicates.jsp.header"/>
</rhn:toolbar>
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 2cb4a91..c11aea4 100644
--- a/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemscompare.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemscompare.jsp
@@ -39,7 +39,7 @@
</script>
</head>
<body>
-<rhn:toolbar base="h1" icon="fa-desktop"
imgAlt="system.common.systemAlt"
+<rhn:toolbar base="h1" icon="header-system"
imgAlt="system.common.systemAlt"
helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s3-sm-system-list-ood">
<bean:message key="duplicates.jsp.header"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemsdelete.jsp
b/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemsdelete.jsp
index bbe41f2..30cbc93 100644
--- a/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemsdelete.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemsdelete.jsp
@@ -7,7 +7,7 @@
<html>
<body>
-<rhn:toolbar base="h1" icon="fa-desktop"
imgAlt="system.common.systemAlt"
+<rhn:toolbar base="h1" icon="header-system"
imgAlt="system.common.systemAlt"
helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s3-sm-system-list-ood">
<bean:message key="duplicates.jsp.header"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/systems/entitlements/entitlements.jsp
b/java/code/webapp/WEB-INF/pages/systems/entitlements/entitlements.jsp
index 55da3f0..91f125d 100644
--- a/java/code/webapp/WEB-INF/pages/systems/entitlements/entitlements.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/entitlements/entitlements.jsp
@@ -10,7 +10,7 @@
<meta name="page-decorator" content="none"/>
</head>
<body>
-<rhn:toolbar base="h1" icon="fa-desktop"
imgAlt="overview.jsp.alt">
+<rhn:toolbar base="h1" icon="header-system"
imgAlt="overview.jsp.alt">
<bean:message key="systementitlements.jsp.header"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/systems/entitlements/flexguests.jsp
b/java/code/webapp/WEB-INF/pages/systems/entitlements/flexguests.jsp
index ca2d5c3..69be682 100644
--- a/java/code/webapp/WEB-INF/pages/systems/entitlements/flexguests.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/entitlements/flexguests.jsp
@@ -27,7 +27,7 @@
<meta name="page-decorator" content="none" />
</head>
<body>
- <rhn:toolbar base="h1" icon="fa-desktop">
+ <rhn:toolbar base="h1" icon="header-system">
<bean:message key="virtualentitlements.toolbar" />
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/systems/entitlements/guestlimited.jsp
b/java/code/webapp/WEB-INF/pages/systems/entitlements/guestlimited.jsp
index e9231b4..a1a3921 100644
--- a/java/code/webapp/WEB-INF/pages/systems/entitlements/guestlimited.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/entitlements/guestlimited.jsp
@@ -14,7 +14,7 @@
</head>
<body>
- <rhn:toolbar base="h1" icon="fa-desktop">
+ <rhn:toolbar base="h1" icon="header-system">
<bean:message key="virtualentitlements.toolbar" />
</rhn:toolbar>
<rhn:dialogmenu mindepth="0"
diff --git a/java/code/webapp/WEB-INF/pages/systems/entitlements/guestunlimited.jsp
b/java/code/webapp/WEB-INF/pages/systems/entitlements/guestunlimited.jsp
index 07a831c..7c69e71 100644
--- a/java/code/webapp/WEB-INF/pages/systems/entitlements/guestunlimited.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/entitlements/guestunlimited.jsp
@@ -14,7 +14,7 @@
</head>
<body>
- <rhn:toolbar base="h1" icon="fa-desktop">
+ <rhn:toolbar base="h1" icon="header-system">
<bean:message key="virtualentitlements.toolbar" />
</rhn:toolbar>
<rhn:dialogmenu mindepth="0"
diff --git a/java/code/webapp/WEB-INF/pages/systems/entitlements/physicalhosts.jsp
b/java/code/webapp/WEB-INF/pages/systems/entitlements/physicalhosts.jsp
index 4b17fd1..6e00ea1 100644
--- a/java/code/webapp/WEB-INF/pages/systems/entitlements/physicalhosts.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/entitlements/physicalhosts.jsp
@@ -13,7 +13,7 @@
</head>
<body>
- <rhn:toolbar base="h1" icon="fa-desktop">
+ <rhn:toolbar base="h1" icon="header-system">
<bean:message key="virtualentitlements.toolbar" />
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/systems/extra-packages-systems-list.jsp
b/java/code/webapp/WEB-INF/pages/systems/extra-packages-systems-list.jsp
index 457f99c..70f24d6 100644
--- a/java/code/webapp/WEB-INF/pages/systems/extra-packages-systems-list.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/extra-packages-systems-list.jsp
@@ -10,7 +10,7 @@
<meta name="page-decorator" content="none" />
</head>
<body>
-<rhn:toolbar base="h1" icon="fa-desktop"
imgAlt="system.common.systemAlt"
+<rhn:toolbar base="h1" icon="header-system"
imgAlt="system.common.systemAlt"
helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s3-sm-system-list-inact">
<bean:message key="extrapackagessystemslist.jsp.header"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/systems/grouplist.jsp
b/java/code/webapp/WEB-INF/pages/systems/grouplist.jsp
index 757626d..4062520 100644
--- a/java/code/webapp/WEB-INF/pages/systems/grouplist.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/grouplist.jsp
@@ -10,7 +10,7 @@
<meta name="page-decorator" content="none" />
</head>
<body>
-<rhn:toolbar base="h1" icon="spacewalk-icon-system-groups"
imgAlt="system.common.groupAlt"
+<rhn:toolbar base="h1" icon="header-system-groups"
imgAlt="system.common.groupAlt"
helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s2-sm-system-group-list"
creationUrl="/rhn/groups/CreateGroup.do"
creationType="group"
diff --git a/java/code/webapp/WEB-INF/pages/systems/inactivelist.jsp
b/java/code/webapp/WEB-INF/pages/systems/inactivelist.jsp
index d88d267..2fee317 100644
--- a/java/code/webapp/WEB-INF/pages/systems/inactivelist.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/inactivelist.jsp
@@ -10,7 +10,7 @@
<meta name="page-decorator" content="none" />
</head>
<body>
-<rhn:toolbar base="h1" icon="fa-desktop"
imgAlt="system.common.systemAlt"
+<rhn:toolbar base="h1" icon="header-system"
imgAlt="system.common.systemAlt"
helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s3-sm-system-list-inact">
<bean:message key="inactivelist.jsp.header"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/systems/outofdatelist.jsp
b/java/code/webapp/WEB-INF/pages/systems/outofdatelist.jsp
index baec619..658de7a 100644
--- a/java/code/webapp/WEB-INF/pages/systems/outofdatelist.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/outofdatelist.jsp
@@ -10,7 +10,7 @@
<meta name="page-decorator" content="none" />
</head>
<body>
-<rhn:toolbar base="h1" icon="fa-desktop"
imgAlt="system.common.systemAlt"
+<rhn:toolbar base="h1" icon="header-system"
imgAlt="system.common.systemAlt"
helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s3-sm-system-list-ood">
<bean:message key="outofdatelist.jsp.header"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/systems/overview.jsp
b/java/code/webapp/WEB-INF/pages/systems/overview.jsp
index 368b990..16ea7bf 100644
--- a/java/code/webapp/WEB-INF/pages/systems/overview.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/overview.jsp
@@ -10,7 +10,7 @@
<meta name="page-decorator" content="none" />
</head>
<body>
-<rhn:toolbar base="h1" icon="fa-desktop"
imgAlt="overview.jsp.alt"
+<rhn:toolbar base="h1" icon="header-system"
imgAlt="overview.jsp.alt"
helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s2-sm-system-overview">
<bean:message key="overview.jsp.header"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/systems/physicallist.jsp
b/java/code/webapp/WEB-INF/pages/systems/physicallist.jsp
index 7d3a1f9..4187984 100644
--- a/java/code/webapp/WEB-INF/pages/systems/physicallist.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/physicallist.jsp
@@ -10,7 +10,7 @@
<meta name="page-decorator" content="none" />
</head>
<body>
-<rhn:toolbar base="h1" icon="fa-desktop"
imgAlt="system.common.systemAlt"
+<rhn:toolbar base="h1" icon="header-system"
imgAlt="system.common.systemAlt"
helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp">
<bean:message key="systemlist.jsp.physicalheader"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/systems/probes/create.jsp
b/java/code/webapp/WEB-INF/pages/systems/probes/create.jsp
index 321e33e..72a3457 100644
--- a/java/code/webapp/WEB-INF/pages/systems/probes/create.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/probes/create.jsp
@@ -10,7 +10,7 @@
</head>
<body>
<%@ include
file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %>
- <rhn:toolbar base="h2" icon="fa-desktop">
+ <rhn:toolbar base="h2" icon="header-system">
<bean:message key="probeedit.jsp.editprobe" />
</rhn:toolbar>
<html:form action="/systems/details/probes/ProbeCreate"
method="POST" styleClass="form-horizontal">
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 cbfd33f..23efd40 100644
--- a/java/code/webapp/WEB-INF/pages/systems/probes/details.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/probes/details.jsp
@@ -12,7 +12,7 @@
<%@ include
file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %>
<c:if test="${is_suite_probe}">
- <rhn:toolbar base="h2" icon="fa-desktop"
+ <rhn:toolbar base="h2" icon="header-system"
miscAlt="probedetails.jsp.editsuiteprobe"
miscIcon="fa-copy"
miscUrl="/rhn/monitoring/config/ProbeSuiteProbeEdit.do?suite_id=${probe.templateProbe.probeSuite.id}&probe_id=${probe.templateProbe.id}"
@@ -23,7 +23,7 @@
</rhn:toolbar>
</c:if>
<c:if test="${not is_suite_probe}">
- <rhn:toolbar base="h2" icon="fa-desktop"
+ <rhn:toolbar base="h2" icon="header-system"
deletionUrl="/rhn/systems/details/probes/ProbeDelete.do?probe_id=${probe.id}&sid=${system.id}"
deletionType="probe"
miscAlt="probedetails.jsp.editthisprobe"
diff --git a/java/code/webapp/WEB-INF/pages/systems/probes/edit.jsp
b/java/code/webapp/WEB-INF/pages/systems/probes/edit.jsp
index 7ad80ec..e6bb00f 100644
--- a/java/code/webapp/WEB-INF/pages/systems/probes/edit.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/probes/edit.jsp
@@ -24,7 +24,7 @@ function refreshNotifFields() {
<%@ include
file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %>
-<rhn:toolbar base="h2" icon="fa-desktop"
+<rhn:toolbar base="h2" icon="header-system"
deletionUrl="/rhn/systems/details/probes/ProbeDelete.do?probe_id=${probe.id}&sid=${system.id}"
deletionType="probe">
<bean:message key="probeedit.jsp.editprobe" />
diff --git a/java/code/webapp/WEB-INF/pages/systems/probes/index.jsp
b/java/code/webapp/WEB-INF/pages/systems/probes/index.jsp
index 8f3da11..66e407d 100644
--- a/java/code/webapp/WEB-INF/pages/systems/probes/index.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/probes/index.jsp
@@ -14,7 +14,7 @@
<body>
<%@ include
file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %>
-<rhn:toolbar base="h2" icon="fa-desktop"
helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s4-sm-system-details-probes"
+<rhn:toolbar base="h2" icon="header-system"
helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s4-sm-system-details-probes"
creationUrl="/rhn/systems/details/probes/ProbeCreate.do?sid=${system.id}"
creationType="probe" >
<bean:message key="probes.index.jsp.toolbar"/>
diff --git
a/java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservation_create.jsp
b/java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservation_create.jsp
index 1b2a419..c268ef6 100644
---
a/java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservation_create.jsp
+++
b/java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservation_create.jsp
@@ -5,7 +5,7 @@
<html:html>
<body>
- <rhn:toolbar base="h1" icon="fa-info-circle"
imgAlt="info.alt.img">
+ <rhn:toolbar base="h1" icon="header-info"
imgAlt="info.alt.img">
<bean:message key="preservation_create.jsp.toolbar"/>
</rhn:toolbar>
diff --git
a/java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservation_edit.jsp
b/java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservation_edit.jsp
index 32f9365..d6445e3 100644
---
a/java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservation_edit.jsp
+++
b/java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservation_edit.jsp
@@ -5,7 +5,7 @@
<html>
<body>
- <rhn:toolbar base="h1" icon="fa-rocket"
imgAlt="system.common.kickstartAlt"
+ <rhn:toolbar base="h1" icon="header-kickstart"
imgAlt="system.common.kickstartAlt"
deletionUrl="/rhn/systems/provisioning/preservation/PreservationListDeleteSingle.do?file_list_id=${fileList.id}"
deletionType="filelist">
<bean:message key="preservation_edit.jsp.toolbar"/>
diff --git
a/java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservation_list.jsp
b/java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservation_list.jsp
index f076d8d..65ae9b7 100644
---
a/java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservation_list.jsp
+++
b/java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservation_list.jsp
@@ -5,7 +5,7 @@
<html:html >
<body>
-<rhn:toolbar base="h1" icon="fa-rocket"
+<rhn:toolbar base="h1" icon="header-kickstart"
imgAlt="system.common.kickstartAlt"
creationUrl="PreservationListCreate.do"
creationType="filelist">
diff --git
a/java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservationlistconfirm.jsp
b/java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservationlistconfirm.jsp
index 66702dc..c3bfe78 100644
---
a/java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservationlistconfirm.jsp
+++
b/java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservationlistconfirm.jsp
@@ -6,7 +6,7 @@
<html:xhtml/>
<html>
<body>
-<rhn:toolbar base="h1" icon="fa-rocket"
+<rhn:toolbar base="h1" icon="header-kickstart"
imgAlt="system.common.kickstartAlt">
<bean:message key="preservation_list.jsp.toolbar"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/systems/proxylist.jsp
b/java/code/webapp/WEB-INF/pages/systems/proxylist.jsp
index b8c5a04..02f10a9 100644
--- a/java/code/webapp/WEB-INF/pages/systems/proxylist.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/proxylist.jsp
@@ -10,7 +10,7 @@
<meta name="page-decorator" content="none" />
</head>
<body>
-<rhn:toolbar base="h1" icon="fa-desktop"
imgAlt="system.common.systemAlt"
+<rhn:toolbar base="h1" icon="header-system"
imgAlt="system.common.systemAlt"
helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s3-sm-system-list-proxy">
<bean:message key="proxylist.jsp.header"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/systems/registeredlist.jsp
b/java/code/webapp/WEB-INF/pages/systems/registeredlist.jsp
index b9e0a28..dbde890 100644
--- a/java/code/webapp/WEB-INF/pages/systems/registeredlist.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/registeredlist.jsp
@@ -11,7 +11,7 @@
<meta name="page-decorator" content="none" />
</head>
<body>
-<rhn:toolbar base="h1" icon="fa-desktop"
imgAlt="system.common.systemAlt"
+<rhn:toolbar base="h1" icon="header-system"
imgAlt="system.common.systemAlt"
helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s3-sm-sstem-list-rregistered">
<bean:message key="registeredlist.jsp.header"/>
</rhn:toolbar>
@@ -90,7 +90,7 @@
sortattr="creatorName" >
<c:choose>
<c:when test="${current.creatorName != null}">
- <i class="fa fa-user" title="<bean:message
key='yourrhn.jsp.user.alt'/>"></i>
+ <rhn:icon type="header-user" title="<bean:message
key='yourrhn.jsp.user.alt'/>" />
<c:out value="${current.creatorName}"/>
</c:when>
<c:otherwise>
diff --git a/java/code/webapp/WEB-INF/pages/systems/requiringrebootlist.jsp
b/java/code/webapp/WEB-INF/pages/systems/requiringrebootlist.jsp
index 5709ed9..359d8ed 100644
--- a/java/code/webapp/WEB-INF/pages/systems/requiringrebootlist.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/requiringrebootlist.jsp
@@ -10,7 +10,7 @@
<meta name="page-decorator" content="none" />
</head>
<body>
-<rhn:toolbar base="h1" icon="fa-desktop"
imgAlt="system.common.systemAlt"
+<rhn:toolbar base="h1" icon="header-system"
imgAlt="system.common.systemAlt"
helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s3-sm-system-list-inact">
<bean:message key="requiringrebootlist.jsp.header"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/listcustomdata.jsp
b/java/code/webapp/WEB-INF/pages/systems/sdc/listcustomdata.jsp
index f807423..7c8d42c 100644
--- a/java/code/webapp/WEB-INF/pages/systems/sdc/listcustomdata.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/sdc/listcustomdata.jsp
@@ -7,7 +7,7 @@
<body>
<%@ include
file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %>
- <rhn:toolbar base="h2" icon="fa-info-circle"
+ <rhn:toolbar base="h2" icon="header-info"
creationUrl="/rhn/systems/details/CreateCustomData.do?sid=${system.id}"
creationType="customdata">
<bean:message key="sdc.details.customdata.header"/>
diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/updatecustomdata.jsp
b/java/code/webapp/WEB-INF/pages/systems/sdc/updatecustomdata.jsp
index afaa535..4452446 100644
--- a/java/code/webapp/WEB-INF/pages/systems/sdc/updatecustomdata.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/sdc/updatecustomdata.jsp
@@ -16,7 +16,7 @@
<div class="toolbar">
<span class="toolbar">
<a
href="/rhn/systems/details/DeleteCustomData.do?sid=${sid}&cikid=${cikid}">
- <i class="fa fa-trash-o" title="delete
value"></i>delete value
+ <rhn:icon type="item-del" title="delete value" />delete
value
</a>
</span>
</div>
diff --git a/java/code/webapp/WEB-INF/pages/systems/softwarecrashesoverview.jsp
b/java/code/webapp/WEB-INF/pages/systems/softwarecrashesoverview.jsp
index a1e9631..da0d259 100644
--- a/java/code/webapp/WEB-INF/pages/systems/softwarecrashesoverview.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/softwarecrashesoverview.jsp
@@ -12,7 +12,7 @@
<meta name="page-decorator" content="none" />
</head>
<body>
- <rhn:toolbar base="h1" icon="spacewalk-icon-bug-ex">
+ <rhn:toolbar base="h1" icon="header-crash">
<bean:message key="software.crashes.overview"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/systems/softwarecrashuuiddetails.jsp
b/java/code/webapp/WEB-INF/pages/systems/softwarecrashuuiddetails.jsp
index dd56d64..ce0bf31 100644
--- a/java/code/webapp/WEB-INF/pages/systems/softwarecrashuuiddetails.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/softwarecrashuuiddetails.jsp
@@ -12,7 +12,7 @@
<meta name="page-decorator" content="none" />
</head>
<body>
- <rhn:toolbar base="h1" icon="spacewalk-icon-bug-ex">
+ <rhn:toolbar base="h1" icon="header-crash">
<bean:message key="software.crashes"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/systems/systemcurrency.jsp
b/java/code/webapp/WEB-INF/pages/systems/systemcurrency.jsp
index d943e86..e3aff88 100644
--- a/java/code/webapp/WEB-INF/pages/systems/systemcurrency.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/systemcurrency.jsp
@@ -11,7 +11,7 @@
<meta name="page-decorator" content="none" />
</head>
<body>
-<rhn:toolbar base="h1" icon="fa-desktop"
imgAlt="system.common.systemAlt">
+<rhn:toolbar base="h1" icon="header-system"
imgAlt="system.common.systemAlt">
<bean:message key="systemcurrency.jsp.header"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/systems/systemlist.jsp
b/java/code/webapp/WEB-INF/pages/systems/systemlist.jsp
index d66b6bd..facd2dc 100644
--- a/java/code/webapp/WEB-INF/pages/systems/systemlist.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/systemlist.jsp
@@ -10,7 +10,7 @@
<meta name="page-decorator" content="none" />
</head>
<body>
-<rhn:toolbar base="h1" icon="fa-desktop"
imgAlt="system.common.systemAlt"
+<rhn:toolbar base="h1" icon="header-system"
imgAlt="system.common.systemAlt"
helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp">
<bean:message key="systemlist.jsp.header"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/systems/systemsearch.jsp
b/java/code/webapp/WEB-INF/pages/systems/systemsearch.jsp
index d8e55a2..aa84681 100644
--- a/java/code/webapp/WEB-INF/pages/systems/systemsearch.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/systemsearch.jsp
@@ -6,7 +6,7 @@
<html:html >
<body>
- <rhn:toolbar base="h1" icon="fa-search"
+ <rhn:toolbar base="h1" icon="header-search"
helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s2-sm-system-search"
imgAlt="search.alt.img">
<bean:message key="systemsearch.jsp.toolbar"/>
diff --git a/java/code/webapp/WEB-INF/pages/systems/unentitledlist.jsp
b/java/code/webapp/WEB-INF/pages/systems/unentitledlist.jsp
index 75334be..f3e25ee 100644
--- a/java/code/webapp/WEB-INF/pages/systems/unentitledlist.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/unentitledlist.jsp
@@ -10,7 +10,7 @@
<meta name="page-decorator" content="none" />
</head>
<body>
-<rhn:toolbar base="h1" icon="fa-desktop"
imgAlt="system.common.systemAlt"
+<rhn:toolbar base="h1" icon="header-system"
imgAlt="system.common.systemAlt"
helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s3-sm-sstem-lists3-sm-system-list-unent">
<bean:message key="unentitledlist.jsp.header"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/systems/ungroupedlist.jsp
b/java/code/webapp/WEB-INF/pages/systems/ungroupedlist.jsp
index fc5531c..12dcb78 100644
--- a/java/code/webapp/WEB-INF/pages/systems/ungroupedlist.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/ungroupedlist.jsp
@@ -10,7 +10,7 @@
<meta name="page-decorator" content="none" />
</head>
<body>
-<rhn:toolbar base="h1" icon="fa-desktop"
imgAlt="system.common.systemAlt"
+<rhn:toolbar base="h1" icon="header-system"
imgAlt="system.common.systemAlt"
helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s3-sm-system-list-ungrp">
<bean:message key="ungroupedlist.jsp.header"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/systems/virtuallist.jsp
b/java/code/webapp/WEB-INF/pages/systems/virtuallist.jsp
index 1e37ee6..7170ad4 100644
--- a/java/code/webapp/WEB-INF/pages/systems/virtuallist.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/virtuallist.jsp
@@ -9,7 +9,7 @@
<meta name="page-decorator" content="none" />
</head>
<body>
-<rhn:toolbar base="h1" icon="fa-desktop"
+<rhn:toolbar base="h1" icon="header-system"
helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s3-sm-system-list-virtual">
<bean:message key="virtuallist.jsp.toolbar"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/user/create/usercreate.jsp
b/java/code/webapp/WEB-INF/pages/user/create/usercreate.jsp
index f85bd23..0a9f29e 100644
--- a/java/code/webapp/WEB-INF/pages/user/create/usercreate.jsp
+++ b/java/code/webapp/WEB-INF/pages/user/create/usercreate.jsp
@@ -16,7 +16,7 @@
</c:if>
<c:if test="${account_type == 'into_org'}" >
- <rhn:toolbar base="h1" icon="fa-user"
imgAlt="user.common.userAlt"
+ <rhn:toolbar base="h1" icon="header-user"
imgAlt="user.common.userAlt"
helpUrl="/rhn/help/reference/en-US/s1-sm-users.jsp">
<bean:message key="usercreate.toolbar" />
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/user/edit/localepreference.jsp
b/java/code/webapp/WEB-INF/pages/user/edit/localepreference.jsp
index fca2382..528a201 100644
--- a/java/code/webapp/WEB-INF/pages/user/edit/localepreference.jsp
+++ b/java/code/webapp/WEB-INF/pages/user/edit/localepreference.jsp
@@ -5,7 +5,7 @@
<html>
<body>
-<rhn:toolbar base="h1" icon="fa-globe"
+<rhn:toolbar base="h1" icon="header-globe"
helpUrl="/rhn/help/reference/en-US/s1-sm-your-rhn.jsp#s2-yourrhn-locale">
<bean:message key="Locale Preferences"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/user/edit/yourchangeemail.jsp
b/java/code/webapp/WEB-INF/pages/user/edit/yourchangeemail.jsp
index eb7f0ab..a3123ac 100644
--- a/java/code/webapp/WEB-INF/pages/user/edit/yourchangeemail.jsp
+++ b/java/code/webapp/WEB-INF/pages/user/edit/yourchangeemail.jsp
@@ -6,7 +6,7 @@
<html>
<body>
- <rhn:toolbar base="h1" icon="fa-user"
+ <rhn:toolbar base="h1" icon="header-user"
helpUrl="/rhn/help/reference/en-US/s1-sm-your-rhn.jsp#s2-sm-your-rhn-account"
imgAlt="users.jsp.imgAlt">
<bean:message key="yourchangeemail.jsp.title"/>
diff --git a/java/code/webapp/WEB-INF/pages/user/edit/yourdetails.jsp
b/java/code/webapp/WEB-INF/pages/user/edit/yourdetails.jsp
index ea2d14f..ab28bfd 100644
--- a/java/code/webapp/WEB-INF/pages/user/edit/yourdetails.jsp
+++ b/java/code/webapp/WEB-INF/pages/user/edit/yourdetails.jsp
@@ -9,7 +9,7 @@
<meta name="page-decorator" content="none" />
</head>
<body>
- <rhn:toolbar base="h1" icon="fa-user"
+ <rhn:toolbar base="h1" icon="header-user"
helpUrl="/rhn/help/reference/en-US/s1-sm-your-rhn.jsp#s2-sm-your-rhn-account"
imgAlt="users.jsp.imgAlt">
<bean:message key="details.jsp.account_details" />
diff --git a/java/code/webapp/WEB-INF/pages/user/edit/yourpreferences.jsp
b/java/code/webapp/WEB-INF/pages/user/edit/yourpreferences.jsp
index a7c9bf5..05cdda6 100644
--- a/java/code/webapp/WEB-INF/pages/user/edit/yourpreferences.jsp
+++ b/java/code/webapp/WEB-INF/pages/user/edit/yourpreferences.jsp
@@ -8,7 +8,7 @@
<meta name="page-decorator" content="none" />
</head>
<body>
-<rhn:toolbar base="h1"
icon="spacewalk-icon-manage-configuration-files"
+<rhn:toolbar base="h1" icon="header-preferences"
helpUrl="/rhn/help/reference/en-US/s1-sm-your-rhn.jsp#s2-sm-your-rhn-prefs">
<bean:message key="Your Preferences"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/yourrhn.jsp
b/java/code/webapp/WEB-INF/pages/yourrhn.jsp
index f312363..c4cfff2 100644
--- a/java/code/webapp/WEB-INF/pages/yourrhn.jsp
+++ b/java/code/webapp/WEB-INF/pages/yourrhn.jsp
@@ -35,7 +35,7 @@
</head>
<body>
-<rhn:toolbar base="h1" icon="fa-tachometer"
imgAlt="yourrhn.jsp.toolbar.img.alt"
+<rhn:toolbar base="h1" icon="header-taskomatic"
imgAlt="yourrhn.jsp.toolbar.img.alt"
helpUrl="/rhn/help/reference/en-US/s1-sm-your-rhn.jsp">
<bean:message key="yourrhn.jsp.toolbar"/>
</rhn:toolbar>
commit c3b7b08a3b6cd32471d88359fc3eb0f157af61a6
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Wed Dec 11 16:16:51 2013 +0100
adding new icon definitions
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 634b12c..d9d254c 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java
@@ -38,28 +38,62 @@ public class IconTag extends TagSupport {
static {
icons = new HashMap<String, String>();
- icons.put("system-ok", "fa fa-check-circle fa-1-5x
text-success");
- icons.put("system-crit", "fa fa-exclamation-circle fa-1-5x
text-danger");
- icons.put("system-warn", "fa fa-exclamation-triangle fa-1-5x
text-warning");
- icons.put("system-unknown", "fa fa-1-5x
spacewalk-icon-unknown-system");
- icons.put("system-locked", "fa fa-1-5x
spacewalk-icon-locked-system");
- icons.put("system-kickstarting", "fa fa-rocket fa-1-5x");
- icons.put("system-unentitled", "fa fa-1-5x
spacewalk-icon-Unentitled");
- icons.put("system-virt-host", "fa fa-1-5x
spacewalk-icon-virtual-host");
- icons.put("system-virt-guest", "fa fa-1-5x
spacewalk-icon-virtual-guest");
- icons.put("system-physical", "fa fa-desktop fa-1-5x");
- icons.put("actions-pending", "fa fa-clock-o fa-1-5x");
- icons.put("actions-ok", "fa fa-check-circle-o fa-1-5x
text-success");
- icons.put("actions-failed", "fa fa-times-circle-o fa-1-5x
text-danger");
- icons.put("errata-security", "fa fa-shield fa-1-5x");
+ icons.put("action-failed", "fa fa-times-circle-o fa-1-5x
text-danger");
+ icons.put("action-ok", "fa fa-check-circle-o fa-1-5x
text-success");
+ icons.put("action-pending", "fa fa-clock-o fa-1-5x");
+ icons.put("action-running", "fa fa-exchange fa-1-5x
text-info");
icons.put("errata-bugfix", "fa fa-bug fa-1-5x");
icons.put("errata-enhance", "fa fa-1-5x
spacewalk-icon-enhancement");
- icons.put("monitoring-status", "fa fa-1-5x
spacewalk-icon-monitoring-status");
- icons.put("monitoring-ok", "fa fa-1-5x spacewalk-icon-health
text-success");
- icons.put("monitoring-warn", "fa fa-1-5x spacewalk-icon-health
text-warning");
+ icons.put("errata-security", "fa fa-shield fa-1-5x");
+ icons.put("event-type-errata", "fa spacewalk-icon-patches");
+ icons.put("event-type-package", "fa
spacewalk-icon-packages");
+ icons.put("event-type-preferences", "fa fa-cog");
+ icons.put("event-type-system", "fa fa-desktop");
+ icons.put("header-action", "fa-clock-o");
+ icons.put("header-activation-key", "fa fa-key");
+ icons.put("header-channel", "fa
spacewalk-icon-software-channels");
+ icons.put("header-channel-mapping", "fa fa-retweet");
+ icons.put("header-configuration", "fa
spacewalk-icon-manage-configuration-files");
+ icons.put("header-crash", "spacewalk-icon-bug-ex");
+ icons.put("header-errata", "fa spacewalk-icon-patches");
+ icons.put("header-globe", "fa fa-globe");
+ icons.put("header-info", "fa fa-info-circle");
+ icons.put("header-kickstart", "fa fa-rocket");
+ icons.put("header-organisation", "fa fa-group");
+ icons.put("header-package", "fa spacewalk-icon-packages");
+ icons.put("header-preferences", "fa fa-cogs");
+ 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-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-user", "fa fa-user");
+ 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-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-unknown", "fa fa-1-5x
spacewalk-icon-health-unknown");
+ 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("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-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");
+ icons.put("system-warn", "fa fa-exclamation-triangle fa-1-5x
text-warning");
}
/**
commit c95a426b36593ca3fd0a4cd74ae75df33d7aadd9
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Wed Dec 11 16:16:18 2013 +0100
adding rhn taglib as it's needed by rhn:icon
diff --git a/java/code/webapp/WEB-INF/includes/legends/errata-legend.jsp
b/java/code/webapp/WEB-INF/includes/legends/errata-legend.jsp
index 21a8ab4..2172124 100644
--- a/java/code/webapp/WEB-INF/includes/legends/errata-legend.jsp
+++ b/java/code/webapp/WEB-INF/includes/legends/errata-legend.jsp
@@ -1,10 +1,11 @@
<%@ taglib
uri="http://struts.apache.org/tags-bean" prefix="bean"
%>
+<%@ taglib
uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<div class="sideleg">
<h4><bean:message key="errata-legend.jsp.title"/></h4>
<ul>
<li><rhn:icon type="errata-security" /><bean:message
key="errata-legend.jsp.security"/></li>
<li><rhn:icon type="errata-bugfix" /><bean:message
key="errata-legend.jsp.bugfix"/></li>
- <li><rhn:icon type="errata-enhancement" /><bean:message
key="errata-legend.jsp.enhancement"/></li>
+ <li><rhn:icon type="errata-enhance" /><bean:message
key="errata-legend.jsp.enhancement"/></li>
</ul>
</div>
diff --git a/java/code/webapp/WEB-INF/includes/legends/probes-list-legend.jsp
b/java/code/webapp/WEB-INF/includes/legends/probes-list-legend.jsp
index f7b3fff..9b99308 100644
--- a/java/code/webapp/WEB-INF/includes/legends/probes-list-legend.jsp
+++ b/java/code/webapp/WEB-INF/includes/legends/probes-list-legend.jsp
@@ -1,4 +1,5 @@
<%@ taglib
uri="http://struts.apache.org/tags-bean" prefix="bean"
%>
+<%@ taglib
uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<div class="sideleg">
<h4><bean:message
key="probes-list-legend.jsp.title"/></h4>
commit dba29e47a1e687f42b6e7fa0ca8a5d0dba1f2678
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Tue Dec 10 17:26:18 2013 +0100
use rhn:icon tag for creating icons in rhn:toolbar
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 64bd363..634b12c 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java
@@ -103,28 +103,37 @@ public class IconTag extends TagSupport {
return title;
}
+ /**
+ * Return just the HTML
+ * @return String that contains generated HTML
+ */
+ public String renderStartTag() {
+ if (!icons.containsKey(type)) {
+ throw new IllegalArgumentException("Unknown icon type: \"" +
type + "\".");
+ }
+
+ StringBuilder result = new StringBuilder();
+ result.append("<i class=\"" + icons.get(type) +
"\"");
+ if (title != null) {
+ result.append(" title=\"" + title + "\"");
+ }
+ result.append("></i>");
+
+ return result.toString();
+ }
+
/** {@inheritDoc}
* @throws JspException
*/
public int doStartTag() throws JspException {
-
if (!icons.containsKey(type)) {
throw new IllegalArgumentException("Unknown icon type: \"" +
type + "\".");
}
JspWriter out = null;
-
try {
out = pageContext.getOut();
-
- StringBuilder result = new StringBuilder();
-
- result.append("<i class=\"" + icons.get(type) +
"\"");
- if (title != null) {
- result.append(" title=\"" + title + "\"");
- }
- result.append("></i>");
-
+ String result = renderStartTag();
out.print(result);
}
catch (IOException ioe) {
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 bd51bc4..3190bb6 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/ToolbarTag.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/ToolbarTag.java
@@ -586,10 +586,13 @@ public class ToolbarTag extends TagSupport {
private String renderIcon() {
if (assertNotEmpty(getIcon())) {
- HtmlTag tag = new HtmlTag("i");
- tag.setAttribute("class", "fa " + getIcon());
- tag.addBody(" ");
- return tag.render();
+ IconTag i = new IconTag();
+ i.setPageContext(pageContext);
+ i.setParent(getParent());
+ i.setType(getIcon());
+ String result = i.renderStartTag();
+ i.release();
+ return result;
}
return "";
}
@@ -672,14 +675,12 @@ public class ToolbarTag extends TagSupport {
}
if (assertNotEmpty(iconName)) {
- HtmlTag i = new HtmlTag("i");
- i.setAttribute("class", "fa " + iconName);
- // Research should be done if would't be better to
- // use a sr-only div (Screeen-Reader only) instead of
- // title.
- i.setAttribute("title", alt);
- a.addBody(i.renderOpenTag());
- a.addBody(i.renderCloseTag());
+ IconTag i = new IconTag();
+ i.setPageContext(pageContext);
+ i.setParent(getParent());
+ i.setType(iconName);
+ a.addBody(i.renderStartTag());
+ i.release();
}
a.addBody(text);