Author: chris.laprun(a)jboss.com Date: 2007-09-04 22:14:32 -0400 (Tue, 04 Sep 2007) New Revision: 8164 Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/confirm.xhtml Log: - JBPORTAL-1657: Fixed issue with empty parent name (root case). Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/confirm.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/confirm.xhtml 2007-09-05 02:14:20 UTC (rev 8163) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/confirm.xhtml 2007-09-05 02:14:32 UTC (rev 8164) @@ -15,13 +15,15 @@ <h3>Delete <h:outputText value="#{portalobjectmgr.selectedObjectType}"/></h3> <p class="portlet-msg-alert">WARNING! You are about to delete the - <h:outputText value=" #{portalobjectmgr.selectedObject.name} "/> - <h:outputText value="#{portalobjectmgr.selectedObject.typeName}"/> from the - <h:outputText value=" #{portalobjectmgr.selectedObjectParent.name} "/> - <h:outputText value="#{portalobjectmgr.selectedObjectParent.typeName}"/>!</p> + <span class="objectName">#{portalobjectmgr.selectedObject.name}</span> + #{portalobjectmgr.selectedObject.typeName} from the + <c:if test="#{not empty portalobjectmgr.selectedObjectParent.name}"> + <span class="objectName">#{portalobjectmgr.selectedObjectParent.name}</span> + </c:if> + #{portalobjectmgr.selectedObjectParent.typeName}! + </p> - <p class="portlet-class">Are you sure you want to delete this - <h:outputText value="#{portalobjectmgr.selectedObjectType}"/>?</p> + <p class="portlet-class">Are you sure you want to delete this #{portalobjectmgr.selectedObjectType}?</p> <h:form> <h:commandButton value="Delete" action="objects" actionListener="#{portalobjectmgr.destroyObject}" @@ -36,4 +38,4 @@ </ui:composition> -</div> +</div> \ No newline at end of file