java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java | 15 +++++++ java/code/webapp/WEB-INF/includes/header.jsp | 8 ++-- java/code/webapp/WEB-INF/pages/admin/config/multiorg.jsp | 6 +-- java/code/webapp/WEB-INF/pages/admin/errata/cloneconfirm.jsp | 6 +-- java/code/webapp/WEB-INF/pages/admin/iss/confirmslaveremove.jsp | 8 ++-- java/code/webapp/WEB-INF/pages/admin/iss/master.jsp | 8 ++-- java/code/webapp/WEB-INF/pages/admin/iss/slave.jsp | 4 +- java/code/webapp/WEB-INF/pages/admin/multiorg/org_users.jsp | 4 +- java/code/webapp/WEB-INF/pages/admin/multiorg/orgdetails.jsp | 2 - java/code/webapp/WEB-INF/pages/admin/multiorg/sat_org_users.jsp | 6 +-- java/code/webapp/WEB-INF/pages/audit/auditsearch.jsp | 4 +- java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp | 2 - java/code/webapp/WEB-INF/pages/channel/channeldetail.jsp | 6 +-- java/code/webapp/WEB-INF/pages/channel/confirmtargetsystems.jsp | 2 - java/code/webapp/WEB-INF/pages/channel/erratalist.jsp | 6 +-- java/code/webapp/WEB-INF/pages/channel/manage/add.jsp | 2 - java/code/webapp/WEB-INF/pages/channel/manage/addcustomerrata.jsp | 6 +-- java/code/webapp/WEB-INF/pages/channel/manage/adderrataredhat.jsp | 6 +-- java/code/webapp/WEB-INF/pages/channel/manage/addpackages.jsp | 2 - java/code/webapp/WEB-INF/pages/channel/manage/channelrepos.jsp | 2 - java/code/webapp/WEB-INF/pages/channel/manage/confirmaddpackages.jsp | 2 - java/code/webapp/WEB-INF/pages/channel/manage/confirmerrata.jsp | 6 +-- java/code/webapp/WEB-INF/pages/channel/manage/confirmerrataremove.jsp | 2 - java/code/webapp/WEB-INF/pages/channel/manage/confirmprotected.jsp | 2 - java/code/webapp/WEB-INF/pages/channel/manage/confirmremovepackages.jsp | 2 - java/code/webapp/WEB-INF/pages/channel/manage/distchannelmap.jsp | 4 +- java/code/webapp/WEB-INF/pages/channel/manage/errata.jsp | 2 - java/code/webapp/WEB-INF/pages/channel/manage/erratapackagesync.jsp | 2 - java/code/webapp/WEB-INF/pages/channel/manage/erratasync.jsp | 8 ++-- java/code/webapp/WEB-INF/pages/channel/manage/listremovepackages.jsp | 2 - java/code/webapp/WEB-INF/pages/channel/manage/packagemenu.jsp | 2 - java/code/webapp/WEB-INF/pages/channel/manage/syncrepos.jsp | 2 - java/code/webapp/WEB-INF/pages/channel/packagesearch.jsp | 2 - java/code/webapp/WEB-INF/pages/channel/subscribedsystems.jsp | 2 - java/code/webapp/WEB-INF/pages/channel/targetsystems.jsp | 2 - java/code/webapp/WEB-INF/pages/common/errors/404.jsp | 2 - java/code/webapp/WEB-INF/pages/common/errors/500.jsp | 2 - java/code/webapp/WEB-INF/pages/common/errors/badcsvaction.jsp | 2 - java/code/webapp/WEB-INF/pages/common/errors/baddownloadaction.jsp | 2 - java/code/webapp/WEB-INF/pages/common/errors/badparam.jsp | 2 - java/code/webapp/WEB-INF/pages/common/errors/loginerror.jsp | 2 - java/code/webapp/WEB-INF/pages/common/errors/lookup.jsp | 2 - java/code/webapp/WEB-INF/pages/common/errors/nosuchkickstart.jsp | 2 - java/code/webapp/WEB-INF/pages/common/errors/nosuchpkg.jsp | 2 - java/code/webapp/WEB-INF/pages/common/errors/permission.jsp | 2 - java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/copyfile_rows.jsp | 4 +- java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/file_info.jsp | 4 +- java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/errata.jsp | 2 - java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/mostCriticalSystems.jsp | 6 +-- java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/scheduledActions.jsp | 2 - java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/systemGroups.jsp | 8 ++-- java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/tasks.jsp | 20 +++++----- java/code/webapp/WEB-INF/pages/configuration/channel/channelsystems.jsp | 2 - java/code/webapp/WEB-INF/pages/configuration/channel/copy2systems.jsp | 2 - java/code/webapp/WEB-INF/pages/configuration/channel/deployconfirm.jsp | 2 - java/code/webapp/WEB-INF/pages/configuration/channel/deploysystems.jsp | 2 - java/code/webapp/WEB-INF/pages/configuration/channel/targetsystems.jsp | 2 - java/code/webapp/WEB-INF/pages/configuration/files/comparechannel.jsp | 4 +- java/code/webapp/WEB-INF/pages/configuration/files/copylocal.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/sdc/channellist.jsp | 2 - java/code/webapp/WEB-INF/pages/configuration/sdc/importfileconfirm.jsp | 4 +- java/code/webapp/WEB-INF/pages/configuration/sdc/subscriptions.jsp | 2 - java/code/webapp/WEB-INF/pages/configuration/ssm/channelsystems.jsp | 4 +- java/code/webapp/WEB-INF/pages/configuration/ssm/deploy.jsp | 2 - java/code/webapp/WEB-INF/pages/configuration/ssm/deployconfirm.jsp | 2 - java/code/webapp/WEB-INF/pages/configuration/ssm/diff.jsp | 2 - java/code/webapp/WEB-INF/pages/configuration/ssm/diffconfirm.jsp | 2 - java/code/webapp/WEB-INF/pages/configuration/ssm/difffiles.jsp | 6 +-- java/code/webapp/WEB-INF/pages/configuration/ssm/diffsystems.jsp | 4 +- java/code/webapp/WEB-INF/pages/configuration/ssm/enable.jsp | 2 - java/code/webapp/WEB-INF/pages/configuration/ssm/enablesummary.jsp | 2 - java/code/webapp/WEB-INF/pages/configuration/ssm/subscribe.jsp | 2 - java/code/webapp/WEB-INF/pages/configuration/ssm/subscribeconfirm.jsp | 2 - java/code/webapp/WEB-INF/pages/configuration/ssm/systemchannels.jsp | 4 +- java/code/webapp/WEB-INF/pages/configuration/ssm/unsubscribe.jsp | 2 - java/code/webapp/WEB-INF/pages/configuration/ssm/unsubscribeconfirm.jsp | 2 - java/code/webapp/WEB-INF/pages/errata/affectedsystems.jsp | 2 - java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp | 14 +++---- 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/groups/detail.jsp | 6 +-- java/code/webapp/WEB-INF/pages/help/docsearch.jsp | 2 - java/code/webapp/WEB-INF/pages/help/helpindex.jsp | 2 - java/code/webapp/WEB-INF/pages/kickstart/kickstartdownload.jsp | 2 - java/code/webapp/WEB-INF/pages/kickstart/kickstarts.jsp | 4 +- java/code/webapp/WEB-INF/pages/kickstart/kstrees.jsp | 2 - java/code/webapp/WEB-INF/pages/kickstart/ssm/schedule.jsp | 4 +- java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/fifth.jsp | 2 - java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/first.jsp | 2 - java/code/webapp/WEB-INF/pages/monitoring/probes.jsp | 2 - java/code/webapp/WEB-INF/pages/ssm/packageupgrade.jsp | 6 +-- java/code/webapp/WEB-INF/pages/ssm/systems/misc/lock-unlock-system.jsp | 2 - java/code/webapp/WEB-INF/pages/ssm/systems/ssm-errata.jsp | 6 +-- java/code/webapp/WEB-INF/pages/systems/crashnotes.jsp | 4 +- java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdeleteconfirm.jsp | 2 - java/code/webapp/WEB-INF/pages/systems/details/packages/packageconfirm.jsp | 2 - java/code/webapp/WEB-INF/pages/systems/details/packages/packagesindex.jsp | 2 - java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/comparesystems.jsp | 2 - java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/profiles.jsp | 4 +- java/code/webapp/WEB-INF/pages/systems/details/packages/upgradable.jsp | 6 +-- java/code/webapp/WEB-INF/pages/systems/errata.jsp | 8 ++-- java/code/webapp/WEB-INF/pages/systems/errataconfirm.jsp | 8 ++-- java/code/webapp/WEB-INF/pages/systems/sdc/channels.jsp | 4 +- java/code/webapp/WEB-INF/pages/systems/sdc/confirmnewbase.jsp | 2 - java/code/webapp/WEB-INF/pages/systems/sdc/deletecustomdata.jsp | 2 - java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp | 8 ++-- java/code/webapp/WEB-INF/pages/systems/sdc/updatecustomdata.jsp | 2 - java/code/webapp/WEB-INF/pages/systems/systemcurrency.jsp | 18 ++++----- java/code/webapp/WEB-INF/pages/systems/systemsearch.jsp | 2 - java/spacewalk-java.spec | 11 +++++ rel-eng/packages/spacewalk-java | 2 - 116 files changed, 231 insertions(+), 207 deletions(-)
New commits: commit 9cf52da2f3d70f15e71452d84ed98b6ada3ba285 Author: Michael Mraka michael.mraka@redhat.com Date: Thu Dec 12 14:40:44 2013 +0100
Automatic commit of package [spacewalk-java] release [2.1.98-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index 0b492a1..985c6ea 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -28,7 +28,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 2.1.97 +Version: 2.1.98 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%%7Bname%7D-%%7Bversion%7D.t... @@ -785,6 +785,15 @@ fi %{jardir}/postgresql-jdbc.jar
%changelog +* Thu Dec 12 2013 Michael Mraka michael.mraka@redhat.com 2.1.98-1 +- replaced icons with icon tag +- system group edit properties - linking + cleanup +- alter system group create page to do editing +- use rhn:toolbar tag instead of creating html inside .jsp + unify icons +- fix icons on config file details page +- icon for file download +- unify configuration management icons + * Wed Dec 11 2013 Tomas Kasparek tkasparek@redhat.com 2.1.97-1 - use new icon aliases in more places
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index a4cd024..a19e19b 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -2.1.97-1 java/ +2.1.98-1 java/
commit 74d9e2a4dcf0a0a5bb7a696f9b747ea6039e85cb Author: Michael Mraka michael.mraka@redhat.com Date: Thu Dec 12 12:32:16 2013 +0100
replaced icons with icon tag
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 393821b..a12b89a 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java @@ -58,28 +58,40 @@ public class IconTag extends TagSupport { 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-errata-add", "fa spacewalk-icon-patch-install"); + icons.put("header-errata-del", "fa spacewalk-icon-patch-remove"); + icons.put("header-errata-set", "fa spacewalk-icon-patch-set"); + icons.put("header-errata-set-add", "fa pacewalk-icon-patchset-install"); + icons.put("header-event-history", "fa fa-suitcase"); icons.put("header-globe", "fa fa-globe"); icons.put("header-info", "fa fa-info-circle"); icons.put("header-list", "fa fa-list"); icons.put("header-kickstart", "fa fa-rocket"); + icons.put("header-multiorg-big", "fa fa-sitemap fa-3x"); 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-proxy", "fa spacewalk-icon-proxy"); icons.put("header-search", "fa fa-search"); icons.put("header-signout", "fa fa-sign-out"); icons.put("header-sitemap", "fa fa-sitemap"); icons.put("header-snapshot", "fa fa-camera"); + icons.put("header-snapshot-rollback", "fa spacewalk-icon-snapshot-rollback"); + icons.put("header-subscriptions-big", "fa fa-list-alt fa-3x"); icons.put("header-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-users-big", "fa fa-group fa-3x"); icons.put("header-taskomatic", "fa fa-tachometer"); icons.put("item-add", "fa fa-plus"); icons.put("item-clone", "fa fa-files-o"); icons.put("item-del", "fa fa-trash-o"); icons.put("item-download", "fa fa-download"); + icons.put("item-disabled", "fa fa-circle-o text-muted"); + icons.put("item-enabled", "fa fa-check text-success"); icons.put("item-ssm-add", "fa fa-plus-circle"); icons.put("item-ssm-del", "fa fa-minus-circle"); icons.put("monitoring-crit", "fa fa-1-5x spacewalk-icon-health text-danger"); @@ -88,6 +100,9 @@ public class IconTag extends TagSupport { 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("nav-bullet", "fa fa-caret-right"); + icons.put("nav-right", "fa fa-arrow-right"); + icons.put("nav-up", "fa fa-caret-up"); icons.put("system-crit", "fa fa-exclamation-circle fa-1-5x text-danger"); icons.put("system-kickstarting", "fa fa-rocket fa-1-5x"); icons.put("system-locked", "fa fa-1-5x spacewalk-icon-locked-system"); diff --git a/java/code/webapp/WEB-INF/includes/header.jsp b/java/code/webapp/WEB-INF/includes/header.jsp index 9c0e89f..b3ae493 100644 --- a/java/code/webapp/WEB-INF/includes/header.jsp +++ b/java/code/webapp/WEB-INF/includes/header.jsp @@ -32,13 +32,13 @@ <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> + <span class="spacewalk-header-non-link"><rhn:icon type="header-sitemap" /><c:out escapeXml="true" value="${requestScope.session.user.org.name}" /></span> </li> <li> - <a href="/rhn/account/UserPreferences.do"><i class="fa fa-cogs" title="<bean:message key='header.jsp.preferences' />"></i></a> + <a href="/rhn/account/UserPreferences.do"><rhn:icon type="header-preferences" title="<bean:message key='header.jsp.preferences' />" /></a> </li> <li> - <html:link forward="logout"><i class="fa fa-sign-out" title="<bean:message key='header.jsp.signout' />"></i></html:link> + <html:link forward="logout"><rhn:icon type="header-signout" title="<bean:message key='header.jsp.signout' />" /></html:link> </li> </ul>
@@ -59,7 +59,7 @@ <div class="form-group"> <input type="hidden" name="submitted" value="true" /> <button type="submit" class="btn btn-info input-sm"> - <i class="fa fa-search"></i> + <rhn:icon type="header-search" /> </button> </div> </form> 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 52f1c7d..ec0e1aa 100644 --- a/java/code/webapp/WEB-INF/pages/admin/config/multiorg.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/config/multiorg.jsp @@ -21,7 +21,7 @@ <p><bean:message key="general.jsp.org.summary3"/></p> <table class="table"> <tr> - <td><i class="fa fa-sitemap fa-3x"></i></td> + <td><rhn:icon type="header-multiorg-big" /></td> <td><bean:message key="general.jsp.org.tbl.header1"/>:</td> <td> <p> @@ -33,7 +33,7 @@ </td> </tr> <tr> - <td><i class="fa fa-list-alt fa-3x"></i></td> + <td><rhn:icon type="header-subscriptions-big" /></td> <td><bean:message key="general.jsp.org.tbl.header2"/>:</td> <td> <p> @@ -45,7 +45,7 @@ </td> </tr> <tr> - <td><i class="fa fa-group fa-3x"></i></td> + <td><rhn:icon type="header-users-big" /></td> <td><bean:message key="general.jsp.org.tbl.header3"/>:</td> <td> <p> diff --git a/java/code/webapp/WEB-INF/pages/admin/errata/cloneconfirm.jsp b/java/code/webapp/WEB-INF/pages/admin/errata/cloneconfirm.jsp index 3c2052a..fe331d3 100644 --- a/java/code/webapp/WEB-INF/pages/admin/errata/cloneconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/errata/cloneconfirm.jsp @@ -17,13 +17,13 @@ <rhn:listdisplay button="deleteconfirm.jsp.confirm"> <rhn:column header="erratalist.jsp.type"> <c:if test="${current.securityAdvisory}"> - <i class="fa fa-lock"></i> + <rhn:icon type="errata-security" /> </c:if> <c:if test="${current.bugFix}"> - <i class="fa fa-bug"></i> + <rhn:icon type="errata-bugfix" /> </c:if> <c:if test="${current.productEnhancement}"> - <i class="fa spacewalk-icon-enhancement"></i> + <rhn:icon type="errata-enhance" /> </c:if> </rhn:column> <rhn:column header="erratalist.jsp.advisory"> diff --git a/java/code/webapp/WEB-INF/pages/admin/iss/confirmslaveremove.jsp b/java/code/webapp/WEB-INF/pages/admin/iss/confirmslaveremove.jsp index c090206..d43f0b8 100644 --- a/java/code/webapp/WEB-INF/pages/admin/iss/confirmslaveremove.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/iss/confirmslaveremove.jsp @@ -27,19 +27,19 @@ <rl:column bound="false" headerkey="iss.slave.isEnabled" sortattr="enabled"> <c:if test="${current.enabled == 'Y'}"> - <i class="fa fa-check text-success" title="<bean:message key='iss.slave.enabled'/>"></i> + <rhn:icon type="item-enabled" title="<bean:message key='iss.slave.enabled' />" /> </c:if> <c:if test="${current.enabled != 'Y'}"> - <i class="fa fa-circle-o" title="<bean:message key='iss.slave.disabled'/>"></i> + <rhn:icon type="item-disabled" title="<bean:message key='iss.slave.disabled' />" /> </c:if> </rl:column> <rl:column bound="false" headerkey="iss.slave.toAll" sortattr="allOrgs"> <c:if test="${current.allowAllOrgs == 'Y'}"> - <i class="fa fa-check text-success" title="<bean:message key='iss.slave.all'/>"></i> + <rhn:icon type="item-enabled" title="<bean:message key='iss.slave.all' />" /> </c:if> <c:if test="${current.allowAllOrgs != 'Y'}"> - <i class="fa fa-circle-o" title="<bean:message key='iss.slave.notAll'/>"></i> + <rhn:icon type="item-disabled" title="<bean:message key='iss.slave.notAll' />" /> </c:if> </rl:column> </rl:list> 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 e85e59f..a82ef20 100644 --- a/java/code/webapp/WEB-INF/pages/admin/iss/master.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/iss/master.jsp @@ -39,19 +39,19 @@ <rl:column bound="false" headerkey="iss.slave.isEnabled" sortattr="enabled" styleclass="center" headerclass="center"> <c:if test="${current.enabled == 'Y'}"> - <i class="fa fa-check text-success" title="<bean:message key='iss.slave.enabled'/>"></i> + <rhn:icon type="item-enabled" title="<bean:message key='iss.slave.enabled' />" /> </c:if> <c:if test="${current.enabled != 'Y'}"> - <i class="fa fa-circle-o" title="<bean:message key='iss.slave.disabled'/>"></i> + <rhn:icon type="item-disabled" title="<bean:message key='iss.slave.disabled' />" /> </c:if> </rl:column> <rl:column bound="false" headerkey="iss.slave.toAll" sortattr="allOrgs" styleclass="center" headerclass="center"> <c:if test="${current.allowAllOrgs == 'Y'}"> - <i class="fa fa-check text-success" title="<bean:message key='iss.slave.all'/>"></i> + <rhn:icon type="item-enabled" title="<bean:message key='iss.slave.all' />" /> </c:if> <c:if test="${current.allowAllOrgs != 'Y'}"> - <i class="fa fa-circle-o" title="<bean:message key='iss.slave.notAll'/>"></i> + <rhn:icon type="item-disabled" title="<bean:message key='iss.slave.notAll' />" /> </c:if> </rl:column> <rl:column bound="false" headerkey="iss.slave.num-orgs-allowed" 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 ee0cc23..76915e6 100644 --- a/java/code/webapp/WEB-INF/pages/admin/iss/slave.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/iss/slave.jsp @@ -32,10 +32,10 @@ <rl:column bound="false" headerkey="iss.master.isDefault" styleclass="center" headerclass="center"> <c:if test="${current.defaultMaster}"> - <i class="fa fa-check text-success" title="<bean:message key='iss.master.isDefault'/>"></i> + <rhn:icon type="item-enabled" title="<bean:message key='iss.master.isDefault' />" /> </c:if> <c:if test="${not current.defaultMaster}"> - <i class="fa fa-circle-o" title="<bean:message key='iss.master.notDefault'/>"></i> + <rhn:icon type="item-disabled" title="<bean:message key='iss.master.notDefault' />" /> </c:if> </rl:column> <rl:column headerkey="iss.num.master.orgs" styleclass="center" headerclass="center"> 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 5cf962c..ff8e50e 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 @@ -86,10 +86,10 @@ attr="orgAdmin"> <c:choose> <c:when test="${current.orgAdmin == 1}"> - <i class="fa fa-check"></i> + <rhn:icon type="item-enabled" /> </c:when> <c:otherwise> - <img src="/img/rhn-listicon-unchecked_immutable.gif"> + <rhn:icon type="item-disabled" /> </c:otherwise> </c:choose>
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 97bf073..72b9e33 100644 --- a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgdetails.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgdetails.jsp @@ -72,7 +72,7 @@ <bean:message key="org.active.users.jsp"/>: </label> <div class="col-lg-6"> - <a class="btn btn-default btn-sm" href="/rhn/admin/multiorg/OrgUsers.do?oid=${param.oid}"><i class="fa fa-group"></i><bean:write name="orgDetailsForm" property="users"/></a> + <a class="btn btn-default btn-sm" href="/rhn/admin/multiorg/OrgUsers.do?oid=${param.oid}"><rhn:icon type="header-organisation" /><bean:write name="orgDetailsForm" property="users"/></a> </div> </div> <div class="form-group"> 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 f17cfe4..2136f55 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 @@ -67,7 +67,7 @@ attr="orgAdmin"> <c:choose> <c:when test="${current.orgAdmin == 1}"> - <i class="fa fa-check"></i> + <rhn:icon type="item-enabled" /> </c:when> <c:otherwise> <img src="/img/rhn-listicon-unchecked_immutable.gif"> @@ -81,12 +81,12 @@ <c:choose> <c:when test="${current.satAdmin == 1}"> <a href="/rhn/admin/multiorg/ToggleSatAdmin.do?uid=${current.id}"> - <i class="fa fa-check text-success"></i> + <rhn:icon type="item-enabled" /> </a> </c:when> <c:otherwise> <a href="/rhn/admin/multiorg/ToggleSatAdmin.do?uid=${current.id}"> - <i class="fa fa-circle-o"></i> + <rhn:icon type="item-disabled" /> </a> </c:otherwise> </c:choose> diff --git a/java/code/webapp/WEB-INF/pages/audit/auditsearch.jsp b/java/code/webapp/WEB-INF/pages/audit/auditsearch.jsp index e2e247c..25855fd 100644 --- a/java/code/webapp/WEB-INF/pages/audit/auditsearch.jsp +++ b/java/code/webapp/WEB-INF/pages/audit/auditsearch.jsp @@ -83,7 +83,7 @@ <rhn:submitted /> <div class="text-right form-group"> <button type="submit" class="btn btn-success"> - <i class="fa fa-search"></i> + <rhn:icon type="header-search" /> <bean:message key="button.search"/> </button> </div> @@ -173,7 +173,7 @@ </div> <div class="text-right"> <button type="submit" class="btn btn-success"> - <i class="fa fa-search"></i> + <rhn:icon type="header-search" /> <bean:message key="button.search"/> </button> </div> 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 df95677..7d02037 100644 --- a/java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp +++ b/java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp @@ -41,7 +41,7 @@ </div> <div class="form-group"> <button type="submit" class="btn btn-default btn-sm"> - <i class="fa fa-search"></i> + <rhn:icon type="header-search" /> <bean:message key="button.search"/> </button> </div> diff --git a/java/code/webapp/WEB-INF/pages/channel/channeldetail.jsp b/java/code/webapp/WEB-INF/pages/channel/channeldetail.jsp index 0f24fec..152dced 100644 --- a/java/code/webapp/WEB-INF/pages/channel/channeldetail.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/channeldetail.jsp @@ -41,7 +41,7 @@ </c:if> <c:if test="${!empty channel.parentChannel}"> <a class="btn btn-info" href="/rhn/channels/ChannelDetail.do?cid=${channel.parentChannel.id}"> - <c:out value="${channel.parentChannel.name}" /> <i class="fa fa-arrow-right"></i> + <c:out value="${channel.parentChannel.name}" /> <rhn:icon type="nav-right" /> </a> </c:if> </div> @@ -146,7 +146,7 @@ </label> <div class="col-lg-6"> <a class="btn btn-info" href="/rhn/channels/ChannelPackages.do?cid=${channel.id}"> - ${pack_size} <i class="fa fa-arrow-right"></i> + ${pack_size} <rhn:icon type="nav-right" /> </a> </div> </div> @@ -193,7 +193,7 @@ </label> <div class="col-lg-6"> <a class="btn btn-info" href="/rhn/channels/ChannelSubscribers.do?cid=${channel.id}"> - ${systems_subscribed} <i class="fa fa-arrow-right"></i> + ${systems_subscribed} <rhn:icon type="nav-right" /> </a> </div> </div> diff --git a/java/code/webapp/WEB-INF/pages/channel/confirmtargetsystems.jsp b/java/code/webapp/WEB-INF/pages/channel/confirmtargetsystems.jsp index 5eb818a..ccd29b3 100755 --- a/java/code/webapp/WEB-INF/pages/channel/confirmtargetsystems.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/confirmtargetsystems.jsp @@ -15,7 +15,7 @@ <%@ include file="/WEB-INF/pages/common/fragments/channel/channel_header.jspf" %> <BR> <h2> - <i class="fa fa-desktop" title="system"></i> + <rhn:icon type="header-system-physical" title="system" /> <bean:message key="channeltarget.confirm.jsp.header1"/> </h2>
diff --git a/java/code/webapp/WEB-INF/pages/channel/erratalist.jsp b/java/code/webapp/WEB-INF/pages/channel/erratalist.jsp index ea2846d..688cc74 100644 --- a/java/code/webapp/WEB-INF/pages/channel/erratalist.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/erratalist.jsp @@ -29,13 +29,13 @@ headerkey="erratalist.jsp.type">
<c:if test="${current.securityAdvisory}"> - <i class="fa fa-lock" title="<bean:message key='erratalist.jsp.securityadvisory' />"></i> + <rhn:icon type="errata-security" title="<bean:message key='erratalist.jsp.securityadvisory' />" /> </c:if> <c:if test="${current.bugFix}"> - <i class="fa fa-bug" title="<bean:message key='erratalist.jsp.bugadvisory' />"></i> + <rhn:icon type="errata-bugfix" title="<bean:message key='erratalist.jsp.bugadvisory' />" /> </c:if> <c:if test="${current.productEnhancement}"> - <i class="fa spacewalk-icon-enhancement" title="<bean:message key='erratalist.jsp.productenhancementadvisory' />"></i> + <rhn:icon type="errata-enhance" title="<bean:message key='erratalist.jsp.productenhancementadvisory' />" /> </c:if>
</rl:column> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/add.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/add.jsp index cd22ec1..bf5eedc 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/add.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/add.jsp @@ -12,7 +12,7 @@ <body> <%@ include file="/WEB-INF/pages/common/fragments/channel/manage/manage_channel_header.jspf" %> <h2> - <i class="fa spacewalk-icon-patches" title="erratum"></i> <bean:message key="header.jsp.errata.add"/> + <rhn:icon type="header-errata" title="erratum" /> <bean:message key="header.jsp.errata.add"/> </h2>
<table class="details"> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/addcustomerrata.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/addcustomerrata.jsp index 883d041..ed9017a 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/addcustomerrata.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/addcustomerrata.jsp @@ -94,13 +94,13 @@ styleclass="center" headerclass="thin-column"> <c:if test="${current.securityAdvisory}"> - <i class="fa fa-lock" title="<bean:message key='erratalist.jsp.securityadvisory'/>"></i> + <rhn:icon type="errata-security" title="<bean:message key='erratalist.jsp.securityadvisory' />" /> </c:if> <c:if test="${current.bugFix}"> - <i class="fa fa-bug" title="<bean:message key='erratalist.jsp.bugadvisory'/>"></i> + <rhn:icon type="errata-bugfix" title="<bean:message key='erratalist.jsp.bugadvisory' />" /> </c:if> <c:if test="${current.productEnhancement}"> - <i class="fa spacewalk-icon-enhancement" title="<bean:message key='erratalist.jsp.productenhancementadvisory'/>"></i> + <rhn:icon type="errata-enhance" title="<bean:message key='erratalist.jsp.productenhancementadvisory' />" /> </c:if> </rl:column>
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/adderrataredhat.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/adderrataredhat.jsp index acac8dc..da69858 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/adderrataredhat.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/adderrataredhat.jsp @@ -116,13 +116,13 @@ styleclass="center" headerclass="thin-column"> <c:if test="${current.securityAdvisory}"> - <i class="fa fa-lock" title="<bean:message key='erratalist.jsp.securityadvisory'/>"></i> + <rhn:icon type="errata-security" title="<bean:message key='erratalist.jsp.securityadvisory' />" /> </c:if> <c:if test="${current.bugFix}"> - <i class="fa fa-bug" title="<bean:message key='erratalist.jsp.bugadvisory'/>"></i> + <rhn:icon type="errata-bugfix" title="<bean:message key='erratalist.jsp.bugadvisory' />" /> </c:if> <c:if test="${current.productEnhancement}"> - <i class="fa spacewalk-icon-enhancement" title="<bean:message key='erratalist.jsp.productenhancementadvisory'/>"></i> + <rhn:icon type="errata-enhance" title="<bean:message key='erratalist.jsp.productenhancementadvisory' />" /> </c:if> </rl:column>
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/addpackages.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/addpackages.jsp index 2e87e21..eac9bee 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/addpackages.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/addpackages.jsp @@ -28,7 +28,7 @@ <rhn:csrf /> <input type="hidden" name="cid" value="${cid}"> <bean:message key="channel.jsp.package.addmessage"/> -<h2><i class="fa spacewalk-icon-packages"></i> <bean:message key="channel.jsp.package.addtitle"/></h2> +<h2><rhn:icon type="header-package" /> <bean:message key="channel.jsp.package.addtitle"/></h2>
<%@ include file="/WEB-INF/pages/common/fragments/channel/manage/channel_selector.jspf" %>
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/channelrepos.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/channelrepos.jsp index 7d4e0a8..2096b7b 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/channelrepos.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/channelrepos.jsp @@ -14,7 +14,7 @@ <%@ include file="/WEB-INF/pages/common/fragments/channel/manage/manage_channel_header.jspf" %> <BR>
-<h2><i class="fa spacewalk-icon-packages"></i> <bean:message key="repos.jsp.channel.repos"/></h2> +<h2><rhn:icon type="header-package" /> <bean:message key="repos.jsp.channel.repos"/></h2>
<rl:listset name="packageSet"> <rhn:csrf /> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/confirmaddpackages.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/confirmaddpackages.jsp index 5274cfe..6a44866 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/confirmaddpackages.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/confirmaddpackages.jsp @@ -14,7 +14,7 @@ <%@ include file="/WEB-INF/pages/common/fragments/channel/manage/manage_channel_header.jspf" %> <BR> <h2> - <i class="fa spacewalk-icon-packages"></i> + <rhn:icon type="header-package" /> <bean:message key="channel.jsp.package.add.confirm.title"/> </h2> <bean:message key="channel.jsp.package.add.confirm.msg"/> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrata.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrata.jsp index 51a5020..73a1ced 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrata.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrata.jsp @@ -24,19 +24,19 @@ <h2>Errata Summary:</h2> <table class="details"> <tr> - <th><i class="fa fa-bug" title="<bean:message key='erratalist.jsp.bugadvisory'/>"></i> + <th><rhn:icon type="errata-bugfix" title="<bean:message key='erratalist.jsp.bugadvisory' />" /> Bug Fix Advisory: </th> <td>${bug_count}</td> </tr> <tr> - <th><i class="fa spacewalk-icon-enhancement" title="<bean:message key='erratalist.jsp.productenhancementadvisory'/>"></i> + <th><rhn:icon type="errata-enhance" title="<bean:message key='erratalist.jsp.productenhancementadvisory' />" /> Product Enhancement Advisory: </th> <td>${enhance_count}</td> </tr> <tr> - <th><i class="fa fa-lock" title="<bean:message key='erratalist.jsp.securityadvisory'/>"></i> + <th><rhn:icon type="errata-security" title="<bean:message key='erratalist.jsp.securityadvisory' />" /> Security Advisory: </th> <td>${secure_count}</td> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrataremove.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrataremove.jsp index f4d2987..a6a56be 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrataremove.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrataremove.jsp @@ -12,7 +12,7 @@ <body> <%@ include file="/WEB-INF/pages/common/fragments/channel/manage/manage_channel_header.jspf" %> <h2> - <i class="fa spacewalk-icon-patches" title="erratum"></i> <bean:message key="header.jsp.errata"/> + <rhn:icon type="header-errata" title="erratum" /> <bean:message key="header.jsp.errata"/> </h2>
<bean:message key="channel.jsp.errata.remove.confirmmessage"/> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/confirmprotected.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/confirmprotected.jsp index c85aaf9..968110e 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/confirmprotected.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/confirmprotected.jsp @@ -17,7 +17,7 @@
<br/> <h2> - <i class="fa spacewalk-icon-packages"></i> + <rhn:icon type="header-package" /> <bean:message key="confirmprivate.jsp.title"/> </h2> <p><bean:message key="confirmprotected.jsp.confirmmsg"/></p> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/confirmremovepackages.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/confirmremovepackages.jsp index 9ee03e8..f2f8bd7 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/confirmremovepackages.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/confirmremovepackages.jsp @@ -14,7 +14,7 @@ <%@ include file="/WEB-INF/pages/common/fragments/channel/manage/manage_channel_header.jspf" %> <BR> <h2> - <i class="fa spacewalk-icon-packages"></i> + <rhn:icon type="header-package" /> Confirm Package Removal </h2> <bean:message key="channel.jsp.package.remove"/> 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 75a9478..4455bee 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/distchannelmap.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/distchannelmap.jsp @@ -69,10 +69,10 @@ > <c:choose> <c:when test="${current.org != null}"> - <i class="fa fa-check text-success"></i> + <rhn:icon type="item-enabled" /> </c:when> <c:otherwise> - <i class="fa fa-circle-o"></i> + <rhn:icon type="item-disabled" /> </c:otherwise> </c:choose> </rl:column> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/errata.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/errata.jsp index c73f58a..7df0baf 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/errata.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/errata.jsp @@ -12,7 +12,7 @@ <body> <%@ include file="/WEB-INF/pages/common/fragments/channel/manage/manage_channel_header.jspf" %> <h2> - <i class="fa spacewalk-icon-patches" title="erratum"></i> <bean:message key="header.jsp.errata"/> + <rhn:icon type="header-errata" title="erratum"/> <bean:message key="header.jsp.errata"/> </h2>
<ul> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/erratapackagesync.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/erratapackagesync.jsp index 4711637..34e35d9 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/erratapackagesync.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/erratapackagesync.jsp @@ -14,7 +14,7 @@ <%@ include file="/WEB-INF/pages/common/fragments/channel/manage/manage_channel_header.jspf" %> <BR>
-<h2><i class="fa spacewalk-icon-packages"></i> <bean:message key="header.jsp.errata.sync.packagepush"/></h2> +<h2><rhn:icon type="header-package" /> <bean:message key="header.jsp.errata.sync.packagepush"/></h2>
<bean:message key="channel.jsp.errata.sync.packages.message"/>
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/erratasync.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/erratasync.jsp index c8d2abe..5a7547b 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/erratasync.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/erratasync.jsp @@ -12,7 +12,7 @@ <body> <%@ include file="/WEB-INF/pages/common/fragments/channel/manage/manage_channel_header.jspf" %> <h2> - <i class="fa spacewalk-icon-patches" title="erratum"></i> <bean:message key="header.jsp.errata.sync"/> + <rhn:icon type="header-errata" title="erratum" /> <bean:message key="header.jsp.errata.sync"/> </h2>
<bean:message key="channel.jsp.errata.sync.message"/> @@ -42,13 +42,13 @@ headerclass="thin-column" sortattr="advisoryType"> <c:if test="${current.advisoryType == 'Product Enhancement Advisory'}"> - <i class="fa spacewalk-icon-enhancement" title="Product Enhancement Advisory"></i> + <rhn:icon type="errata-enhance" title="Product Enhancement Advisory" /> </c:if> <c:if test="${current.advisoryType == 'Security Advisory'}"> - <i class="fa fa-lock" title="Security Advisory"></i> + <rhn:icon type="errata-security" title="Security Advisory" /> </c:if> <c:if test="${current.advisoryType == 'Bug Fix Advisory'}"> - <i class="fa fa-bug" title="Bug Fix Advisory"></i> + <rhn:icon type="errata-bugfix" title="Bug Fix Advisory" /> </c:if>
</rl:column> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/listremovepackages.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/listremovepackages.jsp index 0086bf3..aa32335 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/listremovepackages.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/listremovepackages.jsp @@ -14,7 +14,7 @@ <%@ include file="/WEB-INF/pages/common/fragments/channel/manage/manage_channel_header.jspf" %> <BR>
-<h2><i class="fa spacewalk-icon-packages"></i> <bean:message key="channel.jsp.package.list"/></h2> +<h2><rhn:icon type="header-package" /> <bean:message key="channel.jsp.package.list"/></h2>
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/packagemenu.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/packagemenu.jsp index dec517a..03e7fca 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/packagemenu.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/packagemenu.jsp @@ -13,7 +13,7 @@ <%@ include file="/WEB-INF/pages/common/fragments/channel/manage/manage_channel_header.jspf" %>
<h2> - <i class="fa spacewalk-icon-packages" title="package"></i> Packages + <rhn:icon type="header-package" title="package" /> Packages </h2>
<ul> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/syncrepos.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/syncrepos.jsp index 89e358f..318bc13 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/syncrepos.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/syncrepos.jsp @@ -14,7 +14,7 @@ <%@ include file="/WEB-INF/pages/common/fragments/channel/manage/manage_channel_header.jspf" %> <BR>
-<h2><i class="fa spacewalk-icon-packages"></i> <bean:message key="repos.jsp.channel.repos"/></h2> +<h2><rhn:icon type="header-package" /> <bean:message key="repos.jsp.channel.repos"/></h2>
<rl:listset name="packageSet"> <rhn:csrf /> diff --git a/java/code/webapp/WEB-INF/pages/channel/packagesearch.jsp b/java/code/webapp/WEB-INF/pages/channel/packagesearch.jsp index 5a46003..6a1e9cb 100644 --- a/java/code/webapp/WEB-INF/pages/channel/packagesearch.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/packagesearch.jsp @@ -27,7 +27,7 @@ name="search_string" value="${search_string}" accesskey="4"/> <span class="input-group-btn"> <button type="submit" class="btn btn-default"> - <i class="fa fa-search"></i> + <rhn:icon type="header-search" /> </button> </span> </div> diff --git a/java/code/webapp/WEB-INF/pages/channel/subscribedsystems.jsp b/java/code/webapp/WEB-INF/pages/channel/subscribedsystems.jsp index 31d770b..4224e7d 100644 --- a/java/code/webapp/WEB-INF/pages/channel/subscribedsystems.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/subscribedsystems.jsp @@ -13,7 +13,7 @@
<%@ include file="/WEB-INF/pages/common/fragments/channel/channel_header.jspf" %> <h2> - <i class="fa fa-desktop"></i> + <rhn:icon type="header-system-physical" /> <bean:message key="channelsystems.jsp.header2"/> </h2>
diff --git a/java/code/webapp/WEB-INF/pages/channel/targetsystems.jsp b/java/code/webapp/WEB-INF/pages/channel/targetsystems.jsp index 690f417..a6b19ba 100755 --- a/java/code/webapp/WEB-INF/pages/channel/targetsystems.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/targetsystems.jsp @@ -15,7 +15,7 @@ <%@ include file="/WEB-INF/pages/common/fragments/channel/channel_header.jspf" %> <BR> <h2> - <i class="fa fa-desktop" title="system"></i> + <rhn:icon type="header-system-physical" title="system" /> <bean:message key="channeltarget.jsp.header1"/> </h2>
diff --git a/java/code/webapp/WEB-INF/pages/common/errors/404.jsp b/java/code/webapp/WEB-INF/pages/common/errors/404.jsp index d33b193..7ac4908 100644 --- a/java/code/webapp/WEB-INF/pages/common/errors/404.jsp +++ b/java/code/webapp/WEB-INF/pages/common/errors/404.jsp @@ -11,7 +11,7 @@ <c:set var="escapedUrl" value="${fn:escapeXml(errorUrl)}"/>
<h1> - <i class="fa fa-warning text-warning" title="<bean:message key='500.jsp.imgAlt' />"></i> + <rhn:icon type="system-warn" title="<bean:message key='500.jsp.imgAlt' />" /> <bean:message key="404.jsp.title"/> </h1> <p><bean:message key="404.jsp.summary" arg0="${escapedUrl}"/></p> diff --git a/java/code/webapp/WEB-INF/pages/common/errors/500.jsp b/java/code/webapp/WEB-INF/pages/common/errors/500.jsp index 9c0bd92..7f9218d 100644 --- a/java/code/webapp/WEB-INF/pages/common/errors/500.jsp +++ b/java/code/webapp/WEB-INF/pages/common/errors/500.jsp @@ -6,7 +6,7 @@ <page:applyDecorator name="layout_c"> <body> <h1> - <i class="fa fa-warning text-warning" title="<bean:message key='500.jsp.imgAlt' />"></i> + <rhn:icon type="system-warn" title="<bean:message key='500.jsp.imgAlt' />" /> <bean:message key="500.jsp.title"/> </h1> <p><bean:message key="500.jsp.summary"/></p> diff --git a/java/code/webapp/WEB-INF/pages/common/errors/badcsvaction.jsp b/java/code/webapp/WEB-INF/pages/common/errors/badcsvaction.jsp index 2c97f17..e42296c 100644 --- a/java/code/webapp/WEB-INF/pages/common/errors/badcsvaction.jsp +++ b/java/code/webapp/WEB-INF/pages/common/errors/badcsvaction.jsp @@ -6,7 +6,7 @@
<rhn:require acl="user_authenticated()">
-<h1><i class="fa fa-warning text-warning"></i><bean:message key="badcsvaction.jsp.title"/></h1> +<h1><rhn:icon type="system-warn" /><bean:message key="badcsvaction.jsp.title"/></h1>
<p><bean:message key="badcsvaction.jsp.summary"/></p> <ol> diff --git a/java/code/webapp/WEB-INF/pages/common/errors/baddownloadaction.jsp b/java/code/webapp/WEB-INF/pages/common/errors/baddownloadaction.jsp index e2296e0..2f16211 100644 --- a/java/code/webapp/WEB-INF/pages/common/errors/baddownloadaction.jsp +++ b/java/code/webapp/WEB-INF/pages/common/errors/baddownloadaction.jsp @@ -4,7 +4,7 @@ <html> <body>
-<h1><i class="fa fa-warning text-warning"></i><bean:message key="baddownload.jsp.title"/></h1> +<h1><rhn:icon type="system-warn" /><bean:message key="baddownload.jsp.title"/></h1>
<p><bean:message key="baddownload.jsp.summary"/></p> <ol> diff --git a/java/code/webapp/WEB-INF/pages/common/errors/badparam.jsp b/java/code/webapp/WEB-INF/pages/common/errors/badparam.jsp index fde7d24..a728458 100644 --- a/java/code/webapp/WEB-INF/pages/common/errors/badparam.jsp +++ b/java/code/webapp/WEB-INF/pages/common/errors/badparam.jsp @@ -6,7 +6,7 @@
<rhn:require acl="user_authenticated()">
-<h1><i class="fa fa-warning text-warning"></i><bean:message key="badparam.jsp.title"/></h1> +<h1><rhn:icon type="system-warn" /><bean:message key="badparam.jsp.title"/></h1>
<p><bean:message key="badparam.jsp.summary"/></p> <ol> diff --git a/java/code/webapp/WEB-INF/pages/common/errors/loginerror.jsp b/java/code/webapp/WEB-INF/pages/common/errors/loginerror.jsp index a640b0c..9aa68d5 100644 --- a/java/code/webapp/WEB-INF/pages/common/errors/loginerror.jsp +++ b/java/code/webapp/WEB-INF/pages/common/errors/loginerror.jsp @@ -4,7 +4,7 @@ <html> <body>
-<h1><i class="fa fa-warning text-warning"></i><bean:message key="login.jsp.error.header"/></h1> +<h1><rhn:icon type="system-warn" /><bean:message key="login.jsp.error.header"/></h1>
<p><bean:message key="login.jsp.error.message"/></p>
diff --git a/java/code/webapp/WEB-INF/pages/common/errors/lookup.jsp b/java/code/webapp/WEB-INF/pages/common/errors/lookup.jsp index 9ad6f69..252bfd4 100644 --- a/java/code/webapp/WEB-INF/pages/common/errors/lookup.jsp +++ b/java/code/webapp/WEB-INF/pages/common/errors/lookup.jsp @@ -7,7 +7,7 @@ <rhn:require acl="user_authenticated()">
<h1> - <i class="fa fa-warning text-warning" title="<bean:message key='error.common.errorAlt' />"></i> + <rhn:icon type="system-warn" title="<bean:message key='error.common.errorAlt' />" /> ${error.localizedTitle} </h1>
diff --git a/java/code/webapp/WEB-INF/pages/common/errors/nosuchkickstart.jsp b/java/code/webapp/WEB-INF/pages/common/errors/nosuchkickstart.jsp index dac3c5f..74e68a2 100644 --- a/java/code/webapp/WEB-INF/pages/common/errors/nosuchkickstart.jsp +++ b/java/code/webapp/WEB-INF/pages/common/errors/nosuchkickstart.jsp @@ -5,7 +5,7 @@ <body>
<h1> - <i class="fa fa-warning text-warning" title="<bean:message key='error.common.errorAlt' />"></i> + <rhn:icon type="system-warn" title="<bean:message key='error.common.errorAlt' />" /> <bean:message key="unknown.kickstart" />: </h1>
diff --git a/java/code/webapp/WEB-INF/pages/common/errors/nosuchpkg.jsp b/java/code/webapp/WEB-INF/pages/common/errors/nosuchpkg.jsp index cf7f712..59de36c 100644 --- a/java/code/webapp/WEB-INF/pages/common/errors/nosuchpkg.jsp +++ b/java/code/webapp/WEB-INF/pages/common/errors/nosuchpkg.jsp @@ -5,7 +5,7 @@ <body>
<h1> - <i class="fa fa-warning text-warning" title="<bean:message key='error.common.errorAlt' />"></i> + <rhn:icon type="system-warn" title="<bean:message key='error.common.errorAlt' />" /> <bean:message key="unknown.package" />: </h1>
diff --git a/java/code/webapp/WEB-INF/pages/common/errors/permission.jsp b/java/code/webapp/WEB-INF/pages/common/errors/permission.jsp index 28e31f5..7ff26b2 100644 --- a/java/code/webapp/WEB-INF/pages/common/errors/permission.jsp +++ b/java/code/webapp/WEB-INF/pages/common/errors/permission.jsp @@ -5,7 +5,7 @@ <body>
<h1> - <i class="fa fa-warning text-warning" title="<bean:message key='error.common.errorAlt' />"></i> + <rhn:icon type="system-warn" title="<bean:message key='error.common.errorAlt' />" /> ${error.localizedTitle} </h1>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/copyfile_rows.jsp b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/copyfile_rows.jsp index a962600..a6ce4c4 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/copyfile_rows.jsp +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/copyfile_rows.jsp @@ -25,10 +25,10 @@ url="/rhn/configuration/ChannelOverview.do?ccid=${current.id}"> <c:choose> <c:when test="${requestScope.type == 'central'}"> - <i class="fa spacewalk-icon-software-channels" title="<bean:message key="config.common.globalAlt" />"></i> + <rhn:icon type="header-channel" title="<bean:message key='config.common.globalAlt' />" /> </c:when> <c:when test="${requestScope.type == 'local'}"> - <i class="fa fa-desktop" title="<bean:message key="config.common.localAlt" />"></i> + <rhn:icon type="header-system-physical" title="<bean:message key='config.common.localAlt' />" /> </c:when> <c:otherwise> <i class="fa spacewalk-icon-sandbox" title="<bean:message key="config.common.sandboxAlt" />"></i> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/file_info.jsp b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/file_info.jsp index c9a8a2d..97a7def 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/file_info.jsp +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/file_info.jsp @@ -26,10 +26,10 @@ <i class="fa spacewalk-icon-sandbox" title="<bean:message key="config.common.sandboxAlt" />"></i> </c:when> <c:when test="${mychan.configChannelType.label == 'local_override'}"> - <i class="fa fa-desktop" title="<bean:message key="config.common.localAlt" />"></i> + <rhn:icon type="header-system-physical" title="<bean:message key='config.common.localAlt' />" /> </c:when> <c:otherwise> - <i class="fa spacewalk-icon-software-channels" title="<bean:message key="config.common.globalAlt" />"></i> + <rhn:icon type="header-channel" title="<bean:message key='config.common.globalAlt' />" /> </c:otherwise> </c:choose> ${mychan.name} diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/errata.jsp b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/errata.jsp index 4451d25..76a2b50 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/errata.jsp +++ b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/errata.jsp @@ -14,7 +14,7 @@ description="yourrhn.jsp.relevanterrata.description">
<rhn:column header="yourrhn.jsp.securityerrata"> - <i class="fa fa-lock" title="<bean:message key='errata-legend.jsp.security'/>"></i> + <rhn:icon type="errata-security" title="<bean:message key='errata-legend.jsp.security' />" /> <a href="/rhn/errata/details/Details.do?eid=${current.id}">${current.advisoryName}</a> </rhn:column>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/mostCriticalSystems.jsp b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/mostCriticalSystems.jsp index 4ebed53..7b56ee8 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/mostCriticalSystems.jsp +++ b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/mostCriticalSystems.jsp @@ -32,17 +32,17 @@
<rl:column headerkey="yourrhn.jsp.criticalsystems.securityerrata" headerclass="row-2 text-align: center;"> - <i class="fa fa-lock" title="<bean:message key='errata-legend.jsp.security'/>"></i>${current.securityErrata} + <rhn:icon type="errata-security" title="<bean:message key='errata-legend.jsp.security' />" />${current.securityErrata} </rl:column>
<rl:column headerkey="yourrhn.jsp.criticalsystems.bugfixerrata" headerclass="row-2 text-align: center;"> - <i class="fa fa-bug" title="<bean:message key='errata-legend.jsp.bugfix'/>"></i>${current.bugErrata} + <rhn:icon type="errata-bugfix" title="<bean:message key='errata-legend.jsp.bugfix' />" />${current.bugErrata} </rl:column>
<rl:column headerkey="yourrhn.jsp.criticalsystems.enhancementerrata" headerclass="row-2 text-align: center;"> - <i class="fa spacewalk-icon-enhancement" title="<bean:message key='errata-legend.jsp.enhancement'/>"></i>${current.enhancementErrata} + <rhn:icon type="errata-enhance" title="<bean:message key='errata-legend.jsp.enhancement' />" />${current.enhancementErrata} </rl:column>
</rl:list> 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 8e2d6cd..97f3b33 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 @@ -26,7 +26,7 @@ <i class="fa fa-times-circle-o text-danger" title="<bean:message key='yourrhn.jsp.actions.failed'/>"></i> </c:when> <c:otherwise> - <i class="spacewalk-icon-unknown-system" title="<bean:message key='yourrhn.jsp.actions.unknown'/>"></i> + <rhn:icon type="system-unknown" title="<bean:message key='yourrhn.jsp.actions.unknown' />" /> </c:otherwise> </c:choose> <a href="/rhn/schedule/ActionDetails.do?aid=${current.id}"><c:out value="${current.actionName}" /></a> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/systemGroups.jsp b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/systemGroups.jsp index 5dcd19b..77f7dac 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/systemGroups.jsp +++ b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/systemGroups.jsp @@ -18,13 +18,13 @@ <a href="/network/systems/groups/errata_list.pxt?sgid=${current.id}"> <c:choose> <c:when test="${current.mostSevereErrata == 'Security Advisory'}"> - <i class="fa fa-exclamation-triangle fa-1-5x text-danger" title="<bean:message key='grouplist.jsp.security'/>"></i> + <rhn:icon type="system-crit" title="<bean:message key='grouplist.jsp.security' />" /> </c:when> <c:when test="${current.mostSevereErrata == 'Bug Fix Advisory' or current.mostSevereErrata == 'Product Enhancement Advisory'}"> - <i class="fa fa-exclamation-circle fa-1-5x text-warning" title="<bean:message key='grouplist.jsp.updates'/>"></i> + <rhn:icon type="system-warn" title="<bean:message key='grouplist.jsp.updates' />" /> </c:when> <c:otherwise> - <rhn:icon type="system-ok" title="<bean:message key='grouplist.jsp.noerrata'/>" /> + <rhn:icon type="system-ok" title="<bean:message key='grouplist.jsp.noerrata'/>" /> </c:otherwise> </c:choose> </a> @@ -45,7 +45,7 @@ </rl:list>
<a href="/rhn/systems/SystemGroupList.do"> - <div class="btn btn-default spacewalk-btn-margin-vertical"><i class="spacewalk-icon-system-groups"></i><bean:message key="yourrhn.jsp.allgroups" /></div> + <div class="btn btn-default spacewalk-btn-margin-vertical"><rhn:icon type="header-system-groups" /><bean:message key="yourrhn.jsp.allgroups" /></div> </a>
</rl:listset> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/tasks.jsp b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/tasks.jsp index 59e6fe6..0e434b2 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/tasks.jsp +++ b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/tasks.jsp @@ -18,7 +18,7 @@ <rhn:require acl="not user_role(satellite_admin)"> <rhn:require acl="user_role(org_admin)"> <li class="list-group-item"> - <i class="fa fa-caret-right"></i> <a + <rhn:icon type="nav-bullet" /> <a href="/rhn/systems/SystemEntitlements.do"> <bean:message key="yourrhn.jsp.tasks.subscriptions" /> </a> @@ -29,7 +29,7 @@ <rhn:require acl="user_role(satellite_admin)"> <rhn:require acl="user_role(org_admin)"> <li class="list-group-item"> - <i class="fa fa-caret-right"></i> <bean:message + <rhn:icon type="nav-bullet" /> <bean:message key="yourrhn.jsp.task.manage_subscriptions" /> <br>    <a href="/rhn/systems/SystemEntitlements.do"> <bean:message key="header.jsp.my_organization" /> @@ -42,7 +42,7 @@
<rhn:require acl="user_role(satellite_admin)"> <rhn:require acl="not user_role(org_admin)"> - <li class="list-group-item"><i class="fa fa-caret-right"></i> <a + <li class="list-group-item"><rhn:icon type="nav-bullet" /> <a href="/rhn/admin/multiorg/SoftwareEntitlements.do"> <bean:message key="yourrhn.jsp.tasks.subscriptions" /> </a> @@ -52,7 +52,7 @@
<c:if test="${documentation == 'true'}"> <li class="list-group-item"> - <i class="fa fa-caret-right"></i> <a + <rhn:icon type="nav-bullet" /> <a href="/rhn/help/client-config/en-US/index.jsp"> <bean:message key="yourrhn.jsp.tasks.registersystem" /> </a> @@ -62,7 +62,7 @@ <rhn:require acl="org_entitlement(sw_mgr_enterprise); user_role(activation_key_admin)"> <li class="list-group-item"> - <i class="fa fa-caret-right"></i> <a + <rhn:icon type="nav-bullet" /> <a href="/rhn/activationkeys/List.do"> <bean:message key="yourrhn.jsp.tasks.activationkeys" /> </a> @@ -73,14 +73,14 @@ <rhn:require acl="org_entitlement(rhn_provisioning); user_role(config_admin)"> <li class="list-group-item"> - <i class="fa fa-caret-right"></i> <a + <rhn:icon type="nav-bullet" /> <a href="/rhn/kickstart/KickstartOverview.do"> <bean:message key="yourrhn.jsp.tasks.kickstart" /> </a> </li>
<li class="list-group-item"> - <i class="fa fa-caret-right"></i> <a + <rhn:icon type="nav-bullet" /> <a href="/rhn/configuration/file/GlobalConfigFileList.do"> <bean:message key="yourrhn.jsp.tasks.configuration" /> </a> @@ -89,7 +89,7 @@ <rhn:require acl="show_monitoring();" mixins="com.redhat.rhn.common.security.acl.MonitoringAclHandler"> <li class="list-group-item"> - <i class="fa fa-caret-right"></i> <a + <rhn:icon type="nav-bullet" /> <a href="/rhn/monitoring/ProbeList.do"> <bean:message key="yourrhn.jsp.tasks.monitoring" /> </a> @@ -98,7 +98,7 @@
<rhn:require acl="user_role(satellite_admin)"> <li class="list-group-item"> - <i class="fa fa-caret-right"></i> <a + <rhn:icon type="nav-bullet" /> <a href="/rhn/admin/multiorg/Organizations.do"> <bean:message key="yourrhn.jsp.tasks.manage_sat_orgs" /> </a> @@ -109,7 +109,7 @@
<rhn:require acl="user_role(satellite_admin)"> <li class="list-group-item"> - <i class="fa fa-caret-right"></i> <a + <rhn:icon type="nav-bullet" /> <a href="/rhn/admin/config/GeneralConfig.do"> <bean:message key="yourrhn.jsp.tasks.config_sat" /> </a> diff --git a/java/code/webapp/WEB-INF/pages/configuration/channel/channelsystems.jsp b/java/code/webapp/WEB-INF/pages/configuration/channel/channelsystems.jsp index b3f9330..5042c07 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/channel/channelsystems.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/channel/channelsystems.jsp @@ -42,7 +42,7 @@
<rhn:column header="system.common.systemName" url="/rhn/systems/details/configuration/Overview.do?sid=${current.id}"> - <i class="fa fa-desktop"></i> + <rhn:icon type="header-system-physical" /> ${fn:escapeXml(current.name)} </rhn:column>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/channel/copy2systems.jsp b/java/code/webapp/WEB-INF/pages/configuration/channel/copy2systems.jsp index 866fde7..5c45789 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/channel/copy2systems.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/channel/copy2systems.jsp @@ -33,7 +33,7 @@ sortable="true" sortattr="name"> <a href="/rhn/systems/details/configuration/Overview.do?sid=${current.id}"> - <i class="fa fa-desktop" title="<bean:message key='system.common.systemAlt' />"></i> + <rhn:icon type="header-system-physical" title="<bean:message key='system.common.systemAlt' />" /> ${current.name} </a> </rl:column> diff --git a/java/code/webapp/WEB-INF/pages/configuration/channel/deployconfirm.jsp b/java/code/webapp/WEB-INF/pages/configuration/channel/deployconfirm.jsp index 9057a62..be72710 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/channel/deployconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/channel/deployconfirm.jsp @@ -61,7 +61,7 @@ styleclass="list" emptykey="deployconfirm.jsp.noSystems" width="100%" filter="com.redhat.rhn.frontend.action.configuration.ConfigSystemFilter" > <rl:column headerkey="system.common.systemName" sortable="true" sortattr="name"> - <i class="fa fa-desktop" title="<bean:message key="system.common.systemAlt"/>"></i> + <rhn:icon type="header-system-physical" title="<bean:message key='system.common.systemAlt' />" /> <a href="/rhn/systems/details/configuration/Overview.do?system_detail_navi_node=selected_configfiles&sid=${current.id}"> ${fn:escapeXml(current.name)} </a> diff --git a/java/code/webapp/WEB-INF/pages/configuration/channel/deploysystems.jsp b/java/code/webapp/WEB-INF/pages/configuration/channel/deploysystems.jsp index 561d261..e162200 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/channel/deploysystems.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/channel/deploysystems.jsp @@ -30,7 +30,7 @@
<rhn:column header="system.common.systemName"> <a href="/rhn/systems/details/configuration/Overview.do?sid=${current.id}"> - <i class="fa fa-desktop" title="<bean:message key='system.common.systemAlt' />"></i> + <rhn:icon type="header-system-physical" title="<bean:message key='system.common.systemAlt' />" /> <c:out value="${current.name}" /> </a> </rhn:column> diff --git a/java/code/webapp/WEB-INF/pages/configuration/channel/targetsystems.jsp b/java/code/webapp/WEB-INF/pages/configuration/channel/targetsystems.jsp index dc130dd..62815da 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/channel/targetsystems.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/channel/targetsystems.jsp @@ -36,7 +36,7 @@ <rhn:set value="${current.id}"/> <rhn:column header="system.common.systemName" url="/rhn/systems/details/Overview.do?sid=${current.id}"> - <i class="fa fa-desktop"></i> + <rhn:icon type="header-system-physical" /> <c:out value="${current.name}" escapeXml="true" /> </rhn:column> </rhn:listdisplay> diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/comparechannel.jsp b/java/code/webapp/WEB-INF/pages/configuration/files/comparechannel.jsp index 51f6f30..d03f45b 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/files/comparechannel.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/files/comparechannel.jsp @@ -26,12 +26,12 @@ <rhn:column header="comparechannel.jsp.channel" url="/rhn/configuration/ChannelOverview.do?ccid=${current.id}"> <c:if test="${current.type == 'normal'}"> - <i class="fa spacewalk-icon-software-channels" title="<bean:message key="config.common.globalAlt" />"></i> + <rhn:icon type="header-channel" title="<bean:message key='config.common.globalAlt' />" /> ${current.name} </c:if>
<c:if test="${current.type == 'local_override'}"> - <i class="fa fa-desktop" title="<bean:message key="config.common.localAlt" />"></i> + <rhn:icon type="header-system-physical" title="<bean:message key='config.common.localAlt' />" /> ${current.name} </c:if>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/copylocal.jsp b/java/code/webapp/WEB-INF/pages/configuration/files/copylocal.jsp index 1fa2d73..884999a 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/files/copylocal.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/files/copylocal.jsp @@ -29,7 +29,7 @@
<rhn:column header="configsystemfilter.name" url="/rhn/systems/details/configuration/ViewModifyLocalPaths.do?sid=${current.id}"> - <i class="fa fa-desktop" title="<bean:message key="config.common.localAlt" />"></i> + <rhn:icon type="header-system-physical" title="<bean:message key='config.common.localAlt' />" /> ${fn:escapeXml(current.name)} </rhn:column>
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 81b3f2a..3e6d684 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/overview/localfilelist.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/overview/localfilelist.jsp @@ -28,7 +28,7 @@
<rhn:column header="localfilelist.jsp.system" url="/rhn/systems/details/configuration/Overview.do?sid=${current.serverId}"> - <i class="fa fa-desktop" title="<bean:message key='system.common.systemAlt' />"></i> + <rhn:icon type="header-system-physical" title="<bean:message key='system.common.systemAlt' />" /> ${current.serverName} </rhn:column> </rhn:listdisplay> 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 4c8438b..4f3ae30 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/overview/managedsystems.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/overview/managedsystems.jsp @@ -27,7 +27,7 @@ <rhn:listdisplay filterBy="system.common.systemName"> <rhn:column header="system.common.systemName" url="/rhn/systems/details/configuration/Overview.do?sid=${current.id}"> - <i class="fa fa-desktop" title="<bean:message key='system.common.systemAlt' />"></i> + <rhn:icon type="header-system-physical" title="<bean:message key='system.common.systemAlt' />" /> <c:out value="${current.name}" /> </rhn:column>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/overview/overview.jsp b/java/code/webapp/WEB-INF/pages/configuration/overview/overview.jsp index ddaa6b5..db7af56 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/overview/overview.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/overview/overview.jsp @@ -73,7 +73,7 @@ </c:if>
<c:if test="${current.configChannelType == 'local_override'}"> - <i class="fa fa-desktop"></i> + <rhn:icon type="header-system-physical" /> ${current.channelNameDisplay} </c:if>
@@ -102,7 +102,7 @@ rhn:listdisplay <rhn:column header="configoverview.jsp.system" url="/rhn/systems/details/configuration/Overview.do?sid=${current.serverId}"> - <i class="fa fa-desktop"></i> + <rhn:icon type="header-system-physical" /> ${fn:escapeXml(current.serverName)} </rhn:column>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/channellist.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/channellist.jsp index 9dd03f5..b31c3ce 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/sdc/channellist.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/channellist.jsp @@ -30,7 +30,7 @@ <rhn:set value="${current.id}"/> <rhn:column header="sdc.configlist.jsp.name" url="/rhn/configuration/ChannelOverview.do?ccid=${current.id}"> - <i class="fa spacewalk-icon-software-channels" title="<bean:message key="config.common.globalAlt" />"></i> + <rhn:icon type="header-channel" title="<bean:message key='config.common.globalAlt' />" /> ${current.name} </rhn:column>
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 3121346..9f3e728 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/sdc/importfileconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/importfileconfirm.jsp @@ -41,11 +41,11 @@ <i><bean:message key="sdcimportconfirm.jsp.new" /></i> </c:when> <c:when test="${current.configChannelType == 'normal'}"> - <i class="fa spacewalk-icon-software-channels" title="<bean:message key="config.common.globalAlt" />"></i> + <rhn:icon type="header-channel" title="<bean:message key='config.common.globalAlt' />" /> ${current.channelNameDisplay} </c:when> <c:when test="${current.configChannelType == 'local_override'}"> - <i class="fa fa-desktop" title="<bean:message key="config.common.localAlt" />"></i> + <rhn:icon type="header-system-physical" title="<bean:message key='config.common.localAlt' />" /> ${current.channelNameDisplay} </c:when> <c:otherwise> diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/subscriptions.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/subscriptions.jsp index c0db434..9adb803 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/sdc/subscriptions.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/subscriptions.jsp @@ -33,7 +33,7 @@ <rhn:set value="${current.id}"/> <rhn:column header="sdc.config.subscriptions.jsp.channel" url="/rhn/configuration/ChannelOverview.do?ccid=${current.id}"> - <i class="fa spacewalk-icon-software-channels" title="<bean:message key="config.common.globalAlt" />"></i> + <rhn:icon type="header-channel" title="<bean:message key='config.common.globalAlt' />" /> ${current.name} </rhn:column>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/channelsystems.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/channelsystems.jsp index 3a7679c..7f2b9d5 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/ssm/channelsystems.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/channelsystems.jsp @@ -9,7 +9,7 @@ <body> <%@ include file="/WEB-INF/pages/common/fragments/ssm/header.jspf" %> <h2> - <i class="fa spacewalk-icon-manage-configuration-files" title="<bean:message key="ssmdiff.jsp.imgAlt" />"></i> + <rhn:icon type="header-configuration" title="<bean:message key='ssmdiff.jsp.imgAlt' />" /> <bean:message key="ssmchannelsystems.jsp.header" /> </h2>
@@ -33,7 +33,7 @@ <rhn:listdisplay filterBy="ssmchannelsystems.jsp.system"> <rhn:column header="ssmchannelsystems.jsp.system" url="/rhn/systems/details/configuration/Overview.do?system_detail_navi_node=selected_configfiles&sid=${current.id}"> - <i class="fa fa-desktop" title="<bean:message key='system.common.systemAlt' />"></i> + <rhn:icon type="header-system-physical" title="<bean:message key='system.common.systemAlt' />" /> ${current.name} </rhn:column>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/deploy.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/deploy.jsp index e08a440..e1a3eb2 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/ssm/deploy.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/deploy.jsp @@ -8,7 +8,7 @@ <body> <%@ include file="/WEB-INF/pages/common/fragments/ssm/header.jspf" %> <h2> - <i class="fa spacewalk-icon-manage-configuration-files" title="<bean:message key="ssmdiff.jsp.imgAlt" />"></i> + <rhn:icon type="header-configuration" title="<bean:message key='ssmdiff.jsp.imgAlt' />" /> <bean:message key="ssmdeploy.jsp.header" /> </h2>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/deployconfirm.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/deployconfirm.jsp index 83740b5..bcc3c18 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/ssm/deployconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/deployconfirm.jsp @@ -8,7 +8,7 @@ <body> <%@ include file="/WEB-INF/pages/common/fragments/ssm/header.jspf" %> <h2> - <i class="fa spacewalk-icon-manage-configuration-files" title="<bean:message key="ssmdiff.jsp.imgAlt" />"></i> + <rhn:icon type="header-configuration" title="<bean:message key='ssmdiff.jsp.imgAlt' />" /> <bean:message key="deployconfirm.jsp.header" /> </h2>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/diff.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/diff.jsp index 0e89eec..15c5744 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/ssm/diff.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/diff.jsp @@ -8,7 +8,7 @@ <body> <%@ include file="/WEB-INF/pages/common/fragments/ssm/header.jspf" %> <h2> - <i class="fa spacewalk-icon-manage-configuration-files" title="<bean:message key="ssmdiff.jsp.imgAlt" />"></i> + <rhn:icon type="header-configuration" title="<bean:message key='ssmdiff.jsp.imgAlt' />" /> <bean:message key="ssmdiff.jsp.header" /> </h2>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/diffconfirm.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/diffconfirm.jsp index 6569cc7..a711607 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/ssm/diffconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/diffconfirm.jsp @@ -8,7 +8,7 @@ <body> <%@ include file="/WEB-INF/pages/common/fragments/ssm/header.jspf" %> <h2> - <i class="fa spacewalk-icon-manage-configuration-files" title="<bean:message key="ssmdiff.jsp.imgAlt" />"></i> + <rhn:icon type="header-configuration" title="<bean:message key='ssmdiff.jsp.imgAlt' />" /> <bean:message key="diffconfirm.jsp.header" /> </h2>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/difffiles.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/difffiles.jsp index f8b1f73..439da5d 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/ssm/difffiles.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/difffiles.jsp @@ -8,7 +8,7 @@ <body> <%@ include file="/WEB-INF/pages/common/fragments/ssm/header.jspf" %> <h2> - <i class="fa spacewalk-icon-manage-configuration-files" title="<bean:message key="ssmdiff.jsp.imgAlt" />"></i> + <rhn:icon type="header-configuration" title="<bean:message key='ssmdiff.jsp.imgAlt' />" /> <bean:message key="difffiles.jsp.header" /> </h2>
@@ -53,12 +53,12 @@ <rhn:column header="config.common.configChannel" url="/rhn/configuration/ChannelOverview.do?ccid=${current.configChannelId}"> <c:if test="${current.configChannelType == 'normal'}"> - <i class="fa spacewalk-icon-software-channels" title="<bean:message key="config.common.globalAlt" />"></i> + <rhn:icon type="header-channel" title="<bean:message key='config.common.globalAlt' />" /> ${current.channelNameDisplay} </c:if>
<c:if test="${current.configChannelType == 'local_override'}"> - <i class="fa fa-desktop" title="<bean:message key="config.common.localAlt" />"></i> + <rhn:icon type="header-system-physical" title="<bean:message key='config.common.localAlt' />" /> ${current.channelNameDisplay} </c:if>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/diffsystems.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/diffsystems.jsp index e549fb3..0ba4ed3 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/ssm/diffsystems.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/diffsystems.jsp @@ -9,7 +9,7 @@ <body> <%@ include file="/WEB-INF/pages/common/fragments/ssm/header.jspf" %> <h2> - <i class="fa spacewalk-icon-manage-configuration-files" title="<bean:message key="ssmdiff.jsp.imgAlt" />"></i> + <rhn:icon type="header-configuration" title="<bean:message key='ssmdiff.jsp.imgAlt' />" /> <bean:message key="diffsystems.jsp.header" /> </h2>
@@ -31,7 +31,7 @@ <rhn:listdisplay filterBy="system.common.systemName"> <rhn:column header="system.common.systemName" url="/rhn/systems/details/configuration/Overview.do?sid=${current.id}"> - <i class="fa fa-desktop" title="<bean:message key='system.common.systemAlt' />"></i> + <rhn:icon type="header-system-physical" title="<bean:message key='system.common.systemAlt' />" /> ${fn:escapeXml(current.name)} </rhn:column>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/enable.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/enable.jsp index 8f4eb75..9c7c8dc 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/ssm/enable.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/enable.jsp @@ -9,7 +9,7 @@
<%@ include file="/WEB-INF/pages/common/fragments/ssm/header.jspf" %> <h2> - <i class="fa spacewalk-icon-manage-configuration-files" title="<bean:message key="ssmdiff.jsp.imgAlt" />"></i> + <rhn:icon type="header-configuration" title="<bean:message key='ssmdiff.jsp.imgAlt' />" /> <bean:message key="ssmenable.jsp.header"/> </h2>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/enablesummary.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/enablesummary.jsp index 6c195e1..58127fd 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/ssm/enablesummary.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/enablesummary.jsp @@ -9,7 +9,7 @@
<%@ include file="/WEB-INF/pages/common/fragments/ssm/header.jspf" %> <h2> - <i class="fa spacewalk-icon-manage-configuration-files" title="<bean:message key="ssmdiff.jsp.imgAlt" />"></i> + <rhn:icon type="header-configuration" title="<bean:message key='ssmdiff.jsp.imgAlt' />" /> <bean:message key="summary.jsp.toolbar"/> </h2>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/subscribe.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/subscribe.jsp index c08472a..326f56a 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/ssm/subscribe.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/subscribe.jsp @@ -32,7 +32,7 @@
<rhn:column header="config.common.configChannel" url="/rhn/configuration/ChannelOverview.do?ccid=${current.id}"> - <i class="fa spacewalk-icon-software-channels" title="<bean:message key='config.common.globalAlt' />"></i> + <rhn:icon type="header-channel" title="<bean:message key='config.common.globalAlt' />" /> ${current.name} </rhn:column>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/subscribeconfirm.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/subscribeconfirm.jsp index 9d6164c..4e2d9e8 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/ssm/subscribeconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/subscribeconfirm.jsp @@ -47,7 +47,7 @@ headerkey="system.common.systemName" attr="name"> <a href="/rhn/systems/details/configuration/Overview.do?sid=${current.id}"> - <i class="fa fa-desktop" title="<bean:message key='system.common.systemAlt' />"></i> + <rhn:icon type="header-system-physical" title="<bean:message key='system.common.systemAlt' />" /> ${current.name} </a> </rl:column> diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/systemchannels.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/systemchannels.jsp index 6d115d4..ac9a932 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/ssm/systemchannels.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/systemchannels.jsp @@ -16,7 +16,7 @@ <p> <c:set var="beanarg" scope="request"> <a href="/rhn/systems/details/configuration/Overview.do?sid=${system.id}" - <i class="fa fa-desktop" title="<bean:message key='system.common.systemAlt' />"></i> + <rhn:icon type="header-system-physical" title="<bean:message key='system.common.systemAlt' />" /> ${system.name} </a> </c:set> @@ -34,7 +34,7 @@ <rhn:listdisplay filterBy="config.common.configChannel"> <rhn:column header="config.common.configChannel" url="/rhn/configuration/ChannelOverview.do?ccid=${current.id}"> - <i class="fa spacewalk-icon-software-channels" title="<bean:message key="config.common.globalAlt" />"></i> + <rhn:icon type="header-channel" title="<bean:message key='config.common.globalAlt' />" /> ${current.name} </rhn:column>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/unsubscribe.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/unsubscribe.jsp index b9a0d3c..6ae0ba6 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/ssm/unsubscribe.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/unsubscribe.jsp @@ -29,7 +29,7 @@
<rhn:column header="config.common.configChannel" url="/rhn/configuration/ChannelOverview.do?ccid=${current.id}"> - <i class="fa spacewalk-icon-software-channels" title="<bean:message key="config.common.globalAlt" />"></i> + <rhn:icon type="header-channel" title="<bean:message key='config.common.globalAlt' />" /> ${current.name} </rhn:column>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/unsubscribeconfirm.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/unsubscribeconfirm.jsp index cbbaf50..e0b65f1 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/ssm/unsubscribeconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/unsubscribeconfirm.jsp @@ -33,7 +33,7 @@ button="unsubscribeconfirm.jsp.confirm"> <rhn:column header="unsubscribeconfirm.jsp.system" url="/rhn/systems/details/configuration/Overview.do?sid=${current.id}"> - <i class="fa fa-desktop" title="<bean:message key='system.common.systemAlt' />"></i> + <rhn:icon type="header-system-physical" title="<bean:message key='system.common.systemAlt' />" /> ${current.name} </rhn:column>
diff --git a/java/code/webapp/WEB-INF/pages/errata/affectedsystems.jsp b/java/code/webapp/WEB-INF/pages/errata/affectedsystems.jsp index 4c2c26f..a34bbb1 100644 --- a/java/code/webapp/WEB-INF/pages/errata/affectedsystems.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/affectedsystems.jsp @@ -13,7 +13,7 @@
<%@ include file="/WEB-INF/pages/common/fragments/errata/errata-header.jspf" %> <h2> - <i class="fa fa-desktop" title="<bean:message key='system.common.systemAlt' />"></i> + <rhn:icon type="header-system-physical" title="<bean:message key='system.common.systemAlt' />" /> <bean:message key="affectedsystems.jsp.header"/> </h2>
diff --git a/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp b/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp index 6dd6f40..e2f932e 100644 --- a/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp @@ -76,19 +76,19 @@ <td> <div class="checkbox"> <html:checkbox property="errata_type_bug"> - <i class="fa fa-bug"></i> + <rhn:icon type="errata-bugfix" /> <bean:message key="erratalist.jsp.bugadvisory"/> </html:checkbox> </div> <div class="checkbox"> <html:checkbox property="errata_type_security"> - <i class="fa fa-lock"></i> + <rhn:icon type="errata-security" /> <bean:message key="erratalist.jsp.securityadvisory"/> </html:checkbox> </div> <div class="checkbox"> <html:checkbox property="errata_type_enhancement"> - <i class="fa spacewalk-icon-enhancement"></i> + <rhn:icon type="errata-enhance" /> <bean:message key="erratalist.jsp.productenhancementadvisory"/> </html:checkbox> </div> @@ -142,7 +142,7 @@ </td> <td> <button type="submit" class="btn btn-success btn-sm"> - <i class="fa fa-search"></i> + <rhn:icon type="header-search" /> <bean:message key="button.search"/> </button> </td> @@ -167,13 +167,13 @@ <rl:column bound="false" sortable="true" sortattr="securityAdvisory" headerkey="erratalist.jsp.type"> <c:if test="${current.securityAdvisory}"> - <i class="fa fa-lock"></i> + <rhn:icon type="errata-security" /> </c:if> <c:if test="${current.bugFix}"> - <i class="fa fa-bug"></i> + <rhn:icon type="errata-bugfix" /> </c:if> <c:if test="${current.productEnhancement}"> - <i class="fa spacewalk-icon-enhancement"></i> + <rhn:icon type="errata-enhance" /> </c:if> </rl:column>
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 721d2d1..e08d587 100644 --- a/java/code/webapp/WEB-INF/pages/errata/packages/confirm.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/packages/confirm.jsp @@ -18,7 +18,7 @@ <rhn:dialogmenu mindepth="0" maxdepth="1" definition="/WEB-INF/nav/manage_errata.xml" renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" />
- <h2><i class="fa spacewalk-icon-packages"></i> + <h2><rhn:icon type="header-package" /> <bean:message key="errata.edit.packages.confirm.confirmpackageaddition"/></h2>
<p><bean:message key="errata.edit.packages.confirm.instructions"/></p> 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 34198c9..8d54e2f 100644 --- a/java/code/webapp/WEB-INF/pages/errata/packages/list.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/packages/list.jsp @@ -17,7 +17,7 @@ <rhn:dialogmenu mindepth="0" maxdepth="1" definition="/WEB-INF/nav/manage_errata.xml" renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" />
- <h2><i class="fa spacewalk-icon-packages" title="<bean:message key='errata.common.packageAlt' />"></i> + <h2><rhn:icon type="header-package" title="<bean:message key='errata.common.packageAlt' />" /> <bean:message key="errata.edit.packages.list.erratapackages"/></h2>
<p><bean:message key="errata.edit.packages.list.instructions"/></p> 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 fb3f782..a969d22 100644 --- a/java/code/webapp/WEB-INF/pages/errata/packages/packages.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/packages/packages.jsp @@ -19,7 +19,7 @@ renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" />
<h2> - <i class="fa spacewalk-icon-packages" title="<bean:message key='errata.common.packageAlt' />"></i> + <rhn:icon type="header-package" title="<bean:message key='errata.common.packageAlt' />" /> <bean:message key="errata.edit.packages.erratapackages"/> </h2>
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 d85c492..1220f06 100644 --- a/java/code/webapp/WEB-INF/pages/errata/packages/remove.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/packages/remove.jsp @@ -17,7 +17,7 @@ <rhn:dialogmenu mindepth="0" maxdepth="1" definition="/WEB-INF/nav/manage_errata.xml" renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" />
- <h2><i class="fa spacewalk-icon-packages"></i> + <h2><rhn:icon type="header-package" /> <bean:message key="errata.edit.packages.confirm.confirmpackageremoval"/></h2>
<p><bean:message key="errata.edit.packages.confirm.remove.instructions"/></p> diff --git a/java/code/webapp/WEB-INF/pages/groups/detail.jsp b/java/code/webapp/WEB-INF/pages/groups/detail.jsp index cb60828..2816f20 100644 --- a/java/code/webapp/WEB-INF/pages/groups/detail.jsp +++ b/java/code/webapp/WEB-INF/pages/groups/detail.jsp @@ -28,12 +28,12 @@ <c:if test="${errata_counts['se'] > 0}"> <rhn:icon type="system-crit" /> <span class="system-status-critical-updates"><bean:message key="systemgroup.details.criticalupdates"/></span> - <a class="btn btn-danger" href="/network/systems/groups/errata_list.pxt?sgid=${id}">${errata_counts['se']} <i class="fa fa-arrow-right"></i></a> + <a class="btn btn-danger" href="/network/systems/groups/errata_list.pxt?sgid=${id}">${errata_counts['se']} <rhn:icon type="nav-right" /></a> </c:if> <c:if test="${(errata_counts['se'] == 0) && ((errata_counts['be'] > 0) || (errata_counts['ee'] > 0))}"> <rhn:icon type="system-warn" /> <span class="system-status-updates"><bean:message key="systemgroup.details.someupdates"/></span> - <a class="btn btn-warning" href="/network/systems/groups/errata_list.pxt?sgid=${id}"><i class="fa fa-arrow-right"></i></a> + <a class="btn btn-warning" href="/network/systems/groups/errata_list.pxt?sgid=${id}"><rhn:icon type="nav-right" /></a> </c:if> <c:if test="${(errata_counts['se'] == 0) && (errata_counts['be'] == 0) && (errata_counts['ee'] == 0)}"> <rhn:icon type="system-ok" /> @@ -63,7 +63,7 @@ <th><bean:message key="systemgroup.details.systems"/></th> <td> <c:if test="${system_count > 0}"> - <a class="btn btn-info" href="/rhn/groups/ListRemoveSystems.do?sgid=${id}">${system_count} <i class="fa fa-arrow-right"></i></a> + <a class="btn btn-info" href="/rhn/groups/ListRemoveSystems.do?sgid=${id}">${system_count} <rhn:icon type="nav-right" /></a> </c:if> <c:if test="${system_count == 0}"> <span class="no-details"><bean:message key="systemgroup.details.none"/></span> diff --git a/java/code/webapp/WEB-INF/pages/help/docsearch.jsp b/java/code/webapp/WEB-INF/pages/help/docsearch.jsp index 89609e7..c52041a 100644 --- a/java/code/webapp/WEB-INF/pages/help/docsearch.jsp +++ b/java/code/webapp/WEB-INF/pages/help/docsearch.jsp @@ -53,7 +53,7 @@ <div class="form-group"> <div class="col-md-offset-2 col-md-10"> <button type="submit" class="btn btn-success btn-sm"> - <i class="fa fa-search"></i> + <rhn:icon type="header-search" /> <bean:message key="button.search"/> </button> </div> diff --git a/java/code/webapp/WEB-INF/pages/help/helpindex.jsp b/java/code/webapp/WEB-INF/pages/help/helpindex.jsp index e7a3b51..ff8f8bf 100644 --- a/java/code/webapp/WEB-INF/pages/help/helpindex.jsp +++ b/java/code/webapp/WEB-INF/pages/help/helpindex.jsp @@ -10,7 +10,7 @@ </head> <body>
- <h1><i class="fa fa-info-circle"></i><bean:message key="help.jsp.helpdesk"/></h1> + <h1><rhn:icon type="header-info" /><bean:message key="help.jsp.helpdesk"/></h1>
<ul id="help-url-list">
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/kickstartdownload.jsp b/java/code/webapp/WEB-INF/pages/kickstart/kickstartdownload.jsp index 9a03ab6..6099455 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/kickstartdownload.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/kickstartdownload.jsp @@ -24,7 +24,7 @@ <c:choose> <c:when test="${invalid_channel}"> <tr><td> - <i class="fa fa-warning text-warning" title="<bean:message key='error.common.errorAlt' />"></i> + <rhn:icon type="system-warn" title="<bean:message key='error.common.errorAlt' />" /> <bean:message key="kickstartdownload.jsp.invalidchannel"/> </td></tr> </c:when> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/kickstarts.jsp b/java/code/webapp/WEB-INF/pages/kickstart/kickstarts.jsp index 3b33956..0f463c5 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/kickstarts.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/kickstarts.jsp @@ -51,7 +51,7 @@ </rl:column> <rl:column bound="false" headerkey="kickstart.jsp.active" sortattr="active"> <c:if test="${current.active}"> - <i class="fa fa-check text-success" title="<bean:message key='kickstart.jsp.active'/>"></i> + <rhn:icon type="item-enabled" title="<bean:message key='kickstart.jsp.active' />" /> </c:if> <c:if test="${not current.active}"> <i class="fa fa-times-circle text-danger" title="<bean:message key='kickstart.jsp.inactive'/>"></i> @@ -66,7 +66,7 @@ <i class="fa fa-times-circle text-danger"></i> </c:when> <c:otherwise> - <i class="fa fa-check text-success"></i> + <rhn:icon type="item-enabled" /> </c:otherwise> </c:choose> </rl:column> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/kstrees.jsp b/java/code/webapp/WEB-INF/pages/kickstart/kstrees.jsp index e70582b..948c628 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/kstrees.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/kstrees.jsp @@ -40,7 +40,7 @@ <rl:column headertext="${rhn:localize('kickstart.distro.is-valid.jsp')}?*" sortattr="valid"> <c:choose> <c:when test="${current.valid}"> - <i class="fa fa-check text-success"></i> + <rhn:icon type="item-enabled" /> </c:when> <c:otherwise> <i class="fa fa-times-circle text-danger"></i> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/ssm/schedule.jsp b/java/code/webapp/WEB-INF/pages/kickstart/ssm/schedule.jsp index 4d5368a..9ce4179 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/ssm/schedule.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/ssm/schedule.jsp @@ -10,7 +10,7 @@ <body> <%@ include file="/WEB-INF/pages/common/fragments/ssm/header.jspf" %> <h2> - <i class="fa fa-rocket" title="<bean:message key='system.common.kickstartAlt' />"></i> + <rhn:icon type="header-kickstart" title="<bean:message key='system.common.kickstartAlt' />" /> <bean:message key="kickstart.schedule.heading1.jsp" /> </h2>
@@ -53,7 +53,7 @@ <%@ include file="/WEB-INF/pages/common/fragments/kickstart/schedule/proxy-options.jspf" %> <br/>
-<h2><i class="fa fa-rocket"></i><bean:message key="kickstart.schedule.heading4.jsp" /></h2> +<h2><rhn:icon type="header-kickstart" /><bean:message key="kickstart.schedule.heading4.jsp" /></h2> <table class="details"> <%@ include file="/WEB-INF/pages/common/fragments/kickstart/schedule/network-options.jspf" %> <tr> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/fifth.jsp b/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/fifth.jsp index 2b294e2..d10fd81 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/fifth.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/fifth.jsp @@ -28,7 +28,7 @@ function setContinue() { <%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %> <br /> <h2> - <i class="fa fa-rocket" title="<bean:message key='system.common.kickstartAlt' />"></i> + <rhn:icon type="header-kickstart" title="<bean:message key='system.common.kickstartAlt' />" /> <bean:message key="kickstart.schedule.heading1.jsp" /> </h2>
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/first.jsp b/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/first.jsp index d42aab3..7920b77 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/first.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/first.jsp @@ -27,7 +27,7 @@ function setStep(stepName) {
<br /> <h2> - <i class="fa fa-rocket" title="<bean:message key='system.common.kickstartAlt' />"></i> + <rhn:icon type="header-kickstart" title="<bean:message key='system.common.kickstartAlt' />" /> <bean:message key="kickstart.schedule.heading1.jsp" /> </h2>
diff --git a/java/code/webapp/WEB-INF/pages/monitoring/probes.jsp b/java/code/webapp/WEB-INF/pages/monitoring/probes.jsp index 6af12b8..408fae2 100644 --- a/java/code/webapp/WEB-INF/pages/monitoring/probes.jsp +++ b/java/code/webapp/WEB-INF/pages/monitoring/probes.jsp @@ -17,7 +17,7 @@ <li class="${warningClass}"><a href="/rhn/monitoring/ProbeList.do?state=WARNING"><i class="fa fa-exclamation-triangle text-warning"></i><bean:message key="Warning"/><span class="badge">${warningCount}</span></a></li> <li class="${unknownClass}"><a href="/rhn/monitoring/ProbeList.do?state=UNKNOWN"><i class="fa fa-question-circle text-info"></i><bean:message key="Unknown"/><span class="badge">${unknownCount}</span></a></li> <li class="${pendingClass}"><a href="/rhn/monitoring/ProbeList.do?state=PENDING"><i class="fa fa-clock-o text-info"></i><bean:message key="Pending"/><span class="badge">${pendingCount}</span></a></li> - <li class="${okClass}"><a href="/rhn/monitoring/ProbeList.do?state=OK"><i class="fa fa-check text-success"></i><bean:message key="OK"/><span class="badge">${okCount}</span></a></li> + <li class="${okClass}"><a href="/rhn/monitoring/ProbeList.do?state=OK"><rhn:icon type="item-enabled" /><bean:message key="OK"/><span class="badge">${okCount}</span></a></li> <li class="${allClass}"><a href="/rhn/monitoring/ProbeList.do"><bean:message key="All"/><span class="badge">${allCount}</span></a></li> </ul> </div> diff --git a/java/code/webapp/WEB-INF/pages/ssm/packageupgrade.jsp b/java/code/webapp/WEB-INF/pages/ssm/packageupgrade.jsp index f147469..3653f64 100644 --- a/java/code/webapp/WEB-INF/pages/ssm/packageupgrade.jsp +++ b/java/code/webapp/WEB-INF/pages/ssm/packageupgrade.jsp @@ -53,13 +53,13 @@ <rl:column headerkey="ssm.package.upgrade.select.advisory" bound="false"> <c:if test="${not empty current.advisory}"> <c:if test="${current.advisoryType == 'Security Advisory'}"> - <i class="fa fa-lock" title="<bean:message key='erratalist.jsp.securityadvisory' />"></i> + <rhn:icon type="errata-security" title="<bean:message key='erratalist.jsp.securityadvisory' />" /> </c:if> <c:if test="${current.advisoryType == 'Bug Fix Advisory'}"> - <i class="fa fa-bug" title="<bean:message key='erratalist.jsp.bugadvisory' />"></i> + <rhn:icon type="errata-bugfix" title="<bean:message key='erratalist.jsp.bugadvisory' />" /> </c:if> <c:if test="${current.advisoryType == 'Product Enhancement Advisory'}"> - <i class="fa spacewalk-icon-enhancement" title="<bean:message key='erratalist.jsp.productenhancementadvisory' />"></i> + <rhn:icon type="errata-enhance" title="<bean:message key='erratalist.jsp.productenhancementadvisory' />" /> </c:if> <a href="/rhn/errata/details/Details.do?eid=${current.advisoryId}">${current.advisory}</a><br/> </c:if> diff --git a/java/code/webapp/WEB-INF/pages/ssm/systems/misc/lock-unlock-system.jsp b/java/code/webapp/WEB-INF/pages/ssm/systems/misc/lock-unlock-system.jsp index ca39ac7..d6d70f9 100644 --- a/java/code/webapp/WEB-INF/pages/ssm/systems/misc/lock-unlock-system.jsp +++ b/java/code/webapp/WEB-INF/pages/ssm/systems/misc/lock-unlock-system.jsp @@ -49,7 +49,7 @@ <rl:column headerkey="systemlist.jsp.system" bound="false" sortattr="name" sortable="true"> <c:choose> <c:when test="${current.locked > 0}"> - <i class="fa fa-lock"></i> + <rhn:icon type="errata-security" /> <a href="/rhn/systems/details/Overview.do?sid=${current.id}">${current.name}</a> </c:when> <c:otherwise> diff --git a/java/code/webapp/WEB-INF/pages/ssm/systems/ssm-errata.jsp b/java/code/webapp/WEB-INF/pages/ssm/systems/ssm-errata.jsp index 1cfec32..2650387 100644 --- a/java/code/webapp/WEB-INF/pages/ssm/systems/ssm-errata.jsp +++ b/java/code/webapp/WEB-INF/pages/ssm/systems/ssm-errata.jsp @@ -39,13 +39,13 @@
<rl:column headerkey="erratalist.jsp.type" styleclass="text-align: center;" bound="false"> <c:if test="${current.securityAdvisory}"> - <i class="fa fa-lock"></i> + <rhn:icon type="errata-security" /> </c:if> <c:if test="${current.bugFix}"> - <i class="fa fa-bug"></i> + <rhn:icon type="errata-bugfix" /> </c:if> <c:if test="${current.productEnhancement}"> - <i class="fa spacewalk-icon-enhancement"></i> + <rhn:icon type="errata-enhance" /> </c:if> </rl:column>
diff --git a/java/code/webapp/WEB-INF/pages/systems/crashnotes.jsp b/java/code/webapp/WEB-INF/pages/systems/crashnotes.jsp index 5ecf46e..6e1fb7f 100644 --- a/java/code/webapp/WEB-INF/pages/systems/crashnotes.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/crashnotes.jsp @@ -15,12 +15,12 @@ <div class="toolbar"> <span class="toolbar"> <a href="/rhn/systems/details/EditCrashNote.do?crid=${crid}&sid=${sid}"> - <i class="fa fa-plus-circle text-success" title="<bean:message key='toolbar.create.crashnote'/>"></i> + <rhn:icon type="item-ssm-add" title="<bean:message key='toolbar.create.crashnote' />" /> <bean:message key="toolbar.create.crashnote"/> </a> | <a href="/rhn/systems/details/SoftwareCrashDelete.do?crid=${crid}&sid=${sid}"> - <i class="fa fa-minus-circle text-danger" title="<bean:message key='toolbar.delete.crash'/>"></i> + <rhn:icon type="item-ssm-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/details/audit/xccdfdeleteconfirm.jsp b/java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdeleteconfirm.jsp index 7e86d15..1d99218 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdeleteconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdeleteconfirm.jsp @@ -26,7 +26,7 @@ <rl:column headerkey="system.audit.xccdfdeleteconfirm.jsp.deletable"> <c:choose> <c:when test="${current.deletable}"> - <i class="fa fa-check"></i> + <rhn:icon type="item-enabled" /> </c:when> <c:otherwise> <img src="/img/rhn-listicon-unchecked_immutable.gif"> diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/packageconfirm.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/packageconfirm.jsp index 6d258a4..abe728d 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/packages/packageconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/packageconfirm.jsp @@ -11,7 +11,7 @@
<%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %> <h2> - <i class="fa spacewalk-icon-packages"></i> + <rhn:icon type="header-package" /> <bean:message key="${requestScope.header}" /> </h2> <rhn:systemtimemessage server="${requestScope.system}" /> diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/packagesindex.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/packagesindex.jsp index 8471a89..4c15e2f 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/packages/packagesindex.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/packagesindex.jsp @@ -13,7 +13,7 @@ <%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %>
<h2> - <i class="fa spacewalk-icon-packages" title="<bean:message key='errata.common.packageAlt' />"></i> + <rhn:icon type="header-package" title="<bean:message key='errata.common.packageAlt' />" /> <bean:message key="packagesindex.jsp.header"/> </h2>
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/comparesystems.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/comparesystems.jsp index c0fbcac..1cde015 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/comparesystems.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/comparesystems.jsp @@ -11,7 +11,7 @@ <body> <%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %>
-<h2><i class="fa spacewalk-icon-packages"></i> +<h2><rhn:icon type="header-package" /> <bean:message key="compare.jsp.compareto" arg0="${fn:escapeXml(requestScope.systemname)}" /> </h2>
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/profiles.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/profiles.jsp index b0c4ad1..644957a 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/profiles.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/profiles.jsp @@ -10,7 +10,7 @@ <%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %>
<h2> - <i class="fa spacewalk-icon-packages" title="<bean:message key='errata.common.packageAlt' />"></i> + <rhn:icon type="header-package" title="<bean:message key='errata.common.packageAlt' />" /> <bean:message key="profile.jsp.comparetostoredprofile"/> </h2>
@@ -35,7 +35,7 @@ </p> </div> <h2> - <i class="fa spacewalk-icon-packages" title="<bean:message key='errata.common.packageAlt' />"></i> + <rhn:icon type="header-package" title="<bean:message key='errata.common.packageAlt' />" /> <bean:message key="profile.jsp.comparetosystem"/> </h2> <div class="page-summary"> diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/upgradable.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/upgradable.jsp index a1cc508..f27e68b 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/packages/upgradable.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/upgradable.jsp @@ -53,13 +53,13 @@ <c:forEach items="${current.errata}" var="errata"> <c:if test="${not empty errata.advisory}"> <c:if test="${errata.type == 'Security Advisory'}"> - <i class="fa fa-lock" title="<bean:message key='erratalist.jsp.securityadvisory' />"></i> + <rhn:icon type="errata-security" title="<bean:message key='erratalist.jsp.securityadvisory' />" /> </c:if> <c:if test="${errata.type == 'Bug Fix Advisory'}"> - <i class="fa fa-bug" title="<bean:message key='erratalist.jsp.bugadvisory' />"></i> + <rhn:icon type="errata-bugfix" title="<bean:message key='erratalist.jsp.bugadvisory' />" /> </c:if> <c:if test="${errata.type == 'Product Enhancement Advisory'}"> - <i class="fa spacewalk-icon-enhancement" title="<bean:message key='erratalist.jsp.productenhancementadvisory' />"></i> + <rhn:icon type="errata-enhance" title="<bean:message key='erratalist.jsp.productenhancementadvisory' />" /> </c:if> <a href="/rhn/errata/details/Details.do?eid=${errata.id}">${errata.advisory}</a><br/> </c:if> diff --git a/java/code/webapp/WEB-INF/pages/systems/errata.jsp b/java/code/webapp/WEB-INF/pages/systems/errata.jsp index 351bdf1..46154ad 100644 --- a/java/code/webapp/WEB-INF/pages/systems/errata.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/errata.jsp @@ -25,7 +25,7 @@ <%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %>
<h2> - <i class="fa spacewalk-icon-patches" title="<bean:message key='errata.common.errataAlt' />"></i> + <rhn:icon type="header-errata" title="<bean:message key='errata.common.errataAlt' />" /> <bean:message key="errata.jsp.header"/> </h2>
@@ -82,13 +82,13 @@ <rl:column headerkey="erratalist.jsp.type" styleclass="text-align: center;" bound="false"> <c:if test="${current.securityAdvisory}"> - <i class="fa fa-lock"></i> + <rhn:icon type="errata-security" /> </c:if> <c:if test="${current.bugFix}"> - <i class="fa fa-bug"></i> + <rhn:icon type="errata-bugfix" /> </c:if> <c:if test="${current.productEnhancement}"> - <i class="fa spacewalk-icon-enhancement"></i> + <rhn:icon type="errata-enhance" /> </c:if> </rl:column>
diff --git a/java/code/webapp/WEB-INF/pages/systems/errataconfirm.jsp b/java/code/webapp/WEB-INF/pages/systems/errataconfirm.jsp index 1e499b6..0a61f37 100644 --- a/java/code/webapp/WEB-INF/pages/systems/errataconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/errataconfirm.jsp @@ -13,7 +13,7 @@
<%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %>
-<h2><i class="fa spacewalk-icon-patches"></i><bean:message key="errataconfirm.jsp.header"/></h2> +<h2><rhn:icon type="header-errata" /><bean:message key="errataconfirm.jsp.header"/></h2>
<rhn:systemtimemessage server="${system}" />
@@ -31,13 +31,13 @@
<rl:column headerkey="erratalist.jsp.type" styleclass="text-align: center;"> <c:if test="${current.securityAdvisory}"> - <i class="fa fa-lock"></i> + <rhn:icon type="errata-security" /> </c:if> <c:if test="${current.bugFix}"> - <i class="fa fa-bug"></i> + <rhn:icon type="errata-bugfix" /> </c:if> <c:if test="${current.productEnhancement}"> - <i class="fa spacewalk-icon-enhancement"></i> + <rhn:icon type="errata-enhance" /> </c:if> </rl:column>
diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/channels.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/channels.jsp index a34c9c3..328af9f 100644 --- a/java/code/webapp/WEB-INF/pages/systems/sdc/channels.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/sdc/channels.jsp @@ -8,7 +8,7 @@ <body> <%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %> <h2> - <i class="fa spacewalk-icon-software-channels" title="channel"></i> + <rhn:icon type="header-channel" title="channel" /> <bean:message key="sdc.channels.edit.header2"/> </h2> <html:form method="post" action="/systems/details/SystemChannels.do?sid=${system.id}"> @@ -101,7 +101,7 @@ <rhn:require acl="not system_is_proxy(); not system_is_satellite()" mixins="com.redhat.rhn.common.security.acl.SystemAclHandler">
<h2> - <i class="fa spacewalk-icon-software-channels"></i> + <rhn:icon type="header-channel" /> <bean:message key="sdc.channels.edit.base_software_channel"/> </h2>
diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/confirmnewbase.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/confirmnewbase.jsp index 712b4ea..d718c7a 100644 --- a/java/code/webapp/WEB-INF/pages/systems/sdc/confirmnewbase.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/sdc/confirmnewbase.jsp @@ -7,7 +7,7 @@ <body> <%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %> <h2> - <i class="fa spacewalk-icon-software-channels" title="channel"></i> + <rhn:icon type="header-channel" title="channel" /> <bean:message key="sdc.channels.confirmNewBase.header.confirm"/> </h2>
diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/deletecustomdata.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/deletecustomdata.jsp index 9df91d8..c6adb07 100644 --- a/java/code/webapp/WEB-INF/pages/systems/sdc/deletecustomdata.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/sdc/deletecustomdata.jsp @@ -13,7 +13,7 @@ <%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %> <div class="toolbar-h2"> <div class="toolbar"></div> - <i class="fa fa-warning text-warning" title=""></i> + <rhn:icon type="system-warn" title="" /> <bean:message key="system.jsp.customdata.deletetitle"/> </div>
diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp index 2133762..a9bb2aa 100644 --- a/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp @@ -15,11 +15,11 @@ <div class="panel-body"> <c:choose> <c:when test="${unentitled}"> - <i class="spacewalk-icon-Unentitled"></i> <bean:message key="sdc.details.overview.unentitled" arg0="/rhn/systems/details/Edit.do?sid=${system.id}"/> + <rhn:icon type="system-unentitled" /> <bean:message key="sdc.details.overview.unentitled" arg0="/rhn/systems/details/Edit.do?sid=${system.id}"/> </c:when>
<c:when test="${systemInactive}"> - <i class="spacewalk-icon-unknown-system"/></i> <bean:message key="sdc.details.overview.inactive1"/> + <rhn:icon type="system-unknown" /> <bean:message key="sdc.details.overview.inactive1"/> <c:if test="${documentation == 'true'}"> <bean:message key="sdc.details.overview.inactive2" arg0="/rhn/help/reference/en-US/s1-sm-systems.jsp#s2-sm-system-list"/> </c:if> @@ -80,7 +80,7 @@ <i class="fa fa-circle text-danger"></i> </c:when> <c:otherwise> - <i class="fa fa-warning text-warning"></i> + <rhn:icon type="system-warn" /> </c:otherwise> </c:choose> <a href="/rhn/systems/details/probes/ProbeDetails.do?sid=${system.id}&probe_id=${probe.id}">${probe.description}</a><br/> @@ -195,7 +195,7 @@ <td> <c:choose> <c:when test="${serverLock != null}"> - <i class="fa fa-lock"></i> + <rhn:icon type="errata-security" /> <bean:message key="sdc.details.overview.locked" arg0="${serverLock.locker.login}" arg1="${serverLock.reason}" /><br/> 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 4452446..9012d14 100644 --- a/java/code/webapp/WEB-INF/pages/systems/sdc/updatecustomdata.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/sdc/updatecustomdata.jsp @@ -20,7 +20,7 @@ </a> </span> </div> - <i class="fa fa-info-circle"></i> + <rhn:icon type="header-info" /> <bean:message key="system.jsp.customkey.updatetitle"/> </div>
diff --git a/java/code/webapp/WEB-INF/pages/systems/systemcurrency.jsp b/java/code/webapp/WEB-INF/pages/systems/systemcurrency.jsp index e3aff88..1036871 100644 --- a/java/code/webapp/WEB-INF/pages/systems/systemcurrency.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/systemcurrency.jsp @@ -37,7 +37,7 @@ bound="false" headerkey="systemlist.jsp.system" sortattr="name" > - <i class="fa fa-desktop" title="<bean:message key='systemlist.jsp.nonvirt'/>"></i> + <rhn:icon type="header-system-physical" title="<bean:message key='systemlist.jsp.nonvirt' />" /> <c:out value="<a href="/rhn/systems/details/Overview.do?sid=${current.id}">" escapeXml="false" /> <c:choose> <c:when test="${empty current.name}"> @@ -64,10 +64,10 @@ </c:choose> <c:choose> <c:when test="${current.critical >= 10}"> - <i class="fa fa-exclamation-circle text-danger"></i> + <rhn:icon type="system-crit" /> </c:when> <c:when test="${current.critical >= 5}"> - <i class="fa fa-warning text-warning"></i> + <rhn:icon type="system-warn" /> </c:when> </c:choose> </rl:column> @@ -86,10 +86,10 @@ </c:choose> <c:choose> <c:when test="${current.important >= 15}"> - <i class="fa fa-exclamation-circle text-danger"></i> + <rhn:icon type="system-crit" /> </c:when> <c:when test="${current.important >= 10}"> - <i class="fa fa-warning text-warning"></i> + <rhn:icon type="system-warn" /> </c:when> </c:choose> </rl:column> @@ -108,10 +108,10 @@ </c:choose> <c:choose> <c:when test="${current.moderate >= 20}"> - <i class="fa fa-exclamation-circle text-danger"></i> + <rhn:icon type="system-crit" /> </c:when> <c:when test="${current.moderate >= 15}"> - <i class="fa fa-warning text-warning"></i> + <rhn:icon type="system-warn" /> </c:when> </c:choose> </rl:column> @@ -130,10 +130,10 @@ </c:choose> <c:choose> <c:when test="${current.low >= 25}"> - <i class="fa fa-exclamation-circle text-danger"></i> + <rhn:icon type="system-crit" /> </c:when> <c:when test="${current.low >= 20}"> - <i class="fa fa-warning text-warning"></i> + <rhn:icon type="system-warn" /> </c:when> </c:choose> </rl:column> diff --git a/java/code/webapp/WEB-INF/pages/systems/systemsearch.jsp b/java/code/webapp/WEB-INF/pages/systems/systemsearch.jsp index aa84681..ec6da4d 100644 --- a/java/code/webapp/WEB-INF/pages/systems/systemsearch.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/systemsearch.jsp @@ -29,7 +29,7 @@ value="${search_string}" maxlength="100" accesskey="4"/> <span class="input-group-btn"> <button type="submit" class="btn btn-default"> - <i class="fa fa-search"></i> + <rhn:icon type="header-search" /> </button> </span> </div>
spacewalk-commits@lists.fedorahosted.org