java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 19
++++++++--
java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlements.jsp | 19
++++------
2 files changed, 24 insertions(+), 14 deletions(-)
New commits:
commit cd02ea279659dcead74d793d1c9b677e5b91744a
Author: Partha Aji <paji(a)redhat.com>
Date: Wed Jun 23 14:12:13 2010 -0400
More verbiage on software entitlements page
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 402af22..8c59f44 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
@@ -4465,6 +4465,12 @@ button below, and <b>will be unable to log back
in</b>.</source>
<context
context-type="sourcefile">/rhn/admin/multiorg/SoftwareEntitlements</context>
</context-group>
</trans-unit>
+ <trans-unit id="Used/Alloted">
+<source>Used/Alloted</source>
+ <context-group name="ctx">
+ <context
context-type="sourcefile">/rhn/admin/multiorg/SoftwareEntitlements</context>
+ </context-group>
+ </trans-unit>
<trans-unit id="None Allocated">
<source>None Alloted</source>
<context-group name="ctx">
@@ -4503,13 +4509,20 @@ button below, and <b>will be unable to log back
in</b>.</source>
<context
context-type="sourcefile">/rhn/admin/multiorg/SoftwareEntitlements</context>
</context-group>
</trans-unit>
- <trans-unit id="softwareentitlements.tip">
-<source><strong>*Tip:</strong> 'Total' refers
to the total available to the @@PRODUCT_NAME@@
-as reflected in this @@PRODUCT_NAME@@'s certificate.</source>
+ <trans-unit id="Available/Total.tip">
+<source>'Total' refers to the total available entitlements to the
@@PRODUCT_NAME@@ as reflected in this @@PRODUCT_NAME@@'s certificate.
'Available' refers to the number entitlements that are available to be allocated
to various organizations.</source>
<context-group name="ctx">
<context
context-type="sourcefile">/rhn/admin/multiorg/SoftwareEntitlementSubscriptions</context>
</context-group>
</trans-unit>
+
+ <trans-unit id="Used/Alloted.tip">
+<source>'Alloted' refers to the total number of entitlements allocated to
any organization from initial pool as reflected in this @@PRODUCT_NAME@@'s
certificate. 'Used' refers to entitlements that have been consumed by systems in
various organizations.</source>
+ <context-group name="ctx">
+ <context
context-type="sourcefile">/rhn/admin/multiorg/SoftwareEntitlementSubscriptions</context>
+ </context-group>
+ </trans-unit>
+
<trans-unit id="satusers.tip">
<source><strong>*Tip:</strong> Organization
administrator privileges can
not be modified on this page. Instead, please visit the "Users" top-level
diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlements.jsp
b/java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlements.jsp
index 6675676..a11c4e1 100644
--- a/java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlements.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlements.jsp
@@ -52,7 +52,7 @@
</rl:column>
<rl:column
- headertext="${rhn:localize('Regular Counts')} <br/>
(${rhn:localize('Available/Total')}*)">
+ headertext="${rhn:localize('Regular Counts')} <br/>
(${rhn:localize('Available/Total')})*">
<c:choose>
<c:when test="${empty current.total or current.total ==
0}">
<bean:message key="softwareentitlements.noentitlements"/>
@@ -64,7 +64,8 @@
</rl:column>
<c:if test="${orgCount > 1}">
- <rl:column headerkey="Regular Usage">
+ <rl:column
+ headertext="${rhn:localize('Regular Usage')} <br/>
(${rhn:localize('Used/Alloted')})**">
<c:choose>
<c:when test="${empty current.allocated or current.allocated ==
0}">
<bean:message key="None Allocated"/>
@@ -78,7 +79,7 @@
<rl:column
styleclass="${countstyle}"
- headertext="${rhn:localize('Flex Counts')} <br/>
(${rhn:localize('Available/Total')}*)">
+ headertext="${rhn:localize('Flex Counts')} <br/>
(${rhn:localize('Available/Total')})*">
<c:choose>
<c:when test="${empty current.totalFlex or current.totalFlex ==
0}">
<bean:message key="softwareentitlements.noentitlements"/>
@@ -91,7 +92,7 @@
<c:if test="${orgCount > 1}">
<rl:column bound="false"
- headerkey="Flex Usage"
+ headertext="${rhn:localize('Flex Usage')} <br/>
(${rhn:localize('Used/Alloted')})**"
styleclass="${usagestyle}">
<c:choose>
@@ -102,17 +103,13 @@
<bean:message key="softwareentitlements.usagedata"
arg0="${current.usedFlex}" arg1="${current.allocatedFlex}"
arg2="${current.flexRatio}"/>
</c:otherwise>
</c:choose>
-
-
- </rl:column>
+ </rl:column>
</c:if>
</rl:list>
</rl:listset>
-<span class="small-text">
- <bean:message key="softwareentitlements.tip"/>
-</span>
-
+<rhn:tooltip typeKey="Tip">*-<bean:message key =
"Available/Total.tip"/></rhn:tooltip>
+<rhn:tooltip typeKey="Tip">**-<bean:message key =
"Used/Alloted.tip"/></rhn:tooltip>
</body>
</html:html>
Show replies by date