Author: chris.laprun(a)jboss.com Date: 2007-09-14 15:00:29 -0400 (Fri, 14 Sep 2007) New Revision: 8271 Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/confirm.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/confirmDeleteInstance.xhtml Log: - JBPORTAL-1695: added divs for easier styling. Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/confirm.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/confirm.xhtml 2007-09-14 18:22:35 UTC (rev 8270) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/confirm.xhtml 2007-09-14 19:00:29 UTC (rev 8271) @@ -12,27 +12,33 @@ <ui:param name="portalObjectScreen" value="Delete"/> <ui:define name="content"> - <h3>Delete <h:outputText value="#{portalobjectmgr.selectedObjectType}"/></h3> + <div class="portlet-msg"> + <div class="portlet-msg-icon"><h:graphicImage url="/img/msgIcon_Warning.gif" alt="/!\"/></div> + <div class="portlet-msg-body"> + <h3>Delete <h:outputText value="#{portalobjectmgr.selectedObjectType}"/></h3> - <p class="portlet-msg-alert">WARNING! You are about to delete the - <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-msg-alert">WARNING! You are about to delete the + <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 #{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}" - styleClass="portlet-form-button"> - <f:attribute name="objectId" value="#{portalobjectmgr.selectedObject.id}"/> - </h:commandButton> - <h:commandButton value="Cancel" action="objects" actionListener="#{portalobjectmgr.selectParentObject}" - styleClass="portlet-form-button"/> - </h:form> + <h:form> + <h:commandButton value="Delete" action="objects" actionListener="#{portalobjectmgr.destroyObject}" + styleClass="portlet-form-button"> + <f:attribute name="objectId" value="#{portalobjectmgr.selectedObject.id}"/> + </h:commandButton> + <h:commandButton value="Cancel" action="objects" + actionListener="#{portalobjectmgr.selectParentObject}" + styleClass="portlet-form-button"/> + </h:form> + </div> + </div> </ui:define> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/confirmDeleteInstance.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/confirmDeleteInstance.xhtml 2007-09-14 18:22:35 UTC (rev 8270) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/confirmDeleteInstance.xhtml 2007-09-14 19:00:29 UTC (rev 8271) @@ -23,23 +23,28 @@ </h:form> <br/> - <h3>Delete <span class="objectName">#{instancemgr.selectedInstance.id}</span></h3> + <div class="portlet-msg"> + <div class="portlet-msg-icon"><h:graphicImage url="/img/msgIcon_Warning.gif" alt="/!\"/></div> + <div class="portlet-msg-body"> + <h3>Delete <span class="objectName">#{instancemgr.selectedInstance.id}</span></h3> - <p class="portlet-msg-alert">WARNING! You are about to delete the - <span class="objectName">#{instancemgr.selectedInstance.id}</span> portlet instance causing windows - referencing it to not be able to display their content anymore. - </p> + <p class="portlet-msg-alert">WARNING! You are about to delete the + <span class="objectName">#{instancemgr.selectedInstance.id}</span> portlet instance causing windows + referencing it to not be able to display their content anymore. + </p> - <p class="portlet-class">Are you sure you want to delete this portlet instance?</p> + <p class="portlet-class">Are you sure you want to delete this portlet instance?</p> - <h:form> - <h:commandButton value="Delete" action="instances" actionListener="#{instancemgr.deleteInstance}" - styleClass="portlet-form-button"> - <f:attribute name="instanceId" value="#{instancemgr.selectedInstance.id}"/> - </h:commandButton> - <h:commandButton value="Cancel" action="instances" actionListener="objects" - styleClass="portlet-form-button"/> - </h:form> + <h:form> + <h:commandButton value="Delete" action="instances" actionListener="#{instancemgr.deleteInstance}" + styleClass="portlet-form-button"> + <f:attribute name="instanceId" value="#{instancemgr.selectedInstance.id}"/> + </h:commandButton> + <h:commandButton value="Cancel" action="instances" actionListener="objects" + styleClass="portlet-form-button"/> + </h:form> + </div> + </div> </ui:define> </ui:composition> </div> \ No newline at end of file