Author: thomas.heute(a)jboss.com Date: 2007-05-21 06:09:11 -0400 (Mon, 21 May 2007) New Revision: 7286 Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editProperties.xhtml Log: JBPORTAL-1435: The "Properties" screen for portal objects should have a "Cancel" button. Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editProperties.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editProperties.xhtml 2007-05-21 10:02:06 UTC (rev 7285) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editProperties.xhtml 2007-05-21 10:09:11 UTC (rev 7286) @@ -57,33 +57,37 @@ <p>You can either create a predefined property or create one with the name of your choice</p> <h:form> - <fieldset style="border: 1px solid;"> - <table> - <tbody> - <tr> - <td class="portlet-form-field-label"> - <h:outputLabel for="predefinedProperty" styleClass="portlet-form-field-label">Select a predefined property: </h:outputLabel> - </td> - <td> - <h:selectOneMenu id="predefinedProperty" styleClass="portlet-form-field" value="#{propertyAction.selectedProperty}"> - <f:selectItems value="#{properties.propertyItems}"/> - </h:selectOneMenu> - </td> - </tr> - <tr> - <td class="portlet-form-field-label"> - <h:outputLabel for="property" styleClass="portlet-form-field-label">Or enter a property name: </h:outputLabel> - </td> - <td> - <h:inputText id="property" styleClass="portlet-form-input-field" value="#{propertyAction.otherPropertyName}" /> - </td> - </tr> - </tbody> - </table> - </fieldset> - <div style="text-align:center;padding: 1em 0 1em 0"> - <h:commandButton value="Add property" styleClass="portlet-form-button" action="#{propertyAction.updateProperty}"/> - </div> + <table> + <tbody> + <tr> + <td class="portlet-form-field-label"> + <h:outputLabel for="predefinedProperty" styleClass="portlet-form-field-label">Select a predefined property: </h:outputLabel> + </td> + <td> + <h:selectOneMenu id="predefinedProperty" styleClass="portlet-form-field" value="#{propertyAction.selectedProperty}"> + <f:selectItems value="#{properties.propertyItems}"/> + </h:selectOneMenu> + </td> + </tr> + <tr> + <td class="portlet-form-field-label"> + <h:outputLabel for="property" styleClass="portlet-form-field-label">Or enter a property name: </h:outputLabel> + </td> + <td> + <h:inputText id="property" styleClass="portlet-form-input-field" value="#{propertyAction.otherPropertyName}" /> + </td> + </tr> + </tbody> + </table> + + <h:commandButton value="Add property" styleClass="portlet-form-button" action="#{propertyAction.updateProperty}"/> </h:form> + <!-- Separation --> + <hr/> + + <h:form> + <h:commandButton value="Cancel" styleClass="portlet-form-button" action="objects" immediate="true"/> + </h:form> + </div>