Author: chris.laprun(a)jboss.com Date: 2007-08-21 16:42:40 -0400 (Tue, 21 Aug 2007) New Revision: 8021 Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editProperties.xhtml Log: - JBPORTAL-1645: Do not display properties table if there are no properties. Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editProperties.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editProperties.xhtml 2007-08-21 19:11:48 UTC (rev 8020) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editProperties.xhtml 2007-08-21 20:42:40 UTC (rev 8021) @@ -70,7 +70,7 @@ <!-- defines property list section --> - <c:if test="#{!empty properties.entries}"> + <c:if test="#{properties.size != 0}"> <table cellpadding="0" cellspacing="0" width="100%"> <tr> <th class="portlet-section-title">Manage currently defined properties.</th> @@ -80,37 +80,38 @@ <h:form> <!-- defines layout of property table --> - <h:dataTable value="#{properties.entries}" rowClasses="portlet-section-body, portlet-section-alternate" var="prop"> - <h:column> - <f:facet name="header">Name</f:facet> - <h:outputText title="#{prop.type}" value="#{prop.displayName}"/> - </h:column> - <h:column> - <f:facet name="header">Description</f:facet> - <h:outputText>#{prop.description}</h:outputText> - </h:column> - <h:column> - <f:facet name="header">Inherited</f:facet> - <h:outputText>#{prop.inherited ? 'Yes' : 'No'}</h:outputText> - </h:column> - <h:column> - <f:facet name="header">Value</f:facet> - <h:selectBooleanCheckbox value="#{prop.value}" - readonly="#{prop.readOnly}" - rendered="#{prop.type == 'java.lang.Boolean'}"/> - <h:inputText styleClass="portlet-form-input-field" value="#{prop.value}" - readonly="#{prop.readOnly}" - rendered="#{prop.type == 'java.lang.String'}"/> - </h:column> - <h:column> - <f:facet name="header">Delete</f:facet> - <h:commandLink action="#{properties.action.removeProperty}" - rendered="#{!prop.inherited}"> - <h:outputText value="Delete"/> - <f:param name="name" value="#{prop.name}"/> - </h:commandLink> - </h:column> - </h:dataTable> + <h:dataTable value="#{properties.entries}" + rowClasses="portlet-section-body, portlet-section-alternate" var="prop"> + <h:column> + <f:facet name="header">Name</f:facet> + <h:outputText title="#{prop.type}" value="#{prop.displayName}"/> + </h:column> + <h:column> + <f:facet name="header">Description</f:facet> + <h:outputText>#{prop.description}</h:outputText> + </h:column> + <h:column> + <f:facet name="header">Inherited</f:facet> + <h:outputText>#{prop.inherited ? 'Yes' : 'No'}</h:outputText> + </h:column> + <h:column> + <f:facet name="header">Value</f:facet> + <h:selectBooleanCheckbox value="#{prop.value}" + readonly="#{prop.readOnly}" + rendered="#{prop.type == 'java.lang.Boolean'}"/> + <h:inputText styleClass="portlet-form-input-field" value="#{prop.value}" + readonly="#{prop.readOnly}" + rendered="#{prop.type == 'java.lang.String'}"/> + </h:column> + <h:column> + <f:facet name="header">Delete</f:facet> + <h:commandLink action="#{properties.action.removeProperty}" + rendered="#{!prop.inherited}"> + <h:outputText value="Delete"/> + <f:param name="name" value="#{prop.name}"/> + </h:commandLink> + </h:column> + </h:dataTable> <!-- ends property list --> <h:commandButton value="Update" styleClass="portlet-form-button portlet-section-buttonrow"/></h:form>