spacewalk-commits December 2013

spacewalk-commits@lists.fedorahosted.org

11 participants
227 discussions

Changes to 'refs/tags/spacewalk-web-2.1.43-1'
by Michael Mraka 16 Dec '13

16 Dec '13

Tag 'spacewalk-web-2.1.43-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-12-16 15:13 +0000 Tagging package [spacewalk-web] version [2.1.43-1] in directory [web/]. Changes since spacewalk-java-2.1.100-1: Michael Mraka (1): Automatic commit of package [spacewalk-web] release [2.1.43-1]. --- rel-eng/packages/spacewalk-web | 2 +- web/spacewalk-web.spec | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) ---

1 0

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

16 Dec '13

rel-eng/packages/spacewalk-web | 2 +- web/spacewalk-web.spec | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) New commits: commit 3cd8d8aff681a084cac1461d5a44b4b929cbf3e5 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Mon Dec 16 16:13:00 2013 +0100 Automatic commit of package [spacewalk-web] release [2.1.43-1]. diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web index 6e759f8..9bd3e20 100644 --- a/rel-eng/packages/spacewalk-web +++ b/rel-eng/packages/spacewalk-web @@ -1 +1 @@ -2.1.42-1 web/ +2.1.43-1 web/ diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec index 7293d42..073bbae 100644 --- a/web/spacewalk-web.spec +++ b/web/spacewalk-web.spec @@ -4,7 +4,7 @@ Name: spacewalk-web Summary: Spacewalk Web site - Perl modules Group: Applications/Internet License: GPLv2 -Version: 2.1.42 +Version: 2.1.43 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk/ Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -269,6 +269,10 @@ rm -rf $RPM_BUILD_ROOT %doc LICENSE %changelog +* Mon Dec 16 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.43-1 +- Remove groups/errata_list.pxt +- fixed icon names + * Fri Dec 13 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.42-1 - replaced icons with icon tag - system group edit properties - linking + cleanup

1 0

Changes to 'refs/tags/spacewalk-java-2.1.100-1'
by Michael Mraka 16 Dec '13

16 Dec '13

Tag 'spacewalk-java-2.1.100-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-12-16 15:12 +0000 Tagging package [spacewalk-java] version [2.1.100-1] in directory [java/]. Changes since tito-0.4.18-1.3: Matej Kollar (4): Rewrite of errata_list.pxt to Java Remove groups/errata_list.pxt Having id="list_$min\|max\|total$" is bad Forgotten html entity Michael Mraka (5): replaced old imgs with icons more icon fixes fixed icon names more icon fixes Automatic commit of package [spacewalk-java] release [2.1.100-1]. Tomas Kasparek (2): call ssm check on system - software crashes page fix icon names --- java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml | 23 ++ java/code/src/com/redhat/rhn/frontend/action/groups/ErrataListAction.java | 69 ++++++++ java/code/src/com/redhat/rhn/frontend/action/systems/SoftwareCrashesAction.java | 3 java/code/src/com/redhat/rhn/frontend/configuration/tags/ConfigChannelTag.java | 2 java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_bn_IN.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 2 java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_gu.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_hi.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pa.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ta.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 6 java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java | 13 + java/code/webapp/WEB-INF/nav/system_group_detail.xml | 6 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/groups/header.jspf | 2 java/code/webapp/WEB-INF/pages/common/fragments/kickstart/deleteconfirm.jspf | 2 java/code/webapp/WEB-INF/pages/common/fragments/scheduledactions/action-header.jspf | 2 java/code/webapp/WEB-INF/pages/common/fragments/systems/group_listdisplay.jspf | 2 java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/systemGroups.jsp | 2 java/code/webapp/WEB-INF/pages/groups/detail.jsp | 4 java/code/webapp/WEB-INF/pages/groups/erratalist.jsp | 78 ++++++++++ java/code/webapp/WEB-INF/pages/help/forgotcredentials.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/scripts.jsp | 2 java/code/webapp/WEB-INF/pages/schedule/pendingactionsconfirm.jsp | 2 java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp | 17 +- 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/code/webapp/WEB-INF/pages/user/edit/your_edit_address.jsp | 2 java/code/webapp/WEB-INF/struts-config.xml | 8 + java/docs/webtesting/simple-stress-plan.jmx | 2 java/scripts/java-templates/jspbody.jsp | 2 java/spacewalk-java.spec | 8 - rel-eng/packages/spacewalk-java | 2 spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf | 6 web/html/network/systems/groups/errata_list.pxt | 53 ------ web/include/nav/system_group_detail.xml | 6 web/modules/sniglets/Sniglets/ListView/ActionList.pm | 6 web/modules/sniglets/Sniglets/ServerGroup.pm | 4 54 files changed, 306 insertions(+), 144 deletions(-) ---

1 0

2 commits - java/code java/scripts java/spacewalk-java.spec rel-eng/packages
by Michael Mraka 16 Dec '13

16 Dec '13

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(a)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/%{name}-%{version}.tar.gz @@ -785,6 +785,12 @@ fi %{jardir}/postgresql-jdbc.jar %changelog +* Mon Dec 16 2013 Michael Mraka <michael.mraka(a)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(a)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(a)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 @@ <h2> - <img src="/img/rhn-icon-packages.gif" /> + <rhn:icon type="header-errata" /> <bean:message key="confirmprivate.jsp.title"/> </h2> <bean:message key="confirmprivate.jsp.confirmmsg"/> 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'}"> - <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> - <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>

1 0

2 commits - java/code
by mkollar 16 Dec '13

16 Dec '13

