Author: chris.laprun(a)jboss.com Date: 2007-09-18 15:13:19 -0400 (Tue, 18 Sep 2007) New Revision: 8337 Added: branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/img/ Removed: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/img/ Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/style.css 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-1657: Finished styling of confirmation pages. - JBPORTAL-1704: Moved img directory. Copied: branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/img (from rev 8336, branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/img) Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/style.css =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/style.css 2007-09-18 18:45:15 UTC (rev 8336) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/style.css 2007-09-18 19:13:19 UTC (rev 8337) @@ -423,8 +423,8 @@ } .admin-ui form { - padding:0; - margin:0; + padding: 0; + margin: 0; } .admin-ui #selected.wizardStepBox { @@ -468,11 +468,15 @@ } .admin-ui .portlet-msg { - border: 1px solid #d5d5d5; - margin: auto; + border: 1px solid #bbb; + margin: 2em auto; + padding: 1em; + width: 60%; } -.admin-ui .portlet-msg-icon { - float: left; +.admin-ui .portlet-msg-body { + position: relative; + top: -3em; + left: 3em; + width: 95%; } - 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-18 18:45:15 UTC (rev 8336) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/confirm.xhtml 2007-09-18 19:13:19 UTC (rev 8337) @@ -13,11 +13,11 @@ <ui:define name="content"> <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"> - <h:graphicImage url="/img/msgIcon_Warning.gif" alt="/!\" styleClass="portlet-msg-icon"/> WARNING! You are about to delete the <span class="objectName">#{portalobjectmgr.selectedObject.name}</span> #{portalobjectmgr.selectedObject.typeName} from the @@ -31,12 +31,12 @@ <h:form> <h:commandButton value="Delete" action="objects" actionListener="#{portalobjectmgr.destroyObject}" - styleClass="portlet-form-button"> + styleClass="portlet-form-button portlet-section-buttonrow"> <f:attribute name="objectId" value="#{portalobjectmgr.selectedObject.id}"/> </h:commandButton> <h:commandButton value="Cancel" action="objects" actionListener="#{portalobjectmgr.selectParentObject}" - styleClass="portlet-form-button"/> + styleClass="portlet-form-button portlet-section-buttonrow"/> </h:form> </div> </div> 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-18 18:45:15 UTC (rev 8336) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/confirmDeleteInstance.xhtml 2007-09-18 19:13:19 UTC (rev 8337) @@ -24,11 +24,11 @@ <br/> <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"> - <h:graphicImage url="/img/msgIcon_Warning.gif" alt="/!\" styleClass="portlet-msg-icon"/> 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. @@ -38,11 +38,11 @@ <h:form> <h:commandButton value="Delete" action="instances" actionListener="#{instancemgr.deleteInstance}" - styleClass="portlet-form-button"> + styleClass="portlet-form-button portlet-section-buttonrow"> <f:attribute name="instanceId" value="#{instancemgr.selectedInstance.id}"/> </h:commandButton> <h:commandButton value="Cancel" action="instances" actionListener="objects" - styleClass="portlet-form-button"/> + styleClass="portlet-form-button portlet-section-buttonrow"/> </h:form> </div> </div>