Author: wesleyhales Date: 2008-06-03 12:54:16 -0400 (Tue, 03 Jun 2008) New Revision: 10912 Added: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/corners/ branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/corners/7px/ branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/corners/7px/corner-left-bottom-grey.gif branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/corners/7px/corner-left-bottom-white.gif branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/corners/7px/corner-left-top-grey.gif branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/corners/7px/corner-left-top-white.gif branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/corners/7px/corner-right-bottom-grey.gif branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/corners/7px/corner-right-bottom-white.gif branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/corners/7px/corner-right-top-grey.gif branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/corners/7px/corner-right-top-white.gif Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/css/basestyles.css branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/css/boxes.css branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/css/style.css branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/jboss-portlet.xml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/tags/boxes.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/web.xml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/showPortletDetails.xhtml branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/css/login.css Log: semantically marked up rounded corners, and ie fix for login modal Modified: branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/css/login.css =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/css/login.css 2008-06-03 13:02:14 UTC (rev 10911) +++ branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/css/login.css 2008-06-03 16:54:16 UTC (rev 10912) @@ -18,6 +18,7 @@ font-size: 10px; font-weight: bold; position: absolute; + width: 75px; } input.login-button { Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/css/basestyles.css =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/css/basestyles.css 2008-06-03 13:02:14 UTC (rev 10911) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/css/basestyles.css 2008-06-03 16:54:16 UTC (rev 10912) @@ -100,3 +100,11 @@ border-right: 1px solid #b9c6d7; } +.absolute{ + position:absolute; +} + +.relative{ + position:relative; +} + Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/css/boxes.css =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/css/boxes.css 2008-06-03 13:02:14 UTC (rev 10911) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/css/boxes.css 2008-06-03 16:54:16 UTC (rev 10912) @@ -1,195 +1,86 @@ -/*------------------------------------------Grey Rounded Box-----*/ - -.greyRounded { - /*width: 100%;*/ +.meta-box{ + width: 95%; + padding: 0 0 8px 0; + margin: 0 auto 0 auto; } -.greyRounded .xtop, .greyRounded .xbottom { - display: block; - background: transparent; - font-size: 1px; +.meta-box h3 { + background-color: #ececec; + padding: 2px 2px 2px 5px; + color: #777777; } -.greyRounded .xtop .xb1, .greyRounded .xtop .xb2, .greyRounded .xtop .xb3, .greyRounded .xtop .xb4, - .greyRounded .xbottom .xb1, .greyRounded .xbottom .xb2, .greyRounded .xbottom .xb3, .greyRounded .xbottom .xb4 { - display: block; - overflow: hidden; +/*------------------------------------------White Rounded Box with light grey Header-----*/ +.whiteWithLtGreyHeader { + position:relative; + margin: 5px 0 5px 10px; } -.greyRounded .xtop .xb1, .greyRounded .xtop .xb2, .greyRounded .xtop .xb3, - .greyRounded .xbottom .xb1, .greyRounded .xbottom .xb2, .greyRounded .xbottom .xb3 { - height: 1px; +.whiteWithLtGreyHeader .box-header, +.whiteWithLtGreyHeader .box-footer{ + padding: 0 7px 0 7px; + position: relative; } -.greyRounded .xtop .xb2, .greyRounded .xtop .xb3, .greyRounded .xtop .xb4, - .greyRounded .xbottom .xb2, .greyRounded .xbottom .xb3, .greyRounded .xbottom .xb4 { - background: #f8f8f8; - border-left: 1px solid #d4d4d4; - border-right: 1px solid #d4d4d4; +.whiteWithLtGreyHeader .img-top-left{ + position:absolute; + top:0; + left:0; } -.greyRounded .xtop .xb1, - .greyRounded .xbottom .xb1 { - margin: 0 5px; - background: #d4d4d4; +.whiteWithLtGreyHeader .img-top-right{ + position:absolute; + top:0; + right:0; } -.greyRounded .xtop .xb2, - .greyRounded .xbottom .xb2 { - margin: 0 3px; - border-width: 0 2px; +.whiteWithLtGreyHeader .img-bottom-left{ + position:absolute; + bottom:0; + left:0; } -.greyRounded .xtop .xb3, - .greyRounded .xbottom .xb3 { - margin: 0 2px; +.whiteWithLtGreyHeader .img-bottom-right{ + position:absolute; + bottom:0; + right:0; } -.greyRounded .xtop .xb4, - .greyRounded .xbottom .xb4 { - height: 2px; - margin: 0 1px; +.whiteWithLtGreyHeader .box-header-content{ + border-top:1px solid #a5a5a5; + background-color:#ececec; + width: 100%; + height:6px; } -.greyRounded .xboxcontent { - background: #f8f8f8; - border: 0 solid #d4d4d4; - border-width: 0 1px; - padding: 5px; - font-family: verdana, arial, helvetica, sans-serif; - font-size: 11px; - color: #000; +.whiteWithLtGreyHeader .box-content{ + border-left:1px solid #a5a5a5; + border-right:1px solid #a5a5a5; } -/*------------------------------------------lt blue Rounded Box-----*/ - -.ltBlueRounded { - /*width: 100%;*/ +.whiteWithLtGreyHeader .box-footer-content{ + border-bottom:1px solid #a5a5a5; + width: 100%; + height:6px; } -.ltBlueRounded .xtop, .ltBlueRounded .xbottom { - display: block; - background: transparent; - font-size: 1px; -} -.ltBlueRounded .xtop .xb1, .ltBlueRounded .xtop .xb2, .ltBlueRounded .xtop .xb3, .ltBlueRounded .xtop .xb4, - .ltBlueRounded .xbottom .xb1, .ltBlueRounded .xbottom .xb2, .ltBlueRounded .xbottom .xb3, .ltBlueRounded .xbottom .xb4 { - display: block; - overflow: hidden; -} -.ltBlueRounded .xtop .xb1, .ltBlueRounded .xtop .xb2, .ltBlueRounded .xtop .xb3, - .ltBlueRounded .xbottom .xb1, .ltBlueRounded .xbottom .xb2, .ltBlueRounded .xbottom .xb3 { - height: 1px; -} +/*------------------------------------------Grey Rounded Box-----*/ -.ltBlueRounded .xtop .xb2, .ltBlueRounded .xtop .xb3, .ltBlueRounded .xtop .xb4, - .ltBlueRounded .xbottom .xb2, .ltBlueRounded .xbottom .xb3, .ltBlueRounded .xbottom .xb4 { - background: #f7f9fc; - border-left: 1px solid #d4d4d4; - border-right: 1px solid #d4d4d4; +.greyRounded { + /*todo*/ } -.ltBlueRounded .xtop .xb1, - .ltBlueRounded .xbottom .xb1 { - margin: 0 5px; - background: #d4d4d4; -} -.ltBlueRounded .xtop .xb2, - .ltBlueRounded .xbottom .xb2 { - margin: 0 3px; - border-width: 0 2px; -} -.ltBlueRounded .xtop .xb3, - .ltBlueRounded .xbottom .xb3 { - margin: 0 2px; -} +/*------------------------------------------lt blue Rounded Box-----*/ -.ltBlueRounded .xtop .xb4, - .ltBlueRounded .xbottom .xb4 { - height: 2px; - margin: 0 1px; +.ltBlueRounded { + /*todo*/ } -.ltBlueRounded .xboxcontent { - background: #f7f9fc; - border: 0 solid #d4d4d4; - border-width: 0 1px; - padding: 5px; - font-family: verdana, arial, helvetica, sans-serif; - font-size: 11px; - color: #000; -} -/*------------------------------------------White Rounded Box with light grey Header-----*/ -.whiteWithLtGreyHeader { - /*width: 100%;*/ -} - -.whiteWithLtGreyHeader .xtop, .whiteWithLtGreyHeader .xbottom { - display:block; - background:transparent; - font-size:1px; -} - -.whiteWithLtGreyHeader .xtop .xb1, .whiteWithLtGreyHeader .xtop .xb2, .whiteWithLtGreyHeader .xtop .xb3, .whiteWithLtGreyHeader .xtop .xb4, -.whiteWithLtGreyHeader .xbottom .xb1, .whiteWithLtGreyHeader .xbottom .xb2, .whiteWithLtGreyHeader .xbottom .xb3, .whiteWithLtGreyHeader .xbottom .xb4 { - display:block; - overflow:hidden; - -} -.whiteWithLtGreyHeader .xtop .xb1, .whiteWithLtGreyHeader .xtop .xb2, .whiteWithLtGreyHeader .xtop .xb3, -.whiteWithLtGreyHeader .xbottom .xb1, .whiteWithLtGreyHeader .xbottom .xb2, .whiteWithLtGreyHeader .xbottom .xb3 { - height:1px; -} - -.whiteWithLtGreyHeader .xtop .xb2, .whiteWithLtGreyHeader .xtop .xb3, .whiteWithLtGreyHeader .xtop .xb4{ - background:#f8f8f8; - border-left:1px solid #d4d4d4; - border-right:1px solid #d4d4d4; -} -.whiteWithLtGreyHeader .xbottom .xb2, .whiteWithLtGreyHeader .xbottom .xb3, .whiteWithLtGreyHeader .xbottom .xb4 { - background:#ffffff; - border-left:1px solid #d4d4d4; - border-right:1px solid #d4d4d4; -} - -.whiteWithLtGreyHeader .xtop .xb1, -.whiteWithLtGreyHeader .xbottom .xb1 { - margin:0 5px; - background:#d4d4d4; -} - -.whiteWithLtGreyHeader .xtop .xb2, -.whiteWithLtGreyHeader .xbottom .xb2 { - margin:0 3px; - border-width:0 2px; -} - -.whiteWithLtGreyHeader .xtop .xb3, -.whiteWithLtGreyHeader .xbottom .xb3 { - margin:0 2px; -} - -.whiteWithLtGreyHeader .xtop .xb4, -.whiteWithLtGreyHeader .xbottom .xb4 { - height:2px; - margin:0 1px; -} - -.whiteWithLtGreyHeader .xboxcontent { - display:block; - background:#ffffff; - border:0 solid #d4d4d4; - border-width:0 1px; - padding: 0px; - font-family: verdana,arial,helvetica,sans-serif; - font-size: 11px; - color: #000; -} \ No newline at end of file Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/css/style.css =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/css/style.css 2008-06-03 13:02:14 UTC (rev 10911) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/css/style.css 2008-06-03 16:54:16 UTC (rev 10912) @@ -293,6 +293,11 @@ border: 1px solid #d5d5d5; } +.admin-ui .portlet-section-alternate-blue { + background-color: #EEF3F5; + border: 1px solid #d5d5d5; +} + .admin-ui .portlet-section-selected { background-color: #CBD4E6; } @@ -623,7 +628,7 @@ .details-container { margin: 0 15px 15px 15px; - border: 1px solid #ececec; + border: 2px solid #d0d0d0; } .details-container p { @@ -687,24 +692,9 @@ padding: 15px 0 0 0; } -.meta-box{ - width: 95%; - padding: 0 0 8px 0; - margin: 0 auto 0 auto; -} -.meta-box h3 { - background-color: #f8f8f8; +h3.blue { padding: 2px 2px 2px 5px; - color: #666666; -} - -div.displayNames { - width: 100% -} - -div.displayNames h3 { - padding: 2px 2px 2px 5px; margin: 0 0 3px 0; color: #003399; } Added: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/corners/7px/corner-left-bottom-grey.gif =================================================================== (Binary files differ) Property changes on: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/corners/7px/corner-left-bottom-grey.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/corners/7px/corner-left-bottom-white.gif =================================================================== (Binary files differ) Property changes on: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/corners/7px/corner-left-bottom-white.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/corners/7px/corner-left-top-grey.gif =================================================================== (Binary files differ) Property changes on: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/corners/7px/corner-left-top-grey.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/corners/7px/corner-left-top-white.gif =================================================================== (Binary files differ) Property changes on: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/corners/7px/corner-left-top-white.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/corners/7px/corner-right-bottom-grey.gif =================================================================== (Binary files differ) Property changes on: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/corners/7px/corner-right-bottom-grey.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/corners/7px/corner-right-bottom-white.gif =================================================================== (Binary files differ) Property changes on: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/corners/7px/corner-right-bottom-white.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/corners/7px/corner-right-top-grey.gif =================================================================== (Binary files differ) Property changes on: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/corners/7px/corner-right-top-grey.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/corners/7px/corner-right-top-white.gif =================================================================== (Binary files differ) Property changes on: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/corners/7px/corner-right-top-white.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/jboss-portlet.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/jboss-portlet.xml 2008-06-03 13:02:14 UTC (rev 10911) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/jboss-portlet.xml 2008-06-03 16:54:16 UTC (rev 10912) @@ -39,6 +39,7 @@ <script src="/faces/rfRes/org/richfaces/ui.pack.js" type="text/javascript" ></script> <link rel="stylesheet" type="text/css" href="/faces/rfRes/org/richfaces/skin.xcss" /> <link rel="stylesheet" type="text/css" href="/css/style.css" media="screen"/> + <link rel="stylesheet" type="text/css" href="/css/boxes.css"/> </header-content> <portlet-info> <icon> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/tags/boxes.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/tags/boxes.xhtml 2008-06-03 13:02:14 UTC (rev 10911) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/tags/boxes.xhtml 2008-06-03 16:54:16 UTC (rev 10912) @@ -2,12 +2,23 @@ xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html"> - <link rel="stylesheet" type="text/css" href="/portal-admin/css/boxes.css"/> - <div class="#{class == null ? 'greyRounded' : class}" > - <b class="xtop"><b class="xb1"/><b class="xb2"/><b class="xb3"/><b class="xb4"/></b> - <div class="xboxcontent"> - <ui:insert/> + + <div class="#{class == null ? 'greyRounded' : class}"> + <div class="box-header"> + <h:graphicImage url="/img/corners/7px/corner-left-top-grey.gif" alt="" styleClass="img-top-left"/> + <div class="box-header-content"> </div> - <b class="xbottom"><b class="xb4"/><b class="xb3"/><b class="xb2"/><b class="xb1"/></b> + <h:graphicImage url="/img/corners/7px/corner-right-top-grey.gif" alt="" styleClass="img-top-right"/> + </div> + <div class="box-content"> + <ui:insert/> + </div> + <div class="box-footer"> + <h:graphicImage url="/img/corners/7px/corner-left-bottom-white.gif" alt="" styleClass="img-bottom-left"/> + <div class="box-footer-content"> </div> + <h:graphicImage url="/img/corners/7px/corner-right-bottom-white.gif" alt="" styleClass="img-bottom-right"/> + </div> + </div> + </ui:composition> \ No newline at end of file Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/web.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/web.xml 2008-06-03 13:02:14 UTC (rev 10911) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/web.xml 2008-06-03 16:54:16 UTC (rev 10912) @@ -39,11 +39,6 @@ </context-param> <context-param> - <param-name>javax.portlet.faces.preserveActionParams</param-name> - <param-value>true</param-value> - </context-param> - - <context-param> <param-name>org.ajax4jsf.RESOURCE_URI_PREFIX</param-name> <param-value>rfRes</param-value> </context-param> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/showPortletDetails.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/showPortletDetails.xhtml 2008-06-03 13:02:14 UTC (rev 10911) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/showPortletDetails.xhtml 2008-06-03 16:54:16 UTC (rev 10912) @@ -129,13 +129,12 @@ <f:subview rendered="#{showDisplayNameEditor}"> - <portal:box class="ltBlueRounded meta-box"> - <div class="displayNames"> - <div> - <h:form style="background-color:transparent;"> - <h3 style="background-color:transparent;">#{bundle.COMMON_ADD_INSTANCE_DISPLAY_NAMES}</h3> + <div class="whiteWithLtGreyHeader meta-box"> - <div style="background-color:transparent;"> + + <h3 class="blue">#{bundle.COMMON_ADD_INSTANCE_DISPLAY_NAMES}</h3> + <div class="pad5"> + <h:form style="background-color:transparent;width:100%;margin:0;padding:0;display:inline;"> <h:inputText id="newName" value="#{instanceDisplayNameAction.newText}" required="true"/> <h:selectOneMenu id="locales" value="#{instanceDisplayNameAction.newLocale}"> <f:selectItems value="#{instanceDisplayNameAction.locales}"/> @@ -143,19 +142,16 @@ <h:commandButton value="#{instanceDisplayNameAction.newText ne null ? 'Modify' : 'Add'} Name" action="#{instanceDisplayNameAction.addDisplayName}" styleClass="portlet-form-button"/> - </div> - </h:form> + </h:form> </div> <br/> - <div> - <h:form > - <h3>#{bundle.COMMON_CURRENT_INSTANCE_DISPLAY_NAMES}</h3> + <h3 class="blue">#{bundle.COMMON_CURRENT_INSTANCE_DISPLAY_NAMES}</h3> + <div class="pad5"> - <div > - + <h:form style="display:inline;width:100%;"> <h:dataTable var="value" value="#{instanceDisplayNameAction.currentLocales}" styleClass="objectList datatable" - rowClasses="portlet-section-body,portlet-section-alternate" + rowClasses="portlet-section-body,portlet-section-alternate-blue" columnClasses="objectNameColumn, objectActionColumn" headerClass="portlet-section-header"> <h:column> @@ -186,21 +182,18 @@ <h:outputText value="#{bundle.RENAME}"/> </f:facet> - <div style="width:150px"><h:commandLink action="#{instanceDisplayNameAction.editDisplayName}"> + <div style="width:150px"> + <h:commandLink action="#{instanceDisplayNameAction.editDisplayName}"> <h:outputText styleClass="actionRename" value="#{bundle.RENAME}"/> <f:param name="locale" value="#{value.locale}"/> <f:param name="editAction" value="rename"/> </h:commandLink></div> </h:column> </h:dataTable> - - </div> - </h:form> - + </h:form> </div> - <br class="clear"/> - </div> - </portal:box> + </div> + </f:subview> <br class="clear"/> @@ -237,7 +230,7 @@ <br class="clear"/> </div> - +<br class="clear"/> </div> </h:form>