java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_bn_IN.xml | 4 ++-- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml | 4 ++-- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 2 +- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml | 4 ++-- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml | 4 ++-- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_gu.xml | 4 ++-- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_hi.xml | 4 ++-- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml | 4 ++-- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml | 4 ++-- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml | 4 ++-- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pa.xml | 4 ++-- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml | 4 ++-- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml | 4 ++-- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ta.xml | 4 ++-- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml | 4 ++-- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml | 4 ++-- java/code/webapp/WEB-INF/pages/common/fragments/groups/header.jspf | 2 +- 17 files changed, 32 insertions(+), 32 deletions(-) New commits: commit 385553ba7cc3a8a6a28053a28af200add89c8a4c Author: Matej Kollar <mkollar(a)redhat.com> Date: Mon Dec 16 15:56:31 2013 +0100 Forgotten html entity 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 4d1a431..2d3e701 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 @@ -8,7 +8,7 @@ <div class="spacewalk-toolbar-h1"> <div class="spacewalk-toolbar"> - <a href="/network/systems/ssm/work_with_group.pxt?sgid=${systemgroup.id}&pxt_trap=rhn:work_with_group_cb"> + <a href="/network/systems/ssm/work_with_group.pxt?sgid=${systemgroup.id}&pxt_trap=rhn:work_with_group_cb"> <rhn:icon type="header-system-groups" title="<bean:message key='toolbar.work.with.group' />" /> <bean:message key="toolbar.work.with.group"/> </a> commit fa64637ee6ae1ea7cab26e00fab4ee4226f5a0ae Author: Matej Kollar <mkollar(a)redhat.com> Date: Mon Dec 16 15:42:02 2013 +0100 Having id="list_$min\|max\|total$" is bad It lead to having multiple tags having identical. Classes/ids shall not be localized. diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_bn_IN.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_bn_IN.xml index 30a48d4..d57f52e 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_bn_IN.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_bn_IN.xml @@ -1684,11 +1684,11 @@ <target>চিহ্নিত মান অনুসারে ফিল্টার করা হবে: </target> </trans-unit> <trans-unit id="message.range"> - <source>{0} - {1} of {2}</source> + <source>{0} - {1} of {2}</source> <context-group name="ctx"> <context context-type="sourcefile">on any listview page with a set. 1 - 5 of 120</context> </context-group> - <target>{0} - {1} {2}-র</target> + <target>{0} - {1} {2}-র</target> </trans-unit> <trans-unit id="message.range.withtypedescription"> <source>{0} - {1} of {2} diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml index 527b04b..cb7f38c 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml @@ -1785,11 +1785,11 @@ <target>Filtern nach: </target> </trans-unit> <trans-unit id="message.range"> - <source>{0} - {1} of {2}</source> + <source>{0} - {1} of {2}</source> <context-group name="ctx"> <context context-type="sourcefile">on any listview page with a set. 1 - 5 of 120</context> </context-group> - <target>{0} - {1} von {2}</target> + <target>{0} - {1} von {2}</target> </trans-unit> <trans-unit id="message.range.withtypedescription"> <source>{0} - {1} of {2} diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml index 83109a3..1f43de8 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml @@ -1547,7 +1547,7 @@ </context-group> </trans-unit> <trans-unit id="message.range"> - <source>{0} - {1} of {2}</source> + <source>{0} - {1} of {2}</source> <context-group name="ctx"> <context context-type="sourcefile">on any listview page with a set. 1 - 5 of 120</context> </context-group> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml index 57b0f80..21096ed 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml @@ -1785,11 +1785,11 @@ <target>Filtrar por: </target> </trans-unit> <trans-unit id="message.range"> - <source>{0} - {1} of {2}</source> + <source>{0} - {1} of {2}</source> <context-group name="ctx"> <context context-type="sourcefile">on any listview page with a set. 1 - 5 of 120</context> </context-group> - <target>{0} - {1} de {2}</target> + <target>{0} - {1} de {2}</target> </trans-unit> <trans-unit id="message.range.withtypedescription"> <source>{0} - {1} of {2} diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml index 4eb3119..b2d347c 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml @@ -1787,11 +1787,11 @@ utilisateur avant de supprimer son compte.</target> <target>Filtrer par : </target> </trans-unit> <trans-unit id="message.range"> - <source>{0} - {1} of {2}</source> + <source>{0} - {1} of {2}</source> <context-group name="ctx"> <context context-type="sourcefile">on any listview page with a set. 1 - 5 of 120</context> </context-group> - <target>{0} - {1} de {2}</target> + <target>{0} - {1} de {2}</target> </trans-unit> <trans-unit id="message.range.withtypedescription"> <source>{0} - {1} of {2} diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_gu.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_gu.xml index 1cefbfa..c429e20 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_gu.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_gu.xml @@ -1677,11 +1677,11 @@ <target>દ્વારા ગાળો: </target> </trans-unit> <trans-unit id="message.range"> - <source>{0} - {1} of {2}</source> + <source>{0} - {1} of {2}</source> <context-group name="ctx"> <context context-type="sourcefile">on any listview page with a set. 1 - 5 of 120</context> </context-group> - <target>{0} - {1} of {2}</target> + <target>{0} - {1} of {2}</target> </trans-unit> <trans-unit id="message.range.withtypedescription"> <source>{0} - {1} of {2} diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_hi.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_hi.xml index 8274ea6..b798767 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_hi.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_hi.xml @@ -1677,11 +1677,11 @@ <target>इसके द्वारा फ़िल्टर: </target> </trans-unit> <trans-unit id="message.range"> - <source>{0} - {1} of {2}</source> + <source>{0} - {1} of {2}</source> <context-group name="ctx"> <context context-type="sourcefile">on any listview page with a set. 1 - 5 of 120</context> </context-group> - <target>{0} - {1} of {2}</target> + <target>{0} - {1} of {2}</target> </trans-unit> <trans-unit id="message.range.withtypedescription"> <source>{0} - {1} of {2} diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml index 4b9b1dc..1a670fe 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml @@ -1785,11 +1785,11 @@ <target>Filtra per: </target> </trans-unit> <trans-unit id="message.range"> - <source>{0} - {1} of {2}</source> + <source>{0} - {1} of {2}</source> <context-group name="ctx"> <context context-type="sourcefile">on any listview page with a set. 1 - 5 of 120</context> </context-group> - <target>{0} - {1} of {2}</target> + <target>{0} - {1} of {2}</target> </trans-unit> <trans-unit id="message.range.withtypedescription"> <source>{0} - {1} of {2} diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml index 8d718f2..d19a38c 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml @@ -1785,11 +1785,11 @@ <target>フィルターする: </target> </trans-unit> <trans-unit id="message.range"> - <source>{0} - {1} of {2}</source> + <source>{0} - {1} of {2}</source> <context-group name="ctx"> <context context-type="sourcefile">on any listview page with a set. 1 - 5 of 120</context> </context-group> - <target>{0} - {1} のうち {2}</target> + <target>{0} - {1} のうち {2}</target> </trans-unit> <trans-unit id="message.range.withtypedescription"> <source>{0} - {1} of {2} diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml index ef273d6..cc66b8e 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml @@ -1785,11 +1785,11 @@ <target>거르기:</target> </trans-unit> <trans-unit id="message.range"> - <source>{0} - {1} of {2}</source> + <source>{0} - {1} of {2}</source> <context-group name="ctx"> <context context-type="sourcefile">on any listview page with a set. 1 - 5 of 120</context> </context-group> - <target>{2} 중 {0} - {1}</target> + <target>{2} 중 {0} - {1}</target> </trans-unit> <trans-unit id="message.range.withtypedescription"> <source>{0} - {1} of {2} diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pa.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pa.xml index 853fae0..f63a108 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pa.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pa.xml @@ -1679,11 +1679,11 @@ <target>ਰਾਹੀਂ ਫਿਲਟਰ: </target> </trans-unit> <trans-unit id="message.range"> - <source>{0} - {1} of {2}</source> + <source>{0} - {1} of {2}</source> <context-group name="ctx"> <context context-type="sourcefile">on any listview page with a set. 1 - 5 of 120</context> </context-group> - <target>{0} - {1} of {2}</target> + <target>{0} - {1} of {2}</target> </trans-unit> <trans-unit id="message.range.withtypedescription"> <source>{0} - {1} of {2} diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml index e6d19be..db6f88d 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml @@ -1785,11 +1785,11 @@ <target>Filtrar por: </target> </trans-unit> <trans-unit id="message.range"> - <source>{0} - {1} of {2}</source> + <source>{0} - {1} of {2}</source> <context-group name="ctx"> <context context-type="sourcefile">on any listview page with a set. 1 - 5 of 120</context> </context-group> - <target>{0} - {1} de {2}</target> + <target>{0} - {1} de {2}</target> </trans-unit> <trans-unit id="message.range.withtypedescription"> <source>{0} - {1} of {2} diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml index 36a09df..5cceddb 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml @@ -1785,11 +1785,11 @@ <target>Фильтр: </target> </trans-unit> <trans-unit id="message.range"> - <source>{0} - {1} of {2}</source> + <source>{0} - {1} of {2}</source> <context-group name="ctx"> <context context-type="sourcefile">on any listview page with a set. 1 - 5 of 120</context> </context-group> - <target>{0} - {1} из {2}</target> + <target>{0} - {1} из {2}</target> </trans-unit> <trans-unit id="message.range.withtypedescription"> <source>{0} - {1} of {2} diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ta.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ta.xml index e8d86d7..25bab8c 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ta.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ta.xml @@ -1677,11 +1677,11 @@ <target>வடிப்பு: </target> </trans-unit> <trans-unit id="message.range"> - <source>{0} - {1} of {2}</source> + <source>{0} - {1} of {2}</source> <context-group name="ctx"> <context context-type="sourcefile">on any listview page with a set. 1 - 5 of 120</context> </context-group> - <target>{0} - {1} of {2}</target> + <target>{0} - {1} of {2}</target> </trans-unit> <trans-unit id="message.range.withtypedescription"> <source>{0} - {1} of {2} diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml index 979e1b1..ad05d6c 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml @@ -1785,11 +1785,11 @@ <target>过滤器：</target> </trans-unit> <trans-unit id="message.range"> - <source>{0} - {1} of {2}</source> + <source>{0} - {1} of {2}</source> <context-group name="ctx"> <context context-type="sourcefile">on any listview page with a set. 1 - 5 of 120</context> </context-group> - <target>{0} - {2} 的 {1}</target> + <target>{0} - {2} 的 {1}</target> </trans-unit> <trans-unit id="message.range.withtypedescription"> <source>{0} - {1} of {2} diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml index 75dfdbd..4c0b830 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml @@ -1785,11 +1785,11 @@ <target>由...來篩選：</target> </trans-unit> <trans-unit id="message.range"> - <source>{0} - {1} of {2}</source> + <source>{0} - {1} of {2}</source> <context-group name="ctx"> <context context-type="sourcefile">on any listview page with a set. 1 - 5 of 120</context> </context-group> - <target>{0} - {1} of {2}</target> + <target>{0} - {1} of {2}</target> </trans-unit> <trans-unit id="message.range.withtypedescription"> <source>{0} - {1} of {2}

