Author: wesleyhales Date: 2007-09-18 15:31:58 -0400 (Tue, 18 Sep 2007) New Revision: 8340 Modified: trunk/core-admin/src/bin/portal-admin-war/style.css trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml Log: copy over fix for JBPORTAL-1657 Modified: trunk/core-admin/src/bin/portal-admin-war/style.css =================================================================== --- trunk/core-admin/src/bin/portal-admin-war/style.css 2007-09-18 19:25:19 UTC (rev 8339) +++ trunk/core-admin/src/bin/portal-admin-war/style.css 2007-09-18 19:31:58 UTC (rev 8340) @@ -480,3 +480,9 @@ left: 3em; width: 95%; } + +.admin-label { + padding: 0 4px 3px 0; + display: inline-block; + vertical-align: middle; +} Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml 2007-09-18 19:25:19 UTC (rev 8339) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml 2007-09-18 19:31:58 UTC (rev 8340) @@ -20,13 +20,13 @@ </td> </tr> <tr> - <td> - <span class="portlet-form-field-label">Window Name:</span> - </td> - <td width="100%"> + <td colspan="2"> <h:form id="windowForm"> + <label for="windowName"> + <span class="portlet-form-field-label admin-label">Window Name:</span> <h:inputText id="windowName" value="#{pageManager.windowName}" styleClass="portlet-form-input-field"/> - <h:message for="windowName" errorClass="portlet-msg-error"/> + </label> + <h:message for="windowName" errorClass="portlet-msg-error"/> </h:form> </td> </tr> @@ -38,20 +38,20 @@ </tr> <tr> <td> - <span class="portlet-form-field-label">Content Type:</span> - </td> - <td> <h:form id="abc"> - <h:inputHidden id="windowNameCopy" value="#{pageManager.windowName}"/> - <h:selectOneMenu - id="instanceId" - value="#{pageManager.selectedContentType}" - styleClass="portlet-form-field contentType" - onchange="document.getElementById('abc:windowNameCopy').value = document.getElementById('windowForm:windowName').value; - document.getElementById('abc').submit(); "> - <f:selectItems value="#{pageManager.contentTypeItems}"/> - </h:selectOneMenu> - <h:message for="instanceId" errorClass="portlet-msg-error"/> + <label for="instanceId" class="portlet-form-field-label-container"> + <span class="portlet-form-field-label admin-label">Content Type:</span> + <h:inputHidden id="windowNameCopy" value="#{pageManager.windowName}"/> + <h:selectOneMenu + id="instanceId" + value="#{pageManager.selectedContentType}" + styleClass="portlet-form-field contentType" + onchange="document.getElementById('abc:windowNameCopy').value = document.getElementById('windowForm:windowName').value; + document.getElementById('abc').submit(); "> + <f:selectItems value="#{pageManager.contentTypeItems}"/> + </h:selectOneMenu> + </label> + <h:message for="instanceId" errorClass="portlet-msg-error"/> </h:form> </td> </tr>