java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 31 ++++++++++ java/code/webapp/WEB-INF/pages/systems/entitlements/flexguests.jsp | 20 +++--- 2 files changed, 42 insertions(+), 9 deletions(-)
New commits: commit fba324ad855355537fc0a87f951d7e84721bf89b Author: Partha Aji paji@redhat.com Date: Thu Jun 10 16:33:04 2010 -0400
More updates to the UI
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 0e14d2c..9916ca8 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 @@ -6176,6 +6176,9 @@ value for this entitlement, excluding the default organization's consumption.</s <context context-type="sourcefile">rhn/systems/entitlements/FlexGuests.do</context> <context context-type="sourcefile">rhn/systems/entitlements/EligibleFlexGuests.do</context> </context-group> + <trans-unit id="Registered"> + <source>Registered</source> + </trans-unit> <trans-unit id="flexguest.jsp.entitlement_counts_message_unlimited"> <source>{0} consumed, unlimited available entitlements</source> </trans-unit> @@ -6185,7 +6188,35 @@ value for this entitlement, excluding the default organization's consumption.</s </trans-unit> <trans-unit id="flexguest.jsp.entitlement_counts_message_1"> <source>{0} consumed, {1} available entitlements</source> + </trans-unit> + <trans-unit id="flexguest.jsp.header"> + <source>Flex Guest Entitlement Consumers</source> + </trans-unit> + <trans-unit id="flexguest.jsp.message"> + <source>The following is a list of guest systems that are currently consuming <a href="{0}"> Flex Guest entitlements</a>. These entitlements are used when registering virtual guests that are not associated with a registered host system or that are associated with a host system that is not Virtualization or Virtualization Platform entitled. Flex Guest Entitlement Consumers</source> + </trans-unit> + <trans-unit id="floating.guests"> + <source>Flex Guest Entitlement Consumers</source> + </trans-unit> + + <trans-unit id="eligible.floating.guests"> + <source>Guests Consuming Regular Entitlements</source> </trans-unit> + <trans-unit id="eligible.flexguest.jsp.header"> + <source>Guests Consuming Regular Entitlements</source> + </trans-unit> + <trans-unit id="eligible.flexguest.jsp.message"> + <source>The following is a list of guest systems that are not associated with a virtual entitled (either Virtualization or Virtualization Platform) host system in RHN or for whom there are no remaining <a href="{0}"> Virtualization inherited guest entitlements</a>. These systems are consuming the same software and system entitlements as a physical system.</source> + </trans-unit> + + <trans-unit id="eligible.flexguest.jsp.no-systems"> + <source>There are no eligible flex guest systems consuming regular entitlements.</source> + </trans-unit> + + <trans-unit id="flexguest.jsp.no-systems"> + <source>There are no systems consuming Flex Guest entitlements.</source> + </trans-unit> + </group>
<!-- System search --> diff --git a/java/code/webapp/WEB-INF/pages/systems/entitlements/flexguests.jsp b/java/code/webapp/WEB-INF/pages/systems/entitlements/flexguests.jsp index ecb25dd..cfc2d18 100644 --- a/java/code/webapp/WEB-INF/pages/systems/entitlements/flexguests.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/entitlements/flexguests.jsp @@ -10,11 +10,13 @@ <c:set var="headerkey" value="eligible.flexguest.jsp.header"/> <c:set var="messagekey" value="eligible.flexguest.jsp.message"/> <c:set var="namestyle" value="first-column"/> + <c:set var="empty_msg" value="eligible-flexguest.jsp.no-systems"/> </c:when> <c:otherwise> <c:set var="headerkey" value="flexguest.jsp.header"/> <c:set var="messagekey" value="flexguest.jsp.message"/> <c:set var="namestyle" value=""/> + <c:set var="empty_msg" value="flexguest.jsp.no-systems"/> </c:otherwise> </c:choose>
@@ -25,22 +27,22 @@ <meta name="page-decorator" content="none" /> </head> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-system.gif" imgAlt="system.common.systemAlt" - helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s3-sm-system-list-ood"> - <bean:message key="flexguest.jsp.header"/> -</rhn:toolbar> + <rhn:toolbar base="h1" img="/img/rhn-icon-system.gif" imgAlt="system.common.systemAlt"> + <bean:message key="virtualentitlements.toolbar" /> + </rhn:toolbar>
-<rl:listset name="FlexSet">
<rhn:dialogmenu mindepth="0" maxdepth="1" definition="/WEB-INF/nav/virt_entitlements.xml" renderer="com.redhat.rhn.frontend.nav.DialognavRenderer"/> - <p><bean:message key="flexguest.jsp.message"/> +<h2><bean:message key="${headerkey}"/></h2> + <p><bean:message key="${messagekey}" arg0="http://kbase.redhat.com/faq/docs/DOC-17424%22/%3E </p> - + +<rl:listset name="FlexSet"> <rl:list - emptykey="nosystems.message" + emptykey="${empty_msg}" parentiselement = "false" searchparent="false" searchchild="true" @@ -98,7 +100,7 @@ </rl:non-expandable> </rl:column> - <rl:column headerkey="systemlist.jsp.registered" + <rl:column headerkey="Registered" styleclass="last-column"> rl:expandable</rl:expandable> rl:non-expandable${current.registeredString}</rl:non-expandable>
spacewalk-commits@lists.fedorahosted.org