Author: chris.laprun(a)jboss.com Date: 2007-09-18 15:25:19 -0400 (Tue, 18 Sep 2007) New Revision: 8339 Added: trunk/core-admin/src/bin/portal-admin-war/img/ trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_Add.gif trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_CreateInstance.gif trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_Delete.gif trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_Details.gif trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_IsDefault.gif trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_Layout.gif trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_MakeDefault.gif trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_MoveDown.gif trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_MoveUp.gif trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_Properties.gif trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_Rename.gif trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_Security.gif trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_Theme.gif trunk/core-admin/src/bin/portal-admin-war/img/msgIcon_Warning.gif trunk/core-admin/src/bin/portal-admin-war/img/objectPath_Arrow.gif trunk/core-admin/src/bin/portal-admin-war/img/pathBackground.png trunk/core-admin/src/bin/portal-admin-war/img/pathSeparator.png Removed: trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_Add.gif trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_CreateInstance.gif trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_Delete.gif trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_Details.gif trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_IsDefault.gif trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_Layout.gif trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_MakeDefault.gif trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_MoveDown.gif trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_MoveUp.gif trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_Properties.gif trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_Rename.gif trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_Security.gif trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_Theme.gif trunk/core-admin/src/bin/portal-admin-war/img/msgIcon_Warning.gif trunk/core-admin/src/bin/portal-admin-war/img/objectPath_Arrow.gif trunk/core-admin/src/bin/portal-admin-war/img/pathBackground.png trunk/core-admin/src/bin/portal-admin-war/img/pathSeparator.png trunk/core-admin/src/resources/portal-admin-war/img/ Modified: trunk/core-admin/src/bin/portal-admin-war/style.css 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/confirmDeleteInstance.xhtml Log: - JBPORTAL-1657: Finished styling of confirmation pages. - JBPORTAL-1704: Moved img directory. Copied: trunk/core-admin/src/bin/portal-admin-war/img (from rev 8337, branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/img) Deleted: trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_Add.gif =================================================================== (Binary files differ) Copied: trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_Add.gif (from rev 8337, branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/img/actionIcon_Add.gif) =================================================================== (Binary files differ) Deleted: trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_CreateInstance.gif =================================================================== (Binary files differ) Copied: trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_CreateInstance.gif (from rev 8337, branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/img/actionIcon_CreateInstance.gif) =================================================================== (Binary files differ) Deleted: trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_Delete.gif =================================================================== (Binary files differ) Copied: trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_Delete.gif (from rev 8337, branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/img/actionIcon_Delete.gif) =================================================================== (Binary files differ) Deleted: trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_Details.gif =================================================================== (Binary files differ) Copied: trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_Details.gif (from rev 8337, branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/img/actionIcon_Details.gif) =================================================================== (Binary files differ) Deleted: trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_IsDefault.gif =================================================================== (Binary files differ) Copied: trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_IsDefault.gif (from rev 8337, branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/img/actionIcon_IsDefault.gif) =================================================================== (Binary files differ) Deleted: trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_Layout.gif =================================================================== (Binary files differ) Copied: trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_Layout.gif (from rev 8337, branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/img/actionIcon_Layout.gif) =================================================================== (Binary files differ) Deleted: trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_MakeDefault.gif =================================================================== (Binary files differ) Copied: trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_MakeDefault.gif (from rev 8337, branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/img/actionIcon_MakeDefault.gif) =================================================================== (Binary files differ) Deleted: trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_MoveDown.gif =================================================================== (Binary files differ) Copied: trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_MoveDown.gif (from rev 8337, branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/img/actionIcon_MoveDown.gif) =================================================================== (Binary files differ) Deleted: trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_MoveUp.gif =================================================================== (Binary files differ) Copied: trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_MoveUp.gif (from rev 8337, branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/img/actionIcon_MoveUp.gif) =================================================================== (Binary files differ) Deleted: trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_Properties.gif =================================================================== (Binary files differ) Copied: trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_Properties.gif (from rev 8337, branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/img/actionIcon_Properties.gif) =================================================================== (Binary files differ) Deleted: trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_Rename.gif =================================================================== (Binary files differ) Copied: trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_Rename.gif (from rev 8337, branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/img/actionIcon_Rename.gif) =================================================================== (Binary files differ) Deleted: trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_Security.gif =================================================================== (Binary files differ) Copied: trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_Security.gif (from rev 8337, branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/img/actionIcon_Security.gif) =================================================================== (Binary files differ) Deleted: trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_Theme.gif =================================================================== (Binary files differ) Copied: trunk/core-admin/src/bin/portal-admin-war/img/actionIcon_Theme.gif (from rev 8337, branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/img/actionIcon_Theme.gif) =================================================================== (Binary files differ) Deleted: trunk/core-admin/src/bin/portal-admin-war/img/msgIcon_Warning.gif =================================================================== (Binary files differ) Copied: trunk/core-admin/src/bin/portal-admin-war/img/msgIcon_Warning.gif (from rev 8337, branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/img/msgIcon_Warning.gif) =================================================================== (Binary files differ) Deleted: trunk/core-admin/src/bin/portal-admin-war/img/objectPath_Arrow.gif =================================================================== (Binary files differ) Copied: trunk/core-admin/src/bin/portal-admin-war/img/objectPath_Arrow.gif (from rev 8337, branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/img/objectPath_Arrow.gif) =================================================================== (Binary files differ) Deleted: trunk/core-admin/src/bin/portal-admin-war/img/pathBackground.png =================================================================== (Binary files differ) Copied: trunk/core-admin/src/bin/portal-admin-war/img/pathBackground.png (from rev 8337, branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/img/pathBackground.png) =================================================================== (Binary files differ) Deleted: trunk/core-admin/src/bin/portal-admin-war/img/pathSeparator.png =================================================================== (Binary files differ) Copied: trunk/core-admin/src/bin/portal-admin-war/img/pathSeparator.png (from rev 8337, branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/img/pathSeparator.png) =================================================================== (Binary files differ) Modified: trunk/core-admin/src/bin/portal-admin-war/style.css =================================================================== --- trunk/core-admin/src/bin/portal-admin-war/style.css 2007-09-18 19:22:30 UTC (rev 8338) +++ trunk/core-admin/src/bin/portal-admin-war/style.css 2007-09-18 19:25:19 UTC (rev 8339) @@ -401,14 +401,9 @@ /* Change dashed line to solid. */ .admin-ui hr { - border-top-style: solid; + border-top-style: solid; } -.admin-ui form { - padding:0; - margin:0; -} - .admin-ui .wizardStepBox { display: inline; float: left; @@ -427,6 +422,11 @@ clear: both; } +.admin-ui form { + padding: 0; + margin: 0; +} + .admin-ui #selected.wizardStepBox { background-color: #C8DCC4; border: 1px solid black; @@ -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: 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-18 19:22:30 UTC (rev 8338) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/confirm.xhtml 2007-09-18 19:25:19 UTC (rev 8339) @@ -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: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/confirmDeleteInstance.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/confirmDeleteInstance.xhtml 2007-09-18 19:22:30 UTC (rev 8338) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/confirmDeleteInstance.xhtml 2007-09-18 19:25:19 UTC (rev 8339) @@ -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>