spacewalk-commits December 2013

spacewalk-commits@lists.fedorahosted.org

11 participants
227 discussions

2 commits - java/spacewalk-java.spec rel-eng/packages search-server/spacewalk-search
by Milan Zazrivec 11 Dec '13

11 Dec '13

java/spacewalk-java.spec | 6 +++++- rel-eng/packages/spacewalk-java | 2 +- rel-eng/packages/spacewalk-search | 2 +- search-server/spacewalk-search/spacewalk-search.spec | 5 ++++- 4 files changed, 11 insertions(+), 4 deletions(-) New commits: commit aff50ae7964baf3cda77dd33b4129f512f958448 Author: Milan Zazrivec <mzazrivec(a)redhat.com> Date: Wed Dec 11 16:50:10 2013 +0100 Automatic commit of package [spacewalk-search] release [2.1.8-1]. diff --git a/rel-eng/packages/spacewalk-search b/rel-eng/packages/spacewalk-search index bd48388..a0a7bb2 100644 --- a/rel-eng/packages/spacewalk-search +++ b/rel-eng/packages/spacewalk-search @@ -1 +1 @@ -2.1.7-1 search-server/spacewalk-search/ +2.1.8-1 search-server/spacewalk-search/ diff --git a/search-server/spacewalk-search/spacewalk-search.spec b/search-server/spacewalk-search/spacewalk-search.spec index 101e000..e8f362c 100644 --- a/search-server/spacewalk-search/spacewalk-search.spec +++ b/search-server/spacewalk-search/spacewalk-search.spec @@ -4,7 +4,7 @@ Name: spacewalk-search Summary: Spacewalk Full Text Search Server Group: Applications/Internet License: GPLv2 -Version: 2.1.7 +Version: 2.1.8 Release: 1%{?dist} # This src.rpm is cannonical upstream # You can obtain it using this set of commands @@ -186,6 +186,9 @@ fi %attr(755, root, root) %{_var}/lib/rhn/search/indexes/docs %changelog +* Wed Dec 11 2013 Milan Zazrivec <mzazrivec(a)redhat.com> 2.1.8-1 +- 1040540 - have package search return all matching results + * Fri Dec 06 2013 Tomas Lestach <tlestach(a)redhat.com> 2.1.7-1 - 1023669 - have unique id for SnapshotTag - 1023669 - remove unused logger commit 8ad19a051a64338c3ee2cf9e62bae154896aac7f Author: Milan Zazrivec <mzazrivec(a)redhat.com> Date: Wed Dec 11 16:50:04 2013 +0100 Automatic commit of package [spacewalk-java] release [2.1.95-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index 1785d7b..72c09f2 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.94 +Version: 2.1.95 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -785,6 +785,10 @@ fi %{jardir}/postgresql-jdbc.jar %changelog +* Wed Dec 11 2013 Milan Zazrivec <mzazrivec(a)redhat.com> 2.1.95-1 +- 1040540 - have package search return all matching results +- use rhn:toolbar in 'Show Tomcat Logs' page + * Wed Dec 11 2013 Tomas Kasparek <tkasparek(a)redhat.com> 2.1.94-1 - use new icon aliases in rhn:toolbar tag - adding new icon definitions diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index 4686be9..02f4cfb 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -2.1.94-1 java/ +2.1.95-1 java/

1 0

java/code search-server/spacewalk-search
by Milan Zazrivec 11 Dec '13

11 Dec '13