1 0

spacewalk/config web/html web/include web/modules
by mkollar 16 Dec '13

16 Dec '13

spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf | 6 - web/html/network/systems/groups/errata_list.pxt | 53 ---------------- web/include/nav/system_group_detail.xml | 6 - web/modules/sniglets/Sniglets/ServerGroup.pm | 4 - 4 files changed, 4 insertions(+), 65 deletions(-) New commits: commit 74773af3988bab40bb99cf9a5ac51a3254a4ea92 Author: Matej Kollar <mkollar(a)redhat.com> Date: Mon Dec 16 15:13:37 2013 +0100 Remove groups/errata_list.pxt diff --git a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf index cc39758..b9c6591 100644 --- a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf +++ b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf @@ -138,12 +138,6 @@ PerlConfigRequire PXT/Apache24Config.pm AuthName "RHN System Group Admin Area" require acl user_role(system_group_admin); user_has_access_to_servergroup() </Files> - - <Files errata_list.pxt> - AuthType Basic - AuthName "RHN System Group Admin Area" - require acl user_has_access_to_servergroup() - </Files> </Directory> <Directory "/var/www/html/network/systems/details"> diff --git a/web/html/network/systems/groups/errata_list.pxt b/web/html/network/systems/groups/errata_list.pxt deleted file mode 100644 index 4c45484..0000000 --- a/web/html/network/systems/groups/errata_list.pxt +++ /dev/null @@ -1,53 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<pxt-passthrough> - <pxt-use class="Grail::Frame" /> - <pxt-use class="Sniglets::Users" /> - <pxt-use class="Sniglets::ServerGroup" /> - <pxt-use class="Sniglets::Lists" /> - <pxt-use class="Sniglets::Navi" /> - - <grail-canvas-replacement mode="legend_canvas"> - <rhn-list-legend type="errata" file="/network/components/legends/errata-list-legend.pxi" /> - </grail-canvas-replacement> - - <grail-canvas-template base="/templates/c.pxt" mode="main_canvas"> - -<pxt-include file="/network/components/system_groups/sgdc_header.pxi" /> - - <h2> - <rhn-icon type="header-errata" title="erratum"/> - Relevant Errata - </h2> - - <div class="page-summary"> - The following errata apply to one or more of the systems in this group. - </div> - -<pxt-include-late file="/network/components/message_queues/local.pxi" /> - -<pxt-formvar> -<rhn-listview class="Sniglets::ListView::ErrataList" mode="relevant_to_group"> - - <formvars> - <var name="sgid" /> - </formvars> - - <column name="Type" label="advisory_icon" width="5%" align="center"/> - - <column name="Advisory" label="advisory_name"> - <url>/rhn/errata/details/Details.do?eid={column:id}</url> - </column> - - <column name="Synopsis" label="advisory_synopsis" align="left" width="65%"/> - - <column name="Affected Systems" label="affected_system_count" align="center" width="5%"> - <url>/network/systems/groups/systems_affected_by_errata.pxt?sgid={formvar:sgid}&eid={column:id}</url> - </column> - - <column name="Updated On" label="update_date" width="10%" align="center"/> -</rhn-listview> -</pxt-formvar> - - </grail-canvas-template> -</pxt-passthrough> - diff --git a/web/include/nav/system_group_detail.xml b/web/include/nav/system_group_detail.xml index f6953e1..d3f9588 100644 --- a/web/include/nav/system_group_detail.xml +++ b/web/include/nav/system_group_detail.xml @@ -9,10 +9,8 @@ <rhn-tab name="Target Systems" acl="user_role(system_group_admin)"> <rhn-tab-url>/rhn/groups/AddSystems.do</rhn-tab-url> </rhn-tab> - <rhn-tab name="Errata" on-click="Sniglets::Lists->navi_empty_set" node-id="system_group_errata_list"> - <rhn-tab-url>/network/systems/groups/errata_list.pxt</rhn-tab-url> - <rhn-tab-url>/network/systems/groups/systems_affected_by_errata.pxt</rhn-tab-url> - <rhn-tab-url>/network/systems/groups/apply_errata_confirm.pxt</rhn-tab-url> + <rhn-tab name="Errata"> + <rhn-tab-url>/rhn/groups/ListErrata.do</rhn-tab-url> </rhn-tab> <rhn-tab name="Admins" url="/rhn/groups/AdminList.do" acl="user_role(system_group_admin)" /> diff --git a/web/modules/sniglets/Sniglets/ServerGroup.pm b/web/modules/sniglets/Sniglets/ServerGroup.pm index 1155fb1..c7d8294 100644 --- a/web/modules/sniglets/Sniglets/ServerGroup.pm +++ b/web/modules/sniglets/Sniglets/ServerGroup.pm @@ -72,14 +72,14 @@ sub system_group_status_interface { $subst->{icon} = PXT::HTML->icon(-type => 'system-crit'); $subst->{status_str} = $counts->{SECURITY_ERRATA} . ' critical updates available'; - $subst->{message} = "(<a href=\"/network/systems/groups/errata_list.pxt?sgid=" . $sgid . "\">more info</a>)";; + $subst->{message} = "(<a href=\"/rhn/groups/ListErrata.do?sgid=" . $sgid . "\">more info</a>)";; $subst->{status_class} = 'system-status-critical-updates'; } else { $subst->{icon} = PXT::HTML->icon(-type => 'system-warn'); $subst->{status_str} = ' updates available'; - $subst->{message} = "(<a href=\"/network/systems/groups/errata_list.pxt?sgid=" . $sgid . "\">more info</a>)"; + $subst->{message} = "(<a href=\"/rhn/groups/ListErrata.do?sgid=" . $sgid . "\">more info</a>)"; $subst->{status_class} = 'system-status-updates'; }

