java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 6 +++ java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java | 9 +++-- java/code/src/com/redhat/rhn/frontend/taglibs/ToolbarTag.java | 2 - java/code/webapp/WEB-INF/includes/header.jsp | 4 +- java/code/webapp/WEB-INF/pages/admin/channelperms.jsp | 2 - java/code/webapp/WEB-INF/pages/admin/errata/confirm.jsp | 2 - java/code/webapp/WEB-INF/pages/admin/iss/confirmslaveremove.jsp | 8 ++-- java/code/webapp/WEB-INF/pages/admin/iss/master.jsp | 8 ++-- java/code/webapp/WEB-INF/pages/admin/iss/slave.jsp | 4 +- java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystems.jsp | 10 ++--- java/code/webapp/WEB-INF/pages/channel/confirmtargetsystems.jsp | 2 - java/code/webapp/WEB-INF/pages/channel/erratalist.jsp | 6 +-- java/code/webapp/WEB-INF/pages/channel/manage/add.jsp | 2 - java/code/webapp/WEB-INF/pages/channel/manage/addcustomerrata.jsp | 6 +-- java/code/webapp/WEB-INF/pages/channel/manage/adderrataredhat.jsp | 6 +-- java/code/webapp/WEB-INF/pages/channel/manage/confirmerrata.jsp | 6 +-- java/code/webapp/WEB-INF/pages/channel/manage/confirmerrataremove.jsp | 2 - java/code/webapp/WEB-INF/pages/channel/manage/errata.jsp | 2 - java/code/webapp/WEB-INF/pages/channel/manage/errataremove.jsp | 8 ++-- java/code/webapp/WEB-INF/pages/channel/manage/erratasync.jsp | 8 ++-- java/code/webapp/WEB-INF/pages/channel/manage/packagemenu.jsp | 2 - java/code/webapp/WEB-INF/pages/channel/targetsystems.jsp | 2 - java/code/webapp/WEB-INF/pages/common/errors/404.jsp | 2 - java/code/webapp/WEB-INF/pages/common/errors/500.jsp | 2 - java/code/webapp/WEB-INF/pages/common/errors/lookup.jsp | 2 - java/code/webapp/WEB-INF/pages/common/errors/nosuchkickstart.jsp | 2 - java/code/webapp/WEB-INF/pages/common/errors/nosuchpkg.jsp | 2 - java/code/webapp/WEB-INF/pages/common/errors/permission.jsp | 2 - java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/groups.jspf | 2 - java/code/webapp/WEB-INF/pages/common/fragments/admin/channelperms_list.jspf | 4 +- java/code/webapp/WEB-INF/pages/common/fragments/audit/scap-list-columns.jspf | 10 ++--- java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/summary.jspf | 10 ++--- java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablesummary.jspf | 4 +- java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/copyfile_rows.jsp | 6 +-- java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deploylocal.jspf | 2 - java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/details.jspf | 8 ++-- java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/file_info.jsp | 6 +-- java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/configfile_confirm.jspf | 2 - java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/configfile_rows.jspf | 12 +++--- java/code/webapp/WEB-INF/pages/common/fragments/configuration/ssm/configconfirmlist.jspf | 2 - java/code/webapp/WEB-INF/pages/common/fragments/configuration/ssm/configlist.jspf | 2 - java/code/webapp/WEB-INF/pages/common/fragments/errata/ownedlistdisplay.jspf | 6 +-- java/code/webapp/WEB-INF/pages/common/fragments/errata/relevant-errata-list.jspf | 6 +-- java/code/webapp/WEB-INF/pages/common/fragments/groups/header.jspf | 6 +-- java/code/webapp/WEB-INF/pages/common/fragments/groups/systems.jspf | 2 - java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/proxy-options.jspf | 2 - java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/schedule-options.jspf | 2 - java/code/webapp/WEB-INF/pages/common/fragments/package/package_header.jspf | 2 - java/code/webapp/WEB-INF/pages/common/fragments/probes/probe-state-column-new.jspf | 10 ++--- java/code/webapp/WEB-INF/pages/common/fragments/probes/probe-state-column.jspf | 10 ++--- java/code/webapp/WEB-INF/pages/common/fragments/systems/group_listdisplay.jspf | 6 +-- java/code/webapp/WEB-INF/pages/common/fragments/systems/monitoring_status_groups.jspf | 10 ++--- java/code/webapp/WEB-INF/pages/common/fragments/systems/monitoring_status_systems.jspf | 10 ++--- java/code/webapp/WEB-INF/pages/common/fragments/systems/system_list_fragment.jspf | 6 +-- java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/errata.jsp | 2 - java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/mostCriticalSystems.jsp | 6 +-- java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/recentlyRegistered.jsp | 2 - java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/scheduledActions.jsp | 10 ++--- java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/systemGroups.jsp | 6 +-- java/code/webapp/WEB-INF/pages/configuration/channel/copy2systems.jsp | 2 - java/code/webapp/WEB-INF/pages/configuration/channel/deployconfirm.jsp | 4 +- java/code/webapp/WEB-INF/pages/configuration/channel/deploysystems.jsp | 2 - java/code/webapp/WEB-INF/pages/configuration/files/comparechannel.jsp | 6 +-- java/code/webapp/WEB-INF/pages/configuration/files/comparecopy.jsp | 6 +-- java/code/webapp/WEB-INF/pages/configuration/files/copylocal.jsp | 2 - java/code/webapp/WEB-INF/pages/configuration/files/copysandbox.jsp | 2 - java/code/webapp/WEB-INF/pages/configuration/files/deployconfirm.jsp | 2 - java/code/webapp/WEB-INF/pages/configuration/files/diff.jsp | 2 - java/code/webapp/WEB-INF/pages/configuration/overview/globalconfiglist.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 | 2 - java/code/webapp/WEB-INF/pages/configuration/sdc/channellist.jsp | 2 - java/code/webapp/WEB-INF/pages/configuration/sdc/importfileconfirm.jsp | 8 ++-- java/code/webapp/WEB-INF/pages/configuration/sdc/subscriptions.jsp | 2 - java/code/webapp/WEB-INF/pages/configuration/ssm/channelsystems.jsp | 4 +- java/code/webapp/WEB-INF/pages/configuration/ssm/deploy.jsp | 2 - java/code/webapp/WEB-INF/pages/configuration/ssm/deployconfirm.jsp | 4 +- java/code/webapp/WEB-INF/pages/configuration/ssm/diff.jsp | 2 - java/code/webapp/WEB-INF/pages/configuration/ssm/diffconfirm.jsp | 2 - java/code/webapp/WEB-INF/pages/configuration/ssm/difffiles.jsp | 12 +++--- java/code/webapp/WEB-INF/pages/configuration/ssm/diffsystems.jsp | 6 +-- java/code/webapp/WEB-INF/pages/configuration/ssm/enable.jsp | 2 - java/code/webapp/WEB-INF/pages/configuration/ssm/enablesummary.jsp | 2 - java/code/webapp/WEB-INF/pages/configuration/ssm/rankchannels.jsp | 2 - java/code/webapp/WEB-INF/pages/configuration/ssm/subscribe.jsp | 4 +- java/code/webapp/WEB-INF/pages/configuration/ssm/subscribeconfirm.jsp | 4 +- java/code/webapp/WEB-INF/pages/configuration/ssm/systemchannels.jsp | 6 +-- java/code/webapp/WEB-INF/pages/configuration/ssm/unsubscribe.jsp | 4 +- java/code/webapp/WEB-INF/pages/configuration/ssm/unsubscribeconfirm.jsp | 4 +- java/code/webapp/WEB-INF/pages/errata/affectedsystems.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/groups/edit.jsp | 2 - java/code/webapp/WEB-INF/pages/groups/erratalist.jsp | 6 +-- java/code/webapp/WEB-INF/pages/help/chatindex.jsp | 2 - java/code/webapp/WEB-INF/pages/kickstart/kickstartdownload.jsp | 2 - java/code/webapp/WEB-INF/pages/kickstart/kickstarts.jsp | 4 +- java/code/webapp/WEB-INF/pages/kickstart/ssm/schedule.jsp | 2 - java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/fifth.jsp | 2 - java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/first.jsp | 2 - java/code/webapp/WEB-INF/pages/ssm/packageinstallschedule.jsp | 2 - java/code/webapp/WEB-INF/pages/ssm/packageremoveschedule.jsp | 2 - java/code/webapp/WEB-INF/pages/ssm/packageupgrade.jsp | 6 +-- java/code/webapp/WEB-INF/pages/ssm/packageupgradeschedule.jsp | 2 - java/code/webapp/WEB-INF/pages/ssm/packageverifyschedule.jsp | 2 - java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp | 18 +++++----- java/code/webapp/WEB-INF/pages/systems/crashes.jsp | 2 - java/code/webapp/WEB-INF/pages/systems/crashnote.jsp | 6 +-- java/code/webapp/WEB-INF/pages/systems/crashnotedelete.jsp | 4 +- java/code/webapp/WEB-INF/pages/systems/crashnotes.jsp | 6 +-- java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp | 12 +++--- java/code/webapp/WEB-INF/pages/systems/details/packages/packageconfirm.jsp | 2 - java/code/webapp/WEB-INF/pages/systems/details/packages/packagelist.jsp | 4 +- java/code/webapp/WEB-INF/pages/systems/details/packages/packagesindex.jsp | 2 - java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/profiles.jsp | 4 +- java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncprofile.jsp | 2 - java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncsystem.jsp | 2 - java/code/webapp/WEB-INF/pages/systems/details/packages/upgradable.jsp | 8 ++-- java/code/webapp/WEB-INF/pages/systems/errata.jsp | 2 - java/code/webapp/WEB-INF/pages/systems/errataconfirm.jsp | 2 - java/code/webapp/WEB-INF/pages/systems/registeredlist.jsp | 2 - java/code/webapp/WEB-INF/pages/systems/sdc/channels.jsp | 2 - java/code/webapp/WEB-INF/pages/systems/sdc/confirmnewbase.jsp | 2 - java/code/webapp/WEB-INF/pages/systems/sdc/updatecustomdata.jsp | 2 - java/code/webapp/WEB-INF/pages/systems/systemcurrency.jsp | 2 - 126 files changed, 270 insertions(+), 259 deletions(-)

New commits: commit eb9d24e0c46c6cd848b27de9cfac228b97a398d9 Author: Matej Kollar mkollar@redhat.com Date: Fri Dec 20 16:56:13 2013 +0100

Use new rhn:icon internationalization/localization

diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml index f3334cf..b712119 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml @@ -17193,6 +17193,12 @@ The Tree Path, Kickstart RPM, Base Channel, and Installer Generation should alwa <context context-type="sourcefile">/systems/details/CreateCustomData.do</context> </context-group> </trans-unit> + <trans-unit id="toolbar.delete.customdata"> + <source>delete value</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/details/CreateCustomData.do</context> + </context-group> + </trans-unit>

<!-- SDC Details Edit Page strings --> <trans-unit id="sdc.details.edit.header"> diff --git a/java/code/webapp/WEB-INF/includes/header.jsp b/java/code/webapp/WEB-INF/includes/header.jsp index b3ae493..328516d 100644 --- a/java/code/webapp/WEB-INF/includes/header.jsp +++ b/java/code/webapp/WEB-INF/includes/header.jsp @@ -35,10 +35,10 @@ <span class="spacewalk-header-non-link"><rhn:icon type="header-sitemap" /><c:out escapeXml="true" value="${requestScope.session.user.org.name}" /></span> </li> <li> - <a href="/rhn/account/UserPreferences.do"><rhn:icon type="header-preferences" title="<bean:message key='header.jsp.preferences' />" /></a> + <a href="/rhn/account/UserPreferences.do"><rhn:icon type="header-preferences" title="header.jsp.preferences" /></a> </li> <li> - <html:link forward="logout"><rhn:icon type="header-signout" title="<bean:message key='header.jsp.signout' />" /></html:link> + <html:link forward="logout"><rhn:icon type="header-signout" title="header.jsp.signout" /></html:link> </li> </ul>

diff --git a/java/code/webapp/WEB-INF/pages/admin/channelperms.jsp b/java/code/webapp/WEB-INF/pages/admin/channelperms.jsp index e9c57e9..e9b94ef 100644 --- a/java/code/webapp/WEB-INF/pages/admin/channelperms.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/channelperms.jsp @@ -13,7 +13,7 @@ <p><bean:message key="channelperms.jsp.summary"/></p>

