java/code/webapp/WEB-INF/pages/admin/multiorg/affectedsystems.jsp | 2 - java/code/webapp/WEB-INF/pages/admin/multiorg/orgcreate.jsp | 2 - java/code/webapp/WEB-INF/pages/channel/manage/confirmprivate.jsp | 2 - java/code/webapp/WEB-INF/pages/channel/manage/errataremove.jsp | 8 ++--- java/code/webapp/WEB-INF/pages/common/fragments/audit/scap-list-columns.jspf | 16 ++++++++-- java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/details.jspf | 2 - java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/header.jspf | 2 - java/code/webapp/WEB-INF/pages/common/fragments/kickstart/deleteconfirm.jspf | 2 - java/code/webapp/WEB-INF/pages/help/forgotcredentials.jsp | 2 - java/code/webapp/WEB-INF/pages/schedule/pendingactionsconfirm.jsp | 2 - java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp | 15 +++++++-- java/code/webapp/WEB-INF/pages/systems/details/kickstart/session_status.jsp | 14 ++++---- java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp | 4 +- java/scripts/java-templates/jspbody.jsp | 2 - java/spacewalk-java.spec | 8 ++++- rel-eng/packages/spacewalk-java | 2 - 16 files changed, 55 insertions(+), 30 deletions(-)
New commits: commit bbbb2e3f92bcded4f34522fc9859b786727b964c Author: Michael Mraka michael.mraka@redhat.com Date: Mon Dec 16 16:12:33 2013 +0100
Automatic commit of package [spacewalk-java] release [2.1.100-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index 80745ec..91c57b5 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -28,7 +28,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 2.1.99 +Version: 2.1.100 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%%7Bname%7D-%%7Bversion%7D.t... @@ -785,6 +785,12 @@ fi %{jardir}/postgresql-jdbc.jar
%changelog +* Mon Dec 16 2013 Michael Mraka michael.mraka@redhat.com 2.1.100-1 +- more icon fixes +- Rewrite of errata_list.pxt to Java +- call ssm check on system - software crashes, notes, migrate and hardware pages +- bootstrap fixes + * Fri Dec 13 2013 Michael Mraka michael.mraka@redhat.com 2.1.99-1 - replaced icons with icon tag - simplify logic in cfg:channel tag diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index bdff82c..219c95b 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -2.1.99-1 java/ +2.1.100-1 java/
commit 38c64438926d59eef41d1b8b0ef8c915231bb27e Author: Michael Mraka michael.mraka@redhat.com Date: Mon Dec 16 13:58:17 2013 +0100
more icon fixes
diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/affectedsystems.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/affectedsystems.jsp index b82759c..79f26f1 100644 --- a/java/code/webapp/WEB-INF/pages/admin/multiorg/affectedsystems.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/affectedsystems.jsp @@ -8,7 +8,7 @@ <body> <rhn:toolbar base="h1" - icon="icon-group" + icon="header-organisation" miscUrl="${url}" miscAcl="user_role(org_admin)" miscText="${text}" diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgcreate.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgcreate.jsp index d5db766..0fa4bd5 100644 --- a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgcreate.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgcreate.jsp @@ -5,7 +5,7 @@
<html> <body> - <rhn:toolbar base="h1" icon="icon-info-sign"> + <rhn:toolbar base="h1" icon="header-organisation"> <bean:message key="orgcreate.jsp.title"/> </rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/confirmprivate.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/confirmprivate.jsp index d193920..5eb6eba 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/confirmprivate.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/confirmprivate.jsp @@ -17,7 +17,7 @@
<br/> <h2> - <img src="/img/rhn-icon-packages.gif" /> + <rhn:icon type="header-errata" /> <bean:message key="confirmprivate.jsp.title"/> </h2> <p><bean:message key="confirmprivate.jsp.confirmmsg"/></p> 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 30ac37c..1e1f292 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> - <img src="/img/rhn-icon-errata.gif" alt="erratum" /> <bean:message key="header.jsp.errata"/> + <rhn:icon type="header-errata" title="erratum" /> <bean:message key="header.jsp.errata"/> </h2>
<bean:message key="channel.jsp.errata.remove.message"/> @@ -42,13 +42,13 @@ headerclass="thin-column" sortattr="advisoryType"> <c:if test="${current.advisoryType == 'Product Enhancement Advisory'}"> - <img src="/img/wrh-product.gif" alt="Product Enhancement Advisory" title="Product Enhancement Advisory" /> + <rhn:icon type="errata-enhance" title="Product Enhancement Advisory" /> </c:if> <c:if test="${current.advisoryType == 'Security Advisory'}"> - <img src="/img/wrh-security.gif" alt="Security Advisory" title="Security Advisory" /> + <rhn:icon type="errata-security" title="Security Advisory" /> </c:if> <c:if test="${current.advisoryType == 'Bug Fix Advisory'}"> - <img src="/img/wrh-bug.gif" alt="Bug Fix Advisory" title="Bug Fix Advisory" /> + <rhn:icon type="errata-bugfix" title="Bug Fix Advisory" /> </c:if>
</rl:column> 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 e9def0f..200e6d4 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 @@ -2,9 +2,19 @@ <c:choose> <c:when test="${not empty current.comparableId}"> <a href="/rhn/audit/scap/DiffSubmit.do?first=${current.comparableId}&second=${current.xid}&view=changed"> - <img src="/img/rhn-listicon-${current.diffIcon}.gif" - alt="<bean:message key='scapdiff.jsp.i.${current.diffIcon}'/>" - title="<bean:message key='scapdiff.jsp.i.${current.diffIcon}'/>"/></a> + <c:when test="${current.diffIcon == 'checked'}" > + <rhn:icon type="system-ok" title="<bean:message key='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'/>"/> + </c:when> + <c:when test="${current.diffIcon == 'error'}" > + <rhn:icon type="system-crit" title="<bean:message key='scapdiff.jsp.i.error'/>"/> + </c:when> + <c:otherwise> + <rhn:icon type="system-unknown" title="<bean:message key='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'/>"/> 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 82b0892..d2b47df 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,7 +10,7 @@ <td> <c:choose> <c:when test="${channel.configChannelType.label == 'normal'}"> - <rhn:icon type="header-software-channel" title="<bean:message key='config.common.globalAlt' />"/> + <rhn:icon type="header-channel-configuration" title="<bean:message key='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' />"/> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/header.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/header.jspf index c25d760..6cc1795 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/header.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/header.jspf @@ -24,7 +24,7 @@ </c:set>
<c:if test="${revision.symlink}"> - <c:set var="fileIcon" scope="request" value="icon-link" /> + <c:set var="fileIcon" scope="request" value="header-symlink" /> </c:if>
<c:choose> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/deleteconfirm.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/deleteconfirm.jspf index b356e39..7e9cede 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/deleteconfirm.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/deleteconfirm.jspf @@ -6,7 +6,7 @@
<html> <body> -<rhn:toolbar base="h1" icon="icon-rocket" imgAlt="system.common.kickstartAlt"> +<rhn:toolbar base="h1" icon="header-kickstart" imgAlt="system.common.kickstartAlt"> <bean:message key="kickstartdelete.jsp.header1" arg0="${ksdata.label}"/> </rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/help/forgotcredentials.jsp b/java/code/webapp/WEB-INF/pages/help/forgotcredentials.jsp index c33d8dd..85a1c3c 100644 --- a/java/code/webapp/WEB-INF/pages/help/forgotcredentials.jsp +++ b/java/code/webapp/WEB-INF/pages/help/forgotcredentials.jsp @@ -10,7 +10,7 @@ <script type="text/javascript" src="/javascript/highlander.js"></script> </head> <body> - <rhn:toolbar base="h1" img="/img/rhn-icon-search.gif" imgAlt="lookup" + <rhn:toolbar base="h1" img="header-search" helpUrl=""> <bean:message key="help.credentials.jsp.logininfo"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/schedule/pendingactionsconfirm.jsp b/java/code/webapp/WEB-INF/pages/schedule/pendingactionsconfirm.jsp index d9b23c8..40f275e 100644 --- a/java/code/webapp/WEB-INF/pages/schedule/pendingactionsconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/schedule/pendingactionsconfirm.jsp @@ -7,7 +7,7 @@
<html> <body> -<rhn:toolbar base="h1" icon="icon-time" +<rhn:toolbar base="h1" icon="header-action" imgAlt="actions.jsp.imgAlt" helpUrl="/rhn/help/reference/en-US/s1-sm-actions.jsp#s2-sm-action-pend"> <bean:message key="pendingactions.jsp.confirm_cancel_actions"/> 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 ab18c68..ecdea3b 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 @@ -16,9 +16,18 @@ <c:choose> <c:when test="${not empty testResult.comparableId}"> <a href="/rhn/audit/scap/DiffSubmit.do?first=${testResult.comparableId}&second=${testResult.id}&view=changed"> - <img src="/img/rhn-listicon-${testResult.diffIcon}.gif" - alt="<bean:message key='scapdiff.jsp.i.${testResult.diffIcon}'/>" - title="<bean:message key='scapdiff.jsp.i.${testResult.diffIcon}'/>"/> + <c:when test="${testResult.diffIcon == 'checked'}" > + <rhn:icon type="system-ok" title="<bean:message key='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'/>"/> + </c:when> + <c:when test="${testResult.diffIcon == 'error'}" > + <rhn:icon type="system-crit" title="<bean:message key='scapdiff.jsp.i.error'/>"/> + </c:when> + <c:otherwise> + <rhn:icon type="system-unknown" title="<bean:message key='system.audit.xccdfdetails.jsp.nodiff'/>"/> + </c:otherwise> <bean:message key="system.audit.xccdfdetails.jsp.diff"/> </a> </c:when> diff --git a/java/code/webapp/WEB-INF/pages/systems/details/kickstart/session_status.jsp b/java/code/webapp/WEB-INF/pages/systems/details/kickstart/session_status.jsp index 54e5a14..f784583 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/kickstart/session_status.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/kickstart/session_status.jsp @@ -112,7 +112,7 @@ <tr class="list-row-odd"> <td> <c:if test="${created}"> - <img src="/img/rhn-listicon-ok.gif"/> + <rhn:icon type="system-ok" /> </c:if> </td> <td style="text-align: left;"> @@ -122,7 +122,7 @@ <tr class="list-row-even"> <td> <c:if test="${restarted}"> - <img src="/img/rhn-listicon-ok.gif"/> + <rhn:icon type="system-ok" /> </c:if> </td> <td style="text-align: left;"> @@ -132,7 +132,7 @@ <tr class="list-row-odd"> <td> <c:if test="${registered}"> - <img src="/img/rhn-listicon-ok.gif"/> + <rhn:icon type="system-ok" /> </c:if> </td> <td style="text-align: left;"> @@ -143,7 +143,7 @@ <tr class="list-row-even"> <td> <c:if test="${package_synch_scheduled}"> - <img src="/img/rhn-listicon-ok.gif"/> + <rhn:icon type="system-ok" /> </c:if> </td> <td style="text-align: left;"> @@ -164,7 +164,7 @@ <tr class="${nextstyle1}"> <td> <c:if test="${configuration_deploy}"> - <img src="/img/rhn-listicon-ok.gif"/> + <rhn:icon type="system-ok" /> </c:if> </td> <td style="text-align: left;"> @@ -175,7 +175,7 @@ <tr class="${nextstyle2}"> <td> <c:if test="${complete}"> - <img src="/img/rhn-listicon-ok.gif"/> + <rhn:icon type="system-ok" /> </c:if> </td> <td style="text-align: left;"> @@ -186,7 +186,7 @@ <c:if test="${failed}"> <tr class="${nextstyle1}"> <td> - <img src="/img/rhn-listicon-error.gif"/> + <rhn:icon type="system-crit" />
</td> <td style="text-align: left;"> diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp index f763b17..ce473c4 100644 --- a/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp @@ -64,10 +64,10 @@ <div class="col-md-6"> <c:choose> <c:when test="${probeList[0].state == 'CRITICAL'}"> - <i class="fa spacewalk-icon-monitoring-down"></i> <bean:message key="sdc.details.overview.probes.critical" arg0="/rhn/help/reference/en-US/s1-sm-monitor.jsp"/> + <rhn:icon type="monitoring-crit" /> <bean:message key="sdc.details.overview.probes.critical" arg0="/rhn/help/reference/en-US/s1-sm-monitor.jsp"/> </c:when> <c:otherwise> - <i class="fa spacewalk-icon-monitoring-warning"></i> <bean:message key="sdc.details.overview.probes.warning" arg0="/rhn/help/reference/en-US/s1-sm-monitor.jsp"/> + <rhn:icon type="monitoring-warn" /> <bean:message key="sdc.details.overview.probes.warning" arg0="/rhn/help/reference/en-US/s1-sm-monitor.jsp"/> </c:otherwise> </c:choose> </div> diff --git a/java/scripts/java-templates/jspbody.jsp b/java/scripts/java-templates/jspbody.jsp index 8a6a7bd..55154c1 100644 --- a/java/scripts/java-templates/jspbody.jsp +++ b/java/scripts/java-templates/jspbody.jsp @@ -6,7 +6,7 @@ <html> <body>
-<rhn:toolbar base="h1" img="/img/rhn-icon-info.gif"> +<rhn:toolbar base="h1" icon="header-info"> <bean:message key="###JSPNAME###.toolbar"/> </rhn:toolbar>
spacewalk-commits@lists.fedorahosted.org