Author: chris.laprun(a)jboss.com Date: 2007-08-29 14:01:43 -0400 (Wed, 29 Aug 2007) New Revision: 8103 Modified: trunk/core-admin/src/bin/portal-admin-war/style.css trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editContext.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/showPortletInfo.xhtml Log: - JBPORTAL-1652: Unified create forms. Modified: trunk/core-admin/src/bin/portal-admin-war/style.css =================================================================== --- trunk/core-admin/src/bin/portal-admin-war/style.css 2007-08-29 17:53:14 UTC (rev 8102) +++ trunk/core-admin/src/bin/portal-admin-war/style.css 2007-08-29 18:01:43 UTC (rev 8103) @@ -233,3 +233,8 @@ margin: 2px; padding: 2px; } + +.admin-ui .createObjectForm { + display: block; + padding: 1em 0 0 0; +} Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editContext.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editContext.xhtml 2007-08-29 17:53:14 UTC (rev 8102) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editContext.xhtml 2007-08-29 18:01:43 UTC (rev 8103) @@ -15,21 +15,14 @@ </h:commandLink> </h:form> - <!-- Sub page addition --> - <div style="padding:1em 0 0 0"> - <table> - <tr> - <h:form id="portal_form"> - <td><span class="portlet-font">Create a portal:</span></td> - <td><h:inputText id="name" value="#{portalAction.portalName}" styleClass="portlet-form-input-field" - required="true"/></td> - <td><h:commandButton action="#{portalAction.addPortal}" value="Add portal" - styleClass="portlet-form-button"/></td> - <td><h:message for="name" errorClass="portlet-msg-error"/></td> - </h:form> - </tr> - </table> - </div> + <!-- Portal addition --> + <h:form styleClass="createObjectForm"> + <span class="portlet-font">Create a portal named: </span> + <h:inputText id="name" value="#{portalAction.portalName}" styleClass="portlet-form-input-field" + required="true"/> + <h:commandButton action="#{portalAction.addPortal}" value="Create portal" styleClass="portlet-form-button"/> + <h:message for="name" errorClass="portlet-msg-error"/> + </h:form> <!-- Separation --> <hr/> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml 2007-08-29 17:53:14 UTC (rev 8102) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml 2007-08-29 18:01:43 UTC (rev 8103) @@ -36,30 +36,14 @@ </h:form> <!-- Sub page addition --> - <div style="padding:1em 0 0 0"> - <table> - <tr> - <h:form> - <td> - <span class="portlet-font">Create a page:</span> - </td> - <td> - <h:inputText id="pageName" value="#{addPageAction.pageName}" - styleClass="portlet-form-input-field" required="true"/> - </td> - <td> - <h:commandButton action="#{addPageAction.execute}" value="Add" - styleClass="portlet-form-button"/> - </td> - <td> - <h:message for="pageName" errorClass="portlet-msg-error"/> - </td> - </h:form> - </tr> - </table> - </div> + <h:form styleClass="createObjectForm"> + <span class="portlet-font">Create a page named: </span> + <h:inputText id="pageName" value="#{addPageAction.pageName}" styleClass="portlet-form-input-field" + required="true"/> + <h:commandButton action="#{addPageAction.execute}" value="Create page" styleClass="portlet-form-button"/> + <h:message for="pageName" errorClass="portlet-msg-error"/> + </h:form> - <!-- Separation --> <hr/> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/showPortletInfo.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/showPortletInfo.xhtml 2007-08-29 17:53:14 UTC (rev 8102) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/showPortletInfo.xhtml 2007-08-29 18:01:43 UTC (rev 8103) @@ -1,9 +1,9 @@ <div - xmlns="http://www.w3.org/1999/xhtml" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:c="http://java.sun.com/jstl/core"> + xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:c="http://java.sun.com/jstl/core"> <br/> <!-- Portlet details --> @@ -17,10 +17,12 @@ <!-- Instance creation --> <hr/> - <h:form id="add_instance_form"> - <h:inputText id="instanceId" value="#{createInstanceAction.instanceId}" styleClass="portlet-form-input-field" required="true"/> - <h:commandButton action="#{createInstanceAction.execute}" value="Create instance" styleClass="portlet-form-button"> - </h:commandButton> + <h:form id="add_instance_form" styleClass="createObjectForm"> + <span class="portlet-font">Create an instance named: </span> + <h:inputText id="instanceId" value="#{createInstanceAction.instanceId}" styleClass="portlet-form-input-field" + required="true"/> + <h:commandButton action="#{createInstanceAction.execute}" value="Create instance" + styleClass="portlet-form-button"/> <h:message for="instanceId" errorClass="portlet-msg-error"/> </h:form>