branding/img/restart.png
|binary
java/code/src/com/redhat/rhn/frontend/action/channel/manage/ChannelPackageMenuAction.java
| 1
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
| 2 -
java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp
| 16 +++++++---
4 files changed, 13 insertions(+), 6 deletions(-)
New commits:
commit f81c90023b36e51be8c6f8eb21c1eec1bc97f925
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Apr 24 18:30:02 2012 +0200
removing unused lookup
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ChannelPackageMenuAction.java
b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ChannelPackageMenuAction.java
index 936eb71..d7dc027 100644
---
a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ChannelPackageMenuAction.java
+++
b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ChannelPackageMenuAction.java
@@ -48,7 +48,6 @@ public class ChannelPackageMenuAction extends RhnAction {
long cid = requestContext.getRequiredParam("cid");
Channel chan = ChannelFactory.lookupByIdAndUser(cid, user);
- ChannelFactory.lookupByLabelAndUser(chan.getLabel(), user);
if (!user.hasRole(RoleFactory.CHANNEL_ADMIN) &&
!UserManager.verifyChannelAdmin(user, chan)) {
throw new PermissionCheckFailureException(RoleFactory.CHANNEL_ADMIN);
commit b3d46efc68355e59e879726591d20875f2cb2a4b
Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de>
Date: Tue Apr 24 15:43:30 2012 +0200
Capitalize title to be consistent
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 e82b561..72e9d24 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
@@ -5062,7 +5062,7 @@ value for this entitlement, excluding the default organization's
consumption.</s
</trans-unit>
<trans-unit id="requiringrebootlist.jsp.header">
- <source>Systems requiring reboot</source>
+ <source>Systems Requiring Reboot</source>
<context-group name="ctx">
<context
context-type="sourcefile">/rhn/systems/RequiringReboot</context>
<context
context-type="sourcefile">/rhn/systems/YourRhn.do</context>
commit 76a369475e24a5bdcf3b35ab8395efd3c8a8f53a
Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de>
Date: Fri Apr 20 13:39:16 2012 +0200
Missing icon for the systems that need reboot list
diff --git a/branding/img/restart.png b/branding/img/restart.png
new file mode 100644
index 0000000..3fd71d6
Binary files /dev/null and b/branding/img/restart.png differ
commit c15d5aecce23dfea32dd518c233f0d3bd8ae546c
Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de>
Date: Tue Apr 24 16:18:00 2012 +0200
Put the reboot notification at the end. Make it not mutually exclusive with other
notifications.
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 d69645b..94eba0d 100644
--- a/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp
@@ -8,8 +8,10 @@
<body>
<%@ include
file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %>
<h2><bean:message
key="sdc.details.overview.systemstatus"/></h2>
+
<div class="systeminfo">
<div class="systeminfo-full">
+
<c:choose>
<c:when test="${unentitled}">
@@ -22,10 +24,6 @@
<bean:message key="sdc.details.overview.inactive2"
arg0="/rhn/help/reference/en-US/s1-sm-systems.jsp#s2-sm-system-list"/>
</c:if>
</c:when>
- <c:when test="${rebootRequired}">
- <img src="/img/restart.png"/><bean:message
key="sdc.details.overview.requires_reboot"/>
- <bean:message key="sdc.details.overview.schedulereboot"
arg0="/network/systems/details/reboot_confirm.pxt?sid=${system.id}"/>
- </c:when>
<c:when test="${hasUpdates}">
<c:choose>
<c:when test="${criticalErrataCount > 0}">
@@ -54,6 +52,16 @@
</c:otherwise>
</c:choose>
</div>
+
+ <c:if test="${rebootRequired}">
+ <div class="systeminfo">
+ <div class="systeminfo-full">
+ <img src="/img/restart.png"/><bean:message
key="sdc.details.overview.requires_reboot"/>
+ <bean:message key="sdc.details.overview.schedulereboot"
arg0="/network/systems/details/reboot_confirm.pxt?sid=${system.id}"/>
+ </div>
+ </div>
+ </c:if>
+
<div class="systeminfo-clear" />
</div>
<c:if test="${probeListEmpty != 'true'}">
Show replies by date