From tkasparek at fedoraproject.org Thu Aug 20 12:18:40 2015 Content-Type: multipart/mixed; boundary="===============6184352829428451103==" MIME-Version: 1.0 From: =?utf-8?q?Tom=C3=A1=C5=A1_Ka=C5=A1p=C3=A1rek_=3Ctkasparek_at_fedoraprojec?= =?utf-8?q?t=2Eorg=3E?= To: spacewalk-commits at lists.fedorahosted.org Subject: 2 commits - java/code Date: Wed, 29 Jan 2014 13:35:13 +0000 Message-ID: <20140129133513.9F38060460@fedorahosted.org> --===============6184352829428451103== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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 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/StringResour= ce_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringReso= urce_en_US.xml index 6b09a0e..21618c6 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_U= S.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_U= S.xml @@ -4428,6 +4428,9 @@ value for this entitlement, excluding the default org= anization's consumption. <a href=3D"/rhn/systems/ssm/MigrateSystems.do">Mig= rate</a> systems to another organization + + <a href=3D"/rhn/systems/ssm/misc/LockUnlockSystem.do"= >Lock/unlock</a> systems + <a href=3D"/rhn/systems/ssm/audit/ScheduleXccdf.do"&g= t;Audit</a> systems with OpenSCAP diff --git a/java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp b/java/code/we= bapp/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 @@
  • +
  • =
  • =
  • commit 6dd90bcd6aaf4286fe0c54c53d36ab7fe5c5f050 Author: Tomas Kasparek 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-sy= stem.jsp b/java/code/webapp/WEB-INF/pages/ssm/systems/misc/lock-unlock-syst= em.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 @@ 0}"> - + ${fn:escapeXml(current.name)} --===============6184352829428451103==--