java/code/src/com/redhat/rhn/domain/rhnpackage/PackageFactory.java | 29 +++++++--- search-server/spacewalk-search/src/config/search/rhn_search.conf | 1 search-server/spacewalk-search/src/java/com/redhat/satellite/search/index/IndexManager.java | 4 - 3 files changed, 23 insertions(+), 11 deletions(-) New commits: commit 8ba08460cebddaf5dfe889e2cbccdf0e5d1e0da7 Author: Milan Zazrivec <mzazrivec(a)redhat.com> Date: Wed Dec 11 16:39:46 2013 +0100 1040540 - have package search return all matching results This fix is to make sure: 1. Search results as we get them from the search server will be split into chunks of 1000, since we need to avoid ORA-01795 errors when we select further info for these packages from the database. 2. 'max_hits_returned' config option is no longer needed, and will be only taken into account when it's specified in rhn.conf. That is, by default, the tomcat application won't be trimming the search results according to 'max_hits_returned', not unless the config option is present in rhn.conf Both of the above will lead to all search matches being present in Spacewalk webui. diff --git a/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageFactory.java b/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageFactory.java index 38ae07c..18231cc 100644 --- a/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageFactory.java +++ b/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageFactory.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2009--2012 Red Hat, Inc. + * Copyright (c) 2009--2013 Red Hat, Inc. * * This software is licensed to you under the GNU General Public License, * version 2 (GPLv2). There is NO WARRANTY for this software, express or @@ -298,6 +298,21 @@ public class PackageFactory extends HibernateFactory { return packs.get(packs.size() - 1); } + private static List composePackageSearchResults(String queryName, Map params, + List pids) { + List results = new ArrayList(); + int limit = 1000; // ORA-01795 + + for (int n = 0; n < pids.size(); n += limit) { + int chunkSize = (pids.size() > n + limit) ? n + limit : pids.size(); + List chunk = pids.subList(n, chunkSize); + params.put("pids", chunk); + results.addAll(singleton.listObjectsByNamedQuery(queryName, params)); + } + + return results; + } + /** * Returns PackageOverviews from a search. * @param pids List of package ids returned from search server. @@ -318,19 +333,17 @@ public class PackageFactory extends HibernateFactory { boolean relevantFlag) { List results = null; Map params = new HashMap(); - params.put("pids", pids); if (archLabels != null && !archLabels.isEmpty()) { params.put("channel_arch_labels", archLabels); - results = singleton.listObjectsByNamedQuery("Package.searchByIdAndArches", - params); + results = composePackageSearchResults("Package.searchByIdAndArches", + params, pids); } else if (relevantFlag) { - results = - singleton.listObjectsByNamedQuery("Package.relevantSearchById", params); + results = composePackageSearchResults("Package.relevantSearchById", + params, pids); } else { - results = - singleton.listObjectsByNamedQuery("Package.searchById", params); + results = composePackageSearchResults("Package.searchById", params, pids); } List<PackageOverview> realResults = new ArrayList<PackageOverview>(); for (Object result : results) { diff --git a/search-server/spacewalk-search/src/config/search/rhn_search.conf b/search-server/spacewalk-search/src/config/search/rhn_search.conf index 34dd771..0fc306b 100644 --- a/search-server/spacewalk-search/src/config/search/rhn_search.conf +++ b/search-server/spacewalk-search/src/config/search/rhn_search.conf @@ -1,6 +1,5 @@ search.index_work_dir=/var/lib/rhn/search/indexes search.rpc_handlers=index:com.redhat.satellite.search.rpc.handlers.IndexHandler,db:com.redhat.satellite.search.rpc.handlers.DatabaseHandler,admin:com.redhat.satellite.search.rpc.handlers.AdminHandler -search.max_hits_returned=500 search.connection.driver_class=oracle.jdbc.driver.OracleDriver search.score_threshold=.10 search.system_score_threshold=.01 diff --git a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/index/IndexManager.java b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/index/IndexManager.java index ff61b3e..1aaa110 100644 --- a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/index/IndexManager.java +++ b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/index/IndexManager.java @@ -89,7 +89,7 @@ public class IndexManager { * @param config application config */ public IndexManager(Configuration config) { - maxHits = config.getInt("search.max_hits_returned", 50); + maxHits = config.getInt("search.max_hits_returned", 0); indexWorkDir = config.getString("search.index_work_dir", null); if (indexWorkDir == null) { throw new IllegalArgumentException( @@ -533,7 +533,7 @@ public class IndexManager { if (pr != null) { retval.add(pr); } - if (x == maxHits) { + if (maxHits > 0 && x == maxHits) { break; } }

1 0

java/code
by Tomáš Kašpárek 11 Dec '13

11 Dec '13

java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java | 1 + java/code/webapp/WEB-INF/pages/admin/catalina.jsp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) New commits: commit 14c5b929eaa30b614f4eabef084880c697eaa7fc Author: Tomas Kasparek <tkasparek(a)redhat.com> Date: Wed Dec 11 16:27:25 2013 +0100 use rhn:toolbar in 'Show Tomcat Logs' page 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 d9d254c..1cae70a 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java @@ -58,6 +58,7 @@ public class IconTag extends TagSupport { icons.put("header-errata", "fa spacewalk-icon-patches"); icons.put("header-globe", "fa fa-globe"); icons.put("header-info", "fa fa-info-circle"); + icons.put("header-list", "fa fa-list"); icons.put("header-kickstart", "fa fa-rocket"); icons.put("header-organisation", "fa fa-group"); icons.put("header-package", "fa spacewalk-icon-packages"); diff --git a/java/code/webapp/WEB-INF/pages/admin/catalina.jsp b/java/code/webapp/WEB-INF/pages/admin/catalina.jsp index bd19e30..399084f 100644 --- a/java/code/webapp/WEB-INF/pages/admin/catalina.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/catalina.jsp @@ -22,7 +22,7 @@ editAreaLoader.init({ <body> <rhn:require acl="user_role(satellite_admin)"/> - <h1><i class="fa fa-list"></i> Tomcat</h1> + <rhn:toolbar base="h1" icon="header-list">Tomcat</rhn:toolbar> <form action="/rhn/admin/Catalina.do"> <rhn:csrf /> <div class="panel panel-default">

1 0

Changes to 'refs/tags/spacewalk-java-2.1.94-1'
by Tomáš Kašpárek 11 Dec '13

11 Dec '13

Tag 'spacewalk-java-2.1.94-1' created by Tomas Kasparek <tkasparek(a)redhat.com> at 2013-12-11 15:18 +0000 Tagging package [spacewalk-java] version [2.1.94-1] in directory [java/]. Changes since spacewalk-web-2.1.41-1: Tomas Kasparek (5): use rhn:icon tag for creating icons in rhn:toolbar adding rhn taglib as it's needed by rhn:icon adding new icon definitions use new icon aliases in rhn:toolbar tag Automatic commit of package [spacewalk-java] release [2.1.94-1]. --- java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java | 101 +++++++--- java/code/src/com/redhat/rhn/frontend/taglibs/ToolbarTag.java | 31 +-- java/code/webapp/WEB-INF/includes/header.jsp | 2 java/code/webapp/WEB-INF/includes/legends/errata-legend.jsp | 3 java/code/webapp/WEB-INF/includes/legends/probes-list-legend.jsp | 1 java/code/webapp/WEB-INF/includes/legends/system-legend.jsp | 2 java/code/webapp/WEB-INF/includes/legends/yourrhn-legend.jsp | 6 java/code/webapp/WEB-INF/pages/activationkeys/create.jsp | 2 java/code/webapp/WEB-INF/pages/activationkeys/delete.jsp | 2 java/code/webapp/WEB-INF/pages/activationkeys/list.jsp | 2 java/code/webapp/WEB-INF/pages/admin/addresses.jsp | 2 java/code/webapp/WEB-INF/pages/admin/bunchDetail.jsp | 2 java/code/webapp/WEB-INF/pages/admin/config/bootstrap.jsp | 2 java/code/webapp/WEB-INF/pages/admin/config/certificate.jsp | 2 java/code/webapp/WEB-INF/pages/admin/config/cobbler.jsp | 2 java/code/webapp/WEB-INF/pages/admin/config/general.jsp | 2 java/code/webapp/WEB-INF/pages/admin/config/multiorg.jsp | 2 java/code/webapp/WEB-INF/pages/admin/config/restart.jsp | 2 java/code/webapp/WEB-INF/pages/admin/deleteSchedule.jsp | 2 java/code/webapp/WEB-INF/pages/admin/disableself.jsp | 2 java/code/webapp/WEB-INF/pages/admin/disableselfconfirm.jsp | 2 java/code/webapp/WEB-INF/pages/admin/iss/confirmmastersremove.jsp | 2 java/code/webapp/WEB-INF/pages/admin/iss/confirmslaveremove.jsp | 2 java/code/webapp/WEB-INF/pages/admin/iss/editmaster.jsp | 4 java/code/webapp/WEB-INF/pages/admin/iss/editslave.jsp | 4 java/code/webapp/WEB-INF/pages/admin/iss/master.jsp | 2 java/code/webapp/WEB-INF/pages/admin/iss/slave.jsp | 2 java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filtercreate.jsp | 2 java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filteredit.jsp | 2 java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filters.jsp | 2 java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/methods.jsp | 2 java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitecreate.jsp | 2 java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuiteedit.jsp | 2 java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuites.jsp | 2 java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesremoveconfirm.jsp | 2 java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystems.jsp | 2 java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystemsedit.jsp | 2 java/code/webapp/WEB-INF/pages/admin/multiorg/configuration.jsp | 4 java/code/webapp/WEB-INF/pages/admin/multiorg/entitlementorgs.jsp | 2 java/code/webapp/WEB-INF/pages/admin/multiorg/org_delete.jsp | 2 java/code/webapp/WEB-INF/pages/admin/multiorg/org_users.jsp | 4 java/code/webapp/WEB-INF/pages/admin/multiorg/organizations.jsp | 2 java/code/webapp/WEB-INF/pages/admin/multiorg/orgdetails.jsp | 4 java/code/webapp/WEB-INF/pages/admin/multiorg/orgsoftwaresubs.jsp | 4 java/code/webapp/WEB-INF/pages/admin/multiorg/orgsystemsubs.jsp | 4 java/code/webapp/WEB-INF/pages/admin/multiorg/orgtrust.jsp | 2 java/code/webapp/WEB-INF/pages/admin/multiorg/orgtrustconfirm.jsp | 2 java/code/webapp/WEB-INF/pages/admin/multiorg/sat_org_users.jsp | 2 java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlementdetails.jsp | 2 java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlements.jsp | 2 java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlementsubs.jsp | 2 java/code/webapp/WEB-INF/pages/admin/multiorg/sys_entitlements.jsp | 2 java/code/webapp/WEB-INF/pages/admin/multiorg/system_entitlement_details.jsp | 2 java/code/webapp/WEB-INF/pages/admin/scheduleDetail.jsp | 2 java/code/webapp/WEB-INF/pages/admin/schedules.jsp | 2 java/code/webapp/WEB-INF/pages/admin/taskStatus.jsp | 2 java/code/webapp/WEB-INF/pages/admin/users/activelist.jsp | 2 java/code/webapp/WEB-INF/pages/admin/users/deleteuser.jsp | 2 java/code/webapp/WEB-INF/pages/admin/users/disabledlist.jsp | 2 java/code/webapp/WEB-INF/pages/admin/users/disableuser.jsp | 2 java/code/webapp/WEB-INF/pages/admin/users/userconfirm.jsp | 2 java/code/webapp/WEB-INF/pages/admin/users/userlist.jsp | 2 java/code/webapp/WEB-INF/pages/audit/auditsearch.jsp | 2 java/code/webapp/WEB-INF/pages/audit/auditview.jsp | 2 java/code/webapp/WEB-INF/pages/audit/listxccdf.jsp | 2 java/code/webapp/WEB-INF/pages/audit/machine.jsp | 2 java/code/webapp/WEB-INF/pages/audit/overview.jsp | 2 java/code/webapp/WEB-INF/pages/audit/scap/xccdfdiff.jsp | 2 java/code/webapp/WEB-INF/pages/audit/scap/xccdfdiffsubmit.jsp | 2 java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp | 2 java/code/webapp/WEB-INF/pages/channel/all.jsp | 2 java/code/webapp/WEB-INF/pages/channel/channel_family_tree.jsp | 2 java/code/webapp/WEB-INF/pages/channel/custom.jsp | 2 java/code/webapp/WEB-INF/pages/channel/entitlements.jsp | 2 java/code/webapp/WEB-INF/pages/channel/manage/delete.jsp | 2 java/code/webapp/WEB-INF/pages/channel/manage/distchannelmap.jsp | 2 java/code/webapp/WEB-INF/pages/channel/manage/distchannelmapdelete.jsp | 2 java/code/webapp/WEB-INF/pages/channel/manage/distchannelmapedit.jsp | 4 java/code/webapp/WEB-INF/pages/channel/manage/edit.jsp | 2 java/code/webapp/WEB-INF/pages/channel/manage/manage.jsp | 2 java/code/webapp/WEB-INF/pages/channel/manage/package/confirmdeletepackages.jsp | 2 java/code/webapp/WEB-INF/pages/channel/manage/package/listremovecustompackages.jsp | 2 java/code/webapp/WEB-INF/pages/channel/manage/repo/deleteconfirm.jsp | 2 java/code/webapp/WEB-INF/pages/channel/manage/repo/repodetails.jsp | 4 java/code/webapp/WEB-INF/pages/channel/manage/repo/repos.jsp | 2 java/code/webapp/WEB-INF/pages/channel/packagesearch.jsp | 2 java/code/webapp/WEB-INF/pages/channel/popular.jsp | 2 java/code/webapp/WEB-INF/pages/channel/retired.jsp | 2 java/code/webapp/WEB-INF/pages/channel/shared.jsp | 2 java/code/webapp/WEB-INF/pages/channel/vendor.jsp | 2 java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/common-header.jspf | 2 java/code/webapp/WEB-INF/pages/common/fragments/channel/channel_header.jspf | 2 java/code/webapp/WEB-INF/pages/common/fragments/channel/manage/manage_channel_header.jspf | 2 java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/details-header.jspf | 2 java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/summary.jspf | 2 java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/details.jspf | 2 java/code/webapp/WEB-INF/pages/common/fragments/errata/ownedlistdisplay.jspf | 2 java/code/webapp/WEB-INF/pages/common/fragments/groups/header.jspf | 2 java/code/webapp/WEB-INF/pages/common/fragments/kickstart/advanced/header.jspf | 2 java/code/webapp/WEB-INF/pages/common/fragments/kickstart/clone.jspf | 2 java/code/webapp/WEB-INF/pages/common/fragments/kickstart/kickstart-toolbar.jspf | 2 java/code/webapp/WEB-INF/pages/common/fragments/package/package_header.jspf | 2 java/code/webapp/WEB-INF/pages/common/fragments/profile/header.jspf | 2 java/code/webapp/WEB-INF/pages/common/fragments/ssm/header.jspf | 2 java/code/webapp/WEB-INF/pages/common/fragments/user/user-header.jspf | 2 java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/recentlyRegistered.jsp | 2 java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/scheduledActions.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/overview/globalconfiglist.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/overview/globalfilelist.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/overview/localfilelist.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/overview/managedsystems.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/overview/overview.jsp | 4 java/code/webapp/WEB-INF/pages/configuration/overview/targetsystems.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/sdc/deployfile.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/sdc/deployfileconfirm.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/sdc/difffile.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/sdc/difffileconfirm.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/sdc/importfile.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/sdc/importfileconfirm.jsp | 2 java/code/webapp/WEB-INF/pages/credentials/delete.jsp | 2 java/code/webapp/WEB-INF/pages/credentials/edit.jsp | 2 java/code/webapp/WEB-INF/pages/errata/addchannelpackagepush.jsp | 2 java/code/webapp/WEB-INF/pages/errata/addchannels.jsp | 2 java/code/webapp/WEB-INF/pages/errata/addpackagepackagepush.jsp | 2 java/code/webapp/WEB-INF/pages/errata/all.jsp | 2 java/code/webapp/WEB-INF/pages/errata/cloneerrata.jsp | 2 java/code/webapp/WEB-INF/pages/errata/create.jsp | 2 java/code/webapp/WEB-INF/pages/errata/delete.jsp | 2 java/code/webapp/WEB-INF/pages/errata/edit.jsp | 2 java/code/webapp/WEB-INF/pages/errata/editchannels.jsp | 2 java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp | 2 java/code/webapp/WEB-INF/pages/errata/notify.jsp | 2 java/code/webapp/WEB-INF/pages/errata/packagepush.jsp | 2 java/code/webapp/WEB-INF/pages/errata/packages/add.jsp | 2 java/code/webapp/WEB-INF/pages/errata/packages/confirm.jsp | 2 java/code/webapp/WEB-INF/pages/errata/packages/list.jsp | 2 java/code/webapp/WEB-INF/pages/errata/packages/packages.jsp | 2 java/code/webapp/WEB-INF/pages/errata/packages/remove.jsp | 2 java/code/webapp/WEB-INF/pages/errata/published.jsp | 2 java/code/webapp/WEB-INF/pages/errata/relevant.jsp | 2 java/code/webapp/WEB-INF/pages/errata/unpublished.jsp | 2 java/code/webapp/WEB-INF/pages/help/docsearch.jsp | 2 java/code/webapp/WEB-INF/pages/keys/cryptokeydeleteconfirm.jsp | 2 java/code/webapp/WEB-INF/pages/keys/keycreate.jsp | 2 java/code/webapp/WEB-INF/pages/keys/keyedit.jsp | 2 java/code/webapp/WEB-INF/pages/keys/keys.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/cobbler/deleteconfirm.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippetdetails.jsp | 4 java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippets.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippetview.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/kickstartoverview.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/kickstartranges.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/kickstarts.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/kickstarttreevariables.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/kstrees.jsp | 4 java/code/webapp/WEB-INF/pages/kickstart/scriptdelete.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/scriptedit.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/scripts.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/treecreate.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/treedelete-confirm.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/treeedit.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/advanced/create.jsp | 2 java/code/webapp/WEB-INF/pages/monitoring/probes.jsp | 2 java/code/webapp/WEB-INF/pages/multiorg/channels/consumed.jsp | 2 java/code/webapp/WEB-INF/pages/multiorg/channels/orglist.jsp | 2 java/code/webapp/WEB-INF/pages/multiorg/channels/provided.jsp | 2 java/code/webapp/WEB-INF/pages/multiorg/organizations.jsp | 2 java/code/webapp/WEB-INF/pages/multiorg/orgtrustdetails.jsp | 2 java/code/webapp/WEB-INF/pages/profiles/list.jsp | 2 java/code/webapp/WEB-INF/pages/schedule/archivedactions.jsp | 2 java/code/webapp/WEB-INF/pages/schedule/completedactions.jsp | 2 java/code/webapp/WEB-INF/pages/schedule/failedactions.jsp | 2 java/code/webapp/WEB-INF/pages/schedule/pendingactions.jsp | 2 java/code/webapp/WEB-INF/pages/software/downloads/download.jsp | 2 java/code/webapp/WEB-INF/pages/software/packages/packagenameoverview.jsp | 2 java/code/webapp/WEB-INF/pages/ssm/view-log-details.jsp | 2 java/code/webapp/WEB-INF/pages/ssm/view-log.jsp | 2 java/code/webapp/WEB-INF/pages/systems/crashdelete.jsp | 2 java/code/webapp/WEB-INF/pages/systems/crashdetail.jsp | 2 java/code/webapp/WEB-INF/pages/systems/crashfiles.jsp | 2 java/code/webapp/WEB-INF/pages/systems/crashnote.jsp | 6 java/code/webapp/WEB-INF/pages/systems/crashnotedelete.jsp | 3 java/code/webapp/WEB-INF/pages/systems/customkey/createkey.jsp | 2 java/code/webapp/WEB-INF/pages/systems/customkey/deletekey.jsp | 2 java/code/webapp/WEB-INF/pages/systems/customkey/listcustomkeys.jsp | 2 java/code/webapp/WEB-INF/pages/systems/customkey/updatekey.jsp | 2 java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp | 3 java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/compareprofiles.jsp | 2 java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystems.jsp | 2 java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemscompare.jsp | 2 java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemsdelete.jsp | 2 java/code/webapp/WEB-INF/pages/systems/entitlements/entitlements.jsp | 2 java/code/webapp/WEB-INF/pages/systems/entitlements/flexguests.jsp | 2 java/code/webapp/WEB-INF/pages/systems/entitlements/guestlimited.jsp | 2 java/code/webapp/WEB-INF/pages/systems/entitlements/guestunlimited.jsp | 2 java/code/webapp/WEB-INF/pages/systems/entitlements/physicalhosts.jsp | 2 java/code/webapp/WEB-INF/pages/systems/extra-packages-systems-list.jsp | 2 java/code/webapp/WEB-INF/pages/systems/grouplist.jsp | 2 java/code/webapp/WEB-INF/pages/systems/inactivelist.jsp | 2 java/code/webapp/WEB-INF/pages/systems/outofdatelist.jsp | 2 java/code/webapp/WEB-INF/pages/systems/overview.jsp | 2 java/code/webapp/WEB-INF/pages/systems/physicallist.jsp | 2 java/code/webapp/WEB-INF/pages/systems/probes/create.jsp | 2 java/code/webapp/WEB-INF/pages/systems/probes/details.jsp | 4 java/code/webapp/WEB-INF/pages/systems/probes/edit.jsp | 2 java/code/webapp/WEB-INF/pages/systems/probes/index.jsp | 2 java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservation_create.jsp | 2 java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservation_edit.jsp | 2 java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservation_list.jsp | 2 java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservationlistconfirm.jsp | 2 java/code/webapp/WEB-INF/pages/systems/proxylist.jsp | 2 java/code/webapp/WEB-INF/pages/systems/registeredlist.jsp | 4 java/code/webapp/WEB-INF/pages/systems/requiringrebootlist.jsp | 2 java/code/webapp/WEB-INF/pages/systems/sdc/listcustomdata.jsp | 2 java/code/webapp/WEB-INF/pages/systems/sdc/updatecustomdata.jsp | 2 java/code/webapp/WEB-INF/pages/systems/softwarecrashesoverview.jsp | 2 java/code/webapp/WEB-INF/pages/systems/softwarecrashuuiddetails.jsp | 2 java/code/webapp/WEB-INF/pages/systems/systemcurrency.jsp | 2 java/code/webapp/WEB-INF/pages/systems/systemlist.jsp | 2 java/code/webapp/WEB-INF/pages/systems/systemsearch.jsp | 2 java/code/webapp/WEB-INF/pages/systems/unentitledlist.jsp | 2 java/code/webapp/WEB-INF/pages/systems/ungroupedlist.jsp | 2 java/code/webapp/WEB-INF/pages/systems/virtuallist.jsp | 2 java/code/webapp/WEB-INF/pages/user/create/usercreate.jsp | 2 java/code/webapp/WEB-INF/pages/user/edit/localepreference.jsp | 2 java/code/webapp/WEB-INF/pages/user/edit/yourchangeemail.jsp | 2 java/code/webapp/WEB-INF/pages/user/edit/yourdetails.jsp | 2 java/code/webapp/WEB-INF/pages/user/edit/yourpreferences.jsp | 2 java/code/webapp/WEB-INF/pages/yourrhn.jsp | 2 java/spacewalk-java.spec | 8 rel-eng/packages/spacewalk-java | 2 231 files changed, 341 insertions(+), 293 deletions(-) ---

1 0

java/spacewalk-java.spec rel-eng/packages
by Tomáš Kašpárek 11 Dec '13

11 Dec '13

java/spacewalk-java.spec | 8 +++++++- rel-eng/packages/spacewalk-java | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) New commits: commit 7cd4410a1b8e9014e250a91542049ef68ef93198 Author: Tomas Kasparek <tkasparek(a)redhat.com> Date: Wed Dec 11 16:18:43 2013 +0100 Automatic commit of package [spacewalk-java] release [2.1.94-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index 0dadece..1785d7b 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.93 +Version: 2.1.94 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -785,6 +785,12 @@ fi %{jardir}/postgresql-jdbc.jar %changelog +* Wed Dec 11 2013 Tomas Kasparek <tkasparek(a)redhat.com> 2.1.94-1 +- use new icon aliases in rhn:toolbar tag +- adding new icon definitions +- adding rhn taglib as it's needed by rhn:icon +- use rhn:icon tag for creating icons in rhn:toolbar + * Tue Dec 10 2013 Stephen Herr <sherr(a)redhat.com> 2.1.93-1 - 1039193 - Increase default ram to 768 for RHEL 7 diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index 8fe0e22..4686be9 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -2.1.93-1 java/ +2.1.94-1 java/

1 0

4 commits - java/code
by Tomáš Kašpárek 11 Dec '13

11 Dec '13

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

1 0

Changes to 'refs/tags/spacewalk-web-2.1.41-1'
by Michael Mraka 11 Dec '13

11 Dec '13

Tag 'spacewalk-web-2.1.41-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-12-11 13:52 +0000 Tagging package [spacewalk-web] version [2.1.41-1] in directory [web/]. Changes since spacewalk-java-2.1.93-1: Michael Mraka (4): bootstrap tuning: reimplemented icon tag in pxt updated perl modules to use PXT::HTML->icon() updated pxt pages to use <rhn-icon> tag Automatic commit of package [spacewalk-web] release [2.1.41-1]. --- branding/templates/c.pxt | 10 - rel-eng/packages/spacewalk-web | 2 web/html/help/about.pxt | 2 web/html/network/errata/manage/errata_channel_intersection.pxt | 2 web/html/network/monitoring/scout/details.pxt | 2 web/html/network/monitoring/scout/index.pxt | 2 web/html/network/software/channels/manage/errata/clone.pxt | 2 web/html/network/software/channels/manage/errata/clone_confirm.pxt | 2 web/html/network/software/channels/manage/packages/compare/index.pxt | 2 web/html/network/software/channels/manage/packages/compare/sync_confirm.pxt | 2 web/html/network/software/channels/manage/packages/compare/sync_prompt.pxt | 2 web/html/network/software/channels/manage/patches/add_confirm.pxt | 2 web/html/network/software/channels/manage/patches/index.pxt | 2 web/html/network/software/channels/manage/patches/patch_list.pxt | 2 web/html/network/software/channels/manage/patches/remove_confirm.pxt | 2 web/html/network/software/channels/manage/patchsets/add_confirm.pxt | 2 web/html/network/software/channels/manage/patchsets/index.pxt | 2 web/html/network/software/channels/patches.pxt | 2 web/html/network/software/channels/patchsets.pxt | 2 web/html/network/software/channels/subscribers.pxt | 2 web/html/network/software/packages/dependencies.pxt | 2 web/html/network/software/packages/file_list.pxt | 2 web/html/network/software/packages/install_confirm.pxt | 2 web/html/network/software/packages/newer_versions.pxt | 2 web/html/network/software/packages/package_map.pxt | 2 web/html/network/software/packages/patch_packages.pxt | 2 web/html/network/software/packages/patch_patchsets.pxt | 2 web/html/network/software/packages/patches_patching_package.pxt | 2 web/html/network/software/packages/patchset_patches.pxt | 2 web/html/network/software/packages/system_list.pxt | 2 web/html/network/software/packages/system_list_for_patch.pxt | 2 web/html/network/software/packages/system_list_for_patchset.pxt | 2 web/html/network/software/packages/target_system_list.pxt | 2 web/html/network/software/packages/target_system_list_for_patch.pxt | 2 web/html/network/software/packages/target_system_list_for_patchset.pxt | 2 web/html/network/systems/details/connection.pxt | 2 web/html/network/systems/details/history/dependency_failures.pxt | 2 web/html/network/systems/details/history/event.pxt | 4 web/html/network/systems/details/history/history.pxt | 2 web/html/network/systems/details/history/package_event_results.pxt | 4 web/html/network/systems/details/history/pending.pxt | 2 web/html/network/systems/details/history/snapshots/channels.pxt | 2 web/html/network/systems/details/history/snapshots/config.pxt | 2 web/html/network/systems/details/history/snapshots/groups.pxt | 2 web/html/network/systems/details/history/snapshots/index.pxt | 2 web/html/network/systems/details/history/snapshots/namespaces.pxt | 2 web/html/network/systems/details/history/snapshots/packages.pxt | 2 web/html/network/systems/details/history/snapshots/remove_confirm.pxt | 2 web/html/network/systems/details/history/snapshots/rollback.pxt | 4 web/html/network/systems/details/history/snapshots/snapshot_tags.pxt | 2 web/html/network/systems/details/history/snapshots/system_tags.pxt | 2 web/html/network/systems/details/history/snapshots/unservable_packages.pxt | 2 web/html/network/systems/details/history/verify_results.pxt | 2 web/html/network/systems/details/proxy-clients.pxt | 2 web/html/network/systems/details/proxy.pxt | 2 web/html/network/systems/groups/apply_errata_confirm.pxt | 2 web/html/network/systems/groups/errata_list.pxt | 2 web/html/network/systems/groups/systems_affected_by_errata.pxt | 2 web/html/network/systems/ssm/errata/apply_errata_conf.pxt | 2 web/html/network/systems/ssm/errata/index.pxt | 2 web/html/network/systems/ssm/errata/systems_affected.pxt | 4 web/html/network/systems/ssm/groups/alter_membership_conf.pxt | 2 web/html/network/systems/ssm/groups/create.pxt | 4 web/html/network/systems/ssm/groups/index.pxt | 4 web/html/network/systems/ssm/misc/change_sys_pref_conf.pxt | 2 web/html/network/systems/ssm/misc/choose_value_to_remove.pxt | 2 web/html/network/systems/ssm/misc/choose_value_to_set.pxt | 2 web/html/network/systems/ssm/misc/landing.pxt | 2 web/html/network/systems/ssm/misc/remove_value.pxt | 2 web/html/network/systems/ssm/misc/set_value.pxt | 2 web/html/network/systems/ssm/packages/index.pxt | 2 web/html/network/systems/ssm/packages/schedule_remote_command.pxt | 2 web/html/network/systems/ssm/packages/upload_answer_file.pxt | 4 web/html/network/systems/ssm/patches/index.pxt | 2 web/html/network/systems/ssm/patches/install.pxt | 2 web/html/network/systems/ssm/patches/install_channel.pxt | 2 web/html/network/systems/ssm/patches/install_conf.pxt | 2 web/html/network/systems/ssm/patches/remove.pxt | 2 web/html/network/systems/ssm/patches/remove_conf.pxt | 2 web/html/network/systems/ssm/patchsets/index.pxt | 2 web/html/network/systems/ssm/patchsets/install.pxt | 2 web/html/network/systems/ssm/patchsets/install_channel.pxt | 2 web/html/network/systems/ssm/patchsets/install_conf.pxt | 2 web/html/network/systems/ssm/provisioning/rollback.pxt | 4 web/html/network/systems/ssm/provisioning/rollback_by_tag_conf.pxt | 4 web/html/network/systems/ssm/provisioning/tag_systems.pxt | 4 web/html/network/systems/system_list | 2 web/include/network/components/legends/errata-list-legend.pxi | 7 web/include/network/components/legends/event-status.pxi | 7 web/include/network/components/legends/event-type.pxi | 9 - web/include/network/components/legends/system-list-legend.pxi | 19 +- web/include/network/components/system_groups/sgdc_header.pxi | 4 web/include/network/components/systems/system_details_toolbar.pxi | 12 - web/include/network/software/channels/manage/manage_channels_header.pxi | 2 web/include/network/users/details/header.pxi | 2 web/modules/pxt/PXT/HTML.pm | 71 ++++++++-- web/modules/sniglets/Sniglets/HTML.pm | 19 ++ web/modules/sniglets/Sniglets/ListView/ActionList.pm | 62 ++++---- web/modules/sniglets/Sniglets/ListView/ErrataList.pm | 9 - web/modules/sniglets/Sniglets/ListView/PackageList.pm | 12 - web/modules/sniglets/Sniglets/ListView/SystemList.pm | 6 web/modules/sniglets/Sniglets/ServerGroup.pm | 6 web/modules/sniglets/Sniglets/Servers.pm | 16 +- web/spacewalk-web.spec | 8 - 104 files changed, 275 insertions(+), 198 deletions(-) ---

1 0

rel-eng/packages web/spacewalk-web.spec
by Michael Mraka 11 Dec '13

11 Dec '13

rel-eng/packages/spacewalk-web | 2 +- web/spacewalk-web.spec | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) New commits: commit ce091badf0b89ac0cfe3e39533319eb373198322 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Wed Dec 11 14:52:40 2013 +0100 Automatic commit of package [spacewalk-web] release [2.1.41-1]. diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web index d111ed0..293fdce 100644 --- a/rel-eng/packages/spacewalk-web +++ b/rel-eng/packages/spacewalk-web @@ -1 +1 @@ -2.1.40-1 web/ +2.1.41-1 web/ diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec index 78567d3..bc49e64 100644 --- a/web/spacewalk-web.spec +++ b/web/spacewalk-web.spec @@ -4,7 +4,7 @@ Name: spacewalk-web Summary: Spacewalk Web site - Perl modules Group: Applications/Internet License: GPLv2 -Version: 2.1.40 +Version: 2.1.41 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk/ Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -269,6 +269,12 @@ rm -rf $RPM_BUILD_ROOT %doc LICENSE %changelog +* Wed Dec 11 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.41-1 +- updated pxt pages to use <rhn-icon> tag +- updated perl modules to use PXT::HTML->icon() +- bootstrap tuning: reimplemented icon tag in pxt +- System Group / Admins - updated links and removed old page + * Mon Dec 09 2013 Jan Dobes 2.1.40-1 - system group details - linking + cleanup

1 0

3 commits - branding/templates web/html web/include web/modules
by Michael Mraka 11 Dec '13

11 Dec '13

branding/templates/c.pxt | 10 - web/html/help/about.pxt | 2 web/html/network/errata/manage/errata_channel_intersection.pxt | 2 web/html/network/monitoring/scout/details.pxt | 2 web/html/network/monitoring/scout/index.pxt | 2 web/html/network/software/channels/manage/errata/clone.pxt | 2 web/html/network/software/channels/manage/errata/clone_confirm.pxt | 2 web/html/network/software/channels/manage/packages/compare/index.pxt | 2 web/html/network/software/channels/manage/packages/compare/sync_confirm.pxt | 2 web/html/network/software/channels/manage/packages/compare/sync_prompt.pxt | 2 web/html/network/software/channels/manage/patches/add_confirm.pxt | 2 web/html/network/software/channels/manage/patches/index.pxt | 2 web/html/network/software/channels/manage/patches/patch_list.pxt | 2 web/html/network/software/channels/manage/patches/remove_confirm.pxt | 2 web/html/network/software/channels/manage/patchsets/add_confirm.pxt | 2 web/html/network/software/channels/manage/patchsets/index.pxt | 2 web/html/network/software/channels/patches.pxt | 2 web/html/network/software/channels/patchsets.pxt | 2 web/html/network/software/channels/subscribers.pxt | 2 web/html/network/software/packages/dependencies.pxt | 2 web/html/network/software/packages/file_list.pxt | 2 web/html/network/software/packages/install_confirm.pxt | 2 web/html/network/software/packages/newer_versions.pxt | 2 web/html/network/software/packages/package_map.pxt | 2 web/html/network/software/packages/patch_packages.pxt | 2 web/html/network/software/packages/patch_patchsets.pxt | 2 web/html/network/software/packages/patches_patching_package.pxt | 2 web/html/network/software/packages/patchset_patches.pxt | 2 web/html/network/software/packages/system_list.pxt | 2 web/html/network/software/packages/system_list_for_patch.pxt | 2 web/html/network/software/packages/system_list_for_patchset.pxt | 2 web/html/network/software/packages/target_system_list.pxt | 2 web/html/network/software/packages/target_system_list_for_patch.pxt | 2 web/html/network/software/packages/target_system_list_for_patchset.pxt | 2 web/html/network/systems/details/connection.pxt | 2 web/html/network/systems/details/history/dependency_failures.pxt | 2 web/html/network/systems/details/history/event.pxt | 4 web/html/network/systems/details/history/history.pxt | 2 web/html/network/systems/details/history/package_event_results.pxt | 4 web/html/network/systems/details/history/pending.pxt | 2 web/html/network/systems/details/history/snapshots/channels.pxt | 2 web/html/network/systems/details/history/snapshots/config.pxt | 2 web/html/network/systems/details/history/snapshots/groups.pxt | 2 web/html/network/systems/details/history/snapshots/index.pxt | 2 web/html/network/systems/details/history/snapshots/namespaces.pxt | 2 web/html/network/systems/details/history/snapshots/packages.pxt | 2 web/html/network/systems/details/history/snapshots/remove_confirm.pxt | 2 web/html/network/systems/details/history/snapshots/rollback.pxt | 4 web/html/network/systems/details/history/snapshots/snapshot_tags.pxt | 2 web/html/network/systems/details/history/snapshots/system_tags.pxt | 2 web/html/network/systems/details/history/snapshots/unservable_packages.pxt | 2 web/html/network/systems/details/history/verify_results.pxt | 2 web/html/network/systems/details/proxy-clients.pxt | 2 web/html/network/systems/details/proxy.pxt | 2 web/html/network/systems/groups/apply_errata_confirm.pxt | 2 web/html/network/systems/groups/errata_list.pxt | 2 web/html/network/systems/groups/systems_affected_by_errata.pxt | 2 web/html/network/systems/ssm/errata/apply_errata_conf.pxt | 2 web/html/network/systems/ssm/errata/index.pxt | 2 web/html/network/systems/ssm/errata/systems_affected.pxt | 4 web/html/network/systems/ssm/groups/alter_membership_conf.pxt | 2 web/html/network/systems/ssm/groups/create.pxt | 4 web/html/network/systems/ssm/groups/index.pxt | 4 web/html/network/systems/ssm/misc/change_sys_pref_conf.pxt | 2 web/html/network/systems/ssm/misc/choose_value_to_remove.pxt | 2 web/html/network/systems/ssm/misc/choose_value_to_set.pxt | 2 web/html/network/systems/ssm/misc/landing.pxt | 2 web/html/network/systems/ssm/misc/remove_value.pxt | 2 web/html/network/systems/ssm/misc/set_value.pxt | 2 web/html/network/systems/ssm/packages/index.pxt | 2 web/html/network/systems/ssm/packages/schedule_remote_command.pxt | 2 web/html/network/systems/ssm/packages/upload_answer_file.pxt | 4 web/html/network/systems/ssm/patches/index.pxt | 2 web/html/network/systems/ssm/patches/install.pxt | 2 web/html/network/systems/ssm/patches/install_channel.pxt | 2 web/html/network/systems/ssm/patches/install_conf.pxt | 2 web/html/network/systems/ssm/patches/remove.pxt | 2 web/html/network/systems/ssm/patches/remove_conf.pxt | 2 web/html/network/systems/ssm/patchsets/index.pxt | 2 web/html/network/systems/ssm/patchsets/install.pxt | 2 web/html/network/systems/ssm/patchsets/install_channel.pxt | 2 web/html/network/systems/ssm/patchsets/install_conf.pxt | 2 web/html/network/systems/ssm/provisioning/rollback.pxt | 4 web/html/network/systems/ssm/provisioning/rollback_by_tag_conf.pxt | 4 web/html/network/systems/ssm/provisioning/tag_systems.pxt | 4 web/html/network/systems/system_list | 2 web/include/network/components/legends/errata-list-legend.pxi | 7 web/include/network/components/legends/event-status.pxi | 7 web/include/network/components/legends/event-type.pxi | 9 - web/include/network/components/legends/system-list-legend.pxi | 19 +- web/include/network/components/system_groups/sgdc_header.pxi | 4 web/include/network/components/systems/system_details_toolbar.pxi | 12 - web/include/network/software/channels/manage/manage_channels_header.pxi | 2 web/include/network/users/details/header.pxi | 2 web/modules/pxt/PXT/HTML.pm | 71 ++++++++-- web/modules/sniglets/Sniglets/HTML.pm | 19 ++ web/modules/sniglets/Sniglets/ListView/ActionList.pm | 62 ++++---- web/modules/sniglets/Sniglets/ListView/ErrataList.pm | 9 - web/modules/sniglets/Sniglets/ListView/PackageList.pm | 12 - web/modules/sniglets/Sniglets/ListView/SystemList.pm | 6 web/modules/sniglets/Sniglets/ServerGroup.pm | 6 web/modules/sniglets/Sniglets/Servers.pm | 16 +- 102 files changed, 267 insertions(+), 196 deletions(-) New commits: commit 4bd66865ac1ea97255f5f178c40f14cac10fc6fd Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Tue Dec 10 15:48:45 2013 +0100 updated pxt pages to use <rhn-icon> tag diff --git a/branding/templates/c.pxt b/branding/templates/c.pxt index c1a89cc..ccfdcd2 100644 --- a/branding/templates/c.pxt +++ b/branding/templates/c.pxt @@ -35,16 +35,16 @@ <rhn-display-login> <ul class="nav nav-pills"> <li> - <a href="/rhn/account/UserDetails.do"><i class="fa fa-user"></i>[login]</a> + <a href="/rhn/account/UserDetails.do"><rhn-icon type="header-user"/>[login]</a> </li> <li class="hidden-sm hidden-xs hidden-md"> - <span class="spacewalk-header-non-link"><i class="fa fa-sitemap"></i>[org]</span> + <span class="spacewalk-header-non-link"><rhn-icon type="header-sitemap"/>[org]</span> </li> <li> - <a href="/rhn/account/UserPreferences.do"><i class="fa fa-cogs"></i></a> + <a href="/rhn/account/UserPreferences.do"><rhn-icon type="header-preferences"/></a> </li> <li> - <a href="/rhn/Logout.do"><i class="fa fa-sign-out"></i></a> + <a href="/rhn/Logout.do"><rhn-icon type="header-signout"/></a> </li> </ul> </rhn-display-login> @@ -66,7 +66,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/web/html/help/about.pxt b/web/html/help/about.pxt index 1863b96..7acb517 100644 --- a/web/html/help/about.pxt +++ b/web/html/help/about.pxt @@ -5,7 +5,7 @@ <grail-canvas-template base="/templates/c.pxt" mode="main_canvas"> -<h1><i class="fa fa-info-circle text-primary" title="information"></i> About <pxt-config var="product_name"/></h1> +<h1><rhn-icon type="header-info" title="information"/> About <pxt-config var="product_name"/></h1> <p> <pxt-config var="product_name"/> allows administrators to efficiently manage the systems on their diff --git a/web/html/network/errata/manage/errata_channel_intersection.pxt b/web/html/network/errata/manage/errata_channel_intersection.pxt index b90d16c..29bdf08 100644 --- a/web/html/network/errata/manage/errata_channel_intersection.pxt +++ b/web/html/network/errata/manage/errata_channel_intersection.pxt @@ -18,7 +18,7 @@ <p>The channel <strong>{channel_name}</strong> has the following packages in common with <strong><rhn-errata-advisory/></strong>. If the version of the package from the erratum is newer than the one in your channel, you will have the opportunity to update the channel when you publish this erratum.</p> </div> - <h2><i class="fa spacewalk-icon-packages"></i> Packages</h2> + <h2><rhn-icon type="header-package"/> Packages</h2> <pxt-include-late file="/network/components/message_queues/local.pxi" /> diff --git a/web/html/network/monitoring/scout/details.pxt b/web/html/network/monitoring/scout/details.pxt index ad9928a..1f2cd43 100644 --- a/web/html/network/monitoring/scout/details.pxt +++ b/web/html/network/monitoring/scout/details.pxt @@ -6,7 +6,7 @@ <grail-canvas-template base="/templates/c.pxt" mode="main_canvas"> <pxt-formvar> - <rhn-toolbar base="h1" icon="spacewalk-icon-monitoring-status" help-url="s1-sm-monitor.jsp#s2-sm-monitor-scout" deletion-url="/rhn/systems/details/DeleteConfirm.do?scout_id={formvar:sid}" deletion-type="scout"> + <rhn-toolbar base="h1" icon="monitoring-status" help-url="s1-sm-monitor.jsp#s2-sm-monitor-scout" deletion-url="/rhn/systems/details/DeleteConfirm.do?scout_id={formvar:sid}" deletion-type="scout"> Scout Public Key Page </rhn-toolbar> </pxt-formvar> diff --git a/web/html/network/monitoring/scout/index.pxt b/web/html/network/monitoring/scout/index.pxt index 174a490..9cd74ae 100644 --- a/web/html/network/monitoring/scout/index.pxt +++ b/web/html/network/monitoring/scout/index.pxt @@ -10,7 +10,7 @@ </grail-canvas-replacement> <grail-canvas-template base="/templates/c.pxt" mode="main_canvas"> - <rhn-toolbar base="h1" icon="fa-desktop" help-url="s1-sm-monitor.jsp#s2-sm-monitor-scout"> + <rhn-toolbar base="h1" icon="header-system" help-url="s1-sm-monitor.jsp#s2-sm-monitor-scout"> Update Scout Configuration </rhn-toolbar> diff --git a/web/html/network/software/channels/manage/errata/clone.pxt b/web/html/network/software/channels/manage/errata/clone.pxt index 58345f9..9499bd7 100644 --- a/web/html/network/software/channels/manage/errata/clone.pxt +++ b/web/html/network/software/channels/manage/errata/clone.pxt @@ -19,7 +19,7 @@ </div> <h2> - <i class="fa spacewalk-icon-patches"></i> + <rhn-icon type="header-errata"/> Clone Errata </h2> diff --git a/web/html/network/software/channels/manage/errata/clone_confirm.pxt b/web/html/network/software/channels/manage/errata/clone_confirm.pxt index 8a7844b..d43eee2 100644 --- a/web/html/network/software/channels/manage/errata/clone_confirm.pxt +++ b/web/html/network/software/channels/manage/errata/clone_confirm.pxt @@ -17,7 +17,7 @@ </div> <h2> - <i class="fa spacewalk-icon-patches"></i> + <rhn-icon type="header-errata"/> Clone Errata </h2> diff --git a/web/html/network/software/channels/manage/packages/compare/index.pxt b/web/html/network/software/channels/manage/packages/compare/index.pxt index d889e9c..2ce2273 100644 --- a/web/html/network/software/channels/manage/packages/compare/index.pxt +++ b/web/html/network/software/channels/manage/packages/compare/index.pxt @@ -16,7 +16,7 @@ </div> <h2> - <i class="fa spacewalk-icon-packages" title="package"></i> + <rhn-icon type="header-package" title="package"/> Compare Packages </h2> diff --git a/web/html/network/software/channels/manage/packages/compare/sync_confirm.pxt b/web/html/network/software/channels/manage/packages/compare/sync_confirm.pxt index 4650567..c89ed1c 100644 --- a/web/html/network/software/channels/manage/packages/compare/sync_confirm.pxt +++ b/web/html/network/software/channels/manage/packages/compare/sync_confirm.pxt @@ -16,7 +16,7 @@ </div> <h2> - <i class="fa spacewalk-icon-packages"></i> + <rhn-icon type="event-type-package"/> Confirm Package Sync </h2> diff --git a/web/html/network/software/channels/manage/packages/compare/sync_prompt.pxt b/web/html/network/software/channels/manage/packages/compare/sync_prompt.pxt index b831bd8..e2d849b 100644 --- a/web/html/network/software/channels/manage/packages/compare/sync_prompt.pxt +++ b/web/html/network/software/channels/manage/packages/compare/sync_prompt.pxt @@ -9,7 +9,7 @@ <grail-canvas-template base="/templates/c.pxt" mode="main_canvas"> <rhn-channel-details> - <h1><i class="fa spacewalk-icon-software-channels"></i> Channel: {channel_name}</h1> + <h1><rhn-icon type="header-channel"/> Channel: {channel_name}</h1> </rhn-channel-details> <rhn-navi-nav prefix="manage_channel" depth="0" file="/nav/manage_channel.xml" style="contentnav" /> diff --git a/web/html/network/software/channels/manage/patches/add_confirm.pxt b/web/html/network/software/channels/manage/patches/add_confirm.pxt index 4b05f03..a8b02c5 100644 --- a/web/html/network/software/channels/manage/patches/add_confirm.pxt +++ b/web/html/network/software/channels/manage/patches/add_confirm.pxt @@ -18,7 +18,7 @@ </div> <h2> - <i class="fa spacewalk-icon-patch-install"></i> + <rhn-icon type="header-errata-add"/> Confirm Patch Addition </h2> diff --git a/web/html/network/software/channels/manage/patches/index.pxt b/web/html/network/software/channels/manage/patches/index.pxt index a328550..34c7967 100644 --- a/web/html/network/software/channels/manage/patches/index.pxt +++ b/web/html/network/software/channels/manage/patches/index.pxt @@ -11,7 +11,7 @@ <pxt-include file="/network/software/channels/manage/manage_channels_header.pxi" /> <h2> - <i class="fa spacewalk-icon-patches"></i> Patches + <rhn-icon type="event-type-errata"/> Patches </h2> <pxt-formvar> diff --git a/web/html/network/software/channels/manage/patches/patch_list.pxt b/web/html/network/software/channels/manage/patches/patch_list.pxt index 6fd6b9a..d836b89 100644 --- a/web/html/network/software/channels/manage/patches/patch_list.pxt +++ b/web/html/network/software/channels/manage/patches/patch_list.pxt @@ -19,7 +19,7 @@ </div> <h2> - <i class="fa spacewalk-icon-patch-remove"></i> + <rhn-icon type="header-errata-del"/> List/Remove Channel Patches </h2> diff --git a/web/html/network/software/channels/manage/patches/remove_confirm.pxt b/web/html/network/software/channels/manage/patches/remove_confirm.pxt index 37d3f89..dc26f63 100644 --- a/web/html/network/software/channels/manage/patches/remove_confirm.pxt +++ b/web/html/network/software/channels/manage/patches/remove_confirm.pxt @@ -17,7 +17,7 @@ </div> <h2> - <i class="fa spacewalk-icon-patch-remove"></i> + <rhn-icon type="header-errata-del"/> Confirm Patch Removal </h2> diff --git a/web/html/network/software/channels/manage/patchsets/add_confirm.pxt b/web/html/network/software/channels/manage/patchsets/add_confirm.pxt index fbe9427..1433f70 100644 --- a/web/html/network/software/channels/manage/patchsets/add_confirm.pxt +++ b/web/html/network/software/channels/manage/patchsets/add_confirm.pxt @@ -17,7 +17,7 @@ </div> <h2> - <i class="fa spacewalk-icon-patchset-install"></i> + <rhn-icon type="header-errata-set-add"/> Confirm Patchset Addition </h2> diff --git a/web/html/network/software/channels/manage/patchsets/index.pxt b/web/html/network/software/channels/manage/patchsets/index.pxt index f852f62..59cfa93 100644 --- a/web/html/network/software/channels/manage/patchsets/index.pxt +++ b/web/html/network/software/channels/manage/patchsets/index.pxt @@ -11,7 +11,7 @@ <pxt-include file="/network/software/channels/manage/manage_channels_header.pxi" /> <h2> - <i class="fa spacewalk-icon-patch-set"></i> Patchsets + <rhn-icon type="header-errata-set"/> Patchsets </h2> <pxt-formvar> diff --git a/web/html/network/software/channels/patches.pxt b/web/html/network/software/channels/patches.pxt index 2cc30e1..4a3e02a 100644 --- a/web/html/network/software/channels/patches.pxt +++ b/web/html/network/software/channels/patches.pxt @@ -10,7 +10,7 @@ <grail-canvas-template base="/templates/c.pxt" mode="main_canvas"> <rhn-channel-details> - <h1><i class="fa spacewalk-icon-software-channels"></i> {channel_name}</h1> + <h1><rhn-icon type="header-channel"/> {channel_name}</h1> </rhn-channel-details> <rhn-navi-nav prefix="channel_details" depth="0" file="/nav/channel_detail.xml" style="contentnav" /> diff --git a/web/html/network/software/channels/patchsets.pxt b/web/html/network/software/channels/patchsets.pxt index 2474f58..c04dce6 100644 --- a/web/html/network/software/channels/patchsets.pxt +++ b/web/html/network/software/channels/patchsets.pxt @@ -10,7 +10,7 @@ <grail-canvas-template base="/templates/c.pxt" mode="main_canvas"> <rhn-channel-details> - <h1><i class="fa spacewalk-icon-software-channels"></i> {channel_name}</h1> + <h1><rhn-icon type="header-channel"/> {channel_name}</h1> </rhn-channel-details> <rhn-navi-nav prefix="channel_details" depth="0" file="/nav/channel_detail.xml" style="contentnav" /> diff --git a/web/html/network/software/channels/subscribers.pxt b/web/html/network/software/channels/subscribers.pxt index f454c86..d1a14c6 100644 --- a/web/html/network/software/channels/subscribers.pxt +++ b/web/html/network/software/channels/subscribers.pxt @@ -10,7 +10,7 @@ <grail-canvas-template base="/templates/c.pxt" mode="main_canvas"> <rhn-channel-details> - <h1><i class="fa spacewalk-icon-software-channels"></i> {channel_name} <rhn-help href="s1-sm-channels-packages.jsp#s3-sm-channel-details" /></h1> + <h1><rhn-icon type="header-channel"/> {channel_name} <rhn-help href="s1-sm-channels-packages.jsp#s3-sm-channel-details" /></h1> <rhn-require acl_mixins="RHN::Access::Channel" acl="channel_eoled()"> <p class="local-alert">As of {channel_eol}, this channel has reached its end of life.</p> diff --git a/web/html/network/software/packages/dependencies.pxt b/web/html/network/software/packages/dependencies.pxt index a9ad16a..ff37b25 100644 --- a/web/html/network/software/packages/dependencies.pxt +++ b/web/html/network/software/packages/dependencies.pxt @@ -8,7 +8,7 @@ <grail-canvas-template base="/templates/c.pxt" mode="main_canvas"> <rhn-package-details> - <h1><i class="fa spacewalk-icon-packages" title="package"></i> {package_nvre}.{package_arch_label}.{package_arch_type_label} <rhn-help href="s1-sm-channels-packages.jsp" /></h1> + <h1><rhn-icon type="header-package" title="package"/> {package_nvre}.{package_arch_label}.{package_arch_type_label} <rhn-help href="s1-sm-channels-packages.jsp" /></h1> </rhn-package-details> <rhn-navi-nav prefix="package_details" depth="0" file="/nav/package_detail.xml" style="contentnav" /> diff --git a/web/html/network/software/packages/file_list.pxt b/web/html/network/software/packages/file_list.pxt index bc34c54..56d0b1b 100644 --- a/web/html/network/software/packages/file_list.pxt +++ b/web/html/network/software/packages/file_list.pxt @@ -9,7 +9,7 @@ <grail-canvas-template base="/templates/c.pxt" mode="main_canvas"> <rhn-package-details> - <h1><i class="fa spacewalk-icon-packages" title="package"></i> {package_nvre}.{package_arch_label}.{package_arch_type_label} <rhn-help href="s1-sm-channels-packages.jsp" /></h1> + <h1><rhn-icon type="header-package" title="package"/> {package_nvre}.{package_arch_label}.{package_arch_type_label} <rhn-help href="s1-sm-channels-packages.jsp" /></h1> </rhn-package-details> <rhn-navi-nav prefix="package_details" depth="0" file="/nav/package_detail.xml" style="contentnav" /> diff --git a/web/html/network/software/packages/install_confirm.pxt b/web/html/network/software/packages/install_confirm.pxt index 3bd55e5..e775959 100644 --- a/web/html/network/software/packages/install_confirm.pxt +++ b/web/html/network/software/packages/install_confirm.pxt @@ -9,7 +9,7 @@ <grail-canvas-template base="/templates/c.pxt" mode="main_canvas"> <rhn-package-details> - <h1><i class="fa spacewalk-icon-packages"></i> {package_nvre}.{package_arch_label}.{package_arch_type_label} <rhn-help href="s1-sm-channels-packages.jsp" /></h1> + <h1><rhn-icon type="event-type-package"/> {package_nvre}.{package_arch_label}.{package_arch_type_label} <rhn-help href="s1-sm-channels-packages.jsp" /></h1> </rhn-package-details> <rhn-navi-nav prefix="package_details" depth="0" file="/nav/package_detail.xml" style="contentnav" /> diff --git a/web/html/network/software/packages/newer_versions.pxt b/web/html/network/software/packages/newer_versions.pxt index 64fb6ad..56748f9 100644 --- a/web/html/network/software/packages/newer_versions.pxt +++ b/web/html/network/software/packages/newer_versions.pxt @@ -9,7 +9,7 @@ <grail-canvas-template base="/templates/c.pxt" mode="main_canvas"> <rhn-package-details> - <h1><i class="fa spacewalk-icon-packages" title="package"></i> {package_nvre}.{package_arch_label}.{package_arch_type_label} <rhn-help href="s1-sm-channels-packages.jsp" /></h1> + <h1><rhn-icon type="header-package" title="package"/> {package_nvre}.{package_arch_label}.{package_arch_type_label} <rhn-help href="s1-sm-channels-packages.jsp" /></h1> </rhn-package-details> <rhn-navi-nav prefix="package_details" depth="0" file="/nav/package_detail.xml" style="contentnav" /> diff --git a/web/html/network/software/packages/package_map.pxt b/web/html/network/software/packages/package_map.pxt index 90e53a1..58601a3 100644 --- a/web/html/network/software/packages/package_map.pxt +++ b/web/html/network/software/packages/package_map.pxt @@ -9,7 +9,7 @@ <grail-canvas-template base="/templates/c.pxt" mode="main_canvas"> <rhn-package-details> - <h1><i class="fa spacewalk-icon-packages"></i> {package_nvre}.{package_arch_label}.{package_arch_type_label} <rhn-help href="s1-sm-channels-packages.jsp" /></h1> + <h1><rhn-icon type="event-type-package"/> {package_nvre}.{package_arch_label}.{package_arch_type_label} <rhn-help href="s1-sm-channels-packages.jsp" /></h1> <rhn-navi-nav prefix="package_details" depth="0" file="/nav/package_detail.xml" style="contentnav" /> diff --git a/web/html/network/software/packages/patch_packages.pxt b/web/html/network/software/packages/patch_packages.pxt index f302635..b92f049 100644 --- a/web/html/network/software/packages/patch_packages.pxt +++ b/web/html/network/software/packages/patch_packages.pxt @@ -9,7 +9,7 @@ <grail-canvas-template base="/templates/c.pxt" mode="main_canvas"> <rhn-package-details> - <h1><i class="fa spacewalk-icon-packages"></i> {package_nvre}.{package_arch_label}.{package_arch_type_label} <rhn-help href="s1-sm-channels-packages.jsp" /></h1> + <h1><rhn-icon type="event-type-package"/> {package_nvre}.{package_arch_label}.{package_arch_type_label} <rhn-help href="s1-sm-channels-packages.jsp" /></h1> <rhn-navi-nav prefix="package_details" depth="0" file="/nav/package_detail.xml" style="contentnav" /> diff --git a/web/html/network/software/packages/patch_patchsets.pxt b/web/html/network/software/packages/patch_patchsets.pxt index 555a235..f781494 100644 --- a/web/html/network/software/packages/patch_patchsets.pxt +++ b/web/html/network/software/packages/patch_patchsets.pxt @@ -9,7 +9,7 @@ <grail-canvas-template base="/templates/c.pxt" mode="main_canvas"> <rhn-package-details> - <h1><i class="fa spacewalk-icon-packages"></i> {package_nvre}.{package_arch_label}.{package_arch_type_label} <rhn-help href="s1-sm-channels-packages.jsp" /></h1> + <h1><rhn-icon type="event-type-package"/> {package_nvre}.{package_arch_label}.{package_arch_type_label} <rhn-help href="s1-sm-channels-packages.jsp" /></h1> <rhn-navi-nav prefix="package_details" depth="0" file="/nav/package_detail.xml" style="contentnav" /> diff --git a/web/html/network/software/packages/patches_patching_package.pxt b/web/html/network/software/packages/patches_patching_package.pxt index bab74ac..45358df 100644 --- a/web/html/network/software/packages/patches_patching_package.pxt +++ b/web/html/network/software/packages/patches_patching_package.pxt @@ -9,7 +9,7 @@ <grail-canvas-template base="/templates/c.pxt" mode="main_canvas"> <rhn-package-details> - <h1><i class="fa spacewalk-icon-packages"></i> {package_nvre}.{package_arch_label}.{package_arch_type_label} <rhn-help href="s1-sm-channels-packages.jsp" /></h1> + <h1><rhn-icon type="event-type-package"/> {package_nvre}.{package_arch_label}.{package_arch_type_label} <rhn-help href="s1-sm-channels-packages.jsp" /></h1> <rhn-navi-nav prefix="package_details" depth="0" file="/nav/package_detail.xml" style="contentnav" /> diff --git a/web/html/network/software/packages/patchset_patches.pxt b/web/html/network/software/packages/patchset_patches.pxt index 48e6f11..0c755d3 100644 --- a/web/html/network/software/packages/patchset_patches.pxt +++ b/web/html/network/software/packages/patchset_patches.pxt @@ -9,7 +9,7 @@ <grail-canvas-template base="/templates/c.pxt" mode="main_canvas"> <rhn-package-details> - <h1><i class="fa spacewalk-icon-packages"></i> {package_nvre}.{package_arch_label}.{package_arch_type_label} <rhn-help href="s1-sm-channels-packages.jsp" /></h1> + <h1><rhn-icon type="event-type-package"/> {package_nvre}.{package_arch_label}.{package_arch_type_label} <rhn-help href="s1-sm-channels-packages.jsp" /></h1> <rhn-navi-nav prefix="package_details" depth="0" file="/nav/package_detail.xml" style="contentnav" /> diff --git a/web/html/network/software/packages/system_list.pxt b/web/html/network/software/packages/system_list.pxt index 5e2ddb1..1533831 100644 --- a/web/html/network/software/packages/system_list.pxt +++ b/web/html/network/software/packages/system_list.pxt @@ -9,7 +9,7 @@ <grail-canvas-template base="/templates/c.pxt" mode="main_canvas"> <rhn-package-details> - <h1><i class="fa spacewalk-icon-packages" title="package"></i> {package_nvre}.{package_arch_label}.{package_arch_type_label} <rhn-help href="s1-sm-channels-packages.jsp" /></h1> + <h1><rhn-icon type="header-package" title="package"/> {package_nvre}.{package_arch_label}.{package_arch_type_label} <rhn-help href="s1-sm-channels-packages.jsp" /></h1> </rhn-package-details> <rhn-navi-nav prefix="package_details" depth="0" file="/nav/package_detail.xml" style="contentnav" /> diff --git a/web/html/network/software/packages/system_list_for_patch.pxt b/web/html/network/software/packages/system_list_for_patch.pxt index bb483d2..062538c 100644 --- a/web/html/network/software/packages/system_list_for_patch.pxt +++ b/web/html/network/software/packages/system_list_for_patch.pxt @@ -9,7 +9,7 @@ <grail-canvas-template base="/templates/c.pxt" mode="main_canvas"> <rhn-package-details> - <h1><i class="fa spacewalk-icon-packages"></i> {package_nvre}.{package_arch_label}.{package_arch_type_label} <rhn-help href="s1-sm-channels-packages.jsp" /></h1> + <h1><rhn-icon type="event-type-package"/> {package_nvre}.{package_arch_label}.{package_arch_type_label} <rhn-help href="s1-sm-channels-packages.jsp" /></h1> </rhn-package-details> <rhn-navi-nav prefix="package_details" depth="0" file="/nav/package_detail.xml" style="contentnav" /> diff --git a/web/html/network/software/packages/system_list_for_patchset.pxt b/web/html/network/software/packages/system_list_for_patchset.pxt index ca4d9ff..e502a5d 100644 --- a/web/html/network/software/packages/system_list_for_patchset.pxt +++ b/web/html/network/software/packages/system_list_for_patchset.pxt @@ -9,7 +9,7 @@ <grail-canvas-template base="/templates/c.pxt" mode="main_canvas"> <rhn-package-details> - <h1><i class="fa spacewalk-icon-packages"></i> {package_nvre}.{package_arch_label}.{package_arch_type_label} <rhn-help href="s1-sm-channels-packages.jsp" /></h1> + <h1><rhn-icon type="event-type-package"/> {package_nvre}.{package_arch_label}.{package_arch_type_label} <rhn-help href="s1-sm-channels-packages.jsp" /></h1> </rhn-package-details> <rhn-navi-nav prefix="package_details" depth="0" file="/nav/package_detail.xml" style="contentnav" /> diff --git a/web/html/network/software/packages/target_system_list.pxt b/web/html/network/software/packages/target_system_list.pxt index 646438a..d0c6945 100644 --- a/web/html/network/software/packages/target_system_list.pxt +++ b/web/html/network/software/packages/target_system_list.pxt @@ -9,7 +9,7 @@ <grail-canvas-template base="/templates/c.pxt" mode="main_canvas"> <rhn-package-details> - <h1><i class="fa spacewalk-icon-packages" title="package"></i> {package_nvre}.{package_arch_label}.{package_arch_type_label} <rhn-help href="s1-sm-channels-packages.jsp" /></h1> + <h1><rhn-icon type="header-package" title="package"/> {package_nvre}.{package_arch_label}.{package_arch_type_label} <rhn-help href="s1-sm-channels-packages.jsp" /></h1> </rhn-package-details> <rhn-navi-nav prefix="package_details" depth="0" file="/nav/package_detail.xml" style="contentnav" /> diff --git a/web/html/network/software/packages/target_system_list_for_patch.pxt b/web/html/network/software/packages/target_system_list_for_patch.pxt index 1884574..69ada08 100644 --- a/web/html/network/software/packages/target_system_list_for_patch.pxt +++ b/web/html/network/software/packages/target_system_list_for_patch.pxt @@ -9,7 +9,7 @@ <grail-canvas-template base="/templates/c.pxt" mode="main_canvas"> <rhn-package-details> - <h1><i class="fa spacewalk-icon-packages"></i> {package_nvre}.{package_arch_label}.{package_arch_type_label} <rhn-help href="s1-sm-channels-packages.jsp" /></h1> + <h1><rhn-icon type="event-type-package"/> {package_nvre}.{package_arch_label}.{package_arch_type_label} <rhn-help href="s1-sm-channels-packages.jsp" /></h1> </rhn-package-details> <rhn-navi-nav prefix="package_details" depth="0" file="/nav/package_detail.xml" style="contentnav" /> diff --git a/web/html/network/software/packages/target_system_list_for_patchset.pxt b/web/html/network/software/packages/target_system_list_for_patchset.pxt index 0ce321f..542ee9e 100644 --- a/web/html/network/software/packages/target_system_list_for_patchset.pxt +++ b/web/html/network/software/packages/target_system_list_for_patchset.pxt @@ -9,7 +9,7 @@ <grail-canvas-template base="/templates/c.pxt" mode="main_canvas"> <rhn-package-details> - <h1><i class="fa spacewalk-icon-packages"></i> {package_nvre}.{package_arch_label}.{package_arch_type_label} <rhn-help href="s1-sm-channels-packages.jsp" /></h1> + <h1><rhn-icon type="event-type-package"/> {package_nvre}.{package_arch_label}.{package_arch_type_label} <rhn-help href="s1-sm-channels-packages.jsp" /></h1> </rhn-package-details> <rhn-navi-nav prefix="package_details" depth="0" file="/nav/package_detail.xml" style="contentnav" /> diff --git a/web/html/network/systems/details/connection.pxt b/web/html/network/systems/details/connection.pxt index 7d78786..45d781e 100644 --- a/web/html/network/systems/details/connection.pxt +++ b/web/html/network/systems/details/connection.pxt @@ -16,7 +16,7 @@ <pxt-include-late file="/network/components/message_queues/local.pxi"/> - <h2><i class="fa spacewalk-icon-proxy"></i>Connection Path</h2> + <h2><rhn-icon type="header-proxy"/>Connection Path</h2> <div class="page-summary"> <p> diff --git a/web/html/network/systems/details/history/dependency_failures.pxt b/web/html/network/systems/details/history/dependency_failures.pxt index ba3e6be..b832211 100644 --- a/web/html/network/systems/details/history/dependency_failures.pxt +++ b/web/html/network/systems/details/history/dependency_failures.pxt @@ -15,7 +15,7 @@ <rhn-navi-nav prefix="system_details" depth="0" file="/nav/system_detail.xml" style="contentnav" /> <h2> - <i class="fa spacewalk-icon-packages" title="package"></i> + <rhn-icon type="header-package" title="package"/> Dependency Failures </h2> diff --git a/web/html/network/systems/details/history/event.pxt b/web/html/network/systems/details/history/event.pxt index 249bd2d..760eb2c 100644 --- a/web/html/network/systems/details/history/event.pxt +++ b/web/html/network/systems/details/history/event.pxt @@ -16,7 +16,7 @@ <rhn-navi-nav prefix="system_details" depth="0" file="/nav/system_detail.xml" style="contentnav" /> <h2> - <i class="fa fa-suitcase" title="event"></i> + <rhn-icon type="header-event-history"/> System History Event </h2> @@ -58,7 +58,7 @@ <pxt-formvar> <div class="up-arrow"> -<i class="fa fa-caret-up" title="Go up"></i> +<rhn-icon type="nav-up" title="Go up"/> <a href="/network/systems/details/history/history.pxt?sid={formvar:sid}">Return to history list for <rhn-server-name /></a></div> </pxt-formvar> diff --git a/web/html/network/systems/details/history/history.pxt b/web/html/network/systems/details/history/history.pxt index 2018933..67e134f 100644 --- a/web/html/network/systems/details/history/history.pxt +++ b/web/html/network/systems/details/history/history.pxt @@ -25,7 +25,7 @@ <h2> - <i class="fa fa-suitcase" title="event"></i> + <rhn-icon type="header-event-history" title="event"/> System History </h2> diff --git a/web/html/network/systems/details/history/package_event_results.pxt b/web/html/network/systems/details/history/package_event_results.pxt index f861836..380f174 100644 --- a/web/html/network/systems/details/history/package_event_results.pxt +++ b/web/html/network/systems/details/history/package_event_results.pxt @@ -16,7 +16,7 @@ <rhn-navi-nav prefix="system_details" depth="0" file="/nav/system_detail.xml" style="contentnav" /> <h2> - <i class="fa fa-suitcase" title="event"></i> + <rhn-icon type="header-event-history" title="event"/> System History Event Results </h2> @@ -56,7 +56,7 @@ <pxt-formvar> <div class="up-arrow"> -<i class="fa fa-caret-up" title="Go up"></i> +<rhn-icon type="nav-up" title="Go up"/> <a href="/network/systems/details/history/history.pxt?sid={formvar:sid}">Return to history list for <rhn-server-name /></a></div> </pxt-formvar> diff --git a/web/html/network/systems/details/history/pending.pxt b/web/html/network/systems/details/history/pending.pxt index e9707ae..5d8d528 100644 --- a/web/html/network/systems/details/history/pending.pxt +++ b/web/html/network/systems/details/history/pending.pxt @@ -21,7 +21,7 @@ <h2> - <i class="fa fa-suitcase" title="event"></i> + <rhn-icon type="header-event-history" title="event"/> Pending Events </h2> diff --git a/web/html/network/systems/details/history/snapshots/channels.pxt b/web/html/network/systems/details/history/snapshots/channels.pxt index d127306..a7ca998 100644 --- a/web/html/network/systems/details/history/snapshots/channels.pxt +++ b/web/html/network/systems/details/history/snapshots/channels.pxt @@ -21,7 +21,7 @@ <h2> -<i class="fa fa-camera" title="snapshot"></i> +<rhn-icon type="header-snapshot" title="snapshot"/> <rhn-snapshot-details> {snapshot_created} </rhn-snapshot-details> diff --git a/web/html/network/systems/details/history/snapshots/config.pxt b/web/html/network/systems/details/history/snapshots/config.pxt index 6c1160d..39fd19e 100644 --- a/web/html/network/systems/details/history/snapshots/config.pxt +++ b/web/html/network/systems/details/history/snapshots/config.pxt @@ -21,7 +21,7 @@ <h2> -<i class="fa fa-camera" title="snapshot"></i> +<rhn-icon type="header-snapshot" title="snapshot"/> <rhn-snapshot-details> {snapshot_created} </rhn-snapshot-details> diff --git a/web/html/network/systems/details/history/snapshots/groups.pxt b/web/html/network/systems/details/history/snapshots/groups.pxt index 08a2000..9489893 100644 --- a/web/html/network/systems/details/history/snapshots/groups.pxt +++ b/web/html/network/systems/details/history/snapshots/groups.pxt @@ -21,7 +21,7 @@ <h2> -<i class="fa fa-camera" title="snapshot"></i> +<rhn-icon type="header-snapshot" title="snapshot"/> <rhn-snapshot-details> {snapshot_created} </rhn-snapshot-details> diff --git a/web/html/network/systems/details/history/snapshots/index.pxt b/web/html/network/systems/details/history/snapshots/index.pxt index 602f5f8..0df9532 100644 --- a/web/html/network/systems/details/history/snapshots/index.pxt +++ b/web/html/network/systems/details/history/snapshots/index.pxt @@ -18,7 +18,7 @@ <pxt-include-late file="/network/components/message_queues/local.pxi" /> -<h2><i class="fa fa-camera" title="snapshot"></i> System Snapshots</h2> +<h2><rhn-icon type="header-snapshot" title="snapshot"/> System Snapshots</h2> <div class="page-summary"> diff --git a/web/html/network/systems/details/history/snapshots/namespaces.pxt b/web/html/network/systems/details/history/snapshots/namespaces.pxt index a09e6a6..4de8d2a 100644 --- a/web/html/network/systems/details/history/snapshots/namespaces.pxt +++ b/web/html/network/systems/details/history/snapshots/namespaces.pxt @@ -22,7 +22,7 @@ <h2> -<i class="fa fa-camera" title="snapshot"></i> +<rhn-icon type="header-snapshot" title="snapshot"/> <rhn-snapshot-details> {snapshot_created} </rhn-snapshot-details> diff --git a/web/html/network/systems/details/history/snapshots/packages.pxt b/web/html/network/systems/details/history/snapshots/packages.pxt index 324e423..7ea5794 100644 --- a/web/html/network/systems/details/history/snapshots/packages.pxt +++ b/web/html/network/systems/details/history/snapshots/packages.pxt @@ -22,7 +22,7 @@ <h2> -<i class="fa fa-camera" title="snapshot"></i> +<rhn-icon type="header-snapshot" title="snapshot"/> <rhn-snapshot-details> {snapshot_created} </rhn-snapshot-details> diff --git a/web/html/network/systems/details/history/snapshots/remove_confirm.pxt b/web/html/network/systems/details/history/snapshots/remove_confirm.pxt index 3b2deb2..fe28aeb 100644 --- a/web/html/network/systems/details/history/snapshots/remove_confirm.pxt +++ b/web/html/network/systems/details/history/snapshots/remove_confirm.pxt @@ -17,7 +17,7 @@ <h2> - <i class="fa fa-camera"></i> + <rhn-icon type="header-snapshot"/> Confirm Snapshot Tag Removal </h2> diff --git a/web/html/network/systems/details/history/snapshots/rollback.pxt b/web/html/network/systems/details/history/snapshots/rollback.pxt index 8e541cf..70440df 100644 --- a/web/html/network/systems/details/history/snapshots/rollback.pxt +++ b/web/html/network/systems/details/history/snapshots/rollback.pxt @@ -19,7 +19,7 @@ <rhn-snapshot-details> <h2> -<i class="fa spacewalk-icon-snapshot-rollback" title="rollback"></i> +<rhn-icon type="header-snapshot-rollback" title="rollback"/> Rollback to {snapshot_created} Snapshot</h2> @@ -79,7 +79,7 @@ and the following items will be changed to match the pre-snapshot values: <pxt-formvar> <span class="up-arrow"> -<i class="fa fa-caret-up" title="Go up"></i> +<rhn-icon type="nav-up" title="Go up"/> <a href="/network/systems/details/history/snapshots/index.pxt?sid={formvar:sid}">Return to snapshot list</a></span> </pxt-formvar> diff --git a/web/html/network/systems/details/history/snapshots/snapshot_tags.pxt b/web/html/network/systems/details/history/snapshots/snapshot_tags.pxt index 07d13ca..67a69fe 100644 --- a/web/html/network/systems/details/history/snapshots/snapshot_tags.pxt +++ b/web/html/network/systems/details/history/snapshots/snapshot_tags.pxt @@ -21,7 +21,7 @@ <rhn-snapshot-details> -<rhn-toolbar base="h2" icon="fa-camera" creation-url="/network/systems/details/history/snapshots/add_snapshot_tag.pxt?sid={formvar:sid}&ss_id={formvar:ss_id}" creation-type="snapshot tag"> +<rhn-toolbar base="h2" icon="header-snapshot" creation-url="/network/systems/details/history/snapshots/add_snapshot_tag.pxt?sid={formvar:sid}&ss_id={formvar:ss_id}" creation-type="snapshot tag"> {snapshot_created} Snapshot - Snapshot Tags </rhn-toolbar> diff --git a/web/html/network/systems/details/history/snapshots/system_tags.pxt b/web/html/network/systems/details/history/snapshots/system_tags.pxt index 412731c..341f7eb 100644 --- a/web/html/network/systems/details/history/snapshots/system_tags.pxt +++ b/web/html/network/systems/details/history/snapshots/system_tags.pxt @@ -18,7 +18,7 @@ <pxt-include-late file="/network/components/message_queues/local.pxi" /> - <rhn-toolbar base="h2" icon="fa-camera" creation-url="/network/systems/details/history/snapshots/add_system_tag.pxt?sid={formvar:sid}" creation-type="system tag"> + <rhn-toolbar base="h2" icon="header-snapshot" creation-url="/network/systems/details/history/snapshots/add_system_tag.pxt?sid={formvar:sid}" creation-type="system tag"> Snapshot Tags </rhn-toolbar> diff --git a/web/html/network/systems/details/history/snapshots/unservable_packages.pxt b/web/html/network/systems/details/history/snapshots/unservable_packages.pxt index a6df288..7d08e79 100644 --- a/web/html/network/systems/details/history/snapshots/unservable_packages.pxt +++ b/web/html/network/systems/details/history/snapshots/unservable_packages.pxt @@ -20,7 +20,7 @@ <h2> -<i class="fa fa-camera"></i> +<rhn-icon type="header-snapshot"/> <rhn-snapshot-details> {snapshot_created} </rhn-snapshot-details> diff --git a/web/html/network/systems/details/history/verify_results.pxt b/web/html/network/systems/details/history/verify_results.pxt index 726df40..78dc467 100644 --- a/web/html/network/systems/details/history/verify_results.pxt +++ b/web/html/network/systems/details/history/verify_results.pxt @@ -15,7 +15,7 @@ <rhn-navi-nav prefix="system_details" depth="0" file="/nav/system_detail.xml" style="contentnav" /> <h2> - <i class="fa spacewalk-icon-packages" title="package"></i> + <rhn-icon type="header-package" title="package"/> Package Verification Results </h2> diff --git a/web/html/network/systems/details/proxy-clients.pxt b/web/html/network/systems/details/proxy-clients.pxt index 4fd6e18..70ba069 100644 --- a/web/html/network/systems/details/proxy-clients.pxt +++ b/web/html/network/systems/details/proxy-clients.pxt @@ -16,7 +16,7 @@ <pxt-include-late file="/network/components/message_queues/local.pxi"/> - <h2><i class="fa spacewalk-icon-proxy"></i>Proxy Clients</h2> + <h2><rhn-icon type="header-proxy"/>Proxy Clients</h2> <rhn-listview class="Sniglets::ListView::SystemList" mode="clients_through_proxy" alphabar_column="name"> <formvars> diff --git a/web/html/network/systems/details/proxy.pxt b/web/html/network/systems/details/proxy.pxt index fe5a2c9..def7730 100644 --- a/web/html/network/systems/details/proxy.pxt +++ b/web/html/network/systems/details/proxy.pxt @@ -15,7 +15,7 @@ <pxt-include-late file="/network/components/message_queues/local.pxi"/> - <h2><i class="fa spacewalk-icon-proxy"></i>Proxy</h2> + <h2><rhn-icon type="header-proxy"/>Proxy</h2> <rhn-proxy-entitlement-form> <div class="page-summary"> diff --git a/web/html/network/systems/groups/apply_errata_confirm.pxt b/web/html/network/systems/groups/apply_errata_confirm.pxt index 2b58446..b55cca6 100644 --- a/web/html/network/systems/groups/apply_errata_confirm.pxt +++ b/web/html/network/systems/groups/apply_errata_confirm.pxt @@ -12,7 +12,7 @@ <pxt-include file="/network/components/system_groups/sgdc_header.pxi" /> <h2> - <i class="fa spacewalk-icon-patches"></i> + <rhn-icon type="event-type-errata"/> Confirm Errata Update: <rhn-errata-advisory /> - <rhn-errata-name /> </h2> diff --git a/web/html/network/systems/groups/errata_list.pxt b/web/html/network/systems/groups/errata_list.pxt index 80c9ff8..4c45484 100644 --- a/web/html/network/systems/groups/errata_list.pxt +++ b/web/html/network/systems/groups/errata_list.pxt @@ -15,7 +15,7 @@ <pxt-include file="/network/components/system_groups/sgdc_header.pxi" /> <h2> - <i class="fa spacewalk-icon-patches" title="erratum"></i> + <rhn-icon type="header-errata" title="erratum"/> Relevant Errata </h2> diff --git a/web/html/network/systems/groups/systems_affected_by_errata.pxt b/web/html/network/systems/groups/systems_affected_by_errata.pxt index e2bf05f..88514f3 100644 --- a/web/html/network/systems/groups/systems_affected_by_errata.pxt +++ b/web/html/network/systems/groups/systems_affected_by_errata.pxt @@ -13,7 +13,7 @@ <pxt-include file="/network/components/system_groups/sgdc_header.pxi" /> <h2> - <i class="fa spacewalk-icon-patches"></i> + <rhn-icon type="event-type-errata"/> Systems Affected By: <rhn-errata-advisory /> - <rhn-errata-name /> </h2> diff --git a/web/html/network/systems/ssm/errata/apply_errata_conf.pxt b/web/html/network/systems/ssm/errata/apply_errata_conf.pxt index be580fb..6db9016 100644 --- a/web/html/network/systems/ssm/errata/apply_errata_conf.pxt +++ b/web/html/network/systems/ssm/errata/apply_errata_conf.pxt @@ -7,7 +7,7 @@ <grail-canvas-template base="/templates/c.pxt" mode="main_canvas"> - <h1><i class="fa spacewalk-icon-system-groups" title="system set"></i> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> + <h1><rhn-icon type="header-system-groups" title="system set"/> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> <rhn-navi-nav prefix="system_set_manager" depth="0" file="/nav/ssm.xml" style="contentnav" /> diff --git a/web/html/network/systems/ssm/errata/index.pxt b/web/html/network/systems/ssm/errata/index.pxt index eae7b33..47847b3 100644 --- a/web/html/network/systems/ssm/errata/index.pxt +++ b/web/html/network/systems/ssm/errata/index.pxt @@ -10,7 +10,7 @@ <grail-canvas-template base="/templates/c.pxt" mode="main_canvas"> - <h1><i class="fa spacewalk-icon-system-groups" title="system set"></i> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> + <h1><rhn-icon type="header-system-groups" title="system set"/> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> <rhn-navi-nav prefix="system_set_manager" depth="0" file="/nav/ssm.xml" style="contentnav" /> diff --git a/web/html/network/systems/ssm/errata/systems_affected.pxt b/web/html/network/systems/ssm/errata/systems_affected.pxt index 92c8cd7..fd85c75 100644 --- a/web/html/network/systems/ssm/errata/systems_affected.pxt +++ b/web/html/network/systems/ssm/errata/systems_affected.pxt @@ -8,14 +8,14 @@ <grail-canvas-template base="/templates/c.pxt" mode="main_canvas"> - <h1><i class="fa spacewalk-icon-system-groups" title="system set"></i> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> + <h1><rhn-icon type="header-system-groups" title="system set"/> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> <rhn-navi-nav prefix="system_set_manager" depth="0" file="/nav/ssm.xml" style="contentnav" /> <rhn-errata-details> -<h2><i class="fa fa-desktop"></i> +<h2><rhn-icon type="header-system"/> Selected systems affected by {errata_advisory_name}</h2> </rhn-errata-details> diff --git a/web/html/network/systems/ssm/groups/alter_membership_conf.pxt b/web/html/network/systems/ssm/groups/alter_membership_conf.pxt index 5ab9393..583b485 100644 --- a/web/html/network/systems/ssm/groups/alter_membership_conf.pxt +++ b/web/html/network/systems/ssm/groups/alter_membership_conf.pxt @@ -8,7 +8,7 @@ <grail-canvas-template base="/templates/c.pxt" mode="main_canvas"> - <h1><i class="fa spacewalk-icon-system-groups" title="system set"></i> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> + <h1><rhn-icon type="header-system-groups" title="system set"/> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> <rhn-navi-nav prefix="system_set_manager" depth="0" file="/nav/ssm.xml" style="contentnav"/> diff --git a/web/html/network/systems/ssm/groups/create.pxt b/web/html/network/systems/ssm/groups/create.pxt index dbdbfef..ba148f9 100644 --- a/web/html/network/systems/ssm/groups/create.pxt +++ b/web/html/network/systems/ssm/groups/create.pxt @@ -6,12 +6,12 @@ <grail-canvas-template base="/templates/c.pxt" mode="main_canvas"> - <h1><i class="fa spacewalk-icon-system-groups" title="system set"></i> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> + <h1><rhn-icon type="header-system-groups" title="system set"/> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> <rhn-navi-nav prefix="system_set_manager" depth="0" file="/nav/ssm.xml" style="contentnav" /> <rhn-toolbar base="h2" - icon="fa-desktop" + icon="header-system" help-url="s1-sm-systems.jsp#s3-sm-system-group-creation"> Create a System Group </rhn-toolbar> diff --git a/web/html/network/systems/ssm/groups/index.pxt b/web/html/network/systems/ssm/groups/index.pxt index d193526..0754d9b 100644 --- a/web/html/network/systems/ssm/groups/index.pxt +++ b/web/html/network/systems/ssm/groups/index.pxt @@ -7,12 +7,12 @@ <grail-canvas-template base="/templates/c.pxt" mode="main_canvas"> - <h1><i class="fa spacewalk-icon-system-groups" title="system set"></i> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> + <h1><rhn-icon type="header-system-groups" title="system set"/> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> <rhn-navi-nav prefix="system_set_manager" depth="0" file="/nav/ssm.xml" style="contentnav" /> - <rhn-toolbar base="h2" icon="spacewalk-icon-system-groups" creation-url="/network/systems/ssm/groups/create.pxt" creation-type="group"> + <rhn-toolbar base="h2" icon="header-system-groups" creation-url="/network/systems/ssm/groups/create.pxt" creation-type="group"> Alter Group Membership </rhn-toolbar> diff --git a/web/html/network/systems/ssm/misc/change_sys_pref_conf.pxt b/web/html/network/systems/ssm/misc/change_sys_pref_conf.pxt index 2a5df61..6349438 100644 --- a/web/html/network/systems/ssm/misc/change_sys_pref_conf.pxt +++ b/web/html/network/systems/ssm/misc/change_sys_pref_conf.pxt @@ -6,7 +6,7 @@ <grail-canvas-template base="/templates/c.pxt" mode="main_canvas"> - <h1><i class="fa spacewalk-icon-system-groups" title="system set"></i> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> + <h1><rhn-icon type="header-system-groups" title="system set"/> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> <rhn-navi-nav prefix="system_set_manager" depth="0" file="/nav/ssm.xml" style="contentnav" /> diff --git a/web/html/network/systems/ssm/misc/choose_value_to_remove.pxt b/web/html/network/systems/ssm/misc/choose_value_to_remove.pxt index 30b0f3e..2c100a4 100644 --- a/web/html/network/systems/ssm/misc/choose_value_to_remove.pxt +++ b/web/html/network/systems/ssm/misc/choose_value_to_remove.pxt @@ -8,7 +8,7 @@ <grail-canvas-template base="/templates/c.pxt" mode="main_canvas"> - <h1><i class="fa spacewalk-icon-system-groups" title="system set"></i> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> + <h1><rhn-icon type="header-system-groups" title="system set"/> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> <rhn-navi-nav prefix="system_set_manager" depth="0" file="/nav/ssm.xml" style="contentnav" /> diff --git a/web/html/network/systems/ssm/misc/choose_value_to_set.pxt b/web/html/network/systems/ssm/misc/choose_value_to_set.pxt index d0c84cf..30c0596 100644 --- a/web/html/network/systems/ssm/misc/choose_value_to_set.pxt +++ b/web/html/network/systems/ssm/misc/choose_value_to_set.pxt @@ -7,7 +7,7 @@ <grail-canvas-template base="/templates/c.pxt" mode="main_canvas"> - <h1><i class="fa spacewalk-icon-system-groups" title="system set"></i> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> + <h1><rhn-icon type="header-system-groups" title="system set"/> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> <rhn-navi-nav prefix="system_set_manager" depth="0" file="/nav/ssm.xml" style="contentnav" /> diff --git a/web/html/network/systems/ssm/misc/landing.pxt b/web/html/network/systems/ssm/misc/landing.pxt index a925e12..26cf2ae 100644 --- a/web/html/network/systems/ssm/misc/landing.pxt +++ b/web/html/network/systems/ssm/misc/landing.pxt @@ -5,7 +5,7 @@ <grail-canvas-template base="/templates/c.pxt" mode="main_canvas"> - <h1><i class="fa spacewalk-icon-system-groups" title="system set"></i> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> + <h1><rhn-icon type="header-system-groups" title="system set"/> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> <rhn-navi-nav prefix="system_set_manager" depth="0" file="/nav/ssm.xml" style="contentnav" /> diff --git a/web/html/network/systems/ssm/misc/remove_value.pxt b/web/html/network/systems/ssm/misc/remove_value.pxt index 131b340..b8f8bfb 100644 --- a/web/html/network/systems/ssm/misc/remove_value.pxt +++ b/web/html/network/systems/ssm/misc/remove_value.pxt @@ -7,7 +7,7 @@ <grail-canvas-template base="/templates/c.pxt" mode="main_canvas"> <pxt-formvar> - <h1><i class="fa spacewalk-icon-system-groups" title="system set"></i> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> + <h1><rhn-icon type="header-system-groups" title="system set"/> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> <rhn-navi-nav prefix="system_set_manager" depth="0" file="/nav/ssm.xml" style="contentnav" /> diff --git a/web/html/network/systems/ssm/misc/set_value.pxt b/web/html/network/systems/ssm/misc/set_value.pxt index a3cff35..7f456c8 100644 --- a/web/html/network/systems/ssm/misc/set_value.pxt +++ b/web/html/network/systems/ssm/misc/set_value.pxt @@ -7,7 +7,7 @@ <grail-canvas-template base="/templates/c.pxt" mode="main_canvas"> <pxt-formvar> - <h1><i class="fa spacewalk-icon-system-groups" title="system set"></i> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> + <h1><rhn-icon type="header-system-groups" title="system set"/> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> <rhn-navi-nav prefix="system_set_manager" depth="0" file="/nav/ssm.xml" style="contentnav" /> diff --git a/web/html/network/systems/ssm/packages/index.pxt b/web/html/network/systems/ssm/packages/index.pxt index b5bfbe2..04f685a 100644 --- a/web/html/network/systems/ssm/packages/index.pxt +++ b/web/html/network/systems/ssm/packages/index.pxt @@ -5,7 +5,7 @@ <grail-canvas-template base="/templates/c.pxt" mode="main_canvas"> - <h1><i class="fa spacewalk-icon-system-groups" title="system set"></i> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> + <h1><rhn-icon type="header-system-groups" title="system set"/> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> <rhn-navi-nav prefix="system_set_manager" depth="0" file="/nav/ssm.xml" style="contentnav" /> diff --git a/web/html/network/systems/ssm/packages/schedule_remote_command.pxt b/web/html/network/systems/ssm/packages/schedule_remote_command.pxt index 29cecad..e7fe222 100644 --- a/web/html/network/systems/ssm/packages/schedule_remote_command.pxt +++ b/web/html/network/systems/ssm/packages/schedule_remote_command.pxt @@ -7,7 +7,7 @@ <grail-canvas-template base="/templates/c.pxt" mode="main_canvas"> - <h1><i class="fa spacewalk-icon-system-groups" title="system set"></i> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> + <h1><rhn-icon type="header-system-groups" title="system set"/> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> <rhn-navi-nav prefix="system_set_manager" depth="0" file="/nav/ssm.xml" style="contentnav"/> diff --git a/web/html/network/systems/ssm/packages/upload_answer_file.pxt b/web/html/network/systems/ssm/packages/upload_answer_file.pxt index a150d59..cc4f229 100644 --- a/web/html/network/systems/ssm/packages/upload_answer_file.pxt +++ b/web/html/network/systems/ssm/packages/upload_answer_file.pxt @@ -7,12 +7,12 @@ <grail-canvas-template base="/templates/c.pxt" mode="main_canvas"> - <h1><i class="fa spacewalk-icon-system-groups" title="system set"></i> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> + <h1><rhn-icon type="header-system-groups" title="system set"/> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> <rhn-navi-nav prefix="system_set_manager" depth="0" file="/nav/ssm.xml" style="contentnav"/> <h2> - <i class="fa spacewalk-icon-packages"></i> + <rhn-icon type="event-type-package"/> Upload Answer File </h2> diff --git a/web/html/network/systems/ssm/patches/index.pxt b/web/html/network/systems/ssm/patches/index.pxt index 273a19b..6993493 100644 --- a/web/html/network/systems/ssm/patches/index.pxt +++ b/web/html/network/systems/ssm/patches/index.pxt @@ -5,7 +5,7 @@ <grail-canvas-template base="/templates/c.pxt" mode="main_canvas"> - <h1><i class="fa spacewalk-icon-system-groups" title="system set"></i> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> + <h1><rhn-icon type="header-system-groups" title="system set"/> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> <rhn-navi-nav prefix="system_set_manager" depth="0" file="/nav/ssm.xml" style="contentnav" /> diff --git a/web/html/network/systems/ssm/patches/install.pxt b/web/html/network/systems/ssm/patches/install.pxt index fd1b5ef..8d36e76 100644 --- a/web/html/network/systems/ssm/patches/install.pxt +++ b/web/html/network/systems/ssm/patches/install.pxt @@ -6,7 +6,7 @@ <grail-canvas-template base="/templates/c.pxt" mode="main_canvas"> - <h1><i class="fa spacewalk-icon-system-groups" title="system set"></i> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> + <h1><rhn-icon type="header-system-groups" title="system set"/> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> <rhn-navi-nav prefix="system_set_manager" depth="0" file="/nav/ssm.xml" style="contentnav"/> diff --git a/web/html/network/systems/ssm/patches/install_channel.pxt b/web/html/network/systems/ssm/patches/install_channel.pxt index 98b303b..04ced7e 100644 --- a/web/html/network/systems/ssm/patches/install_channel.pxt +++ b/web/html/network/systems/ssm/patches/install_channel.pxt @@ -7,7 +7,7 @@ <grail-canvas-template base="/templates/c.pxt" mode="main_canvas"> - <h1><i class="fa spacewalk-icon-system-groups" title="system set"></i> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> + <h1><rhn-icon type="header-system-groups" title="system set"/> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> <rhn-navi-nav prefix="system_set_manager" depth="0" file="/nav/ssm.xml" style="contentnav" /> diff --git a/web/html/network/systems/ssm/patches/install_conf.pxt b/web/html/network/systems/ssm/patches/install_conf.pxt index d00796e..965acad 100644 --- a/web/html/network/systems/ssm/patches/install_conf.pxt +++ b/web/html/network/systems/ssm/patches/install_conf.pxt @@ -9,7 +9,7 @@ <grail-canvas-template base="/templates/c.pxt" mode="main_canvas"> - <h1><i class="fa spacewalk-icon-system-groups" title="system set"></i> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> + <h1><rhn-icon type="header-system-groups" title="system set"/> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> <rhn-navi-nav prefix="system_set_manager" depth="0" file="/nav/ssm.xml" style="contentnav"/> diff --git a/web/html/network/systems/ssm/patches/remove.pxt b/web/html/network/systems/ssm/patches/remove.pxt index 2ef8f3e..e10ee94 100644 --- a/web/html/network/systems/ssm/patches/remove.pxt +++ b/web/html/network/systems/ssm/patches/remove.pxt @@ -6,7 +6,7 @@ <grail-canvas-template base="/templates/c.pxt" mode="main_canvas"> - <h1><i class="fa spacewalk-icon-system-groups" title="system set"></i> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> + <h1><rhn-icon type="header-system-groups" title="system set"/> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> <rhn-navi-nav prefix="system_set_manager" depth="0" file="/nav/ssm.xml" style="contentnav"/> diff --git a/web/html/network/systems/ssm/patches/remove_conf.pxt b/web/html/network/systems/ssm/patches/remove_conf.pxt index b5f40b7..ac52370 100644 --- a/web/html/network/systems/ssm/patches/remove_conf.pxt +++ b/web/html/network/systems/ssm/patches/remove_conf.pxt @@ -9,7 +9,7 @@ <grail-canvas-template base="/templates/c.pxt" mode="main_canvas"> - <h1><i class="fa spacewalk-icon-system-groups" title="system set"></i> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> + <h1><rhn-icon type="header-system-groups" title="system set"/> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> <rhn-navi-nav prefix="system_set_manager" depth="0" file="/nav/ssm.xml" style="contentnav" /> diff --git a/web/html/network/systems/ssm/patchsets/index.pxt b/web/html/network/systems/ssm/patchsets/index.pxt index 01da917..fb4529d 100644 --- a/web/html/network/systems/ssm/patchsets/index.pxt +++ b/web/html/network/systems/ssm/patchsets/index.pxt @@ -5,7 +5,7 @@ <grail-canvas-template base="/templates/c.pxt" mode="main_canvas"> - <h1><i class="fa spacewalk-icon-system-groups" title="system set"></i> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> + <h1><rhn-icon type="header-system-groups" title="system set"/> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> <rhn-navi-nav prefix="system_set_manager" depth="0" file="/nav/ssm.xml" style="contentnav" /> diff --git a/web/html/network/systems/ssm/patchsets/install.pxt b/web/html/network/systems/ssm/patchsets/install.pxt index c5983e3..4359778 100644 --- a/web/html/network/systems/ssm/patchsets/install.pxt +++ b/web/html/network/systems/ssm/patchsets/install.pxt @@ -6,7 +6,7 @@ <grail-canvas-template base="/templates/c.pxt" mode="main_canvas"> - <h1><i class="fa spacewalk-icon-system-groups" title="system set"></i> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> + <h1><rhn-icon type="header-system-groups" title="system set"/> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> <rhn-navi-nav prefix="system_set_manager" depth="0" file="/nav/ssm.xml" style="contentnav"/> diff --git a/web/html/network/systems/ssm/patchsets/install_channel.pxt b/web/html/network/systems/ssm/patchsets/install_channel.pxt index 9f3b761..6819d12 100644 --- a/web/html/network/systems/ssm/patchsets/install_channel.pxt +++ b/web/html/network/systems/ssm/patchsets/install_channel.pxt @@ -7,7 +7,7 @@ <grail-canvas-template base="/templates/c.pxt" mode="main_canvas"> - <h1><i class="fa spacewalk-icon-system-groups" title="system set"></i> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> + <h1><rhn-icon type="header-system-groups" title="system set"/> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> <rhn-navi-nav prefix="system_set_manager" depth="0" file="/nav/ssm.xml" style="contentnav" /> diff --git a/web/html/network/systems/ssm/patchsets/install_conf.pxt b/web/html/network/systems/ssm/patchsets/install_conf.pxt index 94fa16e..aed5d82 100644 --- a/web/html/network/systems/ssm/patchsets/install_conf.pxt +++ b/web/html/network/systems/ssm/patchsets/install_conf.pxt @@ -9,7 +9,7 @@ <grail-canvas-template base="/templates/c.pxt" mode="main_canvas"> - <h1><i class="fa spacewalk-icon-system-groups" title="system set"></i> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> + <h1><rhn-icon type="header-system-groups" title="system set"/> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> <rhn-navi-nav prefix="system_set_manager" depth="0" file="/nav/ssm.xml" style="contentnav"/> diff --git a/web/html/network/systems/ssm/provisioning/rollback.pxt b/web/html/network/systems/ssm/provisioning/rollback.pxt index 855ca68..41e48c8 100644 --- a/web/html/network/systems/ssm/provisioning/rollback.pxt +++ b/web/html/network/systems/ssm/provisioning/rollback.pxt @@ -7,12 +7,12 @@ <grail-canvas-template base="/templates/c.pxt" mode="main_canvas"> - <h1><i class="fa spacewalk-icon-system-groups" title="system set"></i> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> + <h1><rhn-icon type="header-system-groups" title="system set"/> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> <rhn-navi-nav prefix="system_set_manager" depth="0" file="/nav/ssm.xml" style="contentnav" /> <h2> -<i class="fa spacewalk-icon-snapshot-rollback" title="rollback"></i> +<rhn-icon type="header-snapshot-rollback" title="rollback"/> Rollback to Snapshot Tag </h2> diff --git a/web/html/network/systems/ssm/provisioning/rollback_by_tag_conf.pxt b/web/html/network/systems/ssm/provisioning/rollback_by_tag_conf.pxt index 609c610..658f5b1 100644 --- a/web/html/network/systems/ssm/provisioning/rollback_by_tag_conf.pxt +++ b/web/html/network/systems/ssm/provisioning/rollback_by_tag_conf.pxt @@ -8,13 +8,13 @@ <grail-canvas-template base="/templates/c.pxt" mode="main_canvas"> - <h1><i class="fa spacewalk-icon-system-groups" title="system set"></i> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> + <h1><rhn-icon type="header-system-groups" title="system set"/> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> <rhn-navi-nav prefix="system_set_manager" depth="0" file="/nav/ssm.xml" style="contentnav" /> <rhn-snapshot-tag-details> <h2> -<i class="fa spacewalk-icon-snapshot-rollback"></i> +<rhn-icon type="header-snapshot-rollback"/> Rollback to Snapshot Tag: {tag_name}</h2> <pxt-include-late file="/network/components/message_queues/local.pxi" /> diff --git a/web/html/network/systems/ssm/provisioning/tag_systems.pxt b/web/html/network/systems/ssm/provisioning/tag_systems.pxt index e29d94f..52c2791 100644 --- a/web/html/network/systems/ssm/provisioning/tag_systems.pxt +++ b/web/html/network/systems/ssm/provisioning/tag_systems.pxt @@ -8,12 +8,12 @@ <grail-canvas-template base="/templates/c.pxt" mode="main_canvas"> - <h1><i class="fa spacewalk-icon-system-groups" title="system set"></i> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> + <h1><rhn-icon type="header-system-groups" title="system set"/> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> <rhn-navi-nav prefix="system_set_manager" depth="0" file="/nav/ssm.xml" style="contentnav" /> <h2> -<i class="fa fa-camera" title="snapshot"></i> +<rhn-icon type="header-snapshot" title="snapshot"/> Tag Systems </h2> diff --git a/web/html/network/systems/system_list b/web/html/network/systems/system_list index d473a9f..717a5df 100644 --- a/web/html/network/systems/system_list +++ b/web/html/network/systems/system_list @@ -14,7 +14,7 @@ <pxt-formvar> <rhn-pathinfo-list-mode type="system"> <div class="spacewalk-toolbar-h1"><div class="spacewalk-toolbar"></div> - <h1><i class="fa fa-desktop"></i> {pinfo_list_name} <rhn-help href="s1-sm-systems.jsp#s2-sm-system-list" /></h1> + <h1><rhn-icon type="header-system"/> {pinfo_list_name} <rhn-help href="s1-sm-systems.jsp#s2-sm-system-list" /></h1> </div> <rhn-listview class="Sniglets::ListView::SystemList" mode="{pinfo_list_mode}" alphabar_column="name"> <formvars> diff --git a/web/include/network/components/legends/errata-list-legend.pxi b/web/include/network/components/legends/errata-list-legend.pxi index de36a24..49e87d6 100644 --- a/web/include/network/components/legends/errata-list-legend.pxi +++ b/web/include/network/components/legends/errata-list-legend.pxi @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> +<pxt-use class="Sniglets::HTML" /> <div class="sideleg"> <h2>Errata Legend</h2> <ul> - <li><i class="fa fa-shield fa-1-5x"></i>Security</li> - <li><i class="fa fa-bug fa-1-5x"></i>Bug Fix</li> - <li><i class="fa fa-1-5x spacewalk-icon-enhancement"></i>Enhancement</li> + <li><rhn-icon type="errata-security"/>Security</li> + <li><rhn-icon type="errata-bugfix"/>Bug Fix</li> + <li><rhn-icon type="errata-enhance"/>Enhancement</li> </ul> </div> diff --git a/web/include/network/components/legends/event-status.pxi b/web/include/network/components/legends/event-status.pxi index 1b98ff5..bf7fc7f 100644 --- a/web/include/network/components/legends/event-status.pxi +++ b/web/include/network/components/legends/event-status.pxi @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> +<pxt-use class="Sniglets::HTML" /> <div class="sideleg"> <h2>Event Status Legend</h2> <ul> - <li><i class="fa fa-check-circle-o fa-1-5x text-success"></i>Complete</li> - <li><i class="fa fa-times-circle-o fa-1-5x text-danger"></i>Failure</li> - <li><i class="fa fa-exchange fa-1-5x text-info"></i>Activity Occuring</li> + <li><rhn-icon type="action-ok"/>Complete</li> + <li><rhn-icon type="action-failed"/>Failure</li> + <li><rhn-icon type="action-running"/>Activity Occuring</li> </ul> </div> diff --git a/web/include/network/components/legends/event-type.pxi b/web/include/network/components/legends/event-type.pxi index df25bf4..2d1fd1c 100644 --- a/web/include/network/components/legends/event-type.pxi +++ b/web/include/network/components/legends/event-type.pxi @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> +<pxt-use class="Sniglets::HTML" /> <div class="sideleg"> <h2>Event Type Legend</h2> <ul> - <li><i class="fa spacewalk-icon-packages"></i>Package Event</li> - <li><i class="fa spacewalk-icon-patches"></i>Errata Event</li> - <li><i class="fa fa-cog"></i>Preferences Event</li> - <li><i class="fa fa-desktop"></i>System Event</li> + <li><rhn-icon type="event-type-package"/>Package Event</li> + <li><rhn-icon type="event-type-errata"/>Errata Event</li> + <li><rhn-icon type="event-type-preferences"/>Preferences Event</li> + <li><rhn-icon type="event-type-system"/>System Event</li> </ul> </div> diff --git a/web/include/network/components/legends/system-list-legend.pxi b/web/include/network/components/legends/system-list-legend.pxi index 2c59157..50f2a96 100644 --- a/web/include/network/components/legends/system-list-legend.pxi +++ b/web/include/network/components/legends/system-list-legend.pxi @@ -3,24 +3,25 @@ <pxt-passthrough> <pxt-use class="Sniglets::Users" /> +<pxt-use class="Sniglets::HTML" /> <div class="sideleg"> <h4>System Legend</h4> <ul> - <li><i class="fa fa-check-circle fa-1-5x text-success"></i>OK</li> - <li><i class="fa fa-exclamation-circle fa-1-5x text-danger"></i>Critical</li> - <li><i class="fa fa-exclamation-triangle fa-1-5x text-warning"></i></i>Warning</li> - <li><i class="spacewalk-icon-unknown-system"></i>Unknown</li> + <li><rhn-icon type="system-ok"/>OK</li> + <li><rhn-icon type="system-crit"/>Critical</li> + <li><rhn-icon type="system-warn"/>Warning</li> + <li><rhn-icon type="system-unknown"/>Unknown</li> <rhn-require acl="org_entitlement(sw_mgr_enterprise)"> - <li><i class="fa fa-1-5x spacewalk-icon-locked-system"></i></i>Locked</li> + <li><rhn-icon type="system-locked"/>Locked</li> </rhn-require> <rhn-require acl="org_entitlement(rhn_provisioning)"> - <li><i class="fa fa-rocket fa-1-5x"></i>Kickstarting</li> + <li><rhn-icon type="system-kickstarting"/>Kickstarting</li> </rhn-require> - <li><i class="fa fa-clock-o fa-1-5x"></i>Pending Actions</li> - <li><i class="fa fa-1-5x spacewalk-icon-Unentitled"></i>Unentitled</li> + <li><rhn-icon type="action-pending"/>Pending Actions</li> + <li><rhn-icon type="system-unentitled"/>Unentitled</li> <rhn-require acl="org_entitlement(rhn_monitor)"> - <li><i class="fa fa-1-5x spacewalk-icon-monitoring-status"></i>Monitoring Status</li> + <li><rhn-icon type="monitoring-status"/>Monitoring Status</li> </rhn-require> </ul> </div> diff --git a/web/include/network/components/system_groups/sgdc_header.pxi b/web/include/network/components/system_groups/sgdc_header.pxi index 3265f40..1e72df5 100644 --- a/web/include/network/components/system_groups/sgdc_header.pxi +++ b/web/include/network/components/system_groups/sgdc_header.pxi @@ -7,12 +7,12 @@ <pxt-formvar> <rhn-toolbar base="h1" - icon="fa spacewalk-icon-system-groups" + icon="header-system-groups" alt="system group" help-url="s1-sm-systems.jsp#s2-sm-system-group-list" misc-url="/network/systems/ssm/work_with_group.pxt?sgid={formvar:sgid}&pxt_trap=rhn:work_with_group_cb" misc-alt="work with group" - misc-icon="fa spacewalk-icon-system-groups" + misc-icon="header-system-groups" misc-text="work with group" deletion-type="group" deletion-url="delete_confirm.pxt?sgid={formvar:sgid}" diff --git a/web/include/network/components/systems/system_details_toolbar.pxi b/web/include/network/components/systems/system_details_toolbar.pxi index 428e951..cd1f3cc 100644 --- a/web/include/network/components/systems/system_details_toolbar.pxi +++ b/web/include/network/components/systems/system_details_toolbar.pxi @@ -6,8 +6,8 @@ <pxt-formvar>  <rhn-require acl="not system_is_virtual_host(); not system_is_virtual()"> - <rhn-toolbar base="h1" img="/img/rhn-icon-system.gif" - alt="system" help-url="s1-sm-systems.jsp#s3-sm-system-details" + <rhn-toolbar base="h1" icon="header-system-physical" + help-url="s1-sm-systems.jsp#s3-sm-system-details" deletion-url="/rhn/systems/details/DeleteConfirm.do?sid={formvar:sid}" deletion-type="system"> <rhn-server-name /> @@ -15,8 +15,8 @@ </rhn-require>  <rhn-require acl="system_is_virtual_host()"> - <rhn-toolbar base="h1" img="/img/virt-host.png" - alt="system" help-url="s1-sm-systems.jsp#s3-sm-system-details" + <rhn-toolbar base="h1" icon="header-system-virt-host" + help-url="s1-sm-systems.jsp#s3-sm-system-details" deletion-url="/rhn/systems/details/DeleteConfirm.do?sid={formvar:sid}" deletion-type="system"> <rhn-server-name /> @@ -24,8 +24,8 @@ </rhn-require>  <rhn-require acl="system_is_virtual()"> - <rhn-toolbar base="h1" img="/img/virt-guest.png" - alt="system" help-url="s1-sm-systems.jsp#s3-sm-system-details" + <rhn-toolbar base="h1" icon="header-system-virt-guest" + help-url="s1-sm-systems.jsp#s3-sm-system-details" deletion-url="/rhn/systems/details/DeleteConfirm.do?sid={formvar:sid}" deletion-type="system"> <rhn-server-name /> diff --git a/web/include/network/software/channels/manage/manage_channels_header.pxi b/web/include/network/software/channels/manage/manage_channels_header.pxi index 00a4044..fdf84e3 100644 --- a/web/include/network/software/channels/manage/manage_channels_header.pxi +++ b/web/include/network/software/channels/manage/manage_channels_header.pxi @@ -5,7 +5,7 @@ <pxt-use class="Sniglets::Navi" /> <rhn-channel-details> - <rhn-toolbar base="h1" img="/img/rhn-icon-channels.gif" help-url="sect-Getting_Started_Guide-Channel_Management-Creating_and_Managing_Custom_Channels-Removing_Software_Packages.jsp" help-guide="getting-started" deletion-type="software channel" deletion-url="/rhn/channels/manage/Delete.do?cid={channel_id}" deletion-acl="user_role(channel_admin); formvar_exists(cid)"> + <rhn-toolbar base="h1" icon="header-channel" help-url="sect-Getting_Started_Guide-Channel_Management-Creating_and_Managing_Custom_Channels-Removing_Software_Packages.jsp" help-guide="getting-started" deletion-type="software channel" deletion-url="/rhn/channels/manage/Delete.do?cid={channel_id}" deletion-acl="user_role(channel_admin); formvar_exists(cid)"> Software Channel: {channel_name} </rhn-toolbar> </rhn-channel-details> diff --git a/web/include/network/users/details/header.pxi b/web/include/network/users/details/header.pxi index de0ade0..e469ccc 100644 --- a/web/include/network/users/details/header.pxi +++ b/web/include/network/users/details/header.pxi @@ -5,7 +5,7 @@ <pxt-use class="Sniglets::HTML" /> <pxt-formvar> - <rhn-toolbar base="h1" img="/img/rhn-icon-users.gif" help-url="s1-sm-users.jsp#s2-sm-user-active" deletion-url="/rhn/users/DeleteUser.do?uid={formvar:uid}" deletion-type="user" deletion-acl="user_role(org_admin)"><rhn-user-login /></rhn-toolbar> + <rhn-toolbar base="h1" icon="header-user" help-url="s1-sm-users.jsp#s2-sm-user-active" deletion-url="/rhn/users/DeleteUser.do?uid={formvar:uid}" deletion-type="user" deletion-acl="user_role(org_admin)"><rhn-user-login /></rhn-toolbar> </pxt-formvar> commit 42946b2fad86195c68b60cfdd8f11b8aa9b684dd Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Tue Dec 10 15:45:48 2013 +0100 updated perl modules to use PXT::HTML->icon() diff --git a/web/modules/pxt/PXT/HTML.pm b/web/modules/pxt/PXT/HTML.pm index 68f52d0..e5a15ce 100644 --- a/web/modules/pxt/PXT/HTML.pm +++ b/web/modules/pxt/PXT/HTML.pm @@ -509,35 +509,58 @@ sub img { } my %rhn_icons = ( - "item-add" => "fa fa-plus", - "item-del" => "fa fa-trash-o", - "system-ok" => "fa fa-check-circle fa-1-5x text-success", - "system-crit" => "fa fa-exclamation-circle fa-1-5x text-danger", - "system-warn" => "fa fa-exclamation-triangle fa-1-5x text-warning", - "system-unknown" => "fa fa-1-5x spacewalk-icon-unknown-system", - "system-locked" => "fa fa-1-5x spacewalk-icon-locked-system", - "system-kickstarting" => "fa fa-rocket fa-1-5x", - "system-unentitled" => "fa fa-1-5x spacewalk-icon-Unentitled", - "system-virt-host" => "fa fa-1-5x spacewalk-icon-virtual-host", - "system-virt-guest" => "fa fa-1-5x spacewalk-icon-virtual-guest", - "system-physical" => "fa fa-desktop fa-1-5x", - "action-pending" => "fa fa-clock-o fa-1-5x", - "action-ok" => "fa fa-check-circle-o fa-1-5x text-success", "action-failed" => "fa fa-times-circle-o fa-1-5x text-danger", + "action-ok" => "fa fa-check-circle-o fa-1-5x text-success", + "action-pending" => "fa fa-clock-o fa-1-5x", "action-running" => "fa fa-exchange fa-1-5x text-info", - "event-type-package" => "fa spacewalk-icon-packages", + "errata-bugfix" => "fa fa-bug fa-1-5x", + "errata-enhance" => "fa fa-1-5x spacewalk-icon-enhancement", + "errata-security" => "fa fa-shield fa-1-5x", "event-type-errata" => "fa spacewalk-icon-patches", + "event-type-package" => "fa spacewalk-icon-packages", "event-type-preferences" => "fa fa-cog", "event-type-system" => "fa fa-desktop", - "errata-security" => "fa fa-shield fa-1-5x", - "errata-bugfix" => "fa fa-bug fa-1-5x", - "errata-enhance" => "fa fa-1-5x spacewalk-icon-enhancement", - "monitoring-status" => "fa fa-1-5x spacewalk-icon-monitoring-status", - "monitoring-ok" => "fa fa-1-5x spacewalk-icon-health text-success", - "monitoring-warn" => "fa fa-1-5x spacewalk-icon-health text-warning", + "header-channel" => "fa spacewalk-icon-software-channels", + "header-errata" => "fa spacewalk-icon-patches", + "header-errata-add" => "fa spacewalk-icon-patch-install", + "header-errata-del" => "fa spacewalk-icon-patch-remove", + "header-errata-set" => "fa spacewalk-icon-patch-set", + "header-errata-set-add" => "fa pacewalk-icon-patchset-install", + "header-event-history" => "fa fa-suitcase", + "header-info" => "fa fa-info-circle text-primary", + "header-package" => "fa spacewalk-icon-packages", + "header-preferences" => "fa fa-cogs", + "header-proxy" => "fa spacewalk-icon-proxy", + "header-search" => "fa fa-search", + "header-signout" => "fa fa-sign-out", + "header-sitemap" => "fa fa-sitemap", + "header-snapshot" => "fa fa-camera", + "header-snapshot-rollback" => "fa spacewalk-icon-snapshot-rollback", + "header-system" => "fa fa-desktop", + "header-system-groups" => "fa spacewalk-icon-system-groups", + "header-system-physical" => "fa fa-desktop", + "header-system-virt-guest" => "fa spacewalk-icon-virtual-guest", + "header-system-virt-host" => "fa spacewalk-icon-virtual-host", + "header-user" => "fa fa-user", + "item-add" => "fa fa-plus", + "item-del" => "fa fa-trash-o", "monitoring-crit" => "fa fa-1-5x spacewalk-icon-health text-danger", - "monitoring-unknown" => "fa fa-1-5x spacewalk-icon-health-unknown", + "monitoring-ok" => "fa fa-1-5x spacewalk-icon-health text-success", "monitoring-pending" => "fa fa-1-5x spacewalk-icon-health-pending", + "monitoring-status" => "fa fa-1-5x spacewalk-icon-monitoring-status", + "monitoring-unknown" => "fa fa-1-5x spacewalk-icon-health-unknown", + "monitoring-warn" => "fa fa-1-5x spacewalk-icon-health text-warning", + "nav-up" => "fa fa-caret-up", + "system-crit" => "fa fa-exclamation-circle fa-1-5x text-danger", + "system-kickstarting" => "fa fa-rocket fa-1-5x", + "system-locked" => "fa fa-1-5x spacewalk-icon-locked-system", + "system-ok" => "fa fa-check-circle fa-1-5x text-success", + "system-physical" => "fa fa-desktop fa-1-5x", + "system-unentitled" => "fa fa-1-5x spacewalk-icon-Unentitled", + "system-unknown" => "fa fa-1-5x spacewalk-icon-unknown-system", + "system-virt-guest" => "fa fa-1-5x spacewalk-icon-virtual-guest", + "system-virt-host" => "fa fa-1-5x spacewalk-icon-virtual-host", + "system-warn" => "fa fa-exclamation-triangle fa-1-5x text-warning", ); sub icon { diff --git a/web/modules/sniglets/Sniglets/HTML.pm b/web/modules/sniglets/Sniglets/HTML.pm index 4691527..a5eb8c1 100644 --- a/web/modules/sniglets/Sniglets/HTML.pm +++ b/web/modules/sniglets/Sniglets/HTML.pm @@ -91,7 +91,7 @@ sub toolbar { } if (defined $params{icon}) { - $icon= sprintf(qq{<i class="$params{icon}"></i>}); + $icon = PXT::HTML->icon(-type => $params{icon}); } if (defined $params{'help-url'}) { @@ -135,14 +135,16 @@ sub creation_link { my $pxt = shift; my %params = @_; - return qq{<a href="$params{url}"><i class="fa fa-plus"></i>create new $params{type}</a>}; + my $icon = PXT::HTML->icon(-type => "item-add"); + return qq{<a href="$params{url}">${icon}create new $params{type}</a>}; } sub deletion_link { my $pxt = shift; my %params = @_; - return qq{<a href="$params{url}"><i class="fa fa-trash-o"></i>delete $params{type}</a>}; + my $icon = PXT::HTML->icon(-type => "item-del"); + return qq{<a href="$params{url}">${icon}delete $params{type}</a>}; } sub misc_link { @@ -150,7 +152,8 @@ sub misc_link { my %params = @_; if (defined $params{icon}) { - return qq{<a href="$params{url}"><i class="$params{icon}"></i>$params{text}</a>}; + my $icon = PXT::HTML->icon(-type => $params{icon}); + return qq{<a href="$params{url}">${icon}$params{text}</a>}; } else { return qq{<a href="$params{url}"><img src="$params{img}" alt="$params{'alt'}" title="$params{'alt'}" />$params{text}</a>}; diff --git a/web/modules/sniglets/Sniglets/ListView/ActionList.pm b/web/modules/sniglets/Sniglets/ListView/ActionList.pm index bee505f..44271b8 100644 --- a/web/modules/sniglets/Sniglets/ListView/ActionList.pm +++ b/web/modules/sniglets/Sniglets/ListView/ActionList.pm @@ -70,27 +70,28 @@ sub _register_modes { } -my %history_type_icons = ('packages.refresh_list' => 'spacewalk-icon-packages', - 'packages.delta' => 'spacewalk-icon-packages', - 'packages.update' => 'spacewalk-icon-packages', - 'packages.remove' => 'spacewalk-icon-packages', - 'packages.runTransaction' => 'spacewalk-icon-packages', - 'up2date_config.get' => 'fa-cog', - 'up2date_config.update' => 'fa-cog', - 'rollback.config' => 'fa-cog', - 'rollback.listTransactions' => 'spacewalk-icon-packages', # bad icon for this - 'errata.update' => 'spacewalk-icon-patches', - 'hardware.refresh_list' => 'fa-desktop', # bad icon for this - 'reboot.reboot' => 'fa-desktop', # bad icon for this - 'configfiles.upload' => 'fa-desktop', - 'configfiles.deploy' => 'fa-desktop', - 'configfiles.verify' => 'fa-desktop', - 'configfiles.diff' => 'fa-desktop', - ); - -my %history_status_icons = ('Completed' => 'fa-check-circle-o fa-1-5x text-success', - 'Failed' => 'fa-times-circle-o fa-1-5x text-danger', - 'Picked Up' => 'fa-exchange fa-1-5x text-info', +my %history_type_icons = ( + 'packages.refresh_list' => 'event-type-package', + 'packages.delta' => 'event-type-package', + 'packages.update' => 'event-type-package', + 'packages.remove' => 'event-type-package', + 'packages.runTransaction' => 'event-type-package', + 'up2date_config.get' => 'event-type-preferences', + 'up2date_config.update' => 'event-type-preferences', + 'rollback.config' => 'event-type-preferences', + 'rollback.listTransactions' => 'event-type-package', # bad icon for this + 'errata.update' => 'event-type-errata', + 'hardware.refresh_list' => 'event-type-system', # bad icon for this + 'reboot.reboot' => 'event-type-system', # bad icon for this + 'configfiles.upload' => 'event-type-system', + 'configfiles.deploy' => 'event-type-system', + 'configfiles.verify' => 'event-type-system', + 'configfiles.diff' => 'event-type-system', + ); + +my %history_status_icons = ('Completed' => 'actions-ok', + 'Failed' => 'actions-failed', + 'Picked Up' => 'actions-running', ); sub system_history_provider { @@ -117,24 +118,25 @@ sub system_history_provider { if (defined $event->{HISTORY_TYPE}) { if ($history_type_icons{$event->{HISTORY_TYPE}}) { - $event->{HISTORY_TYPE} = sprintf(qq{<i class="fa %s" title="%s"></i>}, - $history_type_icons{$event->{HISTORY_TYPE}}, - $event->{HISTORY_TYPE_NAME}); + $event->{HISTORY_TYPE} = PXT::HTML->icon( + -type => $history_type_icons{$event->{HISTORY_TYPE}}, + -title => $event->{HISTORY_TYPE_NAME}); } else { PXT::Debug->log(2,"no icon for scheduled action type?! type: " . $event->{HISTORY_TYPE}); - $event->{HISTORY_TYPE} = qq{<i class="fa fa-desktop" title="System Event"></i>}; + $event->{HISTORY_TYPE} = PXT::HTML->icon(-type => "event-type-system", + -title => "System Event"); } } else { - $event->{HISTORY_TYPE} = qq{<i class="fa fa-desktop" title="System Event"></i>}; + $event->{HISTORY_TYPE} = PXT::HTML->icon(-type => "event-type-system", + -title => "System Event"); } if (defined $event->{HISTORY_STATUS}) { - - $event->{HISTORY_STATUS} = sprintf(qq{<i class="fa %s" title="%s"></i>}, - $history_status_icons{$event->{HISTORY_STATUS}}, - $event->{HISTORY_STATUS}); + $event->{HISTORY_STATUS} = PXT::HTML->icon( + -type => $history_status_icons{$event->{HISTORY_STATUS}}, + -title => $event->{HISTORY_STATUS}); } else { $event->{HISTORY_STATUS} = '<span class="no-details">(n/a)</span>'; diff --git a/web/modules/sniglets/Sniglets/ListView/ErrataList.pm b/web/modules/sniglets/Sniglets/ListView/ErrataList.pm index 0adce0e..d5119d6 100644 --- a/web/modules/sniglets/Sniglets/ListView/ErrataList.pm +++ b/web/modules/sniglets/Sniglets/ListView/ErrataList.pm @@ -24,6 +24,7 @@ use RHN::Server; use RHN::Channel; use RHN::ChannelEditor; use RHN::SearchTypes; +use PXT::HTML; use PXT::Utils; use RHN::Exception qw/throw/; @@ -170,11 +171,11 @@ sub row_callback { my $row = shift; my $pxt = shift; - my %adv_icon = ('Bug Fix Advisory' => '<i class="fa fa-bug fa-1-5x"></i>', - 'Product Enhancement Advisory' => '<i class="fa fa-1-5x spacewalk-icon-enhancement"></i>', - 'Security Advisory' => '<i class="fa fa-shield fa-1-5x"></i>'); + my %adv_icon = ('Bug Fix Advisory' => 'errata-bugfix', + 'Product Enhancement Advisory' => 'errata-enhance', + 'Security Advisory' => 'errata-security'); if (exists $row->{ADVISORY_TYPE}) { - $row->{ADVISORY_ICON} = $adv_icon{$row->{ADVISORY_TYPE}}; + $row->{ADVISORY_ICON} = PXT::HTML->icon(-type => $adv_icon{$row->{ADVISORY_TYPE}}); } if (exists $row->{ADVISORY_LAST_UPDATED}) { diff --git a/web/modules/sniglets/Sniglets/ListView/PackageList.pm b/web/modules/sniglets/Sniglets/ListView/PackageList.pm index 2f83964..fe4da05 100644 --- a/web/modules/sniglets/Sniglets/ListView/PackageList.pm +++ b/web/modules/sniglets/Sniglets/ListView/PackageList.pm @@ -26,6 +26,7 @@ use RHN::ErrataTmp; use RHN::DataSource::Package; use RHN::DataSource; use RHN::DataSource::Simple; +use PXT::HTML; use PXT::Utils; use RHN::Scheduler; use RHN::Manifest; @@ -1382,9 +1383,9 @@ sub package_install_remote_command_cb { return 1; } -my %adv_icon = ('Bug Fix Advisory' => '<i class="fa fa-bug fa-1-5x"></i>', - 'Product Enhancement Advisory' => '<i class="fa fa-1-5x spacewalk-icon-enhancement"></i>', - 'Security Advisory' => '<i class="fa fa-shield fa-1-5x"></i>'); +my %adv_icon = ('Bug Fix Advisory' => 'errata-bugfix', + 'Product Enhancement Advisory' => 'errata-enhance', + 'Security Advisory' => 'errata-security'); sub system_upgradable_package_provider { my $self = shift; @@ -1458,7 +1459,8 @@ sub system_upgradable_package_provider { foreach my $adv (@{$row->{ERRATA_ADVISORY}}) { my $adv_id = shift @{$row->{ERRATA_ID}}; my $adv_type = shift @adv_types; - push @errata, sprintf('%s<a href="/rhn/errata/details/Details.do?eid=%s">%s</a>', $adv_icon{$adv_type}, $adv_id, $adv); + push @errata, sprintf('%s<a href="/rhn/errata/details/Details.do?eid=%s">%s</a>', + PXT::HTML->icon(-type => $adv_icon{$adv_type}), $adv_id, $adv); } $row->{RELATED_ERRATA} = join("<br />\n", @errata); @@ -1480,7 +1482,7 @@ sub obsoleting_packages_provider { my $adv_type = $row->{ADVISORY_TYPE}; my $adv_id = $row->{ERRATA_ID}; - $row->{RELATED_ERRATA} = defined $adv_id ? sprintf('%s<a href="/rhn/errata/details/Details.do?eid=%s">%s</a>', $adv_icon{$adv_type}, $adv_id, $adv) : ''; + $row->{RELATED_ERRATA} = defined $adv_id ? sprintf('%s<a href="/rhn/errata/details/Details.do?eid=%s">%s</a>', PXT::HTML->icon(-type => $adv_icon{$adv_type}), $adv_id, $adv) : ''; } return (%ret); diff --git a/web/modules/sniglets/Sniglets/ListView/SystemList.pm b/web/modules/sniglets/Sniglets/ListView/SystemList.pm index 13a382c..718b9df 100644 --- a/web/modules/sniglets/Sniglets/ListView/SystemList.pm +++ b/web/modules/sniglets/Sniglets/ListView/SystemList.pm @@ -567,14 +567,14 @@ sub row_callback { my $icon_data = Sniglets::Servers::system_status_info($pxt->user, $row); - my $image = PXT::HTML->icon(-class => $icon_data->{icon}, + my $image = PXT::HTML->icon(-type => $icon_data->{icon}, -title => $icon_data->{status_str}); $row->{ADVISORY_ICON} = PXT::HTML->link($icon_data->{link}, $image); my $locked_data = Sniglets::Servers::system_locked_info($pxt->user, $row); if ($locked_data->{link}) { - my $locked_image = PXT::HTML->icon(-class => $locked_data->{icon}, + my $locked_image = PXT::HTML->icon(-type => $locked_data->{icon}, -title => $locked_data->{status_str}); $row->{ADVISORY_ICON} .= PXT::HTML->link($locked_data->{link}, $locked_image); @@ -586,7 +586,7 @@ sub row_callback { if (defined $row->{MONITORING_STATUS}) { my $icon_data = Sniglets::Servers::system_monitoring_info($pxt->user, $row); - my $image = PXT::HTML->icon(-class => $icon_data->{icon}, + my $image = PXT::HTML->icon(-type => $icon_data->{icon}, -title => $icon_data->{status_str}); $row->{MONITORING_ICON} = PXT::HTML->link($icon_data->{system_link}, $image); diff --git a/web/modules/sniglets/Sniglets/ServerGroup.pm b/web/modules/sniglets/Sniglets/ServerGroup.pm index a59b55b..1155fb1 100644 --- a/web/modules/sniglets/Sniglets/ServerGroup.pm +++ b/web/modules/sniglets/Sniglets/ServerGroup.pm @@ -64,20 +64,20 @@ sub system_group_status_interface { if (not ($counts->{SECURITY_ERRATA} or $counts->{BUG_ERRATA} or $counts->{ENHANCEMENT_ERRATA})) { - $subst->{icon} = '<i class="fa fa-check-circle fa-1-5x text-success"></i>'; + $subst->{icon} = PXT::HTML->icon(-type => 'system-ok'); $subst->{status_str} = 'No applicable errata'; $subst->{status_class} = 'system-status-up-to-date'; } elsif ($counts->{SECURITY_ERRATA}) { - $subst->{icon} = '<i class="fa fa-exclamation-circle fa-1-5x text-danger"></i>'; + $subst->{icon} = PXT::HTML->icon(-type => 'system-crit'); $subst->{status_str} = $counts->{SECURITY_ERRATA} . ' critical updates available'; $subst->{message} = "(<a href=\"/network/systems/groups/errata_list.pxt?sgid=" . $sgid . "\">more info</a>)";; $subst->{status_class} = 'system-status-critical-updates'; } else { - $subst->{icon} = '<i class="fa fa-exclamation-triangle fa-1-5x text-warning"></i>'; + $subst->{icon} = PXT::HTML->icon(-type => 'system-warn'); $subst->{status_str} = ' updates available'; $subst->{message} = "(<a href=\"/network/systems/groups/errata_list.pxt?sgid=" . $sgid . "\">more info</a>)"; $subst->{status_class} = 'system-status-updates'; diff --git a/web/modules/sniglets/Sniglets/Servers.pm b/web/modules/sniglets/Sniglets/Servers.pm index 8b4d249..16259fd 100644 --- a/web/modules/sniglets/Sniglets/Servers.pm +++ b/web/modules/sniglets/Sniglets/Servers.pm @@ -218,7 +218,7 @@ sub system_status_info { $ret->{$_} = '' foreach (qw/image status_str status_class message link/); if (not $data->{IS_ENTITLED}) { - $ret->{icon} = 'fa fa-1-5x spacewalk-icon-Unentitled'; + $ret->{icon} = 'system-unentitled'; $ret->{status_str} = 'System not entitled'; $ret->{status_class} = 'system-status-unentitled'; @@ -228,7 +228,7 @@ sub system_status_info { } } elsif ($data->{LAST_CHECKIN_DAYS_AGO} > PXT::Config->get('system_checkin_threshold')) { - $ret->{icon} = 'spacewalk-icon-unknown-system'; + $ret->{icon} = 'system-unknown'; $ret->{status_str} = 'System not checking in with R H N'; $ret->{status_class} = 'system-status-awol'; $ret->{message} = 'more info'; @@ -236,40 +236,40 @@ sub system_status_info { -href => 's1-sm-systems.html#S3-SM-SYSTEM-LIST-INACT'); } elsif ($data->{KICKSTART_SESSION_ID}) { - $ret->{icon} = 'fa fa-rocket fa-1-5x'; + $ret->{icon} = 'system-kickstarting'; $ret->{status_str} = 'Kickstart in progress'; $ret->{status_class} = 'system-status-kickstart'; $ret->{message} = 'view progress'; $ret->{link} = "/rhn/systems/details/kickstart/SessionStatus.do?sid=${sid}"; } elsif (not ($errata_count or $data->{OUTDATED_PACKAGES}) and not $package_actions_count) { - $ret->{icon} = 'fa fa-check-circle fa-1-5x text-success'; + $ret->{icon} = 'system-ok'; $ret->{status_str} = 'System is up to date'; $ret->{status_class} = 'system-status-up-to-date'; } elsif ($errata_count and not RHN::Server->unscheduled_errata($sid, $user->id)) { - $ret->{icon} = 'fa fa-clock-o fa-1-5x'; + $ret->{icon} = 'action-pending'; $ret->{status_str} = 'All updates scheduled'; $ret->{status_class} = 'system-status-updates-scheduled'; $ret->{message} = 'view actions'; $ret->{link} = "/network/systems/details/history/pending.pxt?sid=${sid}"; } elsif ($actions_count) { - $ret->{icon} = 'fa fa-clock-o fa-1-5x'; + $ret->{icon} = 'action-pending'; $ret->{status_class} = 'system-status-updates-scheduled'; $ret->{status_str} = 'Actions scheduled'; $ret->{message} = 'view actions'; $ret->{link} = "/network/systems/details/history/pending.pxt?sid=${sid}"; } elsif ($data->{SECURITY_ERRATA}) { - $ret->{icon} = 'fa fa-exclamation-circle fa-1-5x text-danger'; + $ret->{icon} = 'system-crit'; $ret->{status_str} = 'Critical updates available'; $ret->{status_class} = 'system-status-critical-updates'; $ret->{message} = 'update now'; $ret->{link} = "/rhn/systems/details/ErrataConfirm.do?all=true&sid=${sid}"; } elsif ($data->{OUTDATED_PACKAGES}) { - $ret->{icon} = 'fa fa-exclamation-triangle fa-1-5x text-warning'; + $ret->{icon} = 'system-warn'; $ret->{status_str} = 'Updates available'; $ret->{status_class} = 'system-status-updates'; $ret->{message} = "more info"; commit ff6d0d5ecc9c49d265d3a44dbdec7179e673b740 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Tue Dec 10 13:05:48 2013 +0100 bootstrap tuning: reimplemented icon tag in pxt diff --git a/web/modules/pxt/PXT/HTML.pm b/web/modules/pxt/PXT/HTML.pm index 19b72c0..68f52d0 100644 --- a/web/modules/pxt/PXT/HTML.pm +++ b/web/modules/pxt/PXT/HTML.pm @@ -508,22 +508,50 @@ sub img { return qq{<img $inner_str />}; } +my %rhn_icons = ( + "item-add" => "fa fa-plus", + "item-del" => "fa fa-trash-o", + "system-ok" => "fa fa-check-circle fa-1-5x text-success", + "system-crit" => "fa fa-exclamation-circle fa-1-5x text-danger", + "system-warn" => "fa fa-exclamation-triangle fa-1-5x text-warning", + "system-unknown" => "fa fa-1-5x spacewalk-icon-unknown-system", + "system-locked" => "fa fa-1-5x spacewalk-icon-locked-system", + "system-kickstarting" => "fa fa-rocket fa-1-5x", + "system-unentitled" => "fa fa-1-5x spacewalk-icon-Unentitled", + "system-virt-host" => "fa fa-1-5x spacewalk-icon-virtual-host", + "system-virt-guest" => "fa fa-1-5x spacewalk-icon-virtual-guest", + "system-physical" => "fa fa-desktop fa-1-5x", + "action-pending" => "fa fa-clock-o fa-1-5x", + "action-ok" => "fa fa-check-circle-o fa-1-5x text-success", + "action-failed" => "fa fa-times-circle-o fa-1-5x text-danger", + "action-running" => "fa fa-exchange fa-1-5x text-info", + "event-type-package" => "fa spacewalk-icon-packages", + "event-type-errata" => "fa spacewalk-icon-patches", + "event-type-preferences" => "fa fa-cog", + "event-type-system" => "fa fa-desktop", + "errata-security" => "fa fa-shield fa-1-5x", + "errata-bugfix" => "fa fa-bug fa-1-5x", + "errata-enhance" => "fa fa-1-5x spacewalk-icon-enhancement", + "monitoring-status" => "fa fa-1-5x spacewalk-icon-monitoring-status", + "monitoring-ok" => "fa fa-1-5x spacewalk-icon-health text-success", + "monitoring-warn" => "fa fa-1-5x spacewalk-icon-health text-warning", + "monitoring-crit" => "fa fa-1-5x spacewalk-icon-health text-danger", + "monitoring-unknown" => "fa fa-1-5x spacewalk-icon-health-unknown", + "monitoring-pending" => "fa fa-1-5x spacewalk-icon-health-pending", + ); + sub icon { my $class = shift; my %params = @_; - if (not exists $params{-class}) { - die "classless icon"; - } + die "empty icon type" if not exists $params{-type}; + die qq{unknown icon type: "$params{-type}".} if not exists $rhn_icons{$params{-type}}; - my @inner; - for my $attr (qw/class title/) { - next unless exists $params{"-$attr"}; - push @inner, sprintf(qq{$attr="$params{-$attr}"}); - } + my $icon = qq{<i class="$rhn_icons{$params{-type}}"}; + $icon .= qq{ title="$params{-title}"}; + $icon .= qq{></i>}; - my $inner_str = join(" ", @inner); - return qq{<i $inner_str></i>}; + return $icon; } 1; diff --git a/web/modules/sniglets/Sniglets/HTML.pm b/web/modules/sniglets/Sniglets/HTML.pm index 28f9b29..4691527 100644 --- a/web/modules/sniglets/Sniglets/HTML.pm +++ b/web/modules/sniglets/Sniglets/HTML.pm @@ -42,6 +42,7 @@ sub register_tags { $pxt->register_tag("rhn-refresh-redirect", \&rhn_refresh_redirect); $pxt->register_tag("rhn-autorefresh-widget", \&rhn_autorefresh_widget); $pxt->register_tag("rhn-return-link", \&return_link); + $pxt->register_tag("rhn-icon", \&rhn_icon); } @@ -334,4 +335,11 @@ sub return_link { return PXT::Utils->perform_substitutions($params{__block__}, \%subst); } +sub rhn_icon { + my $pxt = shift; + my %params = validate(@_, {'type' => 1, 'title' => 0}); + + %params = map {("-$_" => $params{$_})} keys %params; + return PXT::HTML->icon(%params); +} 1;

1 0

Changes to 'refs/tags/spacewalk-java-2.1.93-1'
by StephenHerr 10 Dec '13

10 Dec '13

Tag 'spacewalk-java-2.1.93-1' created by Stephen Herr <sherr(a)redhat.com> at 2013-12-10 21:47 +0000 Tagging package [spacewalk-java] version [2.1.93-1] in directory [java/]. Changes since spacewalk-java-2.1.92-1: Stephen Herr (2): 1039193 - Increase default ram to 768 for RHEL 7 Automatic commit of package [spacewalk-java] release [2.1.93-1]. --- java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java | 11 ++++- java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java | 20 ++++++++++ java/code/src/com/redhat/rhn/domain/kickstart/KickstartInstallType.java | 11 ++++- java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartDetailsEditAction.java | 17 ++++++-- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 3 + java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/SelectableDecorator.java | 3 + java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileCreateCommand.java | 2 - java/spacewalk-java.spec | 5 ++ rel-eng/packages/spacewalk-java | 2 - 9 files changed, 61 insertions(+), 13 deletions(-) ---

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
23
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

spacewalk-commits December 2013