Author: julien(a)jboss.com Date: 2007-02-28 11:04:07 -0500 (Wed, 28 Feb 2007) New Revision: 6463 Added: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/objectNavigation.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/showPortletInfo.xhtml Removed: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/nodeNavigation.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/plugins/manager.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/plugins/portlet/manager.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/plugins/preferences.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/plugins/properties.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/plugins/security.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/plugins/theme.xhtml Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/objectTemplate.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/pageNavigation.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/portalNavigation.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/portlets.xhtml Log: cleanup unused stuff + some renames Deleted: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/nodeNavigation.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/nodeNavigation.xhtml 2007-02-28 15:58:26 UTC (rev 6462) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/nodeNavigation.xhtml 2007-02-28 16:04:07 UTC (rev 6463) @@ -1,124 +0,0 @@ -<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:pfc="http://www.jboss.com/portal/facelet/common" - xmlns:c="http://java.sun.com/jstl/core"> - - <h:form> - - <c:if test="#{not empty portalobjectmgr.portalNodes}"> - <table width="100%" class="portlet-table-body"> - <thead class="portlet-section-header"> - <tr> - <th>Portal</th> - <th>Actions</th> - </tr> - </thead> - <tbody> - <c:forEach items="#{portalobjectmgr.portalNodes}" var="object" varStatus="status"> - <tr class="#{status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate'}"> - <td> - <h:commandLink action="#{portalobjectmgr.selectObject}"> - <h:outputText value="#{object.name}"/> - <f:param name="id" value="#{object.id}"/> - </h:commandLink> - </td> - <td> - <h:commandLink action="editPortalPreferences" actionListener="#{portalobjectmgr.selectObject}"> - <h:outputText value="Edit"/> - <f:param name="id" value="#{object.id}"/> - </h:commandLink> | <h:commandLink action="editPortalSecurity" actionListener="#{portalobjectmgr.selectObject}"> - <h:outputText value="Security"/> - <f:param name="id" value="#{object.id}"/> - </h:commandLink> | <h:commandLink action="editPortalTheme" actionListener="#{portalobjectmgr.selectObject}"> - <h:outputText value="Theme"/> - <f:param name="id" value="#{object.id}"/> - </h:commandLink> | <h:commandLink action="portals" actionListener="#{portalobjectmgr.destroyObject}"> - <h:outputText value="Destroy"/> - <f:param name="id" value="#{object.id}"/> - </h:commandLink> - </td> - </tr> - </c:forEach> - </tbody> - </table> - </c:if> - - <c:if test="#{not empty portalobjectmgr.pageNodes}"> - <table width="100%" class="portlet-table-body"> - <thead class="portlet-section-header"> - <tr> - <th>Page</th> - <th>Actions</th> - </tr> - </thead> - <tbody> - <c:forEach items="#{portalobjectmgr.pageNodes}" var="object" varStatus="status"> - <tr class="#{status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate'}"> - <td> - <h:commandLink action="#{portalobjectmgr.selectObject}"> - <h:outputText value="#{object.name}"/> - <f:param name="id" value="#{object.id}"/> - </h:commandLink> - </td> - <td> - <h:commandLink action="editPageLayout" actionListener="#{portalobjectmgr.selectObject}"> - <h:outputText value="Layout"/> - <f:param name="id" value="#{object.id}"/> - </h:commandLink> | <h:commandLink action="editPageSecurity" actionListener="#{portalobjectmgr.selectObject}"> - <h:outputText value="Security"/> - <f:param name="id" value="#{object.id}"/> - </h:commandLink> | <h:commandLink action="editPageTheme" actionListener="#{portalobjectmgr.selectObject}"> - <h:outputText value="Theme"/> - <f:param name="id" value="#{object.id}"/> - </h:commandLink> | <h:commandLink action="pages" actionListener="#{portalobjectmgr.destroyObject}"> - <h:outputText value="Destroy"/> - <f:param name="id" value="#{object.id}"/> - </h:commandLink> - </td> - </tr> - </c:forEach> - </tbody> - </table> - </c:if> - - <c:if test="#{not empty portalobjectmgr.windowNodes}"> - <table width="100%" class="portlet-table-body"> - <thead class="portlet-section-header"> - <tr> - <th>Window</th> - <th>Actions</th> - </tr> - </thead> - <tbody> - <c:forEach items="#{portalobjectmgr.windowNodes}" var="object" varStatus="status"> - <tr class="#{status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate'}"> - <td> - <h:commandLink action="#{portalobjectmgr.selectObject}"> - <h:outputText value="#{object.name}"/> - <f:param name="id" value="#{object.id}"/> - </h:commandLink> - </td> - <td> - <h:commandLink action="editWindowPreferences" actionListener="#{portalobjectmgr.selectObject}"> - <h:outputText value="Edit"/> - <f:param name="id" value="#{object.id}"/> - </h:commandLink> | <h:commandLink action="editWindowTheme" actionListener="#{portalobjectmgr.selectObject}"> - <h:outputText value="Theme"/> - <f:param name="id" value="#{object.id}"/> - </h:commandLink> | <h:commandLink action="windows" actionListener="#{portalobjectmgr.destroyObject}"> - <h:outputText value="Destroy"/> - <f:param name="id" value="#{object.id}"/> - </h:commandLink> - </td> - </tr> - </c:forEach> - </tbody> - </table> - </c:if> - - </h:form> - -</div> Copied: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/objectNavigation.xhtml (from rev 6462, trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/nodeNavigation.xhtml) =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/objectNavigation.xhtml (rev 0) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/objectNavigation.xhtml 2007-02-28 16:04:07 UTC (rev 6463) @@ -0,0 +1,124 @@ +<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:pfc="http://www.jboss.com/portal/facelet/common" + xmlns:c="http://java.sun.com/jstl/core"> + + <h:form> + + <c:if test="#{not empty portalobjectmgr.portalNodes}"> + <table width="100%" class="portlet-table-body"> + <thead class="portlet-section-header"> + <tr> + <th>Portal</th> + <th>Actions</th> + </tr> + </thead> + <tbody> + <c:forEach items="#{portalobjectmgr.portalNodes}" var="object" varStatus="status"> + <tr class="#{status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate'}"> + <td> + <h:commandLink action="#{portalobjectmgr.selectObject}"> + <h:outputText value="#{object.name}"/> + <f:param name="id" value="#{object.id}"/> + </h:commandLink> + </td> + <td> + <h:commandLink action="editPortalPreferences" actionListener="#{portalobjectmgr.selectObject}"> + <h:outputText value="Edit"/> + <f:param name="id" value="#{object.id}"/> + </h:commandLink> | <h:commandLink action="editPortalSecurity" actionListener="#{portalobjectmgr.selectObject}"> + <h:outputText value="Security"/> + <f:param name="id" value="#{object.id}"/> + </h:commandLink> | <h:commandLink action="editPortalTheme" actionListener="#{portalobjectmgr.selectObject}"> + <h:outputText value="Theme"/> + <f:param name="id" value="#{object.id}"/> + </h:commandLink> | <h:commandLink action="portals" actionListener="#{portalobjectmgr.destroyObject}"> + <h:outputText value="Destroy"/> + <f:param name="id" value="#{object.id}"/> + </h:commandLink> + </td> + </tr> + </c:forEach> + </tbody> + </table> + </c:if> + + <c:if test="#{not empty portalobjectmgr.pageNodes}"> + <table width="100%" class="portlet-table-body"> + <thead class="portlet-section-header"> + <tr> + <th>Page</th> + <th>Actions</th> + </tr> + </thead> + <tbody> + <c:forEach items="#{portalobjectmgr.pageNodes}" var="object" varStatus="status"> + <tr class="#{status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate'}"> + <td> + <h:commandLink action="#{portalobjectmgr.selectObject}"> + <h:outputText value="#{object.name}"/> + <f:param name="id" value="#{object.id}"/> + </h:commandLink> + </td> + <td> + <h:commandLink action="editPageLayout" actionListener="#{portalobjectmgr.selectObject}"> + <h:outputText value="Layout"/> + <f:param name="id" value="#{object.id}"/> + </h:commandLink> | <h:commandLink action="editPageSecurity" actionListener="#{portalobjectmgr.selectObject}"> + <h:outputText value="Security"/> + <f:param name="id" value="#{object.id}"/> + </h:commandLink> | <h:commandLink action="editPageTheme" actionListener="#{portalobjectmgr.selectObject}"> + <h:outputText value="Theme"/> + <f:param name="id" value="#{object.id}"/> + </h:commandLink> | <h:commandLink action="pages" actionListener="#{portalobjectmgr.destroyObject}"> + <h:outputText value="Destroy"/> + <f:param name="id" value="#{object.id}"/> + </h:commandLink> + </td> + </tr> + </c:forEach> + </tbody> + </table> + </c:if> + + <c:if test="#{not empty portalobjectmgr.windowNodes}"> + <table width="100%" class="portlet-table-body"> + <thead class="portlet-section-header"> + <tr> + <th>Window</th> + <th>Actions</th> + </tr> + </thead> + <tbody> + <c:forEach items="#{portalobjectmgr.windowNodes}" var="object" varStatus="status"> + <tr class="#{status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate'}"> + <td> + <h:commandLink action="#{portalobjectmgr.selectObject}"> + <h:outputText value="#{object.name}"/> + <f:param name="id" value="#{object.id}"/> + </h:commandLink> + </td> + <td> + <h:commandLink action="editWindowPreferences" actionListener="#{portalobjectmgr.selectObject}"> + <h:outputText value="Edit"/> + <f:param name="id" value="#{object.id}"/> + </h:commandLink> | <h:commandLink action="editWindowTheme" actionListener="#{portalobjectmgr.selectObject}"> + <h:outputText value="Theme"/> + <f:param name="id" value="#{object.id}"/> + </h:commandLink> | <h:commandLink action="windows" actionListener="#{portalobjectmgr.destroyObject}"> + <h:outputText value="Destroy"/> + <f:param name="id" value="#{object.id}"/> + </h:commandLink> + </td> + </tr> + </c:forEach> + </tbody> + </table> + </c:if> + + </h:form> + +</div> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/objectTemplate.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/objectTemplate.xhtml 2007-02-28 15:58:26 UTC (rev 6462) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/objectTemplate.xhtml 2007-02-28 16:04:07 UTC (rev 6463) @@ -10,9 +10,8 @@ <b><h:commandLink value="Portal Objects" action="portals" actionListener="#{portalobjectmgr.selectRootObject}"/></b> | <h:commandLink value="Porlet Instances" action="instances"/> | <h:commandLink value="Portlet Definitions" action="portlets"/> </h:form> - <hr/> - <!-- Path nav --> + <hr/> <h:form> <c:forEach items="#{portalobjectmgr.selectedObjectPath}" var="node"> &gt; Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/pageNavigation.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/pageNavigation.xhtml 2007-02-28 15:58:26 UTC (rev 6462) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/pageNavigation.xhtml 2007-02-28 16:04:07 UTC (rev 6463) @@ -4,7 +4,7 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"> - <ui:include src="nodeNavigation.xhtml"/> + <ui:include src="objectNavigation.xhtml"/> <!-- Sub page addition --> Deleted: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/plugins/manager.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/plugins/manager.xhtml 2007-02-28 15:58:26 UTC (rev 6462) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/plugins/manager.xhtml 2007-02-28 16:04:07 UTC (rev 6463) @@ -1,75 +0,0 @@ -<div - xmlns="http://www.w3.org/1999/xhtml" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:ct="http://www.julien.com"> -<br/> - -<!-- Context tab --> -<h:panelGroup - id="a" - rendered="#{portalobjectmgr.selectedObject.type==0}"> - <h:outputText style="font-weight:bold;" value="Type: "/> - <f:verbatim>CONTEXT<br/></f:verbatim> - <h:form id="portal_form"> - <h:outputLabel for="name"> - <h:outputText value="Portal Name: " style="font-weight:bold;"/> - </h:outputLabel> - <h:inputText id="name" value="#{portalAction.portalName}" - validator="#{portalAction.validatePortalName}" - required="true"/> - <h:messages style="color: red"/> - <br/> - <h:commandButton action="#{portalAction.addPortal}" value="Add portal"/> - </h:form> -</h:panelGroup> - -<!-- Portal tab --> -<h:panelGroup - id="b" - rendered="#{portalobjectmgr.selectedObject.type==1}"> - <h:outputText style="font-weight:bold;" value="Name: "/> - <h:outputText value="#{portalobjectmgr.selectedObject.name}"/> - <f:verbatim><br/><br/></f:verbatim> - <h:outputText style="font-weight:bold;" value="Type: "/> - <f:verbatim>PORTAL<br/></f:verbatim> - <h:form id="portal_form_1"> - <h:outputLabel for="name"> - <h:outputText value="Defaut Page Name: " style="font-weight:bold;"/> - </h:outputLabel> - <h:selectOneMenu id="name" value="#{portalAction.defaultPageName}"> - <f:selectItems value="#{portalobjectmgr.portalPageItems}"/> - </h:selectOneMenu> - <br/> - <h:commandButton value="Update" styleClass="portlet-form-button"/> - <br/> - </h:form> - <h:form id="portal_form_2"> - <h:outputLabel for="name"> - <h:outputText value="New Page Name: " style="font-weight:bold;"/> - </h:outputLabel> - <h:inputText id="name" value="#{addPageAction.pageName}" - validator="#{addPageAction.validatePageName}" - required="true"/> - <h:messages errorClass="portlet-msg-error"/> - <br/> - <h:commandButton action="#{addPageAction.execute}" value="Add page" styleClass="portlet-form-button"/> - </h:form> -</h:panelGroup> - -<!-- Window tab --> -<h:panelGroup - id="d" - rendered="#{portalobjectmgr.selectedObject.type==3}"> - <h:form id="window_form"> - <ct:content - contentType="#{portalobjectmgr.selectedObject.type==3 ? portalobjectmgr.selectedObject.contentType : null}" - contentURI="#{portalobjectmgr.selectedObject.instanceRef}"/> - <br/> - <h:commandButton value="Change instance" styleClass="portlet-form-button"/> - </h:form> - - -</h:panelGroup> -</div> Deleted: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/plugins/portlet/manager.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/plugins/portlet/manager.xhtml 2007-02-28 15:58:26 UTC (rev 6462) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/plugins/portlet/manager.xhtml 2007-02-28 16:04:07 UTC (rev 6463) @@ -1,27 +0,0 @@ -<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"> - <br/> - - <!-- Portlet details --> - - <c:if test="#{portletmgr.selectedPortlet != null}"> - <ui:include src="/WEB-INF/jsp/management/common/showPortletDetails.xhtml"> - <ui:param name="portlet" value="#{portletmgr.selectedPortlet}"/> - </ui:include> - </c:if> - - <!-- 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:message for="instanceId" errorClass="portlet-msg-error"/> - </h:form> - -</div> Deleted: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/plugins/preferences.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/plugins/preferences.xhtml 2007-02-28 15:58:26 UTC (rev 6462) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/plugins/preferences.xhtml 2007-02-28 16:04:07 UTC (rev 6463) @@ -1,78 +0,0 @@ -<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"> -<h:panelGroup - id="panel2" - rendered="#{preferences != null}"> - <h:form> - <h:dataTable - id="data__" - var="row" - value="#{preferences.model}" - rowClasses="portlet-section-body,portlet-section-alternate"> - <h:column> - <f:facet name="header"> - <h:outputText value="Key"/> - </f:facet> - <h:outputText value="#{row.key}"/> - </h:column> - <h:column> - <f:facet name="header"> - <h:outputText value="Name"/> - </f:facet> - <h:outputText value="#{row.name}"/> - </h:column> - <h:column> - <f:facet name="header"> - <h:outputText value="ReadOnly"/> - </f:facet> - <h:outputText value="#{row.readOnly}"/> - </h:column> - <h:column> - <f:facet name="header"> - <h:outputText value="Value"/> - </f:facet> - <h:commandLink - rendered="#{row.cell.value != null and preferences.model.mutable}" - action="#{action.selectRow}"> - <h:graphicImage - value="/images/management/edit.png" - alt="Edit" - style="vertical-align:middle;"/> - </h:commandLink> - <h:commandLink - rendered="#{row.cell.value != null and preferences.model.mutable}" - action="#{action.deleteCell}"> - <h:graphicImage - value="/images/management/delete.png" - alt="Delete" - style="vertical-align:middle;"/> - </h:commandLink> - <h:outputText value="#{row.value}"/> - </h:column> - </h:dataTable> - </h:form> -</h:panelGroup> -<h:panelGroup - id="panel3" - rendered="#{preferences.selectedPreference != null}"> - <h:form> - <h:dataTable - id="string_values" - var="row" - value="#{preferences.selectedPreference.valueIndices}"> - <h:column> - <h:inputText value="#{preferences.selectedPreference.value[row]}"/> - <h:commandButton action="#{action.deleteLine}" value="Delete"/> - </h:column> - </h:dataTable> - <h:commandButton action="#{action.updateCell}" value="Update"/> - </h:form> - <h:form> - <h:inputText value="#{action.appendedValue}"/> - <h:commandButton action="#{action.appendLine}" value="Append"/> - </h:form> -</h:panelGroup> -</div> Deleted: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/plugins/properties.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/plugins/properties.xhtml 2007-02-28 15:58:26 UTC (rev 6462) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/plugins/properties.xhtml 2007-02-28 16:04:07 UTC (rev 6463) @@ -1,91 +0,0 @@ -<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"> - <br/> - <h:outputText style="font-weight:bold;" value="Name: "/> - <h:outputText value="#{portalobjectmgr.selectedObject.name}"/> - <f:verbatim><br/><br/></f:verbatim> - - <h:panelGroup - rendered="#{portalobjectmgr.selectedObject.type==0}"> - <h:outputText style="font-weight:bold;" value="Type: "/> - <f:verbatim>CONTEXT<br/></f:verbatim> - </h:panelGroup> - <h:panelGroup - rendered="#{portalobjectmgr.selectedObject.type==1}"> - <h:outputText style="font-weight:bold;" value="Type: "/> - <f:verbatim>PORTAL<br/></f:verbatim> - </h:panelGroup> - <h:panelGroup - rendered="#{portalobjectmgr.selectedObject.type==2}"> - <h:outputText style="font-weight:bold;" value="Type: "/> - <f:verbatim>PAGE<br/></f:verbatim> - </h:panelGroup> - <h:panelGroup - rendered="#{portalobjectmgr.selectedObject.type==3}"> - <h:outputText style="font-weight:bold;" value="Type: "/> - <f:verbatim>WINDOW<br/></f:verbatim> - </h:panelGroup> - <br/><br/> - - <h:panelGroup - id="prop_a"> - <h:form id="properties_form"> - <h:dataTable - id="data" - var="p" - value="#{portalobjectmgr.selectedProperties}" - binding="#{propertyAction.propertyDataTable}" - rowClasses="portlet-section-body,portlet-section-alternate"> - <h:column> - <f:facet id="the_id_that_fixes_the_bug_1" name="header"> - <h:outputText id="the_id_that_fixes_the_bug_2" value="Operations"/> - </f:facet> - <h:commandLink - id="properties_form_link1" - action="#{propertyAction.selectProperty}"> - <h:graphicImage - value="/images/management/edit.png" - border="0" - alt="Edit" - style="vertical-align:middle;"/> - </h:commandLink> - <h:commandLink - id="properties_form_link2" - action="#{propertyAction.removeProperty}"> - <h:graphicImage - value="/images/management/delete.png" - border="0" - alt="Delete" - style="vertical-align:middle;"/> - </h:commandLink> - <h:outputText value="#{row.value}"/> - </h:column> - <h:column> - <f:facet id="the_id_that_fixes_the_bug_3" name="header"> - <h:outputText id="the_id_that_fixes_the_bug_4" value="Name"/> - </f:facet> - <h:outputText value="#{p[0]}"/> - </h:column> - <h:column> - <f:facet id="the_id_that_fixes_the_bug_5" name="header"> - <h:outputText id="the_id_that_fixes_the_bug_6" value="Value"/> - </f:facet> - <h:outputText value="#{p[1]}"/> - </h:column> - </h:dataTable> - <br/> - <h:messages style="color: red"/> - <h:outputText style="font-weight:bold;" value="Property Name: "/> - <h:inputText value="#{propertyAction.selectedProperty}" - validator="#{propertyAction.validatePropertyName}" /> - <br/> - <h:outputText style="font-weight:bold;" value="Property Value: "/> - <h:inputText value="#{propertyAction.propertyValue}"/> - <br/> - <h:commandButton action="#{propertyAction.updateProperty}" value="Update"/> - </h:form> - </h:panelGroup> -</div> Deleted: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/plugins/security.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/plugins/security.xhtml 2007-02-28 15:58:26 UTC (rev 6462) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/plugins/security.xhtml 2007-02-28 16:04:07 UTC (rev 6463) @@ -1,35 +0,0 @@ -<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"> - <br/> - <h:panelGroup - id="securitypg"> - <h:form - id="myform"> - <h:dataTable - id="dataconstraints" - var="role" - value="#{auth.roles}"> - <h:column - id="role_column"> - <f:facet name="header"> - <h:outputText value="Role"/> - </f:facet> - <h:outputText value="#{role == '__unchecked__' ? 'Unchecked' : (auth.roleDisplayNameMap[role] != null ? auth.roleDisplayNameMap[role] : role)}"/> - </h:column> - <h:column - id="actions_column"> - <f:facet name="header"> - <h:outputText value="Actions"/> - </f:facet> - <h:selectManyListbox value="#{auth.forRole[role]}"> - <f:selectItems value="#{auth.availableActions}"></f:selectItems> - </h:selectManyListbox> - </h:column> - </h:dataTable> - <h:commandButton value="Update"/> - </h:form> - </h:panelGroup> -</div> Deleted: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/plugins/theme.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/plugins/theme.xhtml 2007-02-28 15:58:26 UTC (rev 6462) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/plugins/theme.xhtml 2007-02-28 16:04:07 UTC (rev 6463) @@ -1,110 +0,0 @@ -<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"> -<br/> -<h:outputText style="font-weight:bold;" value="Name: "/> -<h:outputText value="#{portalobjectmgr.selectedObject.name}"/> -<f:verbatim><br/><br/></f:verbatim> - -<h:panelGroup - rendered="#{portalobjectmgr.selectedObject.type==0}"> - <h:outputText style="font-weight:bold;" value="Type: "/> - <f:verbatim>CONTEXT<br/></f:verbatim> -</h:panelGroup> -<h:panelGroup - rendered="#{portalobjectmgr.selectedObject.type==1}"> - <h:outputText style="font-weight:bold;" value="Type: "/> - <f:verbatim>PORTAL<br/></f:verbatim> -</h:panelGroup> -<h:panelGroup - rendered="#{portalobjectmgr.selectedObject.type==2}"> - <h:outputText style="font-weight:bold;" value="Type: "/> - <f:verbatim>PAGE<br/></f:verbatim> -</h:panelGroup> -<h:panelGroup - rendered="#{portalobjectmgr.selectedObject.type==3}"> - <h:outputText style="font-weight:bold;" value="Type: "/> - <f:verbatim>WINDOW<br/></f:verbatim> -</h:panelGroup> -<br/><br/> -<h:panelGroup styleClass="portlet-section-body" - id="themepg"> - <h:form - id="themeform"> - <table border="0" width="100%" cellpadding="2"> - <tr> - <td class="portlet-form-field-label"><label class="portlet-form-field-label">Layout:</label></td> - <td> - <h:selectOneMenu styleClass="portlet-form-field" value="#{themePropertyAction.layoutName}" - disabled="#{themes.window}"> - <f:selectItems value="#{themes.layoutNames}"/> - </h:selectOneMenu> - </td> - </tr> - <tr> - <td class="portlet-form-field-label"><label class="portlet-form-field-label">Theme:</label></td> - <td> - <h:selectOneMenu styleClass="portlet-form-field" value="#{themePropertyAction.themeName}" - disabled="#{themes.window}"> - <f:selectItems value="#{themes.themeNames}"/> - </h:selectOneMenu> - </td> - </tr> - <tr> - <td class="portlet-form-field-label"><label class="portlet-form-field-label">RenderSet:</label></td> - <td> - <h:selectOneMenu styleClass="portlet-form-field" value="#{themePropertyAction.renderSetName}" - disabled="#{themes.window}"> - <f:selectItems value="#{themes.renderSetNames}"/> - </h:selectOneMenu> - </td> - </tr> - <tr> - <td class="portlet-form-field-label"><label class="portlet-form-field-label">Layout Strategy:</label> - </td> - <td> - <h:selectOneMenu styleClass="portlet-form-field" value="#{themePropertyAction.strategyName}" - disabled="#{themes.window}"> - <f:selectItems value="#{themes.strategyNames}"/> - </h:selectOneMenu> - </td> - </tr> - - <tr> - <td class="portlet-form-field-label"><label class="portlet-form-field-label">Window Renderer:</label> - </td> - <td> - <h:selectOneMenu styleClass="portlet-form-field" value="#{themePropertyAction.windowRendererName}" - disabled="#{!themes.window}"> - <f:selectItems value="#{themes.renderSetNames}"/> - </h:selectOneMenu> - </td> - </tr> - <tr> - <td class="portlet-form-field-label"><label class="portlet-form-field-label">Decoration Renderer:</label> - </td> - <td> - <h:selectOneMenu styleClass="portlet-form-field" value="#{themePropertyAction.decorationRendererName}" - disabled="#{!themes.window}"> - <f:selectItems value="#{themes.renderSetNames}"/> - </h:selectOneMenu> - </td> - </tr> - <tr> - <td class="portlet-form-field-label"><label class="portlet-form-field-label">Portlet Renderer:</label> - </td> - <td> - <h:selectOneMenu styleClass="portlet-form-field" value="#{themePropertyAction.portletRendererName}" - disabled="#{!themes.window}"> - <f:selectItems value="#{themes.renderSetNames}"/> - </h:selectOneMenu> - </td> - </tr> - </table> - <h:commandButton styleClass="portlet-form-button" id="the_command" value="Update" - action="#{themePropertyAction.execute}"/> - </h:form> -</h:panelGroup> -</div> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/portalNavigation.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/portalNavigation.xhtml 2007-02-28 15:58:26 UTC (rev 6462) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/portalNavigation.xhtml 2007-02-28 16:04:07 UTC (rev 6463) @@ -3,7 +3,7 @@ xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html"> - <ui:include src="nodeNavigation.xhtml"/> + <ui:include src="objectNavigation.xhtml"/> <hr/> <h:form id="portal_form"> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/portlets.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/portlets.xhtml 2007-02-28 15:58:26 UTC (rev 6462) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/portlets.xhtml 2007-02-28 16:04:07 UTC (rev 6463) @@ -68,7 +68,7 @@ <c:if test="#{portletmgr.selectedPlugin == 'manager'}"> <hr/> <h3>Portlet details</h3> - <ui:include src="/WEB-INF/jsp/management/plugins/portlet/manager.xhtml"/> + <ui:include src="/WEB-INF/jsp/management/showPortletInfo.xhtml"/> </c:if> <c:if test="#{portletmgr.selectedPlugin == 'preferences'}"> <hr/> Copied: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/showPortletInfo.xhtml (from rev 6460, trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/plugins/portlet/manager.xhtml) =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/showPortletInfo.xhtml (rev 0) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/showPortletInfo.xhtml 2007-02-28 16:04:07 UTC (rev 6463) @@ -0,0 +1,27 @@ +<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"> + <br/> + + <!-- Portlet details --> + + <c:if test="#{portletmgr.selectedPortlet != null}"> + <ui:include src="/WEB-INF/jsp/management/common/showPortletDetails.xhtml"> + <ui:param name="portlet" value="#{portletmgr.selectedPortlet}"/> + </ui:include> + </c:if> + + <!-- 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:message for="instanceId" errorClass="portlet-msg-error"/> + </h:form> + +</div> Property changes on: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/showPortletInfo.xhtml ___________________________________________________________________ Name: svn:executable + *