1 0

java/code java/docs
by mkollar 16 Dec '13

16 Dec '13

java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml | 23 ++ java/code/src/com/redhat/rhn/frontend/action/groups/ErrataListAction.java | 69 ++++++++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 6 java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java | 13 + java/code/webapp/WEB-INF/nav/system_group_detail.xml | 6 java/code/webapp/WEB-INF/pages/common/fragments/systems/group_listdisplay.jspf | 2 java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/systemGroups.jsp | 2 java/code/webapp/WEB-INF/pages/groups/detail.jsp | 4 java/code/webapp/WEB-INF/pages/groups/erratalist.jsp | 78 ++++++++++ java/code/webapp/WEB-INF/struts-config.xml | 8 + java/docs/webtesting/simple-stress-plan.jmx | 2 11 files changed, 204 insertions(+), 9 deletions(-) New commits: commit 0e950fb1904fea42149fe5f3b7b04f8f216b8f5d Author: Matej Kollar <mkollar(a)redhat.com> Date: Tue Dec 10 13:27:06 2013 +0100 Rewrite of errata_list.pxt to Java diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml index ccce0a1..bf964c3 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml +++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml @@ -120,6 +120,29 @@ SELECT DISTINCT E.id, E.update_date, E.synopsis as advisory_synopsis <elaborator name="errata_overview" /> </mode> +<mode name="relevant_to_server_group" class="com.redhat.rhn.frontend.dto.ErrataOverview"> + <query params="sgid"> +SELECT DISTINCT E.id, E.advisory, E.advisory_name, E.advisory_type, E.synopsis AS ADVISORY_SYNOPSIS, + E.update_date, + (SELECT COUNT(Distinct SGM2.server_id) + FROM rhnServerNeededErrataCache SNEC, + rhnServerGroupMembers SGM2 + WHERE SNEC.errata_id = E.id + AND SNEC.server_id = SGM2.server_id + AND SGM2.server_group_id = :sgid) AS AFFECTED_SYSTEM_COUNT + FROM rhnErrata E, + rhnServerNeededErrataCache SNEC, + rhnServerGroupMembers SGM, + rhnServerFeaturesView SFV + WHERE SGM.server_id = SNEC.server_id + AND SNEC.errata_id = E.id + AND SFV.server_id = SGM.server_id + AND SFV.label = 'ftr_system_grouping' + AND SGM.server_group_id = :sgid +ORDER BY E.update_date DESC, E.id + </query> +</mode> + <mode name="relevant_to_system" class="com.redhat.rhn.frontend.dto.ErrataOverview"> <query params="user_id, sid"> SELECT DISTINCT E.id, E.update_date, diff --git a/java/code/src/com/redhat/rhn/frontend/action/groups/ErrataListAction.java b/java/code/src/com/redhat/rhn/frontend/action/groups/ErrataListAction.java new file mode 100644 index 0000000..1bd5a5b --- /dev/null +++ b/java/code/src/com/redhat/rhn/frontend/action/groups/ErrataListAction.java @@ -0,0 +1,69 @@ +/** + * Copyright (c) 2013 Red Hat, Inc. + * + * This software is licensed to you under the GNU General Public License, + * version 2 (GPLv2). There is NO WARRANTY for this software, express or + * implied, including the implied warranties of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 + * along with this software; if not, see + * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. + * + * Red Hat trademarks are not licensed under GPLv2. No permission is + * granted to use or replicate Red Hat trademarks that are incorporated + * in this software or its documentation. + */ +package com.redhat.rhn.frontend.action.groups; + +import com.redhat.rhn.domain.server.ManagedServerGroup; +import com.redhat.rhn.frontend.action.common.BadParameterException; +import com.redhat.rhn.frontend.struts.RequestContext; +import com.redhat.rhn.frontend.struts.RhnAction; +import com.redhat.rhn.frontend.struts.StrutsDelegate; +import com.redhat.rhn.frontend.taglibs.list.helper.ListHelper; +import com.redhat.rhn.frontend.taglibs.list.helper.Listable; +import com.redhat.rhn.manager.errata.ErrataManager; + +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; + +import java.util.List; +import java.util.Map; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + + +/** + * List Errata for server group + */ +public class ErrataListAction extends RhnAction implements Listable { + + /** {@inheritDoc} */ + public ActionForward execute(ActionMapping actionMapping, + ActionForm formIn, + HttpServletRequest request, + HttpServletResponse response) { + + RequestContext requestContext = new RequestContext(request); + ManagedServerGroup serverGroup = requestContext.lookupAndBindServerGroup(); + if (serverGroup == null) { + throw new BadParameterException("Invalid " + RequestContext.SERVER_GROUP_ID + + " parameter:" + serverGroup.getId()); + } + + ListHelper helper = new ListHelper(this, request); + helper.execute(); + + Map params = makeParamMap(request); + params.put(RequestContext.SERVER_GROUP_ID, serverGroup.getId()); + + return StrutsDelegate.getInstance().forwardParams( + actionMapping.findForward("default"), params); + } + + /** {@inheritDoc} */ + public List getResult(RequestContext context) { + ManagedServerGroup currentGroup = context.lookupAndBindServerGroup(); + return ErrataManager.relevantErrata(currentGroup); + } +} 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 0c032ad..c88ef07 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 @@ -5249,6 +5249,12 @@ value for this entitlement, excluding the default organization's consumption.</s <trans-unit id="systemgroup.admins.updated"> <source>Admin list for system group {0} updated.</source> </trans-unit> + <trans-unit id="systemgroup.erratalist.title"> + <source>Relevant Errata </source> + </trans-unit> + <trans-unit id="systemgroup.erratalist.summary"> + <source>The following errata apply to one or more of the systems in this group.</source> + </trans-unit> <trans-unit id="systemgroup.target-systems.summary"> <source>The following are systems that may be added to this group.</source> </trans-unit> diff --git a/java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java b/java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java index ba98a9c..54aa37a 100644 --- a/java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java +++ b/java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java @@ -39,6 +39,7 @@ import com.redhat.rhn.domain.errata.ErrataFile; import com.redhat.rhn.domain.org.Org; import com.redhat.rhn.domain.rhnset.RhnSet; import com.redhat.rhn.domain.role.RoleFactory; +import com.redhat.rhn.domain.server.ManagedServerGroup; import com.redhat.rhn.domain.user.User; import com.redhat.rhn.frontend.action.channel.manage.PublishErrataHelper; import com.redhat.rhn.frontend.dto.ChannelOverview; @@ -350,6 +351,18 @@ public class ErrataManager extends BaseManager { return ErrataManager.getRelevantErrata(user, false); } + /** Returns errata relevant to given server group. + * @param serverGroup Server group. + * @return Relevant errata for ... + */ + public static DataResult relevantErrata(ManagedServerGroup serverGroup) { + SelectMode m = ModeFactory.getMode("Errata_queries", "relevant_to_server_group"); + Map params = new HashMap(); + params.put("sgid", serverGroup.getId()); + DataResult res = makeDataResultNoPagination(params, null, m); + return res; + } + /** * Returns the relevant errata to the system set (used in SSM). * diff --git a/java/code/webapp/WEB-INF/nav/system_group_detail.xml b/java/code/webapp/WEB-INF/nav/system_group_detail.xml index f6953e1..d3f9588 100644 --- a/java/code/webapp/WEB-INF/nav/system_group_detail.xml +++ b/java/code/webapp/WEB-INF/nav/system_group_detail.xml @@ -9,10 +9,8 @@ <rhn-tab name="Target Systems" acl="user_role(system_group_admin)"> <rhn-tab-url>/rhn/groups/AddSystems.do</rhn-tab-url> </rhn-tab> - <rhn-tab name="Errata" on-click="Sniglets::Lists->navi_empty_set" node-id="system_group_errata_list"> - <rhn-tab-url>/network/systems/groups/errata_list.pxt</rhn-tab-url> - <rhn-tab-url>/network/systems/groups/systems_affected_by_errata.pxt</rhn-tab-url> - <rhn-tab-url>/network/systems/groups/apply_errata_confirm.pxt</rhn-tab-url> + <rhn-tab name="Errata"> + <rhn-tab-url>/rhn/groups/ListErrata.do</rhn-tab-url> </rhn-tab> <rhn-tab name="Admins" url="/rhn/groups/AdminList.do" acl="user_role(system_group_admin)" /> 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 0eb96f4..9493d3b 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 @@ -28,7 +28,7 @@ styleclass="center" headerclass="thin-column"> - <c:out value="<a href=\"/network/systems/groups/errata_list.pxt?sgid=${current.id}\">" escapeXml="false"/> + <c:out value="<a href=\"/rhn/groups/ListErrata.do?sgid=${current.id}\">" escapeXml="false"/> <c:choose> <c:when test="${current.mostSevereErrata == 'Security Advisory'}"> 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 77f7dac..a3eaccc 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 @@ -15,7 +15,7 @@ emptykey="yourrhn.jsp.systemgroups.none"> <rl:column headerkey="grouplist.jsp.status"> - <a href="/network/systems/groups/errata_list.pxt?sgid=${current.id}"> + <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' />" /> diff --git a/java/code/webapp/WEB-INF/pages/groups/detail.jsp b/java/code/webapp/WEB-INF/pages/groups/detail.jsp index 2816f20..1740f13 100644 --- a/java/code/webapp/WEB-INF/pages/groups/detail.jsp +++ b/java/code/webapp/WEB-INF/pages/groups/detail.jsp @@ -28,12 +28,12 @@ <c:if test="${errata_counts['se'] > 0}"> <rhn:icon type="system-crit" /> <bean:message key="systemgroup.details.criticalupdates"/> - <a class="btn btn-danger" href="/network/systems/groups/errata_list.pxt?sgid=${id}">${errata_counts['se']} <rhn:icon type="nav-right" /></a> + <a class="btn btn-danger" href="/rhn/groups/ListErrata.do?sgid=${id}">${errata_counts['se']} <rhn:icon type="nav-right" /></a> </c:if> <c:if test="${(errata_counts['se'] == 0) && ((errata_counts['be'] > 0) || (errata_counts['ee'] > 0))}"> <rhn:icon type="system-warn" /> <bean:message key="systemgroup.details.someupdates"/> - <a class="btn btn-warning" href="/network/systems/groups/errata_list.pxt?sgid=${id}"><rhn:icon type="nav-right" /></a> + <a class="btn btn-warning" href="/rhn/groups/ListErrata.do?sgid=${id}"><rhn:icon type="nav-right" /></a> </c:if> <c:if test="${(errata_counts['se'] == 0) && (errata_counts['be'] == 0) && (errata_counts['ee'] == 0)}"> <rhn:icon type="system-ok" /> diff --git a/java/code/webapp/WEB-INF/pages/groups/erratalist.jsp b/java/code/webapp/WEB-INF/pages/groups/erratalist.jsp new file mode 100644 index 0000000..7f3fd52 --- /dev/null +++ b/java/code/webapp/WEB-INF/pages/groups/erratalist.jsp @@ -0,0 +1,78 @@ +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> +<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %> +<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %> +<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> +<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> + + +<html> +<head> + <meta name="page-decorator" content="none" /> +</head> +<body> + +<%@ include file="/WEB-INF/pages/common/fragments/groups/header.jspf" %> + +<h2> + <bean:message key="systemgroup.erratalist.title" /> +</h2> + +<div class="page-summary"> +<bean:message key="systemgroup.erratalist.summary" /> +</div> + +<rl:listset name="groupSet" legend="errata"> + <rhn:csrf /> + <input type="hidden" name="sgid" value="${systemgroup.id}" /> + + <rl:list emptykey="erratalist.jsp.noerrata"> + + <rl:decorator name="PageSizeDecorator" /> + <rl:decorator name="ElaborationDecorator" /> + + <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' />" /> + </c:if> + <c:if test="${current.bugFix}"> + <rhn:icon type="errata-bugfix" title="<bean:message key='erratalist.jsp.bugadvisory' />" /> + </c:if> + <c:if test="${current.productEnhancement}"> + <rhn:icon type="errata-enhance" title="<bean:message key='erratalist.jsp.productenhancementadvisory' />" /> + </c:if> + </rl:column> + <rl:column headerkey="erratalist.jsp.advisory"> + <a href="/rhn/errata/details/Details.do?eid=${current.id}">${current.advisoryName}</a> + </rl:column> + <rl:column headerkey="erratalist.jsp.synopsis" + sortable="true" + sortattr="advisorySynopsis" + filterattr="advisorySynopsis"> + ${current.advisorySynopsis} + </rl:column> + <rl:column headerkey="erratalist.jsp.systems" + styleclass="text-align: center;"> + <a href="/rhn/errata/details/SystemsAffected.do?eid=${current.id}">${current.affectedSystemCount}</a> + </rl:column> + <c:if test="${displayCves}"> + <rl:column headerkey="erratalist.jsp.updated" + sortable="true" + sortattr="updateDateObj" + styleclass="text-align: center;"> + ${current.updateDate} + </rl:column> + </c:if> + <c:if test="${not displayCves}"> + <rl:column headerkey="erratalist.jsp.updated" + sortable="true" + sortattr="updateDateObj" + styleclass="text-align: center;"> + ${current.updateDate} + </rl:column> + </c:if> + + </rl:list> +</rl:listset> + +</body> +</html> diff --git a/java/code/webapp/WEB-INF/struts-config.xml b/java/code/webapp/WEB-INF/struts-config.xml index 47e5539..20509c3 100644 --- a/java/code/webapp/WEB-INF/struts-config.xml +++ b/java/code/webapp/WEB-INF/struts-config.xml @@ -3917,6 +3917,14 @@ redirect="true" /> </action> + <action path="/groups/ListErrata" + scope="request" + type="com.redhat.rhn.frontend.action.groups.ErrataListAction" + className="com.redhat.rhn.frontend.struts.RhnActionMapping"> + <forward name="default" + path="/WEB-INF/pages/groups/erratalist.jsp" /> + </action> + <action path="/groups/EditGroup" scope="request" type="com.redhat.rhn.frontend.action.groups.EditGroupAction" diff --git a/java/docs/webtesting/simple-stress-plan.jmx b/java/docs/webtesting/simple-stress-plan.jmx index ec8e824..2d55d1b 100644 --- a/java/docs/webtesting/simple-stress-plan.jmx +++ b/java/docs/webtesting/simple-stress-plan.jmx @@ -869,7 +869,7 @@ </node> <node> <testelement class="org.apache.jmeter.protocol.http.sampler.HTTPSampler"> -<property xml:space="preserve" propType="org.apache.jmeter.testelement.property.StringProperty" name="HTTPSampler.path">/network/systems/details/errata_list.pxt</property> +<property xml:space="preserve" propType="org.apache.jmeter.testelement.property.StringProperty" name="HTTPSampler.path">/rhn/groups/ListErrata.do</property> <property xml:space="preserve" propType="org.apache.jmeter.testelement.property.StringProperty" name="TestElement.test_class">org.apache.jmeter.protocol.http.sampler.HTTPSampler</property> <property xml:space="preserve" propType="org.apache.jmeter.testelement.property.StringProperty" name="HTTPSampler.method">GET</property> <property xml:space="preserve" propType="org.apache.jmeter.testelement.property.BooleanProperty" name="HTTPSampler.use_keepalive">true</property>

