Author: chris.laprun(a)jboss.com Date: 2007-09-05 15:56:04 -0400 (Wed, 05 Sep 2007) New Revision: 8179 Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portlets.xhtml Log: - JBPORTAL-1677: Split functionality into several pages (though everything is handled by instances.xhtml) - JBPORTAL-1678: Do not show preferences link in portlet definitions list (was already done for instances). Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml 2007-09-05 17:22:45 UTC (rev 8178) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml 2007-09-05 19:56:04 UTC (rev 8179) @@ -10,8 +10,8 @@ <ui:define name="content"> +<c:if test="#{empty instancemgr.selectedPlugin}"> <h:form> - <table id="instancesTable2" width="100%"> <thead class="portlet-section-header"> <tr> @@ -63,51 +63,79 @@ </c:forEach> </c:if> </ul> - </h:form> +</c:if> - <c:if test="#{instancemgr.selectedPlugin != null}"> - <hr/> - - <c:if test="#{instancemgr.selectedPlugin == 'info'}"> - <c:choose> - <c:when test="#{instancemgr.selectedInstance.portlet != null}"> - <h3>Portlet details - </h3> - <ui:include src="common/showPortletDetails.xhtml"> - <ui:param name="portlet" value="#{instancemgr.selectedInstance.portlet}"/> - <ui:param name="portletmgr" value="#{portletmgr}"/> - </ui:include> - </c:when> - <c:otherwise> - <h3>Portlet details</h3> - The associated portlet is not available - </c:otherwise> - </c:choose> - </c:if> - - <c:if test="#{instancemgr.selectedPlugin == 'preferences'}"> - <h3>Editing preferences of #{instancemgr.selectedInstance.id}: </h3> - <ui:include src="common/editPreferences.xhtml"> - <ui:param name="prefs" value="#{instancemgr.selectedPrefs}"/> +<c:if test="#{instancemgr.selectedPlugin == 'info'}"> + <!-- Path nav --> + <h:form> + <ul class="objectpath"> + <li> + <h:commandLink action="#{instancemgr.selectInstance}">Portlet Instances</h:commandLink> + </li> + <li>&gt;</li> + <li class="selected"> + <span class="objectName">#{instancemgr.selectedInstance.id}</span> portlet details + </li> + </ul> + </h:form> + <br/> + <c:choose> + <c:when test="#{instancemgr.selectedInstance.portlet != null}"> + <ui:include src="common/showPortletDetails.xhtml"> + <ui:param name="portlet" value="#{instancemgr.selectedInstance.portlet}"/> + <ui:param name="portletmgr" value="#{portletmgr}"/> </ui:include> - <h:form style="text-align:center;padding: 1em 0 1em 0"> - <h:commandButton value="Save" action="#{instancemgr.updatePrefs}" styleClass="portlet-form-button"/> - <h:commandButton value="Cancel" action="#{instancemgr.cancelPrefs}" styleClass="portlet-form-button"/> - </h:form> - </c:if> + </c:when> + <c:otherwise> + The associated portlet is not available. + </c:otherwise> + </c:choose> +</c:if> - <c:if test="#{instancemgr.selectedPlugin == 'security'}"> - <h3>Editing security of #{instancemgr.selectedInstance.id}: </h3> +<c:if test="#{instancemgr.selectedPlugin == 'preferences'}"> + <!-- Path nav --> + <h:form> + <ul class="objectpath"> + <li> + <h:commandLink action="#{instancemgr.selectInstance}">Portlet Instances</h:commandLink> + </li> + <li>&gt;</li> + <li class="selected"> + <span class="objectName">#{instancemgr.selectedInstance.id}</span> preferences + </li> + </ul> + </h:form> + <br/> + <ui:include src="common/editPreferences.xhtml"> + <ui:param name="prefs" value="#{instancemgr.selectedPrefs}"/> + </ui:include> + <h:form> + <h:commandButton value="Save" action="#{instancemgr.updatePrefs}" styleClass="portlet-form-button"/> + <h:commandButton value="Cancel" action="#{instancemgr.cancelPrefs}" styleClass="portlet-form-button"/> + </h:form> +</c:if> - <ui:decorate template="/WEB-INF/jsf/common/editSecurity.xhtml"> - <ui:param name="auth" value="#{instancemgr.auth}"/> - </ui:decorate> - </c:if> +<c:if test="#{instancemgr.selectedPlugin == 'security'}"> + <!-- Path nav --> + <h:form> + <ul class="objectpath"> + <li> + <h:commandLink action="#{instancemgr.selectInstance}">Portlet Instances</h:commandLink> + </li> + <li>&gt;</li> + <li class="selected"> + <span class="objectName">#{instancemgr.selectedInstance.id}</span> security settings + </li> + </ul> + </h:form> + <br/> + <ui:decorate template="/WEB-INF/jsf/common/editSecurity.xhtml"> + <ui:param name="auth" value="#{instancemgr.auth}"/> + </ui:decorate> +</c:if> - </c:if> - </ui:define> </ui:composition> </div> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portlets.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portlets.xhtml 2007-09-05 17:22:45 UTC (rev 8178) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portlets.xhtml 2007-09-05 19:56:04 UTC (rev 8179) @@ -55,15 +55,17 @@ <td><h:selectBooleanCheckbox disabled="true" value="#{portlet.remote}"/></td> <td><h:selectBooleanCheckbox disabled="true" value="#{portlet.remotable}"/></td> <td> + <h:panelGroup rendered="#{!empty portlet.info.preferences.keys}"> + <h:commandLink action="#{portletmgr.selectPortlet}"> + <f:param name="id" value="#{portlet.context.id}"/> + <f:param name="plugin" value="preferences"/> + Preferences + </h:commandLink> | </h:panelGroup> <h:commandLink action="#{portletmgr.selectPortlet}"> <f:param name="id" value="#{portlet.context.id}"/> - <f:param name="plugin" value="preferences"/> - Preferences - </h:commandLink> | <h:commandLink action="#{portletmgr.selectPortlet}"> - <f:param name="id" value="#{portlet.context.id}"/> - <f:param name="plugin" value="createInstance"/> - Create instance - </h:commandLink> + <f:param name="plugin" value="createInstance"/> + Create instance + </h:commandLink> </td> </tr> </c:forEach> @@ -94,7 +96,7 @@ </li> <li>&gt;</li> <li class="selected"> - #{portletmgr.selectedPortlet.name.value} details + <span class="objectName">#{portletmgr.selectedPortlet.name.value}</span> details </li> </ul> </h:form> @@ -113,7 +115,7 @@ </li> <li>&gt;</li> <li class="selected"> - #{portletmgr.selectedPortlet.name.value} preferences + <span class="objectName">#{portletmgr.selectedPortlet.name.value}</span> preferences </li> </ul> </h:form> @@ -132,7 +134,7 @@ </li> <li>&gt;</li> <li class="selected"> - #{portletmgr.selectedPortlet.name.value} instance creation + <span class="objectName">#{portletmgr.selectedPortlet.name.value}</span> instance creation </li> </ul> </h:form>