java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 3 +++
java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp | 1 +
java/code/webapp/WEB-INF/pages/ssm/systems/misc/lock-unlock-system.jsp | 2 +-
3 files changed, 5 insertions(+), 1 deletion(-)
New commits:
commit 544ddbcc6e773ce9e5126f1c19e81a55bfe3b6e0
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Wed Jan 29 14:30:48 2014 +0100
add message about system lock/unlock into ssm index
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 6b09a0e..21618c6 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
@@ -4428,6 +4428,9 @@ value for this entitlement, excluding the default organization's
consumption.</s
<trans-unit id="ssm.overview.misc.migrate">
<source><a
href="/rhn/systems/ssm/MigrateSystems.do">Migrate</a>
systems to another organization</source>
</trans-unit>
+ <trans-unit id="ssm.overview.misc.lock">
+ <source><a
href="/rhn/systems/ssm/misc/LockUnlockSystem.do">Lock/unlock</a>
systems</source>
+ </trans-unit>
<trans-unit id="ssm.overview.misc.scap">
<source><a
href="/rhn/systems/ssm/audit/ScheduleXccdf.do">Audit</a>
systems with OpenSCAP</source>
</trans-unit>
diff --git a/java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp
b/java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp
index dbadd5a..fdb9dfb 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp
@@ -141,6 +141,7 @@
<li><bean:message
key="ssm.overview.misc.delete"/></li>
<li><bean:message
key="ssm.overview.misc.reboot"/></li>
<li><bean:message
key="ssm.overview.misc.migrate"/></li>
+ <li><bean:message
key="ssm.overview.misc.lock"/></li>
<li><bean:message
key="ssm.overview.misc.scap"/></li>
</ul>
</div>
commit 6dd90bcd6aaf4286fe0c54c53d36ab7fe5c5f050
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Wed Jan 29 14:22:30 2014 +0100
use icon for locked system
diff --git a/java/code/webapp/WEB-INF/pages/ssm/systems/misc/lock-unlock-system.jsp
b/java/code/webapp/WEB-INF/pages/ssm/systems/misc/lock-unlock-system.jsp
index b2103f6..d8ec9a6 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/systems/misc/lock-unlock-system.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/systems/misc/lock-unlock-system.jsp
@@ -50,7 +50,7 @@
<rl:column headerkey="systemlist.jsp.system"
bound="false" sortattr="name" sortable="true">
<c:choose>
<c:when test="${current.locked > 0}">
- <rhn:icon type="errata-security" />
+ <rhn:icon type="system-locked" />
<a
href="/rhn/systems/details/Overview.do?sid=${current.id}">${fn:escapeXml(current.name)}</a>
</c:when>
<c:otherwise>
Show replies by date