1 0

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

16 Dec '13

java/code/webapp/WEB-INF/pages/common/fragments/scheduledactions/action-header.jspf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 71ab0f5292c8409aecf63d4de2220d3f5ba4e0b4 Author: Tomas Kasparek <tkasparek(a)redhat.com> Date: Mon Dec 16 13:49:34 2013 +0100 fix icon names diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/scheduledactions/action-header.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/scheduledactions/action-header.jspf index bc9b6fc..a9493a6 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/scheduledactions/action-header.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/scheduledactions/action-header.jspf @@ -1,4 +1,4 @@ -<rhn:toolbar base="h1" icon="spacewalk-icon-schedule-computer" +<rhn:toolbar base="h1" icon="header-schedule" iconAlt="action.common.scheduleAlt" helpUrl="/rhn/help/reference/en-US/s1-sm-actions.jsp"> ${requestScope.actionname}

1 0

3 commits - java/code web/modules
by Michael Mraka 16 Dec '13

16 Dec '13

java/code/src/com/redhat/rhn/frontend/configuration/tags/ConfigChannelTag.java | 2 +- java/code/webapp/WEB-INF/pages/kickstart/scripts.jsp | 2 +- java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp | 2 +- java/code/webapp/WEB-INF/pages/user/edit/your_edit_address.jsp | 2 +- web/modules/sniglets/Sniglets/ListView/ActionList.pm | 6 +++--- 5 files changed, 7 insertions(+), 7 deletions(-) New commits: commit d6dbdbb5ec1c7284bed0c68fc5593a4dbba4f99a Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Mon Dec 16 13:39:13 2013 +0100 fixed icon names diff --git a/web/modules/sniglets/Sniglets/ListView/ActionList.pm b/web/modules/sniglets/Sniglets/ListView/ActionList.pm index 44271b8..360b511 100644 --- a/web/modules/sniglets/Sniglets/ListView/ActionList.pm +++ b/web/modules/sniglets/Sniglets/ListView/ActionList.pm @@ -89,9 +89,9 @@ my %history_type_icons = ( 'configfiles.diff' => 'event-type-system', ); -my %history_status_icons = ('Completed' => 'actions-ok', - 'Failed' => 'actions-failed', - 'Picked Up' => 'actions-running', +my %history_status_icons = ('Completed' => 'action-ok', + 'Failed' => 'action-failed', + 'Picked Up' => 'action-running', ); sub system_history_provider { commit d39a310f057889b4bab55c6b3a25bf5b2fff2520 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Mon Dec 16 11:55:40 2013 +0100 more icon fixes diff --git a/java/code/src/com/redhat/rhn/frontend/configuration/tags/ConfigChannelTag.java b/java/code/src/com/redhat/rhn/frontend/configuration/tags/ConfigChannelTag.java index 4d78001..4f202f3 100644 --- a/java/code/src/com/redhat/rhn/frontend/configuration/tags/ConfigChannelTag.java +++ b/java/code/src/com/redhat/rhn/frontend/configuration/tags/ConfigChannelTag.java @@ -125,7 +125,7 @@ public class ConfigChannelTag extends TagSupport { i.setType("header-system"); } else { - i.setType("sandbox"); + i.setType("header-sandbox"); } String result = i.renderStartTag(); i.release(); 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 6da67f1..ab18c68 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 @@ -61,7 +61,7 @@ <tr> <th><bean:message key="configoverview.jsp.scheduledBy"/>:</th> <td> - <img src="/img/rhn-listicon-user.gif" alt="<bean:message key='yourrhn.jsp.user.alt'/>"/> + <rhn:icon type="header-user" title="<bean:message key='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/user/edit/your_edit_address.jsp b/java/code/webapp/WEB-INF/pages/user/edit/your_edit_address.jsp index b2857a4..a64448e 100644 --- a/java/code/webapp/WEB-INF/pages/user/edit/your_edit_address.jsp +++ b/java/code/webapp/WEB-INF/pages/user/edit/your_edit_address.jsp @@ -7,7 +7,7 @@ <meta name="page-decorator" content="none" /> </head> <body> - <rhn:toolbar base="h1" icon="icon-user" imgAlt="user.common.userAlt"> + <rhn:toolbar base="h1" icon="header-user" imgAlt="user.common.userAlt"> <bean:message key="Addresses"/> </rhn:toolbar> <div class="panel panel-default"> commit 0a4e3b7b98daf4bf06e97c046e1fc085713bda63 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Mon Dec 16 11:27:10 2013 +0100 replaced old imgs with icons diff --git a/java/code/webapp/WEB-INF/pages/kickstart/scripts.jsp b/java/code/webapp/WEB-INF/pages/kickstart/scripts.jsp index 9b704b2..83c8f6f 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/scripts.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/scripts.jsp @@ -20,7 +20,7 @@ </rhn:toolbar> </c:if> <c:if test="${empty kickstart_scripts}"> - <rhn:toolbar base="h1" img="/img/rhn-kickstart_profile.gif" + <rhn:toolbar base="h1" icon="header-kickstart" creationUrl="/rhn/kickstart/KickstartScriptCreate.do?ksid=${ksdata.id}" creationType="kickstartscript" imgAlt="kickstarts.alt.img">

1 0

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

16 Dec '13

java/code/src/com/redhat/rhn/frontend/action/systems/SoftwareCrashesAction.java | 3 +++ 1 file changed, 3 insertions(+) New commits: commit bb7d455a1683f80d391e20db1ba5aed1bd9edc6a Author: Tomas Kasparek <tkasparek(a)redhat.com> Date: Mon Dec 16 11:01:52 2013 +0100 call ssm check on system - software crashes page same issue as in 3f2e4abaadd5f41cdf00624275a22587e64ebd5f message and link to add to ssm was present on system hardware page even when system was already in ssm diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/SoftwareCrashesAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/SoftwareCrashesAction.java index 42d3f7d..81ee4ed 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/SoftwareCrashesAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/SoftwareCrashesAction.java @@ -18,6 +18,7 @@ import com.redhat.rhn.domain.rhnset.RhnSet; import com.redhat.rhn.domain.server.Server; import com.redhat.rhn.domain.server.ServerFactory; import com.redhat.rhn.domain.user.User; +import com.redhat.rhn.frontend.action.systems.sdc.SdcHelper; import com.redhat.rhn.frontend.dto.SoftwareCrashDto; import com.redhat.rhn.frontend.struts.RequestContext; import com.redhat.rhn.frontend.struts.RhnAction; @@ -65,6 +66,8 @@ public class SoftwareCrashesAction extends RhnAction implements Listable { return handleSubmit(mapping, context, server); } + SdcHelper.ssmCheck(request, server.getId(), context.getLoggedInUser()); + return mapping.findForward(RhnHelper.DEFAULT_FORWARD); }

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

spacewalk-commits December 2013