Author: wesleyhales Date: 2008-10-27 18:23:32 -0400 (Mon, 27 Oct 2008) New Revision: 12190 Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editPageLayout.xhtml branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/component/portlet/PortletHandler.java Log: https://jira.jboss.org/jira/browse/JBPORTAL-2196 Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editPageLayout.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editPageLayout.xhtml 2008-10-27 18:47:36 UTC (rev 12189) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editPageLayout.xhtml 2008-10-27 22:23:32 UTC (rev 12190) @@ -28,43 +28,25 @@ styleClass="portlet-form-input-field id-window-name"/> </label> <h:message for="windowName" errorClass="portlet-msg-error"/> - </h:form> - </td> - </tr> - <tr> - <td colspan="2"> - <hr/> - #{bundle.COMMON_SELECT_TYPE_CONTENT}: - </td> - </tr> - <tr> - <td> - <h:form id="contentTypesForm"> + + <hr/> + #{bundle.COMMON_SELECT_TYPE_CONTENT}: + <br/> <label for="instanceId" class="portlet-form-field-label-container"> <span class="portlet-form-field-label admin-label">#{bundle.COMMON_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('#{pageManager.namespace}:contentTypesForm:windowNameCopy').value = document.getElementById('#{pageManager.namespace}:windowForm:windowName').value; - document.getElementById('#{pageManager.namespace}:contentTypesForm').submit(); "> + onchange="this.form.submit(); "> <f:selectItems value="#{pageManager.contentTypeItems}"/> </h:selectOneMenu> </label> <h:message for="instanceId" errorClass="portlet-msg-error"/> - </h:form> - </td> - </tr> - <tr> - <td colspan="2"> + <hr/> #{bundle.COMMON_SELECT_CONTENT}: - </td> - </tr> - <tr> - <td colspan="2" valign="top"> - <h:form></h:form> + </h:form> <jbp:portlet portletId="#{pageManager.selectedEditorPortletId}" portletInvoker="#{pageManager.portletInvoker}" @@ -74,7 +56,8 @@ initialMode="edit_content" initialWindowState="normal" renderParameters="#{pageManager.selectedRenderParameters}" - onClick="url.setParameter('windowName', document.getElementById('#{pageManager.namespace}:windowForm:windowName').value);"/> + onClick="url.setParameter('windowName', document.getElementById(document.getElementById('namespaceHolder').value + ':windowForm:windowName').value);"/> + <input type="hidden" value="#{pageManager.namespace}" id="namespaceHolder"/> </td> </tr> </table> Modified: branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/component/portlet/PortletHandler.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/component/portlet/PortletHandler.java 2008-10-27 18:47:36 UTC (rev 12189) +++ branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/component/portlet/PortletHandler.java 2008-10-27 22:23:32 UTC (rev 12190) @@ -95,6 +95,18 @@ }; } } + if ("onClick".equals(name)) + { + final String s = attribute.getValue(); + return new Metadata() + { + public void applyMetadata(FaceletContext ctx, Object instance) + { + UIPortlet portlet = (UIPortlet)instance; + portlet.setOnClick(s); + } + }; + } return null; } });