Author: chris.laprun(a)jboss.com Date: 2007-08-21 15:11:48 -0400 (Tue, 21 Aug 2007) New Revision: 8020 Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml trunk/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/consumers.xhtml Log: - JBPORTAL-1643: Replaced Destroy by Delete. Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml 2007-08-21 19:11:06 UTC (rev 8019) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml 2007-08-21 19:11:48 UTC (rev 8020) @@ -1,78 +1,84 @@ <div - xmlns="http://www.w3.org/1999/xhtml" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:h="http://java.sun.com/jsf/html"> + xmlns="http://www.w3.org/1999/xhtml" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html"> <ui:composition template="objectTemplate.xhtml"> <ui:define name="content"> - - <h:form> - <h:panelGroup rendered="#{portalobjectmgr.selectedObject.type == PortalObject.TYPE_PAGE}"><h:commandLink action="editPageLayout" actionListener="#{portalobjectmgr.selectObject}"> - <h:outputText value="Page layout"/> - <f:param name="id" value="#{portalobjectmgr.selectedObject.id}"/> - </h:commandLink> | </h:panelGroup><h:commandLink action="editPageSecurity" actionListener="#{portalobjectmgr.selectObject}"> + + <h:form> + <h:panelGroup rendered="#{portalobjectmgr.selectedObject.type == PortalObject.TYPE_PAGE}"><h:commandLink + action="editPageLayout" actionListener="#{portalobjectmgr.selectObject}"> + <h:outputText value="Page layout"/> + <f:param name="id" value="#{portalobjectmgr.selectedObject.id}"/> + </h:commandLink> | </h:panelGroup><h:commandLink action="editPageSecurity" + actionListener="#{portalobjectmgr.selectObject}"> <h:outputText value="Security"/> <f:param name="id" value="#{portalobjectmgr.selectedObject.id}"/> </h:commandLink> | <h:commandLink action="editProperties" actionListener="#{portalobjectmgr.selectObject}"> - <h:outputText value="Properties"/> - <f:param name="id" value="#{portalobjectmgr.selectedObject.id}"/> - </h:commandLink> | <h:commandLink action="editPageTheme" actionListener="#{portalobjectmgr.selectObject}"> + <h:outputText value="Properties"/> + <f:param name="id" value="#{portalobjectmgr.selectedObject.id}"/> + </h:commandLink> | <h:commandLink action="editPageTheme" actionListener="#{portalobjectmgr.selectObject}"> <h:outputText value="Theme"/> <f:param name="id" value="#{portalobjectmgr.selectedObject.id}"/> - </h:commandLink> | <h:panelGroup rendered="#{!((portalobjectmgr.selectedObject.type == PortalObject.TYPE_PORTAL) and ((portalobjectmgr.selectedObject.name == 'admin') or (portalobjectmgr.selectedObject.name == 'template') or (portalobjectmgr.selectedObject.name == 'default')))}"><h:commandLink action="renameObject" actionListener="#{portalobjectmgr.selectObject}"> + </h:commandLink> | <h:panelGroup + rendered="#{!((portalobjectmgr.selectedObject.type == PortalObject.TYPE_PORTAL) and ((portalobjectmgr.selectedObject.name == 'admin') or (portalobjectmgr.selectedObject.name == 'template') or (portalobjectmgr.selectedObject.name == 'default')))}"><h:commandLink + action="renameObject" actionListener="#{portalobjectmgr.selectObject}"> <h:outputText value="Rename"/> <f:param name="id" value="#{portalobjectmgr.selectedObject.id}"/> - </h:commandLink> | </h:panelGroup><h:commandLink action="confirm" actionListener="#{portalobjectmgr.selectObject}"> - <h:outputText value="Destroy"/> + </h:commandLink> | </h:panelGroup><h:commandLink action="confirm" + actionListener="#{portalobjectmgr.selectObject}"> + <h:outputText value="Delete"/> <f:param name="id" value="#{portalobjectmgr.selectedObject.id}"/> </h:commandLink> - </h:form> + </h:form> <!-- Sub page addition --> <div style="padding:1em 0 0 0"> <table> <tr> - <h:form> - <td> - <span class="portlet-font">Create a page:</span> - </td> - <td> - <h:inputText id="pageName" value="#{addPageAction.pageName}" styleClass="portlet-form-input-field" required="true"/> - </td> - <td> - <h:commandButton action="#{addPageAction.execute}" value="Add" styleClass="portlet-form-button"/> - </td> - <td> - <h:message for="pageName" errorClass="portlet-msg-error"/> - </td> - </h:form> + <h:form> + <td> + <span class="portlet-font">Create a page:</span> + </td> + <td> + <h:inputText id="pageName" value="#{addPageAction.pageName}" + styleClass="portlet-form-input-field" required="true"/> + </td> + <td> + <h:commandButton action="#{addPageAction.execute}" value="Add" + styleClass="portlet-form-button"/> + </td> + <td> + <h:message for="pageName" errorClass="portlet-msg-error"/> + </td> + </h:form> </tr> <!-- Default page --> <h:panelGroup rendered="#{portalobjectmgr.selectedObject.type == PortalObject.TYPE_PORTAL}"> - <tr> - <h:form> - <td> - <span class="portlet-font">Default page:</span> - </td> - <td> - <h:selectOneMenu id="name" styleClass="portlet-form-field" value="#{portalAction.defaultObjectName}"> - <f:selectItems value="#{portalobjectmgr.portalPageItems}" /> - </h:selectOneMenu> - </td> - <td colspan="2"> - <h:commandButton styleClass="portlet-form-button" value="Update" action="objects"/> - </td> - </h:form> - </tr> + <tr> + <h:form> + <td> + <span class="portlet-font">Default page:</span> + </td> + <td> + <h:selectOneMenu id="name" styleClass="portlet-form-field" + value="#{portalAction.defaultObjectName}"> + <f:selectItems value="#{portalobjectmgr.portalPageItems}"/> + </h:selectOneMenu> + </td> + <td colspan="2"> + <h:commandButton styleClass="portlet-form-button" value="Update" action="objects"/> + </td> + </h:form> + </tr> </h:panelGroup> </table> </div> - - <!-- Separation --> <hr/> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml 2007-08-21 19:11:06 UTC (rev 8019) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml 2007-08-21 19:11:48 UTC (rev 8020) @@ -34,13 +34,16 @@ <h:outputText value="Security"/> <f:param name="id" value="#{instance.id}"/> <f:param name="plugin" value="security"/> - </h:commandLink> | <h:panelGroup rendered="#{! empty(instancemgr.selectedInstancesPrefs[instance.id])}"><h:commandLink action="#{instancemgr.selectInstance}"> - <h:outputText value="Preferences"/> - <f:param name="id" value="#{instance.id}"/> - <f:param name="plugin" value="preferences"/> - </h:commandLink> | </h:panelGroup><h:commandLink action="confirmDeleteInstance" actionListener="#{instancemgr.selectInstance}"> - <h:outputText value="Destroy"/> + </h:commandLink> | <h:panelGroup + rendered="#{! empty(instancemgr.selectedInstancesPrefs[instance.id])}"><h:commandLink + action="#{instancemgr.selectInstance}"> + <h:outputText value="Preferences"/> <f:param name="id" value="#{instance.id}"/> + <f:param name="plugin" value="preferences"/> + </h:commandLink> | </h:panelGroup><h:commandLink action="confirmDeleteInstance" + actionListener="#{instancemgr.selectInstance}"> + <h:outputText value="Delete"/> + <f:param name="id" value="#{instance.id}"/> </h:commandLink> </td> </tr> @@ -52,7 +55,8 @@ <c:forEach begin="0" end="#{(instancemgr.instanceCount - 1)/ instancemgr.paginationSize}" step="1" var="index"> <li class="#{index == instancemgr.selectedFrom ? 'selected' : ''}"> - <h:commandLink action="#{instancemgr.selectFrom}"><f:param name="from" value="#{index * instancemgr.paginationSize}"/><h:outputText + <h:commandLink action="#{instancemgr.selectFrom}"><f:param name="from" + value="#{index * instancemgr.paginationSize}"/><h:outputText value="#{index * instancemgr.paginationSize}"/></h:commandLink> </li> </c:forEach> @@ -95,9 +99,9 @@ <c:if test="#{instancemgr.selectedPlugin == 'security'}"> <h3>Editing security of #{instancemgr.selectedInstance.id}: </h3> - + <ui:decorate template="/WEB-INF/jsf/common/editSecurity.xhtml"> - <ui:param name="auth" value="#{instancemgr.auth}"/> + <ui:param name="auth" value="#{instancemgr.auth}"/> </ui:decorate> </c:if> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml 2007-08-21 19:11:06 UTC (rev 8019) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml 2007-08-21 19:11:48 UTC (rev 8020) @@ -30,20 +30,24 @@ <h:commandLink action="editPortalSecurity" actionListener="#{portalobjectmgr.selectObject}"> <h:outputText value="Security"/> <f:param name="id" value="#{object.id}"/> - </h:commandLink> | <h:commandLink action="editProperties" actionListener="#{portalobjectmgr.selectObject}"> - <h:outputText value="Properties"/> - <f:param name="id" value="#{object.id}"/> - </h:commandLink> | <h:commandLink action="editPortalTheme" + </h:commandLink> | <h:commandLink action="editProperties" actionListener="#{portalobjectmgr.selectObject}"> + <h:outputText value="Properties"/> + <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:panelGroup rendered="#{(object.name != 'admin') and (object.name != 'template') and (object.name != 'default')}"> | <h:commandLink action="renameObject" actionListener="#{portalobjectmgr.selectObject}"> + </h:commandLink><h:panelGroup + rendered="#{(object.name != 'admin') and (object.name != 'template') and (object.name != 'default')}"> | + <h:commandLink action="renameObject" actionListener="#{portalobjectmgr.selectObject}"> <h:outputText value="Rename"/> <f:param name="id" value="#{object.id}"/> - </h:commandLink></h:panelGroup> | <h:commandLink action="confirm" actionListener="#{portalobjectmgr.selectObject}"> - <h:outputText value="Destroy"/> - <f:param name="id" value="#{object.id}"/> - </h:commandLink> + </h:commandLink></h:panelGroup> | <h:commandLink action="confirm" + actionListener="#{portalobjectmgr.selectObject}"> + <h:outputText value="Delete"/> + <f:param name="id" value="#{object.id}"/> + </h:commandLink> </td> </tr> </c:forEach> @@ -75,17 +79,17 @@ <h:outputText value="Security"/> <f:param name="id" value="#{object.id}"/> </h:commandLink> | <h:commandLink action="editProperties" actionListener="#{portalobjectmgr.selectObject}"> - <h:outputText value="Properties"/> - <f:param name="id" value="#{object.id}"/> - </h:commandLink> | <h:commandLink action="editPageTheme" actionListener="#{portalobjectmgr.selectObject}"> + <h:outputText value="Properties"/> + <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="renameObject" actionListener="#{portalobjectmgr.selectObject}"> - <h:outputText value="Rename"/> - <f:param name="id" value="#{object.id}"/> - </h:commandLink> | <h:commandLink action="confirm" actionListener="#{portalobjectmgr.selectObject}"> - <h:outputText value="Destroy"/> + <h:outputText value="Rename"/> <f:param name="id" value="#{object.id}"/> + </h:commandLink> | <h:commandLink action="confirm" actionListener="#{portalobjectmgr.selectObject}"> + <h:outputText value="Delete"/> + <f:param name="id" value="#{object.id}"/> </h:commandLink> </td> </tr> @@ -113,16 +117,17 @@ <h:commandLink action="editWindowTheme" actionListener="#{portalobjectmgr.selectObject}"> <h:outputText value="Theme"/> <f:param name="id" value="#{object.id}"/> - </h:commandLink> | <h:commandLink action="editProperties" actionListener="#{portalobjectmgr.selectObject}"> - <h:outputText value="Properties"/> - <f:param name="id" value="#{object.id}"/> - </h:commandLink> | <h:commandLink action="renameObject" actionListener="#{portalobjectmgr.selectObject}"> - <h:outputText value="Rename"/> - <f:param name="id" value="#{object.id}"/> - </h:commandLink> | <h:commandLink action="confirm" actionListener="#{portalobjectmgr.selectObject}"> - <h:outputText value="Destroy"/> - <f:param name="id" value="#{object.id}"/> - </h:commandLink> + </h:commandLink> | <h:commandLink action="editProperties" + actionListener="#{portalobjectmgr.selectObject}"> + <h:outputText value="Properties"/> + <f:param name="id" value="#{object.id}"/> + </h:commandLink> | <h:commandLink action="renameObject" actionListener="#{portalobjectmgr.selectObject}"> + <h:outputText value="Rename"/> + <f:param name="id" value="#{object.id}"/> + </h:commandLink> | <h:commandLink action="confirm" actionListener="#{portalobjectmgr.selectObject}"> + <h:outputText value="Delete"/> + <f:param name="id" value="#{object.id}"/> + </h:commandLink> </td> </tr> </c:forEach> Modified: trunk/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/consumers.xhtml =================================================================== --- trunk/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/consumers.xhtml 2007-08-21 19:11:06 UTC (rev 8019) +++ trunk/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/consumers.xhtml 2007-08-21 19:11:48 UTC (rev 8020) @@ -58,7 +58,7 @@ </h:commandLink> </c:if> | <h:commandLink action="#{consumersMgr.destroyConsumer}"> <f:param name="id" value="#{consumer.producerId}"/> - <h:outputText value="Destroy"/> + <h:outputText value="Delete"/> </h:commandLink> </td> </tr>