java/code/src/com/redhat/rhn/frontend/dto/ChannelFamilySystemGroup.java | 10 - java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 6 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 3 java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml | 7 - java/code/webapp/WEB-INF/nav/virt_entitlements.xml | 7 + java/code/webapp/WEB-INF/pages/systems/entitlements/flexguests.jsp | 70 +++++++++- java/code/webapp/WEB-INF/struts-config.xml | 1 7 files changed, 92 insertions(+), 12 deletions(-)
New commits: commit ee9d38cb3cd7b30ad28059eafaa3fbdb3c04143a Author: Partha Aji paji@redhat.com Date: Thu Jun 10 16:08:19 2010 -0400
More UI updates on the Flex Guest Pages added Nav stuff
diff --git a/java/code/src/com/redhat/rhn/frontend/dto/ChannelFamilySystemGroup.java b/java/code/src/com/redhat/rhn/frontend/dto/ChannelFamilySystemGroup.java index dc68082..62c09f4 100644 --- a/java/code/src/com/redhat/rhn/frontend/dto/ChannelFamilySystemGroup.java +++ b/java/code/src/com/redhat/rhn/frontend/dto/ChannelFamilySystemGroup.java @@ -43,11 +43,13 @@ public class ChannelFamilySystemGroup implements Identifiable, Expandable { return ls.getMessage("flexguest.jsp.entitlement_counts_message_unlimited", currentMembers); } + String key = "flexguest.jsp.entitlement_counts_message"; + long available = maxMembers - currentMembers; + if (available > 1) { + key = key + "_1"; + }
- - return ls.getMessage("flexguest.jsp.entitlement_counts_message", - currentMembers, maxMembers - currentMembers); - + return ls.getMessage(key, currentMembers, available); }
/** diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml index e5cc410..3987ef8 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml @@ -557,6 +557,12 @@ http://www.oasis-open.org/committees/xliff/documents/xliff-core-1.1.xsd" <context context-type="sourcefile">Navigation Menu</context> </context-group> </trans-unit> + <trans-unit id="Active"> +<source>Active</source> + <context-group name="ctx"> + <context context-type="sourcefile">Navigation Menu</context> + </context-group> + </trans-unit> <trans-unit id="IP Ranges"> <source>IP Ranges</source> <context-group name="ctx"> 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 56811c7..0e14d2c 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 @@ -6183,6 +6183,9 @@ value for this entitlement, excluding the default organization's consumption.</s <trans-unit id="flexguest.jsp.entitlement_counts_message"> <source>{0} consumed, {1} available entitlement</source> </trans-unit> + <trans-unit id="flexguest.jsp.entitlement_counts_message_1"> + <source>{0} consumed, {1} available entitlements</source> + </trans-unit> </group>
<!-- System search --> diff --git a/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml b/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml index 78d8838..e514848 100644 --- a/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml +++ b/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml @@ -15,7 +15,12 @@ <rhn-tab name="Locale Preferences" url="/rhn/account/LocalePreferences.do" /> <rhn-tab name="Subscription Management" url="/rhn/systems/SystemEntitlements.do" acl="user_role(org_admin)" > <rhn-tab name="System Entitlements" url="/rhn/systems/SystemEntitlements.do" acl="user_role(org_admin)" /> - <rhn-tab name="virtualization.entitlements" url="/rhn/systems/entitlements/GuestLimitedHosts.do" acl="user_role(org_admin)"/> + <rhn-tab name="virtualization.entitlements" url="/rhn/systems/entitlements/GuestLimitedHosts.do" acl="user_role(org_admin)"> + <rhn-tab-url>/rhn/systems/entitlements/GuestUnlimitedHosts.do</rhn-tab-url> + <rhn-tab-url>/rhn/systems/entitlements/PhysicalHosts.do</rhn-tab-url> + <rhn-tab-url>/rhn/systems/entitlements/FlexGuests.do</rhn-tab-url> + <rhn-tab-url>/rhn/systems/entitlements/EligibleFlexGuests.do</rhn-tab-url> + </rhn-tab> <rhn-tab name="Software Channel Entitlements" url="/rhn/channels/software/Entitlements.do" acl="user_role(org_admin)" /> </rhn-tab> <rhn-tab name="Organization Trusts" url="/rhn/multiorg/Organizations.do" acl="user_role(org_admin)"> diff --git a/java/code/webapp/WEB-INF/nav/virt_entitlements.xml b/java/code/webapp/WEB-INF/nav/virt_entitlements.xml index 188bccd..76a954c 100644 --- a/java/code/webapp/WEB-INF/nav/virt_entitlements.xml +++ b/java/code/webapp/WEB-INF/nav/virt_entitlements.xml @@ -10,4 +10,11 @@ <rhn-tab name="guests.without.hosts"> <rhn-tab-url>/rhn/systems/entitlements/PhysicalHosts.do</rhn-tab-url> </rhn-tab> + <rhn-tab name="floating.guests"> + <rhn-tab-url>/rhn/systems/entitlements/FlexGuests.do</rhn-tab-url> +</rhn-tab> + <rhn-tab name="eligible.floating.guests"> + <rhn-tab-url>/rhn/systems/entitlements/EligibleFlexGuests.do</rhn-tab-url> + </rhn-tab> + </rhn-navi-tree> 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 7224c62..ecb25dd 100644 --- a/java/code/webapp/WEB-INF/pages/systems/entitlements/flexguests.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/entitlements/flexguests.jsp @@ -1,9 +1,24 @@ +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %> <%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %> <%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
+<c:choose> + <c:when test="${not empty requestScope.selectable}"> + <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: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:otherwise> +</c:choose> + + html:xhtml/ <html> <head> @@ -17,11 +32,13 @@
<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"/> </p> -<%-- <rhn:dialogmenu mindepth="0" maxdepth="1" definition="/WEB-INF/nav/duplicate_systems_tabs.xml" - renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" /> --%> -<br/> + <rl:list emptykey="nosystems.message" parentiselement = "false" @@ -32,9 +49,26 @@ <rl:rowrenderer name="ExpandableRowRenderer" /> <rl:decorator name="ExpansionDecorator"/>
+ <c:if test="${not empty requestScope.selectable}"> + <rl:decorator name="SelectableDecorator"/> + <c:choose> + <c:when test = "${rl:expandable(current)}"> + <rl:selectablecolumn value="${current.id}" + styleclass="first-column"/> + </c:when> + <c:otherwise> + <rl:selectablecolumn value="${current.selectionKey}" + styleclass="first-column"/> + + </c:otherwise> + </c:choose> + </c:if> + + <!-- Name Column --> - <rl:column headerkey="systemlist.jsp.system" filterattr="name" filtermessage="${filtermessage}" styleclass="first-column"> - <rl:expandable rendericon="true">${current.name} <em>(${current.entitlementCountMessage})</em> </rl:expandable> + <rl:column headerkey="systemlist.jsp.system" filterattr="name" filtermessage="${filtermessage}" styleclass="${namestyle}"> + <rl:expandable rendericon="true"> <a href="/rhn/software/channels/ChannelFamilyTree.do?cfid=${current.id}">${current.name} <em>(${current.entitlementCountMessage})</em> </a> + </rl:expandable> <rl:non-expandable rendericon="true"> <c:out value="<a href="/rhn/systems/details/Overview.do?sid=${current.id}">" escapeXml="false" /> @@ -49,9 +83,19 @@ </rl:non-expandable> </rl:column>
- <rl:column headerkey="systemlist.jsp.active"> + <rl:column headerkey="Status"> rl:expandable</rl:expandable> - rl:non-expandable${current.active}</rl:non-expandable> + rl:non-expandable + <c:choose> + <c:when test="${current.active}"> + <bean:message key="Active"/> + </c:when> + <c:otherwise> + <bean:message key="Inactive"/> + </c:otherwise> + </c:choose> + + </rl:non-expandable> </rl:column> <rl:column headerkey="systemlist.jsp.registered" @@ -63,6 +107,18 @@ </rl:list> rhn:submitted/
+<c:if test="${not empty requestScope.selectable}"> + <div align="right"> + + <hr /> + <html:submit property="dispatch"> + <bean:message key="Make Flex"/> + </html:submit> + + </div> +</c:if> + + </rl:listset>
diff --git a/java/code/webapp/WEB-INF/struts-config.xml b/java/code/webapp/WEB-INF/struts-config.xml index 561d957..2eaaaa9 100644 --- a/java/code/webapp/WEB-INF/struts-config.xml +++ b/java/code/webapp/WEB-INF/struts-config.xml @@ -6358,6 +6358,7 @@ className="com.redhat.rhn.frontend.struts.RhnActionMapping"> <set-property property="acls" value="user_role(org_admin)"/> <forward name="default" path="/WEB-INF/pages/systems/entitlements/flexguests.jsp"/> + <forward name="success" path="/systems/entitlements/FlexGuests.do" redirect="true"/> </action>
<action path="/channels/manage/errata/Add"
spacewalk-commits@lists.fedorahosted.org