<p> -(<rhn:icon type="item-enabled" title="<bean:message key='channelperms.jsp.permGranted.short'/>" /> +(<rhn:icon type="item-enabled" title="channelperms.jsp.permGranted.short" /> <bean:message key="channelperms.jsp.permGranted" />) </p>

diff --git a/java/code/webapp/WEB-INF/pages/admin/errata/confirm.jsp b/java/code/webapp/WEB-INF/pages/admin/errata/confirm.jsp index 08bbae4..9d6c0ca 100644 --- a/java/code/webapp/WEB-INF/pages/admin/errata/confirm.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/errata/confirm.jsp @@ -46,7 +46,7 @@ <th><bean:message key="syncprofile.jsp.than"/></th> </tr> <tr> - <th><rhn:icon type="header-schedule" title="<bean:message key='syncprofile.jsp.selection' />" /> + <th><rhn:icon type="header-schedule" title="syncprofile.jsp.selection" /> </th> <td> <jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp"> diff --git a/java/code/webapp/WEB-INF/pages/admin/iss/confirmslaveremove.jsp b/java/code/webapp/WEB-INF/pages/admin/iss/confirmslaveremove.jsp index d43f0b8..3ed1369 100644 --- a/java/code/webapp/WEB-INF/pages/admin/iss/confirmslaveremove.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/iss/confirmslaveremove.jsp @@ -27,19 +27,19 @@ <rl:column bound="false" headerkey="iss.slave.isEnabled" sortattr="enabled"> <c:if test="${current.enabled == 'Y'}"> - <rhn:icon type="item-enabled" title="<bean:message key='iss.slave.enabled' />" /> + <rhn:icon type="item-enabled" title="iss.slave.enabled" /> </c:if> <c:if test="${current.enabled != 'Y'}"> - <rhn:icon type="item-disabled" title="<bean:message key='iss.slave.disabled' />" /> + <rhn:icon type="item-disabled" title="iss.slave.disabled" /> </c:if> </rl:column> <rl:column bound="false" headerkey="iss.slave.toAll" sortattr="allOrgs"> <c:if test="${current.allowAllOrgs == 'Y'}"> - <rhn:icon type="item-enabled" title="<bean:message key='iss.slave.all' />" /> + <rhn:icon type="item-enabled" title="iss.slave.all" /> </c:if> <c:if test="${current.allowAllOrgs != 'Y'}"> - <rhn:icon type="item-disabled" title="<bean:message key='iss.slave.notAll' />" /> + <rhn:icon type="item-disabled" title="iss.slave.notAll" /> </c:if> </rl:column> </rl:list> diff --git a/java/code/webapp/WEB-INF/pages/admin/iss/master.jsp b/java/code/webapp/WEB-INF/pages/admin/iss/master.jsp index a82ef20..0b4f982 100644 --- a/java/code/webapp/WEB-INF/pages/admin/iss/master.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/iss/master.jsp @@ -39,19 +39,19 @@ <rl:column bound="false" headerkey="iss.slave.isEnabled" sortattr="enabled" styleclass="center" headerclass="center"> <c:if test="${current.enabled == 'Y'}"> - <rhn:icon type="item-enabled" title="<bean:message key='iss.slave.enabled' />" /> + <rhn:icon type="item-enabled" title="iss.slave.enabled" /> </c:if> <c:if test="${current.enabled != 'Y'}"> - <rhn:icon type="item-disabled" title="<bean:message key='iss.slave.disabled' />" /> + <rhn:icon type="item-disabled" title="iss.slave.disabled" /> </c:if> </rl:column> <rl:column bound="false" headerkey="iss.slave.toAll" sortattr="allOrgs" styleclass="center" headerclass="center"> <c:if test="${current.allowAllOrgs == 'Y'}"> - <rhn:icon type="item-enabled" title="<bean:message key='iss.slave.all' />" /> + <rhn:icon type="item-enabled" title="iss.slave.all" /> </c:if> <c:if test="${current.allowAllOrgs != 'Y'}"> - <rhn:icon type="item-disabled" title="<bean:message key='iss.slave.notAll' />" /> + <rhn:icon type="item-disabled" title="iss.slave.notAll" /> </c:if> </rl:column> <rl:column bound="false" headerkey="iss.slave.num-orgs-allowed" diff --git a/java/code/webapp/WEB-INF/pages/admin/iss/slave.jsp b/java/code/webapp/WEB-INF/pages/admin/iss/slave.jsp index 76915e6..bb382a2 100644 --- a/java/code/webapp/WEB-INF/pages/admin/iss/slave.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/iss/slave.jsp @@ -32,10 +32,10 @@ <rl:column bound="false" headerkey="iss.master.isDefault" styleclass="center" headerclass="center"> <c:if test="${current.defaultMaster}"> - <rhn:icon type="item-enabled" title="<bean:message key='iss.master.isDefault' />" /> + <rhn:icon type="item-enabled" title="iss.master.isDefault" /> </c:if> <c:if test="${not current.defaultMaster}"> - <rhn:icon type="item-disabled" title="<bean:message key='iss.master.notDefault' />" /> + <rhn:icon type="item-disabled" title="iss.master.notDefault" /> </c:if> </rl:column> <rl:column headerkey="iss.num.master.orgs" styleclass="center" headerclass="center"> diff --git a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystems.jsp b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystems.jsp index 6ac67b1..bb0a1b6 100644 --- a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystems.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystems.jsp @@ -32,19 +32,19 @@ <rhn:set value="${current.id}" /> <rhn:column header="probesuitesystems.jsp.state"> <c:if test="${current.status == 'UNKNOWN'}"> - <rhn:icon type="monitoring-unknown" title="<bean:message key='monitoring.status.unknown' />" /> + <rhn:icon type="monitoring-unknown" title="monitoring.status.unknown" /> </c:if> <c:if test="${current.status == 'OK'}"> - <rhn:icon type="monitoring-ok" title="<bean:message key='monitoring.status.ok' />" /> + <rhn:icon type="monitoring-ok" title="monitoring.status.ok" /> </c:if> <c:if test="${current.status == 'WARNING'}"> - <rhn:icon type="monitoring-warn" title="<bean:message key='monitoring.status.warn' />" /> + <rhn:icon type="monitoring-warn" title="monitoring.status.warn" /> </c:if> <c:if test="${current.status == 'PENDING'}"> - <rhn:icon type="monitoring-pending" title="<bean:message key='monitoring.status.pending' />" /> + <rhn:icon type="monitoring-pending" title="monitoring.status.pending" /> </c:if> <c:if test="${current.status == 'CRITICAL'}"> - <rhn:icon type="monitoring-crit" title="<bean:message key='monitoring.status.critical' />" /> + <rhn:icon type="monitoring-crit" title="monitoring.status.critical" /> </c:if> </rhn:column> <rhn:column header="probesuitesystems.jsp.system"> diff --git a/java/code/webapp/WEB-INF/pages/channel/confirmtargetsystems.jsp b/java/code/webapp/WEB-INF/pages/channel/confirmtargetsystems.jsp index ccd29b3..c7e3a91 100755 --- a/java/code/webapp/WEB-INF/pages/channel/confirmtargetsystems.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/confirmtargetsystems.jsp @@ -15,7 +15,7 @@ <%@ include file="/WEB-INF/pages/common/fragments/channel/channel_header.jspf" %> <BR> <h2> - <rhn:icon type="header-system-physical" title="system" /> + <rhn:icon type="header-system-physical" title="system.common.systemAlt" /> <bean:message key="channeltarget.confirm.jsp.header1"/> </h2>

diff --git a/java/code/webapp/WEB-INF/pages/channel/erratalist.jsp b/java/code/webapp/WEB-INF/pages/channel/erratalist.jsp index 001acba..c74d112 100644 --- a/java/code/webapp/WEB-INF/pages/channel/erratalist.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/erratalist.jsp @@ -29,13 +29,13 @@ headerkey="erratalist.jsp.type">

<c:if test="${current.securityAdvisory}"> - <rhn:icon type="errata-security" title="<bean:message key='erratalist.jsp.securityadvisory' />" /> + <rhn:icon type="errata-security" title="erratalist.jsp.securityadvisory" /> </c:if> <c:if test="${current.bugFix}"> - <rhn:icon type="errata-bugfix" title="<bean:message key='erratalist.jsp.bugadvisory' />" /> + <rhn:icon type="errata-bugfix" title="erratalist.jsp.bugadvisory" /> </c:if> <c:if test="${current.productEnhancement}"> - <rhn:icon type="errata-enhance" title="<bean:message key='erratalist.jsp.productenhancementadvisory' />" /> + <rhn:icon type="errata-enhance" title="erratalist.jsp.productenhancementadvisory" /> </c:if>

</rl:column> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/add.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/add.jsp index bf5eedc..11bf1f5 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/add.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/add.jsp @@ -12,7 +12,7 @@ <body> <%@ include file="/WEB-INF/pages/common/fragments/channel/manage/manage_channel_header.jspf" %> <h2> - <rhn:icon type="header-errata" title="erratum" /> <bean:message key="header.jsp.errata.add"/> + <rhn:icon type="header-errata" title="errata.common.errataAlt" /> <bean:message key="header.jsp.errata.add"/> </h2>

<table class="details"> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/addcustomerrata.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/addcustomerrata.jsp index ed9017a..54c946f 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/addcustomerrata.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/addcustomerrata.jsp @@ -94,13 +94,13 @@ styleclass="center" headerclass="thin-column"> <c:if test="${current.securityAdvisory}"> - <rhn:icon type="errata-security" title="<bean:message key='erratalist.jsp.securityadvisory' />" /> + <rhn:icon type="errata-security" title="erratalist.jsp.securityadvisory" /> </c:if> <c:if test="${current.bugFix}"> - <rhn:icon type="errata-bugfix" title="<bean:message key='erratalist.jsp.bugadvisory' />" /> + <rhn:icon type="errata-bugfix" title="erratalist.jsp.bugadvisory" /> </c:if> <c:if test="${current.productEnhancement}"> - <rhn:icon type="errata-enhance" title="<bean:message key='erratalist.jsp.productenhancementadvisory' />" /> + <rhn:icon type="errata-enhance" title="erratalist.jsp.productenhancementadvisory" /> </c:if> </rl:column>

diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/adderrataredhat.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/adderrataredhat.jsp index da69858..89214c5 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/adderrataredhat.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/adderrataredhat.jsp @@ -116,13 +116,13 @@ styleclass="center" headerclass="thin-column"> <c:if test="${current.securityAdvisory}"> - <rhn:icon type="errata-security" title="<bean:message key='erratalist.jsp.securityadvisory' />" /> + <rhn:icon type="errata-security" title="erratalist.jsp.securityadvisory" /> </c:if> <c:if test="${current.bugFix}"> - <rhn:icon type="errata-bugfix" title="<bean:message key='erratalist.jsp.bugadvisory' />" /> + <rhn:icon type="errata-bugfix" title="erratalist.jsp.bugadvisory" /> </c:if> <c:if test="${current.productEnhancement}"> - <rhn:icon type="errata-enhance" title="<bean:message key='erratalist.jsp.productenhancementadvisory' />" /> + <rhn:icon type="errata-enhance" title="erratalist.jsp.productenhancementadvisory" /> </c:if> </rl:column>

diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrata.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrata.jsp index 73a1ced..1b71fcf 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrata.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrata.jsp @@ -24,19 +24,19 @@ <h2>Errata Summary:</h2> <table class="details"> <tr> - <th><rhn:icon type="errata-bugfix" title="<bean:message key='erratalist.jsp.bugadvisory' />" /> + <th><rhn:icon type="errata-bugfix" title="erratalist.jsp.bugadvisory" /> Bug Fix Advisory: </th> <td>${bug_count}</td> </tr> <tr> - <th><rhn:icon type="errata-enhance" title="<bean:message key='erratalist.jsp.productenhancementadvisory' />" /> + <th><rhn:icon type="errata-enhance" title="erratalist.jsp.productenhancementadvisory" /> Product Enhancement Advisory: </th> <td>${enhance_count}</td> </tr> <tr> - <th><rhn:icon type="errata-security" title="<bean:message key='erratalist.jsp.securityadvisory' />" /> + <th><rhn:icon type="errata-security" title="erratalist.jsp.securityadvisory" /> Security Advisory: </th> <td>${secure_count}</td> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrataremove.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrataremove.jsp index a6a56be..532a934 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrataremove.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrataremove.jsp @@ -12,7 +12,7 @@ <body> <%@ include file="/WEB-INF/pages/common/fragments/channel/manage/manage_channel_header.jspf" %> <h2> - <rhn:icon type="header-errata" title="erratum" /> <bean:message key="header.jsp.errata"/> + <rhn:icon type="header-errata" title="errata.common.errataAlt" /> <bean:message key="header.jsp.errata" /> </h2>

<bean:message key="channel.jsp.errata.remove.confirmmessage"/> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/errata.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/errata.jsp index 7df0baf..f06081c 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/errata.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/errata.jsp @@ -12,7 +12,7 @@ <body> <%@ include file="/WEB-INF/pages/common/fragments/channel/manage/manage_channel_header.jspf" %> <h2> - <rhn:icon type="header-errata" title="erratum"/> <bean:message key="header.jsp.errata"/> + <rhn:icon type="header-errata" title="errata.common.errataAlt"/> <bean:message key="header.jsp.errata"/> </h2>

<ul> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/errataremove.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/errataremove.jsp index 1e1f292..631d746 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/errataremove.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/errataremove.jsp @@ -12,7 +12,7 @@ <body> <%@ include file="/WEB-INF/pages/common/fragments/channel/manage/manage_channel_header.jspf" %> <h2> - <rhn:icon type="header-errata" title="erratum" /> <bean:message key="header.jsp.errata"/> + <rhn:icon type="header-errata" title="errata.common.errataAlt" /> <bean:message key="header.jsp.errata"/> </h2>

<bean:message key="channel.jsp.errata.remove.message"/> @@ -42,13 +42,13 @@ headerclass="thin-column" sortattr="advisoryType"> <c:if test="${current.advisoryType == 'Product Enhancement Advisory'}"> - <rhn:icon type="errata-enhance" title="Product Enhancement Advisory" /> + <rhn:icon type="errata-enhance" title="erratalist.jsp.productenhancementadvisory" /> </c:if> <c:if test="${current.advisoryType == 'Security Advisory'}"> - <rhn:icon type="errata-security" title="Security Advisory" /> + <rhn:icon type="errata-security" title="erratalist.jsp.securityadvisory" /> </c:if> <c:if test="${current.advisoryType == 'Bug Fix Advisory'}"> - <rhn:icon type="errata-bugfix" title="Bug Fix Advisory" /> + <rhn:icon type="errata-bugfix" title="erratalist.jsp.bugadvisory" /> </c:if>

</rl:column> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/erratasync.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/erratasync.jsp index 5a7547b..158fb1e 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/erratasync.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/erratasync.jsp @@ -12,7 +12,7 @@ <body> <%@ include file="/WEB-INF/pages/common/fragments/channel/manage/manage_channel_header.jspf" %> <h2> - <rhn:icon type="header-errata" title="erratum" /> <bean:message key="header.jsp.errata.sync"/> + <rhn:icon type="header-errata" title="errata.common.errataAlt" /> <bean:message key="header.jsp.errata.sync"/> </h2>

<bean:message key="channel.jsp.errata.sync.message"/> @@ -42,13 +42,13 @@ headerclass="thin-column" sortattr="advisoryType"> <c:if test="${current.advisoryType == 'Product Enhancement Advisory'}"> - <rhn:icon type="errata-enhance" title="Product Enhancement Advisory" /> + <rhn:icon type="errata-enhance" title="erratalist.jsp.productenhancementadvisory" /> </c:if> <c:if test="${current.advisoryType == 'Security Advisory'}"> - <rhn:icon type="errata-security" title="Security Advisory" /> + <rhn:icon type="errata-security" title="erratalist.jsp.securityadvisory" /> </c:if> <c:if test="${current.advisoryType == 'Bug Fix Advisory'}"> - <rhn:icon type="errata-bugfix" title="Bug Fix Advisory" /> + <rhn:icon type="errata-bugfix" title="erratalist.jsp.bugadvisory" /> </c:if>

</rl:column> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/packagemenu.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/packagemenu.jsp index 03e7fca..cff55a6 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/packagemenu.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/packagemenu.jsp @@ -13,7 +13,7 @@ <%@ include file="/WEB-INF/pages/common/fragments/channel/manage/manage_channel_header.jspf" %>

<h2> - <rhn:icon type="header-package" title="package" /> Packages + <rhn:icon type="header-package" title="package.jsp.alt" /> <bean:message key="package.jsp.menu.packages" /> </h2>

<ul> diff --git a/java/code/webapp/WEB-INF/pages/channel/targetsystems.jsp b/java/code/webapp/WEB-INF/pages/channel/targetsystems.jsp index a6b19ba..db4fcb1 100755 --- a/java/code/webapp/WEB-INF/pages/channel/targetsystems.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/targetsystems.jsp @@ -15,7 +15,7 @@ <%@ include file="/WEB-INF/pages/common/fragments/channel/channel_header.jspf" %> <BR> <h2> - <rhn:icon type="header-system-physical" title="system" /> + <rhn:icon type="header-system-physical" title="system.common.systemAlt" /> <bean:message key="channeltarget.jsp.header1"/> </h2>

diff --git a/java/code/webapp/WEB-INF/pages/common/errors/404.jsp b/java/code/webapp/WEB-INF/pages/common/errors/404.jsp index 7ac4908..5f49490 100644 --- a/java/code/webapp/WEB-INF/pages/common/errors/404.jsp +++ b/java/code/webapp/WEB-INF/pages/common/errors/404.jsp @@ -11,7 +11,7 @@ <c:set var="escapedUrl" value="${fn:escapeXml(errorUrl)}"/>

<h1> - <rhn:icon type="system-warn" title="<bean:message key='500.jsp.imgAlt' />" /> + <rhn:icon type="system-warn" title="500.jsp.imgAlt" /> <bean:message key="404.jsp.title"/> </h1> <p><bean:message key="404.jsp.summary" arg0="${escapedUrl}"/></p> diff --git a/java/code/webapp/WEB-INF/pages/common/errors/500.jsp b/java/code/webapp/WEB-INF/pages/common/errors/500.jsp index 7f9218d..05a92f8 100644 --- a/java/code/webapp/WEB-INF/pages/common/errors/500.jsp +++ b/java/code/webapp/WEB-INF/pages/common/errors/500.jsp @@ -6,7 +6,7 @@ <page:applyDecorator name="layout_c"> <body> <h1> - <rhn:icon type="system-warn" title="<bean:message key='500.jsp.imgAlt' />" /> + <rhn:icon type="system-warn" title="500.jsp.imgAlt" /> <bean:message key="500.jsp.title"/> </h1> <p><bean:message key="500.jsp.summary"/></p> diff --git a/java/code/webapp/WEB-INF/pages/common/errors/lookup.jsp b/java/code/webapp/WEB-INF/pages/common/errors/lookup.jsp index 252bfd4..facb0d7 100644 --- a/java/code/webapp/WEB-INF/pages/common/errors/lookup.jsp +++ b/java/code/webapp/WEB-INF/pages/common/errors/lookup.jsp @@ -7,7 +7,7 @@ <rhn:require acl="user_authenticated()">

<h1> - <rhn:icon type="system-warn" title="<bean:message key='error.common.errorAlt' />" /> + <rhn:icon type="system-warn" title="error.common.errorAlt" /> ${error.localizedTitle} </h1>

diff --git a/java/code/webapp/WEB-INF/pages/common/errors/nosuchkickstart.jsp b/java/code/webapp/WEB-INF/pages/common/errors/nosuchkickstart.jsp index 74e68a2..d267385 100644 --- a/java/code/webapp/WEB-INF/pages/common/errors/nosuchkickstart.jsp +++ b/java/code/webapp/WEB-INF/pages/common/errors/nosuchkickstart.jsp @@ -5,7 +5,7 @@ <body>

<h1> - <rhn:icon type="system-warn" title="<bean:message key='error.common.errorAlt' />" /> + <rhn:icon type="system-warn" title="error.common.errorAlt" /> <bean:message key="unknown.kickstart" />: </h1>

diff --git a/java/code/webapp/WEB-INF/pages/common/errors/nosuchpkg.jsp b/java/code/webapp/WEB-INF/pages/common/errors/nosuchpkg.jsp index 59de36c..8f9aa78 100644 --- a/java/code/webapp/WEB-INF/pages/common/errors/nosuchpkg.jsp +++ b/java/code/webapp/WEB-INF/pages/common/errors/nosuchpkg.jsp @@ -5,7 +5,7 @@ <body>

<h1> - <rhn:icon type="system-warn" title="<bean:message key='error.common.errorAlt' />" /> + <rhn:icon type="system-warn" title="error.common.errorAlt" /> <bean:message key="unknown.package" />: </h1>

diff --git a/java/code/webapp/WEB-INF/pages/common/errors/permission.jsp b/java/code/webapp/WEB-INF/pages/common/errors/permission.jsp index 7ff26b2..e15ff38 100644 --- a/java/code/webapp/WEB-INF/pages/common/errors/permission.jsp +++ b/java/code/webapp/WEB-INF/pages/common/errors/permission.jsp @@ -5,7 +5,7 @@ <body>

<h1> - <rhn:icon type="system-warn" title="<bean:message key='error.common.errorAlt' />" /> + <rhn:icon type="system-warn" title="error.common.errorAlt" /> ${error.localizedTitle} </h1>

diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/groups.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/groups.jspf index a806ae2..a57df19 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/groups.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/groups.jspf @@ -14,7 +14,7 @@

<div class="page-summary"> - <h2><rhn:icon type="header-system-groups" title="system group" /> + <h2><rhn:icon type="header-system-groups" title="system.common.groupAlt" /> <bean:message key="${param.title_key}"/> </h2> <p> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/admin/channelperms_list.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/admin/channelperms_list.jspf index 3716f17..c8a342f 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/admin/channelperms_list.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/admin/channelperms_list.jspf @@ -2,10 +2,10 @@ <rhn:listdisplay filterBy="channelperms.jsp.channelname" button="channelperms.jsp.submitpermissions"> <rhn:column header="channelperms.jsp.permission" width="5%"> <c:if test="${userIsChannelAdmin}"> - <rhn:icon type="item-enabled" title="<bean:message key='channelperms.jsp.permAdmin' />" /> + <rhn:icon type="item-enabled" title="channelperms.jsp.permAdmin" /> </c:if> <c:if test="${current.globallySubscribable and not (userIsChannelAdmin)}"> - <rhn:icon type="item-enabled" title="<bean:message key='channelperms.jsp.permGlobal' />" /> + <rhn:icon type="item-enabled" title="channelperms.jsp.permGlobal" /> </c:if> <c:if test="${not (userIsChannelAdmin or current.globallySubscribable)}"> <html:multibox property="selectedChannels">${current.id}</html:multibox> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/audit/scap-list-columns.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/audit/scap-list-columns.jspf index 200e6d4..2cdf510 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/audit/scap-list-columns.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/audit/scap-list-columns.jspf @@ -3,21 +3,21 @@ <c:when test="${not empty current.comparableId}"> <a href="/rhn/audit/scap/DiffSubmit.do?first=${current.comparableId}&second=${current.xid}&view=changed"> <c:when test="${current.diffIcon == 'checked'}" > - <rhn:icon type="system-ok" title="<bean:message key='scapdiff.jsp.i.checked'/>"/> + <rhn:icon type="system-ok" title="scapdiff.jsp.i.checked" /> </c:when> <c:when test="${current.diffIcon == 'alert'}" > - <rhn:icon type="system-warn" title="<bean:message key='scapdiff.jsp.i.alert'/>"/> + <rhn:icon type="system-warn" title="scapdiff.jsp.i.alert" /> </c:when> <c:when test="${current.diffIcon == 'error'}" > - <rhn:icon type="system-crit" title="<bean:message key='scapdiff.jsp.i.error'/>"/> + <rhn:icon type="system-crit" title="scapdiff.jsp.i.error" /> </c:when> <c:otherwise> - <rhn:icon type="system-unknown" title="<bean:message key='system.audit.xccdfdetails.jsp.nodiff'/>"/> + <rhn:icon type="system-unknown" title="system.audit.xccdfdetails.jsp.nodiff" /> </c:otherwise> </a> </c:when> <c:otherwise> - <rhn:icon type="system-unknown" title="<bean:message key='system.audit.xccdfdetails.jsp.nodiff'/>"/> + <rhn:icon type="system-unknown" title="system.audit.xccdfdetails.jsp.nodiff" /> </c:otherwise> </c:choose>&nbsp;

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 e600bb4..8a31b01 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/summary.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/summary.jspf @@ -49,7 +49,7 @@ <c:choose> <c:when test="${summary.numSystems > 0}"> <td> - <rhn:icon type="header-system" title="<bean:message key='system.common.systemAlt' />" /> + <rhn:icon type="header-system" title="system.common.systemAlt" /> <a href="/rhn/systems/details/configuration/Overview.do?&amp;sid=${summary.mostRecentSystem.id}"> <c:out value="${summary.mostRecentSystem.name}" /> </a><br /> @@ -68,13 +68,13 @@ <c:when test="${summary.numFiles + summary.numDirs + summary.numSymlinks > 0}"> <c:choose> <c:when test="${summary.mostRecentMod.configFile.latestConfigRevision.directory}"> - <rhn:icon type="header-folder" title="<bean:message key='config.common.dirAlt' />" /> + <rhn:icon type="header-folder" title="config.common.dirAlt" /> </c:when> <c:when test="${summary.mostRecentMod.configFile.latestConfigRevision.symlink}"> - <rhn:icon type="header-symlink" title="<bean:message key='config.common.symlinkAlt' />" /> + <rhn:icon type="header-symlink" title="config.common.symlinkAlt" /> </c:when> <c:otherwise> - <rhn:icon type="header-file" title="<bean:message key='config.common.fileAlt' />" /> + <rhn:icon type="header-file" title="config.common.fileAlt" /> </c:otherwise> </c:choose> <a href="/rhn/configuration/file/FileDetails.do?cfid=${summary.mostRecentMod.configFile.id}"> @@ -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> - <rhn:icon type="header-user" title="<bean:message key='user.common.userAlt' />" /> + <rhn:icon type="header-user" title="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/enablesummary.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablesummary.jspf index efe4d7b..7b50398 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablesummary.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablesummary.jspf @@ -8,10 +8,10 @@

<rhn:column header="summary.jsp.status"> <c:if test="${current.success}"> - <rhn:icon type="action-ok" title="<bean:message key='summary.jsp.okAlt' />" /> + <rhn:icon type="action-ok" title="summary.jsp.okAlt" /> </c:if> <c:if test="${!current.success}"> - <rhn:icon type="action-failed" title="<bean:message key='summary.jsp.errorAlt' />" /> + <rhn:icon type="action-failed" title="summary.jsp.errorAlt" /> </c:if> </rhn:column>

diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/copyfile_rows.jsp b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/copyfile_rows.jsp index 800c7e5..bb5ee4c 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/copyfile_rows.jsp +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/copyfile_rows.jsp @@ -25,13 +25,13 @@ url="/rhn/configuration/ChannelOverview.do?ccid=${current.id}"> <c:choose> <c:when test="${requestScope.type == 'central'}"> - <rhn:icon type="header-channel" title="<bean:message key='config.common.globalAlt' />" /> + <rhn:icon type="header-channel" title="config.common.globalAlt" /> </c:when> <c:when test="${requestScope.type == 'local'}"> - <rhn:icon type="header-system-physical" title="<bean:message key='config.common.localAlt' />" /> + <rhn:icon type="header-system-physical" title="config.common.localAlt" /> </c:when> <c:otherwise> - <rhn:icon type="header-sandbox" title="<bean:message key='config.common.sandboxAlt' />" /> + <rhn:icon type="header-sandbox" title="config.common.sandboxAlt" /> </c:otherwise> </c:choose> ${current.nameDisplay} diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deploylocal.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deploylocal.jspf index 3e14cc8..8404dd9 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deploylocal.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deploylocal.jspf @@ -51,7 +51,7 @@ </tr> <tr> <th> - <rhn:icon type="header-schedule" title="<bean:message key='deploy.jsp.selection' />" /> + <rhn:icon type="header-schedule" title="deploy.jsp.selection" /> </th> <td> <jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp"> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/details.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/details.jspf index d2b47df..ca98dc1 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/details.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/details.jspf @@ -10,13 +10,13 @@ <td> <c:choose> <c:when test="${channel.configChannelType.label == 'normal'}"> - <rhn:icon type="header-channel-configuration" title="<bean:message key='config.common.globalAlt' />"/> + <rhn:icon type="header-channel-configuration" title="config.common.globalAlt" /> </c:when> <c:when test="${channel.configChannelType.label == 'local_override'}"> - <rhn:icon type="header-system" title="<bean:message key='config.common.localAlt' />"/> + <rhn:icon type="header-system" title="config.common.localAlt" /> </c:when> <c:otherwise> - <rhn:icon type="header-sandbox" title="<bean:message key='config.common.sandboxAlt' />" /> + <rhn:icon type="header-sandbox" title="config.common.sandboxAlt" /> </c:otherwise> </c:choose>

@@ -49,7 +49,7 @@ * the login of the user --%> <c:set var="beanarg" scope="request"> - <rhn:icon type="header-user" title="<bean:message key='user.common.userAlt' />" /> + <rhn:icon type="header-user" title="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/configuration/files/file_info.jsp b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/file_info.jsp index c11917a..fc9f430 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/file_info.jsp +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/file_info.jsp @@ -23,13 +23,13 @@ <a href="/rhn/configuration/ChannelOverview.do?ccid=${mychan.id}"> <c:choose> <c:when test="${mychan.configChannelType.label == 'server_import'}"> - <rhn:icon type="header-sandbox" title="<bean:message key='config.common.sandboxAlt' />" /> + <rhn:icon type="header-sandbox" title="config.common.sandboxAlt" /> </c:when> <c:when test="${mychan.configChannelType.label == 'local_override'}"> - <rhn:icon type="header-system-physical" title="<bean:message key='config.common.localAlt' />" /> + <rhn:icon type="header-system-physical" title="config.common.localAlt" /> </c:when> <c:otherwise> - <rhn:icon type="header-channel" title="<bean:message key='config.common.globalAlt' />" /> + <rhn:icon type="header-channel" title="config.common.globalAlt" /> </c:otherwise> </c:choose> ${mychan.name} diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/configfile_confirm.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/configfile_confirm.jspf index 3f43e60..741bb0b 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/configfile_confirm.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/configfile_confirm.jspf @@ -23,7 +23,7 @@ <th><bean:message key="sdcconfigconfirm.jsp.usedate"/></th> </tr> <tr> - <th><rhn:icon type="header-schedule" title="<bean:message key='syncprofile.jsp.selection' />" /> + <th><rhn:icon type="header-schedule" title="syncprofile.jsp.selection" /> </th> <td> <jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp"> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/configfile_rows.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/configfile_rows.jspf index 00bd067..4d8add2 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/configfile_rows.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/configfile_rows.jspf @@ -5,13 +5,13 @@ <rhn:column header="sdcconfigfiles.jsp.filename"> <c:choose> <c:when test="${current.configFileType == 'file'}"> - <rhn:icon type="header-file" title="<bean:message key='config.common.fileAlt' />"/> ${current.path} + <rhn:icon type="header-file" title="config.common.fileAlt" /> ${current.path} </c:when> <c:when test="${current.configFileType == 'directory'}"> - <rhn:icon type="header-folder" title="<bean:message key='config.common.dirAlt' />"/> ${current.path} + <rhn:icon type="header-folder" title="config.common.dirAlt" /> ${current.path} </c:when> <c:otherwise> - <rhn:icon type="header-symlink" title="<bean:message key='config.common.symlinkAlt' />"/> ${current.path} + <rhn:icon type="header-symlink" title="config.common.symlinkAlt" /> ${current.path} </c:otherwise> </c:choose> </rhn:column> @@ -25,13 +25,13 @@ url="/rhn/configuration/ChannelOverview.do?ccid=${current.configChannelId}"> <c:choose> <c:when test="${current.configChannelType == 'normal'}"> - <rhn:icon type="header-channel" title="<bean:message key='config.common.globalAlt' />"/> + <rhn:icon type="header-channel" title="config.common.globalAlt" /> </c:when> <c:when test="${current.configChannelType == 'local_override'}"> - <rhn:icon type="header-system" title="<bean:message key='config.common.localAlt' />"/> + <rhn:icon type="header-system" title="config.common.localAlt" /> </c:when> <c:otherwise> - <rhn:icon type="header-sandbox" title="<bean:message key='config.common.sandboxAlt' />"/> + <rhn:icon type="header-sandbox" title="config.common.sandboxAlt" /> </c:otherwise> </c:choose> ${current.channelNameDisplay} diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/ssm/configconfirmlist.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/ssm/configconfirmlist.jspf index c1f7e29..32a4014 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/ssm/configconfirmlist.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/ssm/configconfirmlist.jspf @@ -6,7 +6,7 @@ <rhn:listdisplay filterBy="system.common.systemName"> <rhn:column header="system.common.systemName" url="/rhn/systems/details/configuration/Overview.do?sid=${current.id}"> - <rhn:icon type="header-system" title="<bean:message key='system.common.systemAlt' />" /> + <rhn:icon type="header-system" title="system.common.systemAlt" /> ${current.name} </rhn:column>

diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/ssm/configlist.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/ssm/configlist.jspf index aed702a..59d3eb7 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/ssm/configlist.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/ssm/configlist.jspf @@ -9,7 +9,7 @@ <rhn:set value="${current.id}"/>

<rhn:column header="ssmdiff.jsp.filename"> - <rhn:icon type="header-file" title="<bean:message key='config.common.fileAlt' />" /> + <rhn:icon type="header-file" title="config.common.fileAlt" /> ${current.path} </rhn:column>

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 54d1932..31bffef 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/errata/ownedlistdisplay.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/errata/ownedlistdisplay.jspf @@ -12,13 +12,13 @@

<rl:column headerkey="erratalist.jsp.type"> <c:if test="${current.securityAdvisory}"> - <rhn:icon type="errata-security" title="<bean:message key='erratalist.jsp.securityadvisory' />" /> + <rhn:icon type="errata-security" title="erratalist.jsp.securityadvisory" /> </c:if> <c:if test="${current.bugFix}"> - <rhn:icon type="errata-bugfix" title="<bean:message key='erratalist.jsp.bugadvisory' />" /> + <rhn:icon type="errata-bugfix" title="erratalist.jsp.bugadvisory" /> </c:if> <c:if test="${current.productEnhancement}"> - <rhn:icon type="errata-enhance" title="<bean:message key='erratalist.jsp.productenhancementadvisory' />" /> + <rhn:icon type="errata-enhance" title="erratalist.jsp.productenhancementadvisory" /> </c:if> </rl:column> <rl:column headerkey="erratalist.jsp.advisory"> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/errata/relevant-errata-list.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/errata/relevant-errata-list.jspf index a50025b..589fd31 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/errata/relevant-errata-list.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/errata/relevant-errata-list.jspf @@ -8,13 +8,13 @@

<rl:column headerkey="erratalist.jsp.type" styleclass="text-align: left;"> <c:if test="${current.securityAdvisory}"> - <rhn:icon type="errata-security" title="<bean:message key='erratalist.jsp.securityadvisory' />" /> + <rhn:icon type="errata-security" title="erratalist.jsp.securityadvisory" /> </c:if> <c:if test="${current.bugFix}"> - <rhn:icon type="errata-bugfix" title="<bean:message key='erratalist.jsp.bugadvisory' />" /> + <rhn:icon type="errata-bugfix" title="erratalist.jsp.bugadvisory" /> </c:if> <c:if test="${current.productEnhancement}"> - <rhn:icon type="errata-enhance" title="<bean:message key='erratalist.jsp.productenhancementadvisory' />" /> + <rhn:icon type="errata-enhance" title="erratalist.jsp.productenhancementadvisory" /> </c:if> </rl:column> <rl:column headerkey="erratalist.jsp.advisory"> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/groups/header.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/groups/header.jspf index df5d63c..2dc9175 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/groups/header.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/groups/header.jspf @@ -9,11 +9,11 @@ <div class="spacewalk-toolbar"> <span class="spacewalk-toolbar"> <a href="/rhn/systems/WorkWithGroup.do?sgid=${systemgroup.id}"> - <rhn:icon type="header-system-groups" title="<bean:message key='toolbar.work.with.group' />" /> + <rhn:icon type="header-system-groups" title="toolbar.work.with.group" /> <bean:message key="toolbar.work.with.group"/> </a> <a href="/rhn/groups/Delete.do?sgid=${systemgroup.id}"> - <rhn:icon type="item-del" title="<bean:message key='toolbar.delete.systemgroup'/>" /> + <rhn:icon type="item-del" title="toolbar.delete.systemgroup" /> <bean:message key="toolbar.delete.systemgroup"/> </a>

@@ -21,7 +21,7 @@ </div> <h1>

- <rhn:icon type="header-system-groups" title="system groups" /> + <rhn:icon type="header-system-groups" title="system.common.groupAlt" />

<c:if test="${empty systemgroup}"> <decorator:getProperty property="meta.name" /> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/groups/systems.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/groups/systems.jspf index 20c0a79..a6862ad 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/groups/systems.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/groups/systems.jspf @@ -17,7 +17,7 @@ </rhn:require>

<h2> - <rhn:icon type="header-system" title="system" /> + <rhn:icon type="header-system" title="system.common.systemAlt" /> <bean:message key="${param.title_key}"/> </h2> <p> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/proxy-options.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/proxy-options.jspf index b687099..edcf1de 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/proxy-options.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/proxy-options.jspf @@ -15,7 +15,7 @@ function clearChecked(radioGroup) {

<c:if test="${not empty proxies}"> <h2> - <rhn:icon type="header-proxy" title="<bean:message key='system.common.proxyAlt' />" /> + <rhn:icon type="header-proxy" title="system.common.proxyAlt" /> <bean:message key="kickstart.schedule.heading.proxy.jsp"/> </h2> <c:choose> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/schedule-options.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/schedule-options.jspf index ba2fc55..7728e0f 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/schedule-options.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/schedule-options.jspf @@ -3,7 +3,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> <h2> - <rhn:icon type="header-schedule" title="<bean:message key='system.common.scheduleAlt' />" /> + <rhn:icon type="header-schedule" title="system.common.scheduleAlt" /> <bean:message key="kickstart.schedule.heading3.jsp" /> </h2> <c:choose> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/package/package_header.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/package/package_header.jspf index 0ee1a6a..00e2cff 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/package/package_header.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/package/package_header.jspf @@ -1,7 +1,7 @@

<rhn:toolbar base="h1" icon="header-package" imgAlt="package.jsp.alt"> - <c:out value="${package_name}" escapeXml="true"/><a href="/rhn/help/reference/en-US/s1-sm-channels-packages.jsp" target="_blank" class="help-title"><rhn:icon type="header-help" title="Help Icon" /></a> + <c:out value="${package_name}" escapeXml="true"/><a href="/rhn/help/reference/en-US/s1-sm-channels-packages.jsp" target="_blank" class="help-title"><rhn:icon type="header-help" title="toolbar.jsp.helpicon.alt" /></a> </rhn:toolbar>

diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/probes/probe-state-column-new.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/probes/probe-state-column-new.jspf index 0da3f9a..a2f8937 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/probes/probe-state-column-new.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/probes/probe-state-column-new.jspf @@ -5,18 +5,18 @@ headerkey="probedetails.jsp.state" headerclass="thin-column"> <c:if test="${current.stateString == 'UNKNOWN'}"> - <rhn:icon type="monitoring-unknown" title="<bean:message key='monitoring.status.unknown' />" /> + <rhn:icon type="monitoring-unknown" title="monitoring.status.unknown" /> </c:if> <c:if test="${current.stateString == 'OK'}"> - <rhn:icon type="monitoring-ok" title="<bean:message key='monitoring.status.ok' />" /> + <rhn:icon type="monitoring-ok" title="monitoring.status.ok" /> </c:if> <c:if test="${current.stateString == 'WARNING'}"> - <rhn:icon type="monitoring-warn" title="<bean:message key='monitoring.status.warn' />" /> + <rhn:icon type="monitoring-warn" title="monitoring.status.warn" /> </c:if> <c:if test="${current.stateString == 'PENDING'}"> - <rhn:icon type="monitoring-pending" title="<bean:message key='monitoring.status.pending' />" /> + <rhn:icon type="monitoring-pending" title="monitoring.status.pending" /> </c:if> <c:if test="${current.stateString == 'CRITICAL'}"> - <rhn:icon type="monitoring-crit" title="<bean:message key='monitoring.status.critical' />" /> + <rhn:icon type="monitoring-crit" title="monitoring.status.critical" /> </c:if> </rl:column> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/probes/probe-state-column.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/probes/probe-state-column.jspf index a2fdece..da9d36e 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/probes/probe-state-column.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/probes/probe-state-column.jspf @@ -1,17 +1,17 @@ <rhn:column header="probedetails.jsp.state"> <c:if test="${current.stateString == 'UNKNOWN'}"> - <rhn:icon type="monitoring-unknown" title="<bean:message key='monitoring.status.unknown' />" /> + <rhn:icon type="monitoring-unknown" title="monitoring.status.unknown" /> </c:if> <c:if test="${current.stateString == 'OK'}"> - <rhn:icon type="monitoring-ok" title="<bean:message key='monitoring.status.ok' />" /> + <rhn:icon type="monitoring-ok" title="monitoring.status.ok" /> </c:if> <c:if test="${current.stateString == 'WARNING'}"> - <rhn:icon type="monitoring-warn" title="<bean:message key='monitoring.status.warn' />" /> + <rhn:icon type="monitoring-warn" title="monitoring.status.warn" /> </c:if> <c:if test="${current.stateString == 'PENDING'}"> - <rhn:icon type="monitoring-pending" title="<bean:message key='monitoring.status.pending' />" /> + <rhn:icon type="monitoring-pending" title="monitoring.status.pending" /> </c:if> <c:if test="${current.stateString == 'CRITICAL'}"> - <rhn:icon type="monitoring-crit" title="<bean:message key='monitoring.status.critical' />" /> + <rhn:icon type="monitoring-crit" title="monitoring.status.critical" /> </c:if> </rhn:column> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/systems/group_listdisplay.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/systems/group_listdisplay.jspf index b2debd3..43c2754 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/systems/group_listdisplay.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/systems/group_listdisplay.jspf @@ -32,13 +32,13 @@

<c:choose> <c:when test="${current.mostSevereErrata == 'Security Advisory'}"> - <rhn:icon type="system-crit" title="<bean:message key='grouplist.jsp.security' />" /> + <rhn:icon type="system-crit" title="grouplist.jsp.security" /> </c:when> <c:when test="${current.mostSevereErrata == 'Bug Fix Advisory' or current.mostSevereErrata == 'Product Enhancement Advisory'}"> - <rhn:icon type="system-warn" title="<bean:message key='grouplist.jsp.updates' />" /> + <rhn:icon type="system-warn" title="grouplist.jsp.updates" /> </c:when> <c:otherwise> - <rhn:icon type="system-ok" title="<bean:message key='grouplist.jsp.noerrata'/>" /> + <rhn:icon type="system-ok" title="grouplist.jsp.noerrata" /> </c:otherwise> </c:choose>

diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/systems/monitoring_status_groups.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/systems/monitoring_status_groups.jspf index 3474988..9e008d7 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/systems/monitoring_status_groups.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/systems/monitoring_status_groups.jspf @@ -10,19 +10,19 @@ <c:out value="<a href="/network/systems/groups/probe_list.pxt?sgid=${current.id}">" escapeXml="false" />

<c:if test="${current.monitoringStatus == 'CRITICAL'}"> - <rhn:icon type="monitoring-crit" title="<bean:message key='systemlist.jsp.probecritical' />" /> + <rhn:icon type="monitoring-crit" title="systemlist.jsp.probecritical" /> </c:if> <c:if test="${current.monitoringStatus == 'WARNING'}"> - <rhn:icon type="monitoring-warn" title="<bean:message key='systemlist.jsp.probewarning' />" /> + <rhn:icon type="monitoring-warn" title="systemlist.jsp.probewarning" /> </c:if> <c:if test="${current.monitoringStatus == 'UNKNOWN'}"> - <rhn:icon type="monitoring-unknown" title="<bean:message key='systemlist.jsp.probeunknown' />" /> + <rhn:icon type="monitoring-unknown" title="systemlist.jsp.probeunknown" /> </c:if> <c:if test="${current.monitoringStatus == 'PENDING'}"> - <rhn:icon type="monitoring-pending" title="<bean:message key='systemlist.jsp.probepending' />" /> + <rhn:icon type="monitoring-pending" title="systemlist.jsp.probepending" /> </c:if> <c:if test="${current.monitoringStatus == 'OK'}"> - <rhn:icon type="monitoring-ok" title="<bean:message key='systemlist.jsp.probeok' />" /> + <rhn:icon type="monitoring-ok" title="systemlist.jsp.probeok" /> </c:if>

<c:out value="</a>" escapeXml="false"/> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/systems/monitoring_status_systems.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/systems/monitoring_status_systems.jspf index d42400e..931ef7f 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/systems/monitoring_status_systems.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/systems/monitoring_status_systems.jspf @@ -13,19 +13,19 @@ <c:out value="<a href="/rhn/systems/details/probes/ProbesList.do?sid=${current.id}">" escapeXml="false"/>

<c:if test="${current.monitoringStatus == 'CRITICAL'}"> - <rhn:icon type="monitoring-crit" title="<bean:message key='systemlist.jsp.probecritical' />" /> + <rhn:icon type="monitoring-crit" title="systemlist.jsp.probecritical" /> </c:if> <c:if test="${current.monitoringStatus == 'WARNING'}"> - <rhn:icon type="monitoring-warn" title="<bean:message key='systemlist.jsp.probewarning' />" /> + <rhn:icon type="monitoring-warn" title="systemlist.jsp.probewarning" /> </c:if> <c:if test="${current.monitoringStatus == 'UNKNOWN'}"> - <rhn:icon type="monitoring-unknown" title="<bean:message key='systemlist.jsp.probeunknown' />" /> + <rhn:icon type="monitoring-unknown" title="systemlist.jsp.probeunknown" /> </c:if> <c:if test="${current.monitoringStatus == 'PENDING'}"> - <rhn:icon type="monitoring-pending" title="<bean:message key='systemlist.jsp.probepending' />" /> + <rhn:icon type="monitoring-pending" title="systemlist.jsp.probepending" /> </c:if> <c:if test="${current.monitoringStatus == 'OK'}"> - <rhn:icon type="monitoring-ok" title="<bean:message key='systemlist.jsp.probeok' />" /> + <rhn:icon type="monitoring-ok" title="systemlist.jsp.probeok" /> </c:if> <c:out value="</a>" escapeXml="false"/> </rl:column> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/systems/system_list_fragment.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/systems/system_list_fragment.jspf index 88d1e69..eb7632f 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/systems/system_list_fragment.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/systems/system_list_fragment.jspf @@ -1,13 +1,13 @@ <c:out value="<a href="/rhn/systems/details/Overview.do?sid=${current.id}">" escapeXml="false" /> <c:choose> <c:when test="${current.virtualGuest && empty nosystemicons}"> - <rhn:icon type="system-virt-guest" title="<bean:message key='systemlist.jsp.virtguest'/>" /> + <rhn:icon type="system-virt-guest" title="systemlist.jsp.virtguest" /> </c:when> <c:when test="${current.virtualHost && empty nosystemicons}"> - <rhn:icon type="system-virt-host" title="<bean:message key='systemlist.jsp.virthost'/>" /> + <rhn:icon type="system-virt-host" title="systemlist.jsp.virthost" /> </c:when> <c:otherwise> - <rhn:icon type="system-physical" title="<bean:message key='systemlist.jsp.nonvirt'/>" /> + <rhn:icon type="system-physical" title="systemlist.jsp.nonvirt" /> </c:otherwise> </c:choose> <c:choose> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/errata.jsp b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/errata.jsp index 76a2b50..72ef430 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/errata.jsp +++ b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/errata.jsp @@ -14,7 +14,7 @@ description="yourrhn.jsp.relevanterrata.description">

<rhn:column header="yourrhn.jsp.securityerrata"> - <rhn:icon type="errata-security" title="<bean:message key='errata-legend.jsp.security' />" /> + <rhn:icon type="errata-security" title="errata-legend.jsp.security" /> <a href="/rhn/errata/details/Details.do?eid=${current.id}">${current.advisoryName}</a> </rhn:column>

diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/mostCriticalSystems.jsp b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/mostCriticalSystems.jsp index 7b56ee8..75f0b8c 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/mostCriticalSystems.jsp +++ b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/mostCriticalSystems.jsp @@ -32,17 +32,17 @@

<rl:column headerkey="yourrhn.jsp.criticalsystems.securityerrata" headerclass="row-2 text-align: center;"> - <rhn:icon type="errata-security" title="<bean:message key='errata-legend.jsp.security' />" />${current.securityErrata} + <rhn:icon type="errata-security" title="errata-legend.jsp.security" />${current.securityErrata} </rl:column>

<rl:column headerkey="yourrhn.jsp.criticalsystems.bugfixerrata" headerclass="row-2 text-align: center;"> - <rhn:icon type="errata-bugfix" title="<bean:message key='errata-legend.jsp.bugfix' />" />${current.bugErrata} + <rhn:icon type="errata-bugfix" title="errata-legend.jsp.bugfix" />${current.bugErrata} </rl:column>

<rl:column headerkey="yourrhn.jsp.criticalsystems.enhancementerrata" headerclass="row-2 text-align: center;"> - <rhn:icon type="errata-enhance" title="<bean:message key='errata-legend.jsp.enhancement' />" />${current.enhancementErrata} + <rhn:icon type="errata-enhance" title="errata-legend.jsp.enhancement" />${current.enhancementErrata} </rl:column>

</rl:list> 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 ca57deb..fe00d43 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}"> - <rhn:icon type="header-user" title="<bean:message key='yourrhn.jsp.user.alt'/>" /> + <rhn:icon type="header-user" title="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 93206cd..3298808 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/scheduledActions.jsp +++ b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/scheduledActions.jsp @@ -17,16 +17,16 @@ <rhn:column header="schedulesync.jsp.action"> <c:choose> <c:when test="${current.actionStatusId == 0 || current.actionStatusId == 1}"> - <rhn:icon type="action-pending" title="<bean:message key='yourrhn.jsp.actions.pending' />" /> + <rhn:icon type="action-pending" title="yourrhn.jsp.actions.pending" /> </c:when> <c:when test="${current.actionStatusId == 2}"> - <rhn:icon type="action-ok" title="<bean:message key='yourrhn.jsp.actions.completed' />" /> + <rhn:icon type="action-ok" title="yourrhn.jsp.actions.completed" /> </c:when> <c:when test="${current.actionStatusId == 3}"> - <rhn:icon type="action-failed" title="<bean:message key='yourrhn.jsp.actions.failed' />" /> + <rhn:icon type="action-failed" title="yourrhn.jsp.actions.failed" /> </c:when> <c:otherwise> - <rhn:icon type="system-unknown" title="<bean:message key='yourrhn.jsp.actions.unknown' />" /> + <rhn:icon type="system-unknown" title="yourrhn.jsp.actions.unknown" /> </c:otherwise> </c:choose> <a href="/rhn/schedule/ActionDetails.do?aid=${current.id}"><c:out value="${current.actionName}" /></a> @@ -36,7 +36,7 @@ style="text-align: center;"> <c:choose> <c:when test="${current.userName != ''}"> - <rhn:icon type="header-user" title="<bean:message key='yourrhn.jsp.user.alt'/>" /> + <rhn:icon type="header-user" title="yourrhn.jsp.user.alt" /> ${current.userName} </c:when> <c:otherwise> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/systemGroups.jsp b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/systemGroups.jsp index a3eaccc..2861794 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/systemGroups.jsp +++ b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/systemGroups.jsp @@ -18,13 +18,13 @@ <a href="/rhn/groups/ListErrata.do?sgid=${current.id}"> <c:choose> <c:when test="${current.mostSevereErrata == 'Security Advisory'}"> - <rhn:icon type="system-crit" title="<bean:message key='grouplist.jsp.security' />" /> + <rhn:icon type="system-crit" title="grouplist.jsp.security" /> </c:when> <c:when test="${current.mostSevereErrata == 'Bug Fix Advisory' or current.mostSevereErrata == 'Product Enhancement Advisory'}"> - <rhn:icon type="system-warn" title="<bean:message key='grouplist.jsp.updates' />" /> + <rhn:icon type="system-warn" title="grouplist.jsp.updates" /> </c:when> <c:otherwise> - <rhn:icon type="system-ok" title="<bean:message key='grouplist.jsp.noerrata'/>" /> + <rhn:icon type="system-ok" title="grouplist.jsp.noerrata" /> </c:otherwise> </c:choose> </a> diff --git a/java/code/webapp/WEB-INF/pages/configuration/channel/copy2systems.jsp b/java/code/webapp/WEB-INF/pages/configuration/channel/copy2systems.jsp index 5c45789..2ed87fa 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/channel/copy2systems.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/channel/copy2systems.jsp @@ -33,7 +33,7 @@ sortable="true" sortattr="name"> <a href="/rhn/systems/details/configuration/Overview.do?sid=${current.id}"> - <rhn:icon type="header-system-physical" title="<bean:message key='system.common.systemAlt' />" /> + <rhn:icon type="header-system-physical" title="system.common.systemAlt" /> ${current.name} </a> </rl:column> diff --git a/java/code/webapp/WEB-INF/pages/configuration/channel/deployconfirm.jsp b/java/code/webapp/WEB-INF/pages/configuration/channel/deployconfirm.jsp index 81b0194..fee5f8e 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/channel/deployconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/channel/deployconfirm.jsp @@ -61,7 +61,7 @@ styleclass="list" emptykey="deployconfirm.jsp.noSystems" width="100%" filter="com.redhat.rhn.frontend.action.configuration.ConfigSystemFilter" > <rl:column headerkey="system.common.systemName" sortable="true" sortattr="name"> - <rhn:icon type="header-system-physical" title="<bean:message key='system.common.systemAlt' />" /> + <rhn:icon type="header-system-physical" title="system.common.systemAlt" /> <a href="/rhn/systems/details/configuration/Overview.do?system_detail_navi_node=selected_configfiles&sid=${current.id}"> ${fn:escapeXml(current.name)} </a> @@ -82,7 +82,7 @@ <th><bean:message key="deployconfirm.jsp.usedate"/></th> </tr> <tr> - <th><rhn:icon type="header-schedule" title="<bean:message key='syncprofile.jsp.selection' />" /> + <th><rhn:icon type="header-schedule" title="syncprofile.jsp.selection" /> </th> <td> <jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp"> diff --git a/java/code/webapp/WEB-INF/pages/configuration/channel/deploysystems.jsp b/java/code/webapp/WEB-INF/pages/configuration/channel/deploysystems.jsp index e162200..19eb345 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/channel/deploysystems.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/channel/deploysystems.jsp @@ -30,7 +30,7 @@

<rhn:column header="system.common.systemName"> <a href="/rhn/systems/details/configuration/Overview.do?sid=${current.id}"> - <rhn:icon type="header-system-physical" title="<bean:message key='system.common.systemAlt' />" /> + <rhn:icon type="header-system-physical" title="system.common.systemAlt" /> <c:out value="${current.name}" /> </a> </rhn:column> diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/comparechannel.jsp b/java/code/webapp/WEB-INF/pages/configuration/files/comparechannel.jsp index e7d8f6d..c1a3674 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/files/comparechannel.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/files/comparechannel.jsp @@ -26,17 +26,17 @@ <rhn:column header="comparechannel.jsp.channel" url="/rhn/configuration/ChannelOverview.do?ccid=${current.id}"> <c:if test="${current.type == 'normal'}"> - <rhn:icon type="header-channel" title="<bean:message key='config.common.globalAlt' />" /> + <rhn:icon type="header-channel" title="config.common.globalAlt" /> ${current.name} </c:if>

<c:if test="${current.type == 'local_override'}"> - <rhn:icon type="header-system-physical" title="<bean:message key='config.common.localAlt' />" /> + <rhn:icon type="header-system-physical" title="config.common.localAlt" /> ${current.name} </c:if>

<c:if test="${current.type == 'server_import'}"> - <rhn:icon type="header-sandbox" title="<bean:message key='config.common.sandboxAlt' />" /> + <rhn:icon type="header-sandbox" title="config.common.sandboxAlt" /> ${current.name} </c:if> </rhn:column> diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/comparecopy.jsp b/java/code/webapp/WEB-INF/pages/configuration/files/comparecopy.jsp index 436e294..d5e603c 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/files/comparecopy.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/files/comparecopy.jsp @@ -36,13 +36,13 @@ url="/rhn/configuration/file/FileDetails.do?cfid=${current.configFileId}&amp;crid=${current.configRevisionId}"> <c:choose> <c:when test="${current.configFileType == 'file'}"> - <rhn:icon type="header-file" title="<bean:message key='config.common.fileAlt' />" /> + <rhn:icon type="header-file" title="config.common.fileAlt" /> </c:when> <c:when test="${current.configFileType == 'directory'}"> - <rhn:icon type="header-folder" title="<bean:message key='config.common.dirAlt' />" /> + <rhn:icon type="header-folder" title="config.common.dirAlt" /> </c:when> <c:otherwise> - <rhn:icon type="header-symlink" title="<bean:message key='config.common.symlinkAlt' />" /> + <rhn:icon type="header-symlink" title="config.common.symlinkAlt" /> </c:otherwise> </c:choose> <bean:message key="comparecopy.jsp.revnum" arg0="${current.configRevision}" /> diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/copylocal.jsp b/java/code/webapp/WEB-INF/pages/configuration/files/copylocal.jsp index 884999a..cd9ae1f 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/files/copylocal.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/files/copylocal.jsp @@ -29,7 +29,7 @@

<rhn:column header="configsystemfilter.name" url="/rhn/systems/details/configuration/ViewModifyLocalPaths.do?sid=${current.id}"> - <rhn:icon type="header-system-physical" title="<bean:message key='config.common.localAlt' />" /> + <rhn:icon type="header-system-physical" title="config.common.localAlt" /> ${fn:escapeXml(current.name)} </rhn:column>

diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/copysandbox.jsp b/java/code/webapp/WEB-INF/pages/configuration/files/copysandbox.jsp index 942184c..7fba88a 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/files/copysandbox.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/files/copysandbox.jsp @@ -28,7 +28,7 @@

<rhn:column header="copysandbox.jsp.channel" url="/rhn/systems/details/configuration/ViewModifySandboxPaths.do?sid=${current.id}"> - <rhn:icon type="header-sandbox" title="<bean:message key='config.common.sandboxAlt' />" /> + <rhn:icon type="header-sandbox" title="config.common.sandboxAlt" /> ${fn:escapeXml(current.name)} </rhn:column>

diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/deployconfirm.jsp b/java/code/webapp/WEB-INF/pages/configuration/files/deployconfirm.jsp index e930b24..d2bcaf3 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/files/deployconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/files/deployconfirm.jsp @@ -45,7 +45,7 @@ <th><bean:message key="deploy.jsp.usedate" /></th> </tr> <tr> - <th><rhn:icon type="header-schedule" title="<bean:message key='deploy.jsp.selection' />" /></th> + <th><rhn:icon type="header-schedule" title="deploy.jsp.selection" /></th> <td><jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp" flush=""> <jsp:param name="widget" value="date" /> diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/diff.jsp b/java/code/webapp/WEB-INF/pages/configuration/files/diff.jsp index b66fd7c..329698ad 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/files/diff.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/files/diff.jsp @@ -58,7 +58,7 @@ </span> <span> <a href="/rhn/configuration/file/DownloadDiff.do?cfid=${file.id}&amp;crid=${revision.id}&amp;ocrid=${orevision.id}"> - <rhn:icon type="item-download" title="<bean:message key='diff.jsp.downloadAlt' />" /> + <rhn:icon type="item-download" title="diff.jsp.downloadAlt" /> <bean:message key="diff.jsp.download" /> </a> </span> 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 289130c..b18d778 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/overview/globalconfiglist.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/overview/globalconfiglist.jsp @@ -29,7 +29,7 @@ <rhn:listdisplay filterBy="globalconfiglist.jsp.name"> <rhn:column header="globalconfiglist.jsp.name" url="/rhn/configuration/ChannelOverview.do?ccid=${current.id}"> - <rhn:icon type="header-channel" title="<bean:message key='config.common.globalAlt' />" /> + <rhn:icon type="header-channel" title="config.common.globalAlt" /> ${current.name} </rhn:column>

diff --git a/java/code/webapp/WEB-INF/pages/configuration/overview/localfilelist.jsp b/java/code/webapp/WEB-INF/pages/configuration/overview/localfilelist.jsp index 3e6d684..9534769 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/overview/localfilelist.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/overview/localfilelist.jsp @@ -28,7 +28,7 @@

<rhn:column header="localfilelist.jsp.system" url="/rhn/systems/details/configuration/Overview.do?sid=${current.serverId}"> - <rhn:icon type="header-system-physical" title="<bean:message key='system.common.systemAlt' />" /> + <rhn:icon type="header-system-physical" title="system.common.systemAlt" /> ${current.serverName} </rhn:column> </rhn:listdisplay> diff --git a/java/code/webapp/WEB-INF/pages/configuration/overview/managedsystems.jsp b/java/code/webapp/WEB-INF/pages/configuration/overview/managedsystems.jsp index 4f3ae30..d238387 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/overview/managedsystems.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/overview/managedsystems.jsp @@ -27,7 +27,7 @@ <rhn:listdisplay filterBy="system.common.systemName"> <rhn:column header="system.common.systemName" url="/rhn/systems/details/configuration/Overview.do?sid=${current.id}"> - <rhn:icon type="header-system-physical" title="<bean:message key='system.common.systemAlt' />" /> + <rhn:icon type="header-system-physical" title="system.common.systemAlt" /> <c:out value="${current.name}" /> </rhn:column>

diff --git a/java/code/webapp/WEB-INF/pages/configuration/overview/overview.jsp b/java/code/webapp/WEB-INF/pages/configuration/overview/overview.jsp index cab5938..1c6c579 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/overview/overview.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/overview/overview.jsp @@ -118,7 +118,7 @@ <rhn:column header="configoverview.jsp.scheduledBy" url="/rhn/users/UserDetails.do?uid=${current.scheduledById}" renderUrl="${requestScope.is_admin}"> - <rhn:icon type="header-user" title="<bean:message key='user.common.userAlt' />" /> + <rhn:icon type="header-user" title="user.common.userAlt" /> ${fn:escapeXml(current.scheduledByName)} </rhn:column>

diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/channellist.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/channellist.jsp index b31c3ce..7c4787a 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/sdc/channellist.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/channellist.jsp @@ -30,7 +30,7 @@ <rhn:set value="${current.id}"/> <rhn:column header="sdc.configlist.jsp.name" url="/rhn/configuration/ChannelOverview.do?ccid=${current.id}"> - <rhn:icon type="header-channel" title="<bean:message key='config.common.globalAlt' />" /> + <rhn:icon type="header-channel" title="config.common.globalAlt" /> ${current.name} </rhn:column>

diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/importfileconfirm.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/importfileconfirm.jsp index 98a6708..50b466f 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/sdc/importfileconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/importfileconfirm.jsp @@ -41,15 +41,15 @@ <i><bean:message key="sdcimportconfirm.jsp.new" /></i> </c:when> <c:when test="${current.configChannelType == 'normal'}"> - <rhn:icon type="header-channel" title="<bean:message key='config.common.globalAlt' />" /> + <rhn:icon type="header-channel" title="config.common.globalAlt" /> ${current.channelNameDisplay} </c:when> <c:when test="${current.configChannelType == 'local_override'}"> - <rhn:icon type="header-system-physical" title="<bean:message key='config.common.localAlt' />" /> + <rhn:icon type="header-system-physical" title="config.common.localAlt" /> ${current.channelNameDisplay} </c:when> <c:otherwise> - <rhn:icon type="header-sandbox" title="<bean:message key='config.common.sandboxAlt' />" /> + <rhn:icon type="header-sandbox" title="config.common.sandboxAlt" /> ${current.channelNameDisplay} </c:otherwise> </c:choose> @@ -70,7 +70,7 @@ <th><bean:message key="sdcimportconfirm.jsp.usedate"/></th> </tr> <tr> - <th><rhn:icon type="header-schedule" title="<bean:message key='syncprofile.jsp.selection' />" /> + <th><rhn:icon type="header-schedule" title="syncprofile.jsp.selection" /> </th> <td> <jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp"> diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/subscriptions.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/subscriptions.jsp index 9adb803..ef49282 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/sdc/subscriptions.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/subscriptions.jsp @@ -33,7 +33,7 @@ <rhn:set value="${current.id}"/> <rhn:column header="sdc.config.subscriptions.jsp.channel" url="/rhn/configuration/ChannelOverview.do?ccid=${current.id}"> - <rhn:icon type="header-channel" title="<bean:message key='config.common.globalAlt' />" /> + <rhn:icon type="header-channel" title="config.common.globalAlt" /> ${current.name} </rhn:column>

diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/channelsystems.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/channelsystems.jsp index 7f2b9d5..92210d7 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/ssm/channelsystems.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/channelsystems.jsp @@ -9,7 +9,7 @@ <body> <%@ include file="/WEB-INF/pages/common/fragments/ssm/header.jspf" %> <h2> - <rhn:icon type="header-configuration" title="<bean:message key='ssmdiff.jsp.imgAlt' />" /> + <rhn:icon type="header-configuration" title="ssmdiff.jsp.imgAlt" /> <bean:message key="ssmchannelsystems.jsp.header" /> </h2>

@@ -33,7 +33,7 @@ <rhn:listdisplay filterBy="ssmchannelsystems.jsp.system"> <rhn:column header="ssmchannelsystems.jsp.system" url="/rhn/systems/details/configuration/Overview.do?system_detail_navi_node=selected_configfiles&sid=${current.id}"> - <rhn:icon type="header-system-physical" title="<bean:message key='system.common.systemAlt' />" /> + <rhn:icon type="header-system-physical" title="system.common.systemAlt" /> ${current.name} </rhn:column>

diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/deploy.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/deploy.jsp index e1a3eb2..a898198 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/ssm/deploy.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/deploy.jsp @@ -8,7 +8,7 @@ <body> <%@ include file="/WEB-INF/pages/common/fragments/ssm/header.jspf" %> <h2> - <rhn:icon type="header-configuration" title="<bean:message key='ssmdiff.jsp.imgAlt' />" /> + <rhn:icon type="header-configuration" title="ssmdiff.jsp.imgAlt" /> <bean:message key="ssmdeploy.jsp.header" /> </h2>

diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/deployconfirm.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/deployconfirm.jsp index 66b5e83..acf28db 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/ssm/deployconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/deployconfirm.jsp @@ -8,7 +8,7 @@ <body> <%@ include file="/WEB-INF/pages/common/fragments/ssm/header.jspf" %> <h2> - <rhn:icon type="header-configuration" title="<bean:message key='ssmdiff.jsp.imgAlt' />" /> + <rhn:icon type="header-configuration" title="ssmdiff.jsp.imgAlt" /> <bean:message key="deployconfirm.jsp.header" /> </h2>

@@ -41,7 +41,7 @@ <th><bean:message key="deployconfirm.jsp.usedate"/></th> </tr> <tr> - <th><rhn:icon type="header-schedule" title="<bean:message key='syncprofile.jsp.selection' />" /> + <th><rhn:icon type="header-schedule" title="syncprofile.jsp.selection" /> </th> <td> <jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp"> diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/diff.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/diff.jsp index 15c5744..9e0c891 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/ssm/diff.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/diff.jsp @@ -8,7 +8,7 @@ <body> <%@ include file="/WEB-INF/pages/common/fragments/ssm/header.jspf" %> <h2> - <rhn:icon type="header-configuration" title="<bean:message key='ssmdiff.jsp.imgAlt' />" /> + <rhn:icon type="header-configuration" title="ssmdiff.jsp.imgAlt" /> <bean:message key="ssmdiff.jsp.header" /> </h2>

diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/diffconfirm.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/diffconfirm.jsp index a711607..aa5f7e2 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/ssm/diffconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/diffconfirm.jsp @@ -8,7 +8,7 @@ <body> <%@ include file="/WEB-INF/pages/common/fragments/ssm/header.jspf" %> <h2> - <rhn:icon type="header-configuration" title="<bean:message key='ssmdiff.jsp.imgAlt' />" /> + <rhn:icon type="header-configuration" title="ssmdiff.jsp.imgAlt" /> <bean:message key="diffconfirm.jsp.header" /> </h2>

diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/difffiles.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/difffiles.jsp index 9cb0140..3ba313f 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/ssm/difffiles.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/difffiles.jsp @@ -8,7 +8,7 @@ <body> <%@ include file="/WEB-INF/pages/common/fragments/ssm/header.jspf" %> <h2> - <rhn:icon type="header-configuration" title="<bean:message key='ssmdiff.jsp.imgAlt' />" /> + <rhn:icon type="header-configuration" title="ssmdiff.jsp.imgAlt" /> <bean:message key="difffiles.jsp.header" /> </h2>

@@ -32,15 +32,15 @@ <rhn:column header="difffiles.jsp.filename"> <c:choose> <c:when test="${current.configFileType == 'file'}"> - <rhn:icon type="header-file" title="<bean:message key='config.common.fileAlt' />" /> + <rhn:icon type="header-file" title="config.common.fileAlt" /> <c:out value="${current.path}" /> </c:when> <c:when test="${current.configFileType == 'directory'}"> - <rhn:icon type="header-folder" title="<bean:message key='config.common.dirAlt' />" /> + <rhn:icon type="header-folder" title="config.common.dirAlt" /> <c:out value="${current.path}" /> </c:when> <c:otherwise> - <rhn:icon type="header-symlink" title="<bean:message key='config.common.symlinkAlt' />" /> + <rhn:icon type="header-symlink" title="config.common.symlinkAlt" /> </c:otherwise> </c:choose> </rhn:column> @@ -53,12 +53,12 @@ <rhn:column header="config.common.configChannel" url="/rhn/configuration/ChannelOverview.do?ccid=${current.configChannelId}"> <c:if test="${current.configChannelType == 'normal'}"> - <rhn:icon type="header-channel" title="<bean:message key='config.common.globalAlt' />" /> + <rhn:icon type="header-channel" title="config.common.globalAlt" /> ${current.channelNameDisplay} </c:if>

<c:if test="${current.configChannelType == 'local_override'}"> - <rhn:icon type="header-system-physical" title="<bean:message key='config.common.localAlt' />" /> + <rhn:icon type="header-system-physical" title="config.common.localAlt" /> ${current.channelNameDisplay} </c:if>

diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/diffsystems.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/diffsystems.jsp index a29932b..ce98d42 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/ssm/diffsystems.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/diffsystems.jsp @@ -9,13 +9,13 @@ <body> <%@ include file="/WEB-INF/pages/common/fragments/ssm/header.jspf" %> <h2> - <rhn:icon type="header-configuration" title="<bean:message key='ssmdiff.jsp.imgAlt' />" /> + <rhn:icon type="header-configuration" title="ssmdiff.jsp.imgAlt" /> <bean:message key="diffsystems.jsp.header" /> </h2>

<div class="page-summary"> <c:set var="beanarg" scope="request"> - <rhn:icon type="header-file" title="<bean:message key='config.common.fileAlt' />" /> + <rhn:icon type="header-file" title="config.common.fileAlt" /> ${fn:escapeXml(requestScope.filepath)} </c:set> <p> @@ -31,7 +31,7 @@ <rhn:listdisplay filterBy="system.common.systemName"> <rhn:column header="system.common.systemName" url="/rhn/systems/details/configuration/Overview.do?sid=${current.id}"> - <rhn:icon type="header-system-physical" title="<bean:message key='system.common.systemAlt' />" /> + <rhn:icon type="header-system-physical" title="system.common.systemAlt" /> ${fn:escapeXml(current.name)} </rhn:column>

diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/enable.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/enable.jsp index 9c7c8dc..e32b45b 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/ssm/enable.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/enable.jsp @@ -9,7 +9,7 @@

<%@ include file="/WEB-INF/pages/common/fragments/ssm/header.jspf" %> <h2> - <rhn:icon type="header-configuration" title="<bean:message key='ssmdiff.jsp.imgAlt' />" /> + <rhn:icon type="header-configuration" title="ssmdiff.jsp.imgAlt" /> <bean:message key="ssmenable.jsp.header"/> </h2>

diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/enablesummary.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/enablesummary.jsp index 58127fd..07ce3bf 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/ssm/enablesummary.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/enablesummary.jsp @@ -9,7 +9,7 @@

<%@ include file="/WEB-INF/pages/common/fragments/ssm/header.jspf" %> <h2> - <rhn:icon type="header-configuration" title="<bean:message key='ssmdiff.jsp.imgAlt' />" /> + <rhn:icon type="header-configuration" title="ssmdiff.jsp.imgAlt" /> <bean:message key="summary.jsp.toolbar"/> </h2>

diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/rankchannels.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/rankchannels.jsp index 4694004..4d68b30 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/ssm/rankchannels.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/rankchannels.jsp @@ -13,7 +13,7 @@ <%@ include file="/WEB-INF/pages/common/fragments/ssm/header.jspf" %>

<h2> - <rhn:icon type="header-configuration" title="<bean:message key='config.common.channelsAlt' />" /> + <rhn:icon type="header-configuration" title="config.common.channelsAlt" /> <bean:message key="ssm.config.rank.jsp.header" /> </h2> <h3><bean:message key="ssm.config.rank.jsp.step"/></h3> diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/subscribe.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/subscribe.jsp index 326f56a..527e845 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/ssm/subscribe.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/subscribe.jsp @@ -9,7 +9,7 @@

<%@ include file="/WEB-INF/pages/common/fragments/ssm/header.jspf" %> <h2> - <rhn:icon type="header-configuration" title="<bean:message key='config.common.channelsAlt' />" /> + <rhn:icon type="header-configuration" title="config.common.channelsAlt" /> <bean:message key="ssm.config.subscribe.jsp.header"/> </h2> <h3><bean:message key="ssm.config.subscribe.jsp.step"/></h3> @@ -32,7 +32,7 @@

<rhn:column header="config.common.configChannel" url="/rhn/configuration/ChannelOverview.do?ccid=${current.id}"> - <rhn:icon type="header-channel" title="<bean:message key='config.common.globalAlt' />" /> + <rhn:icon type="header-channel" title="config.common.globalAlt" /> ${current.name} </rhn:column>

diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/subscribeconfirm.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/subscribeconfirm.jsp index 4e2d9e8..deb3114 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/ssm/subscribeconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/subscribeconfirm.jsp @@ -11,7 +11,7 @@

<%@ include file="/WEB-INF/pages/common/fragments/ssm/header.jspf" %> <h2> - <rhn:icon type="header-configuration" title="<bean:message key='config.common.channelsAlt' />" /> + <rhn:icon type="header-configuration" title="config.common.channelsAlt" /> <bean:message key="ssm.config.subscribeconfirm.jsp.header"/> </h2> <h3><bean:message key="ssm.config.subscribeconfirm.jsp.step"/></h3> @@ -47,7 +47,7 @@ headerkey="system.common.systemName" attr="name"> <a href="/rhn/systems/details/configuration/Overview.do?sid=${current.id}"> - <rhn:icon type="header-system-physical" title="<bean:message key='system.common.systemAlt' />" /> + <rhn:icon type="header-system-physical" title="system.common.systemAlt" /> ${current.name} </a> </rl:column> diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/systemchannels.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/systemchannels.jsp index ac9a932..fea3d0d 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/ssm/systemchannels.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/systemchannels.jsp @@ -8,7 +8,7 @@ <body> <%@ include file="/WEB-INF/pages/common/fragments/ssm/header.jspf" %> <h2> - <rhn:icon type="header-configuration" title="<bean:message key='config.common.channelsAlt' />" /> + <rhn:icon type="header-configuration" title="config.common.channelsAlt" /> <bean:message key="ssmsystemchannels.jsp.header" /> </h2>

@@ -16,7 +16,7 @@ <p> <c:set var="beanarg" scope="request"> <a href="/rhn/systems/details/configuration/Overview.do?sid=${system.id}" - <rhn:icon type="header-system-physical" title="<bean:message key='system.common.systemAlt' />" /> + <rhn:icon type="header-system-physical" title="system.common.systemAlt" /> ${system.name} </a> </c:set> @@ -34,7 +34,7 @@ <rhn:listdisplay filterBy="config.common.configChannel"> <rhn:column header="config.common.configChannel" url="/rhn/configuration/ChannelOverview.do?ccid=${current.id}"> - <rhn:icon type="header-channel" title="<bean:message key='config.common.globalAlt' />" /> + <rhn:icon type="header-channel" title="config.common.globalAlt" /> ${current.name} </rhn:column>

diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/unsubscribe.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/unsubscribe.jsp index 6ae0ba6..c07c807 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/ssm/unsubscribe.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/unsubscribe.jsp @@ -9,7 +9,7 @@

<%@ include file="/WEB-INF/pages/common/fragments/ssm/header.jspf" %> <h2> - <rhn:icon type="header-configuration" title="<bean:message key='config.common.channelsAlt' />" /> + <rhn:icon type="header-configuration" title="config.common.channelsAlt" /> <bean:message key="unsubscribe.jsp.header"/> </h2>

@@ -29,7 +29,7 @@

<rhn:column header="config.common.configChannel" url="/rhn/configuration/ChannelOverview.do?ccid=${current.id}"> - <rhn:icon type="header-channel" title="<bean:message key='config.common.globalAlt' />" /> + <rhn:icon type="header-channel" title="config.common.globalAlt" /> ${current.name} </rhn:column>

diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/unsubscribeconfirm.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/unsubscribeconfirm.jsp index e0b65f1..1f44469 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/ssm/unsubscribeconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/unsubscribeconfirm.jsp @@ -9,7 +9,7 @@

<%@ include file="/WEB-INF/pages/common/fragments/ssm/header.jspf" %> <h2> - <rhn:icon type="header-configuration" title="<bean:message key='config.common.channelsAlt' />" /> + <rhn:icon type="header-configuration" title="config.common.channelsAlt" /> <bean:message key="unsubscribeconfirm.jsp.header"/> </h2>

@@ -33,7 +33,7 @@ button="unsubscribeconfirm.jsp.confirm"> <rhn:column header="unsubscribeconfirm.jsp.system" url="/rhn/systems/details/configuration/Overview.do?sid=${current.id}"> - <rhn:icon type="header-system-physical" title="<bean:message key='system.common.systemAlt' />" /> + <rhn:icon type="header-system-physical" title="system.common.systemAlt" /> ${current.name} </rhn:column>

diff --git a/java/code/webapp/WEB-INF/pages/errata/affectedsystems.jsp b/java/code/webapp/WEB-INF/pages/errata/affectedsystems.jsp index a34bbb1..71536c8 100644 --- a/java/code/webapp/WEB-INF/pages/errata/affectedsystems.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/affectedsystems.jsp @@ -13,7 +13,7 @@

<%@ include file="/WEB-INF/pages/common/fragments/errata/errata-header.jspf" %> <h2> - <rhn:icon type="header-system-physical" title="<bean:message key='system.common.systemAlt' />" /> + <rhn:icon type="header-system-physical" title="system.common.systemAlt" /> <bean:message key="affectedsystems.jsp.header"/> </h2>

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 8d54e2f..ded64be 100644 --- a/java/code/webapp/WEB-INF/pages/errata/packages/list.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/packages/list.jsp @@ -17,7 +17,7 @@ <rhn:dialogmenu mindepth="0" maxdepth="1" definition="/WEB-INF/nav/manage_errata.xml" renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" />

- <h2><rhn:icon type="header-package" title="<bean:message key='errata.common.packageAlt' />" /> + <h2><rhn:icon type="header-package" title="errata.common.packageAlt" /> <bean:message key="errata.edit.packages.list.erratapackages"/></h2>

<p><bean:message key="errata.edit.packages.list.instructions"/></p> diff --git a/java/code/webapp/WEB-INF/pages/errata/packages/packages.jsp b/java/code/webapp/WEB-INF/pages/errata/packages/packages.jsp index a969d22..4b6c944 100644 --- a/java/code/webapp/WEB-INF/pages/errata/packages/packages.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/packages/packages.jsp @@ -19,7 +19,7 @@ renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" />

<h2> - <rhn:icon type="header-package" title="<bean:message key='errata.common.packageAlt' />" /> + <rhn:icon type="header-package" title="errata.common.packageAlt" /> <bean:message key="errata.edit.packages.erratapackages"/> </h2>

diff --git a/java/code/webapp/WEB-INF/pages/groups/edit.jsp b/java/code/webapp/WEB-INF/pages/groups/edit.jsp index 7a13e88..f93a6ed 100644 --- a/java/code/webapp/WEB-INF/pages/groups/edit.jsp +++ b/java/code/webapp/WEB-INF/pages/groups/edit.jsp @@ -6,7 +6,7 @@ <html> <body> <h1> - <rhn:icon type="header-system-groups" title="system group" /> + <rhn:icon type="header-system-groups" title="system.common.groupAlt" /> <c:choose> <c:when test='${empty param.sgid}'> <bean:message key="systemgroup.create.header"/> diff --git a/java/code/webapp/WEB-INF/pages/groups/erratalist.jsp b/java/code/webapp/WEB-INF/pages/groups/erratalist.jsp index 09baeba..489a569 100644 --- a/java/code/webapp/WEB-INF/pages/groups/erratalist.jsp +++ b/java/code/webapp/WEB-INF/pages/groups/erratalist.jsp @@ -32,13 +32,13 @@

<rl:column headerkey="erratalist.jsp.type" styleclass="text-align: left;"> <c:if test="${current.securityAdvisory}"> - <rhn:icon type="errata-security" title="<bean:message key='erratalist.jsp.securityadvisory' />" /> + <rhn:icon type="errata-security" title="erratalist.jsp.securityadvisory" /> </c:if> <c:if test="${current.bugFix}"> - <rhn:icon type="errata-bugfix" title="<bean:message key='erratalist.jsp.bugadvisory' />" /> + <rhn:icon type="errata-bugfix" title="erratalist.jsp.bugadvisory" /> </c:if> <c:if test="${current.productEnhancement}"> - <rhn:icon type="errata-enhance" title="<bean:message key='erratalist.jsp.productenhancementadvisory' />" /> + <rhn:icon type="errata-enhance" title="erratalist.jsp.productenhancementadvisory" /> </c:if> </rl:column> <rl:column headerkey="erratalist.jsp.advisory"> diff --git a/java/code/webapp/WEB-INF/pages/help/chatindex.jsp b/java/code/webapp/WEB-INF/pages/help/chatindex.jsp index 3872270..52b7040 100644 --- a/java/code/webapp/WEB-INF/pages/help/chatindex.jsp +++ b/java/code/webapp/WEB-INF/pages/help/chatindex.jsp @@ -9,7 +9,7 @@ <script type="text/javascript" src="/javascript/highlander.js"></script> </head> <body> - <h1><rhn:icon type="header-help" title="Help" /><bean:message key="help.jsp.chat"/></h1> + <h1><rhn:icon type="header-help" title="help.jsp.chat" /> <bean:message key="help.jsp.chat" /></h1> <p><bean:message key="help.jsp.chatinfo"/></p> <p><bean:message key="help.jsp.chatlink"/></p> </body> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/kickstartdownload.jsp b/java/code/webapp/WEB-INF/pages/kickstart/kickstartdownload.jsp index 6099455..ae56acd 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/kickstartdownload.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/kickstartdownload.jsp @@ -24,7 +24,7 @@ <c:choose> <c:when test="${invalid_channel}"> <tr><td> - <rhn:icon type="system-warn" title="<bean:message key='error.common.errorAlt' />" /> + <rhn:icon type="system-warn" title="error.common.errorAlt" /> <bean:message key="kickstartdownload.jsp.invalidchannel"/> </td></tr> </c:when> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/kickstarts.jsp b/java/code/webapp/WEB-INF/pages/kickstart/kickstarts.jsp index ab5f855..20aa52b 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/kickstarts.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/kickstarts.jsp @@ -51,10 +51,10 @@ </rl:column> <rl:column bound="false" headerkey="kickstart.jsp.active" sortattr="active"> <c:if test="${current.active}"> - <rhn:icon type="item-enabled" title="<bean:message key='kickstart.jsp.active' />" /> + <rhn:icon type="item-enabled" title="kickstart.jsp.active" /> </c:if> <c:if test="${not current.active}"> - <rhn:icon type="item-disabled" title="<bean:message key='kickstart.jsp.inactive' />" /> + <rhn:icon type="item-disabled" title="kickstart.jsp.inactive" /> </c:if> </rl:column> <rl:column headerkey="kickstart.distro.label.jsp" sortattr="treeLabel"> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/ssm/schedule.jsp b/java/code/webapp/WEB-INF/pages/kickstart/ssm/schedule.jsp index 9ce4179..f2f3a15 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/ssm/schedule.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/ssm/schedule.jsp @@ -10,7 +10,7 @@ <body> <%@ include file="/WEB-INF/pages/common/fragments/ssm/header.jspf" %> <h2> - <rhn:icon type="header-kickstart" title="<bean:message key='system.common.kickstartAlt' />" /> + <rhn:icon type="header-kickstart" title="system.common.kickstartAlt" /> <bean:message key="kickstart.schedule.heading1.jsp" /> </h2>

diff --git a/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/fifth.jsp b/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/fifth.jsp index d10fd81..afec407 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/fifth.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/fifth.jsp @@ -28,7 +28,7 @@ function setContinue() { <%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %> <br /> <h2> - <rhn:icon type="header-kickstart" title="<bean:message key='system.common.kickstartAlt' />" /> + <rhn:icon type="header-kickstart" title="system.common.kickstartAlt" /> <bean:message key="kickstart.schedule.heading1.jsp" /> </h2>

diff --git a/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/first.jsp b/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/first.jsp index 7920b77..009ed03 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/first.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/first.jsp @@ -27,7 +27,7 @@ function setStep(stepName) {

<br /> <h2> - <rhn:icon type="header-kickstart" title="<bean:message key='system.common.kickstartAlt' />" /> + <rhn:icon type="header-kickstart" title="system.common.kickstartAlt" /> <bean:message key="kickstart.schedule.heading1.jsp" /> </h2>

diff --git a/java/code/webapp/WEB-INF/pages/ssm/packageinstallschedule.jsp b/java/code/webapp/WEB-INF/pages/ssm/packageinstallschedule.jsp index 18a1294..8e3fa1d 100644 --- a/java/code/webapp/WEB-INF/pages/ssm/packageinstallschedule.jsp +++ b/java/code/webapp/WEB-INF/pages/ssm/packageinstallschedule.jsp @@ -56,7 +56,7 @@ <th><bean:message key="confirm.jsp.than"/></th> </tr> <tr> - <th><rhn:icon type="header-schedule" title="<bean:message key='confirm.jsp.selection' />" /> + <th><rhn:icon type="header-schedule" title="confirm.jsp.selection" /> </th> <td> <jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp"> diff --git a/java/code/webapp/WEB-INF/pages/ssm/packageremoveschedule.jsp b/java/code/webapp/WEB-INF/pages/ssm/packageremoveschedule.jsp index 5c8080e..7299058 100644 --- a/java/code/webapp/WEB-INF/pages/ssm/packageremoveschedule.jsp +++ b/java/code/webapp/WEB-INF/pages/ssm/packageremoveschedule.jsp @@ -65,7 +65,7 @@ <th><bean:message key="confirm.jsp.than"/></th> </tr> <tr> - <th><rhn:icon type="header-schedule" title="<bean:message key='confirm.jsp.selection' />" /> + <th><rhn:icon type="header-schedule" title="confirm.jsp.selection" /> </th> <td> <jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp"> diff --git a/java/code/webapp/WEB-INF/pages/ssm/packageupgrade.jsp b/java/code/webapp/WEB-INF/pages/ssm/packageupgrade.jsp index 3653f64..bb02107 100644 --- a/java/code/webapp/WEB-INF/pages/ssm/packageupgrade.jsp +++ b/java/code/webapp/WEB-INF/pages/ssm/packageupgrade.jsp @@ -53,13 +53,13 @@ <rl:column headerkey="ssm.package.upgrade.select.advisory" bound="false"> <c:if test="${not empty current.advisory}"> <c:if test="${current.advisoryType == 'Security Advisory'}"> - <rhn:icon type="errata-security" title="<bean:message key='erratalist.jsp.securityadvisory' />" /> + <rhn:icon type="errata-security" title="erratalist.jsp.securityadvisory" /> </c:if> <c:if test="${current.advisoryType == 'Bug Fix Advisory'}"> - <rhn:icon type="errata-bugfix" title="<bean:message key='erratalist.jsp.bugadvisory' />" /> + <rhn:icon type="errata-bugfix" title="erratalist.jsp.bugadvisory" /> </c:if> <c:if test="${current.advisoryType == 'Product Enhancement Advisory'}"> - <rhn:icon type="errata-enhance" title="<bean:message key='erratalist.jsp.productenhancementadvisory' />" /> + <rhn:icon type="errata-enhance" title="erratalist.jsp.productenhancementadvisory" /> </c:if> <a href="/rhn/errata/details/Details.do?eid=${current.advisoryId}">${current.advisory}</a><br/> </c:if> diff --git a/java/code/webapp/WEB-INF/pages/ssm/packageupgradeschedule.jsp b/java/code/webapp/WEB-INF/pages/ssm/packageupgradeschedule.jsp index 2af9008..e258855 100644 --- a/java/code/webapp/WEB-INF/pages/ssm/packageupgradeschedule.jsp +++ b/java/code/webapp/WEB-INF/pages/ssm/packageupgradeschedule.jsp @@ -70,7 +70,7 @@ <th><bean:message key="confirm.jsp.than"/></th> </tr> <tr> - <th><rhn:icon type="header-schedule" title="<bean:message key='confirm.jsp.selection' />" /> + <th><rhn:icon type="header-schedule" title="confirm.jsp.selection" /> </th> <td> <jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp"> diff --git a/java/code/webapp/WEB-INF/pages/ssm/packageverifyschedule.jsp b/java/code/webapp/WEB-INF/pages/ssm/packageverifyschedule.jsp index 047cd59..9780610 100644 --- a/java/code/webapp/WEB-INF/pages/ssm/packageverifyschedule.jsp +++ b/java/code/webapp/WEB-INF/pages/ssm/packageverifyschedule.jsp @@ -65,7 +65,7 @@ <th><bean:message key="confirm.jsp.than"/></th> </tr> <tr> - <th><rhn:icon type="header-schedule" title="<bean:message key='confirm.jsp.selection' />" /> + <th><rhn:icon type="header-schedule" title="confirm.jsp.selection" /> </th> <td> <jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp"> diff --git a/java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp b/java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp index 9f1c66c..dbadd5a 100644 --- a/java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp +++ b/java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp @@ -21,7 +21,7 @@ <li class="list-group-item"> <div class="row"> <div class="col-sm-2"> - <rhn:icon type="header-system" title="<bean:message key='ssm.overview.systems' />" /> + <rhn:icon type="header-system" title="ssm.overview.systems" /> <bean:message key="ssm.overview.systems"/> </div> <div class="col-sm-10"> @@ -32,7 +32,7 @@ <li class="list-group-item"> <div class="row"> <div class="col-sm-2"> - <rhn:icon type="header-errata" title="<bean:message key='ssm.overview.errata'/>" /> + <rhn:icon type="header-errata" title="ssm.overview.errata" /> <bean:message key="ssm.overview.errata"/> </div> <div class="col-sm-10"> @@ -43,7 +43,7 @@ <li class="list-group-item"> <div class="row"> <div class="col-sm-2"> - <rhn:icon type="header-package" title="<bean:message key='ssm.overview.packages' />" /> + <rhn:icon type="header-package" title="ssm.overview.packages" /> <bean:message key="ssm.overview.packages"/> </div> <div class="col-sm-10"> @@ -55,7 +55,7 @@ <li class="list-group-item"> <div class="row"> <div class="col-sm-2"> - <rhn:icon type="header-errata" title="<bean:message key='ssm.overview.patches' />" /> + <rhn:icon type="header-errata" title="ssm.overview.patches" /> <bean:message key="ssm.overview.patches"/> </div> <div class="col-sm-10"> @@ -67,7 +67,7 @@ <li class="list-group-item"> <div class="row"> <div class="col-sm-2"> - <rhn:icon type="header-errata-set" title="<bean:message key='ssm.overview.patch.clusters' />" /> + <rhn:icon type="header-errata-set" title="ssm.overview.patch.clusters" /> <bean:message key="ssm.overview.patch.clusters"/> </div> <div class="col-sm-10"> @@ -80,7 +80,7 @@ <li class="list-group-item"> <div class="row"> <div class="col-sm-2"> - <rhn:icon type="header-system-groups" title="<bean:message key='ssm.overview.groups' />" /> + <rhn:icon type="header-system-groups" title="ssm.overview.groups" /> <bean:message key="ssm.overview.groups"/> </div> <div class="col-sm-10"> @@ -92,7 +92,7 @@ <li class="list-group-item"> <div class="row"> <div class="col-sm-2"> - <rhn:icon type="header-channel" title="<bean:message key='ssm.overview.channels' />" /> + <rhn:icon type="header-channel" title="ssm.overview.channels" /> <bean:message key="ssm.overview.channels"/> </div> <div class="col-sm-10"> @@ -110,7 +110,7 @@ <li class="list-group-item"> <div class="row"> <div class="col-sm-2"> - <rhn:icon type="header-kickstart" title="<bean:message key='ssm.overview.provisioning' />" /> + <rhn:icon type="header-kickstart" title="ssm.overview.provisioning" /> <bean:message key="ssm.overview.provisioning"/> </div> <div class="col-sm-10"> @@ -126,7 +126,7 @@ <li class="list-group-item"> <div class="row"> <div class="col-sm-2"> - <rhn:icon type="header-event-history" title="<bean:message key='ssm.overview.misc' />" /> + <rhn:icon type="header-event-history" title="ssm.overview.misc" /> <bean:message key="ssm.overview.misc"/> </div> <div class="col-sm-10"> diff --git a/java/code/webapp/WEB-INF/pages/systems/crashes.jsp b/java/code/webapp/WEB-INF/pages/systems/crashes.jsp index ee04bbb..ba04d8d 100644 --- a/java/code/webapp/WEB-INF/pages/systems/crashes.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/crashes.jsp @@ -14,7 +14,7 @@ <%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %>

<h2> - <rhn:icon type="header-crash" title="<bean:message key='crashes.jsp.crashes' />" /> + <rhn:icon type="header-crash" title="crashes.jsp.crashes" /> <bean:message key="crashes.jsp.crashes"/> </h2>

diff --git a/java/code/webapp/WEB-INF/pages/systems/crashnote.jsp b/java/code/webapp/WEB-INF/pages/systems/crashnote.jsp index bcdbea2..bf37251 100644 --- a/java/code/webapp/WEB-INF/pages/systems/crashnote.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/crashnote.jsp @@ -15,20 +15,20 @@ <c:choose> <c:when test="${not empty param.cnid}"> <a href="/rhn/systems/details/DeleteCrashNote.do?sid=${sid}&crid=${crid}&cnid=${cnid}"> - <rhn:icon type="item-del" title="<bean:message key='toolbar.delete.note'/>" /> + <rhn:icon type="item-del" title="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}"> - <rhn:icon type="item-del" title="<bean:message key='toolbar.delete.crash'/>" /> + <rhn:icon type="item-del" title="toolbar.delete.crash" /> <bean:message key="toolbar.delete.crash"/> </a>

</span> </div> - <rhn:icon type="header-crash" title="<bean:message key='info.alt.img' />" /> + <rhn:icon type="header-crash" title="info.alt.img" /> ${fn:escapeXml(crash.crash)} </div>

diff --git a/java/code/webapp/WEB-INF/pages/systems/crashnotedelete.jsp b/java/code/webapp/WEB-INF/pages/systems/crashnotedelete.jsp index 5969b65..20d1fd5 100644 --- a/java/code/webapp/WEB-INF/pages/systems/crashnotedelete.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/crashnotedelete.jsp @@ -13,12 +13,12 @@ <div class="toolbar"> <span class="toolbar"> <a href="/rhn/systems/details/SoftwareCrashDelete.do?crid=${crid}&sid=${sid}"> - <rhn:icon type="item-del" title="<bean:message key='toolbar.delete.crash'/>" /> + <rhn:icon type="item-del" title="toolbar.delete.crash" /> <bean:message key="toolbar.delete.crash"/> </a> </span> </div> - <rhn:icon type="header-crash" title="<bean:message key='info.alt.img' />" /> + <rhn:icon type="header-crash" title="info.alt.img" /> ${fn:escapeXml(crash.crash)} </div>

diff --git a/java/code/webapp/WEB-INF/pages/systems/crashnotes.jsp b/java/code/webapp/WEB-INF/pages/systems/crashnotes.jsp index d06c2c6..48bcc44 100644 --- a/java/code/webapp/WEB-INF/pages/systems/crashnotes.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/crashnotes.jsp @@ -15,18 +15,18 @@ <div class="toolbar"> <span class="toolbar"> <a href="/rhn/systems/details/EditCrashNote.do?crid=${crid}&sid=${sid}"> - <rhn:icon type="item-ssm-add" title="<bean:message key='toolbar.create.crashnote' />" /> + <rhn:icon type="item-ssm-add" title="toolbar.create.crashnote" /> <bean:message key="toolbar.create.crashnote"/> </a> | <a href="/rhn/systems/details/SoftwareCrashDelete.do?crid=${crid}&sid=${sid}"> - <rhn:icon type="item-ssm-del" title="<bean:message key='toolbar.delete.crash' />" /> + <rhn:icon type="item-ssm-del" title="toolbar.delete.crash" /> <bean:message key="toolbar.delete.crash"/> </a>

</span> </div> - <rhn:icon type="header-crash" title="<bean:message key='info.alt.img' />" /> + <rhn:icon type="header-crash" title="info.alt.img" /> ${fn:escapeXml(crash.crash)} </div>

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 ecdea3b..ae2e158 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 @@ -17,16 +17,16 @@ <c:when test="${not empty testResult.comparableId}"> <a href="/rhn/audit/scap/DiffSubmit.do?first=${testResult.comparableId}&second=${testResult.id}&view=changed"> <c:when test="${testResult.diffIcon == 'checked'}" > - <rhn:icon type="system-ok" title="<bean:message key='scapdiff.jsp.i.checked'/>"/> + <rhn:icon type="system-ok" title="scapdiff.jsp.i.checked" /> </c:when> <c:when test="${testResult.diffIcon == 'alert'}" > - <rhn:icon type="system-warn" title="<bean:message key='scapdiff.jsp.i.alert'/>"/> + <rhn:icon type="system-warn" title="scapdiff.jsp.i.alert" /> </c:when> <c:when test="${testResult.diffIcon == 'error'}" > - <rhn:icon type="system-crit" title="<bean:message key='scapdiff.jsp.i.error'/>"/> + <rhn:icon type="system-crit" title="scapdiff.jsp.i.error" /> </c:when> <c:otherwise> - <rhn:icon type="system-unknown" title="<bean:message key='system.audit.xccdfdetails.jsp.nodiff'/>"/> + <rhn:icon type="system-unknown" title="system.audit.xccdfdetails.jsp.nodiff" /> </c:otherwise> <bean:message key="system.audit.xccdfdetails.jsp.diff"/> </a> @@ -39,7 +39,7 @@

<c:if test="${testResult.deletable}"> <a href="/rhn/systems/details/audit/XccdfDeleteConfirm.do?sid=${param.sid}&xid=${testResult.id}"> - <rhn:icon type="item-del" title="<bean:message key='system.audit.xccdfdelete'/>" /> + <rhn:icon type="item-del" title="system.audit.xccdfdelete" /> <bean:message key="system.audit.xccdfdelete"/> </a> | @@ -70,7 +70,7 @@ <tr> <th><bean:message key="configoverview.jsp.scheduledBy"/>:</th> <td> - <rhn:icon type="header-user" title="<bean:message key='yourrhn.jsp.user.alt'/>"/> + <rhn:icon type="header-user" title="yourrhn.jsp.user.alt" /> <a href="/network/systems/details/history/event.pxt?sid=${param.sid}&hid=${testResult.scapActionDetails.parentAction.id}"> <c:out value="${testResult.scapActionDetails.parentAction.schedulerUser.login}"/> </a> diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/packageconfirm.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/packageconfirm.jsp index 2ad1ebc..f9bbe02 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/packages/packageconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/packageconfirm.jsp @@ -53,7 +53,7 @@ <th><bean:message key="confirm.jsp.than"/></th> </tr> <tr> - <th><rhn:icon type="header-schedule" title="<bean:message key='confirm.jsp.selection' />" /> + <th><rhn:icon type="header-schedule" title="confirm.jsp.selection" /> </th> <td> <jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp"> diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/packagelist.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/packagelist.jsp index e35c831..c6b5c42 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/packages/packagelist.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/packagelist.jsp @@ -12,7 +12,7 @@

<rhn:require acl="not system_feature(ftr_package_remove)"> <h2> - <rhn:icon type="header-package-del" title="<bean:message key='errata.common.deletepackageAlt' />" /> + <rhn:icon type="header-package-del" title="errata.common.deletepackageAlt" /> <bean:message key="packagelist.jsp.installedpackages" /> </h2> <div class="page-summary"> @@ -23,7 +23,7 @@ </rhn:require> <rhn:require acl="system_feature(ftr_package_remove)"> <h2> - <rhn:icon type="header-package-del" title="<bean:message key='errata.common.deletepackageAlt' />" /> + <rhn:icon type="header-package-del" title="errata.common.deletepackageAlt" /> <bean:message key="packagelist.jsp.removablepackages" /> </h2> <div class="page-summary"> diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/packagesindex.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/packagesindex.jsp index 4c15e2f..d082b3f 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/packages/packagesindex.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/packagesindex.jsp @@ -13,7 +13,7 @@ <%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %>

<h2> - <rhn:icon type="header-package" title="<bean:message key='errata.common.packageAlt' />" /> + <rhn:icon type="header-package" title="errata.common.packageAlt" /> <bean:message key="packagesindex.jsp.header"/> </h2>

diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/profiles.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/profiles.jsp index 644957a..f273709 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/profiles.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/profiles.jsp @@ -10,7 +10,7 @@ <%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %>

<h2> - <rhn:icon type="header-package" title="<bean:message key='errata.common.packageAlt' />" /> + <rhn:icon type="header-package" title="errata.common.packageAlt" /> <bean:message key="profile.jsp.comparetostoredprofile"/> </h2>

@@ -35,7 +35,7 @@ </p> </div> <h2> - <rhn:icon type="header-package" title="<bean:message key='errata.common.packageAlt' />" /> + <rhn:icon type="header-package" title="errata.common.packageAlt" /> <bean:message key="profile.jsp.comparetosystem"/> </h2> <div class="page-summary"> diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncprofile.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncprofile.jsp index 730a9b4..56a1bdd 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncprofile.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncprofile.jsp @@ -51,7 +51,7 @@ <th><bean:message key="confirm.jsp.than"/></th> </tr> <tr> - <th><rhn:icon type="header-schedule" title="<bean:message key='confirm.jsp.selection' />" /> + <th><rhn:icon type="header-schedule" title="confirm.jsp.selection" /> </th> <td> <jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp"> diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncsystem.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncsystem.jsp index bafeb70..6ff8b16 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncsystem.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncsystem.jsp @@ -52,7 +52,7 @@ <th><bean:message key="confirm.jsp.than"/></th> </tr> <tr> - <th><rhn:icon type="header-schedule" title="<bean:message key='confirm.jsp.selection' />" /> + <th><rhn:icon type="header-schedule" title="confirm.jsp.selection" /> </th> <td> <jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp"> diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/upgradable.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/upgradable.jsp index 787bd72..57ce5d2 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/packages/upgradable.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/upgradable.jsp @@ -11,7 +11,7 @@ <%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %>

<h2> - <rhn:icon type="header-package-upgrade" title="<bean:message key='errata.common.upgradepackageAlt' />" /> + <rhn:icon type="header-package-upgrade" title="errata.common.upgradepackageAlt" /> <bean:message key="upgradable.jsp.header" /> </h2> <div class="page-summary"> @@ -53,13 +53,13 @@ <c:forEach items="${current.errata}" var="errata"> <c:if test="${not empty errata.advisory}"> <c:if test="${errata.type == 'Security Advisory'}"> - <rhn:icon type="errata-security" title="<bean:message key='erratalist.jsp.securityadvisory' />" /> + <rhn:icon type="errata-security" title="erratalist.jsp.securityadvisory" /> </c:if> <c:if test="${errata.type == 'Bug Fix Advisory'}"> - <rhn:icon type="errata-bugfix" title="<bean:message key='erratalist.jsp.bugadvisory' />" /> + <rhn:icon type="errata-bugfix" title="erratalist.jsp.bugadvisory" /> </c:if> <c:if test="${errata.type == 'Product Enhancement Advisory'}"> - <rhn:icon type="errata-enhance" title="<bean:message key='erratalist.jsp.productenhancementadvisory' />" /> + <rhn:icon type="errata-enhance" title="erratalist.jsp.productenhancementadvisory" /> </c:if> <a href="/rhn/errata/details/Details.do?eid=${errata.id}">${errata.advisory}</a><br/> </c:if> diff --git a/java/code/webapp/WEB-INF/pages/systems/errata.jsp b/java/code/webapp/WEB-INF/pages/systems/errata.jsp index 6efddfb..825bfed 100644 --- a/java/code/webapp/WEB-INF/pages/systems/errata.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/errata.jsp @@ -25,7 +25,7 @@ <%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %>

<h2> - <rhn:icon type="header-errata" title="<bean:message key='errata.common.errataAlt' />" /> + <rhn:icon type="header-errata" title="errata.common.errataAlt" /> <bean:message key="errata.jsp.header"/> </h2>

diff --git a/java/code/webapp/WEB-INF/pages/systems/errataconfirm.jsp b/java/code/webapp/WEB-INF/pages/systems/errataconfirm.jsp index 513d149..2ccbdb6 100644 --- a/java/code/webapp/WEB-INF/pages/systems/errataconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/errataconfirm.jsp @@ -65,7 +65,7 @@ <th><bean:message key="syncprofile.jsp.than"/></th> </tr> <tr> - <th><rhn:icon type="header-schedule" title="<bean:message key='syncprofile.jsp.selection' />" /> + <th><rhn:icon type="header-schedule" title="syncprofile.jsp.selection" /> </th> <td> <jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp"> diff --git a/java/code/webapp/WEB-INF/pages/systems/registeredlist.jsp b/java/code/webapp/WEB-INF/pages/systems/registeredlist.jsp index dbde890..1684e4a 100644 --- a/java/code/webapp/WEB-INF/pages/systems/registeredlist.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/registeredlist.jsp @@ -90,7 +90,7 @@ sortattr="creatorName" > <c:choose> <c:when test="${current.creatorName != null}"> - <rhn:icon type="header-user" title="<bean:message key='yourrhn.jsp.user.alt'/>" /> + <rhn:icon type="header-user" title="yourrhn.jsp.user.alt" /> <c:out value="${current.creatorName}"/> </c:when> <c:otherwise> diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/channels.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/channels.jsp index 328af9f..223f151 100644 --- a/java/code/webapp/WEB-INF/pages/systems/sdc/channels.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/sdc/channels.jsp @@ -8,7 +8,7 @@ <body> <%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %> <h2> - <rhn:icon type="header-channel" title="channel" /> + <rhn:icon type="header-channel" title="common.download.channelAlt" /> <bean:message key="sdc.channels.edit.header2"/> </h2> <html:form method="post" action="/systems/details/SystemChannels.do?sid=${system.id}"> diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/confirmnewbase.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/confirmnewbase.jsp index d718c7a..02641d4 100644 --- a/java/code/webapp/WEB-INF/pages/systems/sdc/confirmnewbase.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/sdc/confirmnewbase.jsp @@ -7,7 +7,7 @@ <body> <%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %> <h2> - <rhn:icon type="header-channel" title="channel" /> + <rhn:icon type="header-channel" title="common.download.channelAlt" /> <bean:message key="sdc.channels.confirmNewBase.header.confirm"/> </h2>

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 9012d14..420d8c1 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}"> - <rhn:icon type="item-del" title="delete value" />delete value + <rhn:icon type="item-del" title="toolbar.delete.customdata" /><bean:message key="toolbar.delete.customdata" /> </a> </span> </div> diff --git a/java/code/webapp/WEB-INF/pages/systems/systemcurrency.jsp b/java/code/webapp/WEB-INF/pages/systems/systemcurrency.jsp index 1036871..84427d9 100644 --- a/java/code/webapp/WEB-INF/pages/systems/systemcurrency.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/systemcurrency.jsp @@ -37,7 +37,7 @@ bound="false" headerkey="systemlist.jsp.system" sortattr="name" > - <rhn:icon type="header-system-physical" title="<bean:message key='systemlist.jsp.nonvirt' />" /> + <rhn:icon type="header-system-physical" title="systemlist.jsp.nonvirt" /> <c:out value="<a href="/rhn/systems/details/Overview.do?sid=${current.id}">" escapeXml="false" /> <c:choose> <c:when test="${empty current.name}">

commit 63be6b1ed2e683af7e570aa0096b4766292f7331 Author: Matej Kollar mkollar@redhat.com Date: Fri Dec 20 16:54:18 2013 +0100

Perform localization inside rhn:icon tag

It is better to do it this way -- forces internationalization and simplified code.

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 4e4b3cc..f3a8c69 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java @@ -15,6 +15,8 @@

package com.redhat.rhn.frontend.taglibs;

+import com.redhat.rhn.common.localization.LocalizationService; + import java.io.IOException; import java.util.HashMap; import java.util.Map; @@ -23,6 +25,8 @@ import javax.servlet.jsp.JspException; import javax.servlet.jsp.JspWriter; import javax.servlet.jsp.tagext.TagSupport;

+import org.apache.commons.lang.StringEscapeUtils; + /** * Tag to easy display the icons * <pre> @@ -179,7 +183,7 @@ public class IconTag extends TagSupport { * @return The title of the icon */ public String getTitle() { - return title; + return LocalizationService.getInstance().getMessage(title); }

/** @@ -194,7 +198,8 @@ public class IconTag extends TagSupport { StringBuilder result = new StringBuilder(); result.append("<i class="" + icons.get(type) + """); if (title != null) { - result.append(" title="" + title + """); + result.append(" title="" + + StringEscapeUtils.escapeHtml(this.getTitle()) + """); } result.append("></i>");

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 ffb447d..3eb21ec 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/ToolbarTag.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/ToolbarTag.java @@ -651,13 +651,13 @@ public class ToolbarTag extends TagSupport { return ""; }

- alt = LocalizationService.getInstance().getMessage(alt); text = LocalizationService.getInstance().getMessage(text);

HtmlTag a = new HtmlTag("a"); a.setAttribute("href", url);

if (assertNotEmpty(imgName)) { + alt = LocalizationService.getInstance().getMessage(alt); HtmlTag imgTag = new HtmlTag("img"); imgTag.setAttribute("src", "/img/" + imgName); imgTag.setAttribute("alt", alt);