Author: julien(a)jboss.com Date: 2007-02-28 20:44:49 -0500 (Wed, 28 Feb 2007) New Revision: 6480 Modified: trunk/core-admin/src/resources/portal-admin-sar/content/editor.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectTemplate.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/pages.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portals.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/windows.xhtml Log: fixing a couple of broken stuff in the latest refactor Modified: trunk/core-admin/src/resources/portal-admin-sar/content/editor.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-sar/content/editor.xhtml 2007-03-01 01:25:33 UTC (rev 6479) +++ trunk/core-admin/src/resources/portal-admin-sar/content/editor.xhtml 2007-03-01 01:44:49 UTC (rev 6480) @@ -12,9 +12,7 @@ styleClass="portlet-form-field"> <f:selectItems value="#{registry.editors.portlet.instanceItems}"/> </h:selectOneListbox> - <hr/> <h:commandButton value="Show details" styleClass="portlet-form-button"/> - <br/> <pfc:context> <ui:param name="instance" value="#{registry.editors.portlet.instanceMap[contentURI]}"/> <ui:param name="portlet" value="#{instance.portlet}"/> @@ -23,7 +21,7 @@ <div><span class="portlet-form-field-label">Portlet instance:</span> #{instance.id}</div> <c:choose> <c:when test="#{portlet != null}"> - <ui:include src="/WEB-INF/jsp/management/common/showPortletDetails.xhtml"> + <ui:include src="/WEB-INF/jsf/common/showPortletDetails.xhtml"> <ui:param name="portlet" value="#{portlet}"/> </ui:include> </c:when> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectTemplate.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectTemplate.xhtml 2007-03-01 01:25:33 UTC (rev 6479) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectTemplate.xhtml 2007-03-01 01:44:49 UTC (rev 6480) @@ -36,9 +36,6 @@ </ul> </h:form> - <!-- Navigation --> - <ui:include src="objectNavigation.xhtml"/> - <!-- Content --> <ui:insert name="content">Content</ui:insert> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/pages.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/pages.xhtml 2007-03-01 01:25:33 UTC (rev 6479) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/pages.xhtml 2007-03-01 01:44:49 UTC (rev 6480) @@ -8,6 +8,9 @@ <h:message id="status" for="status"/> + <!-- Navigation --> + <ui:include src="objectNavigation.xhtml"/> + <!-- Sub page addition --> <hr/> <h:form id="portal_form"> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portals.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portals.xhtml 2007-03-01 01:25:33 UTC (rev 6479) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portals.xhtml 2007-03-01 01:44:49 UTC (rev 6480) @@ -8,6 +8,9 @@ <h:message id="status" for="status"/> + <!-- Navigation --> + <ui:include src="objectNavigation.xhtml"/> + <hr/> <h:form id="portal_form"> <h:inputText id="name" value="#{portalAction.portalName}" styleClass="portlet-form-input-field" required="true"/> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/windows.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/windows.xhtml 2007-03-01 01:25:33 UTC (rev 6479) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/windows.xhtml 2007-03-01 01:44:49 UTC (rev 6480) @@ -9,12 +9,10 @@ <h:message id="status" for="status"/> - <hr/> <h:form id="window_form"> <ct:content - contentType="#{portalobjectmgr.selectedObject.type==3 ? portalobjectmgr.selectedObject.contentType : null}" + contentType="#{portalobjectmgr.selectedObject.contentType}" contentURI="#{portalobjectmgr.selectedObject.instanceRef}"/> - <br/> <h:commandButton value="Change instance" styleClass="portlet-form-button"/> </h:form>