Index: reference/library/src/webapp/js/headscripts.js =================================================================== --- reference/library/src/webapp/js/headscripts.js (revision 35211) +++ reference/library/src/webapp/js/headscripts.js (working copy) @@ -597,4 +597,16 @@ function privacy_hide_popup(){ if(document.getElementById("privacy_overlay")){document.body.removeChild(document.getElementById("privacy_overlay"));} if(document.getElementById("privacy_tool_popup")){document.getElementById("privacy_tool_popup").style.display="none";} -} \ No newline at end of file +} + +function browserSafeDocHeight() { + docHeight = Math.max(document.body.scrollHeight,document.body.offsetHeight) ; + if (window.innerHeight) { // all except Explorer + winHeight = window.innerHeight; + } else if (document.documentElement && document.documentElement.clientHeight) { // Explorer 6 Strict Mode + winHeight = document.documentElement.clientHeight; + } else if (document.body) { // other Explorers + winHeight = document.body.clientHeight; + } + return Math.max(winHeight,docHeight); +} Index: reference/library/src/webapp/skin/default/portal.css =================================================================== --- reference/library/src/webapp/skin/default/portal.css (revision 35211) +++ reference/library/src/webapp/skin/default/portal.css (working copy) @@ -20,7 +20,7 @@ /*wrapper masthead and site navigation two possible states - logged in headerMax, not logged in - headerMin*/ #headerMax,#headerMin{ - width: 98%; + width: 100%; margin: 1em auto 0 auto; height:100%; overflow:hidden; @@ -56,7 +56,7 @@ #container{ width: 98%; clear:both; - margin: 1em auto; + margin: 0 auto; padding-top: 10px; } @@ -162,6 +162,7 @@ that can be used or hidden,can also use a background:url(images/.) in this block,or both superimposing them*/ #mastLogo{ float: left; + margin-left: 0.2em; width: auto; } @@ -258,14 +259,16 @@ /*PART 4 - SITE NAVIGATION - children of #siteNavBlock*/ /*outer wrapper for the site navigation blocks - it is a class,not an id because it can be overloaded with other values having to do with site type so for example
so that different site types can be treated differently via inheritance - children are #siteNavWrap and #navBottom*/ -.siteNavWrap{ + +.siteNavWrap { + position: relative; width: 100%; - background: #09c url(images/sitenavback.jpg) top left repeat-x; - padding: 0; - margin: 0; + background: #88D0E8 url(images/blue-border.gif) repeat-x center bottom; float: left; - border-top: 1px solid #09c; - clear:both; + clear: both; + font-size: 100%; + line-height: normal; + z-index: 2000; } /*wrapper for the site links and site that is displayed when more than x sites are in the link list*/ #selectNav{ - padding: .4em .4em .2em .2em; + padding: 0; text-align: right; vertical-align: middle; - float:right + margin: 0.2em 0 0 0.6em; + float: left; } /*the contextually defined*/ #selectNav select{ display:inline; - font-size: .8em; - margin: 0 3px; + font-size: .9em; + margin: 7px 0 0 ; padding: 0; + border: 2px solid #0077B5; } #selectNav select option{ @@ -299,19 +307,24 @@ /*a ul - the li below are outer wrappers for the links to sites */ #siteLinkList{ -/* white-space: nowrap;*/ - line-height:2em; - list-style: none none none; - font-size: 1em; + white-space: nowrap; + list-style-image:none; + list-style-position:outside; + list-style-type:none; margin: 0; - padding: 4px 0; - width: auto; + padding: 6px 0 0 6px; + float: left; } /*list elements - children are and */ -#siteLinkList li{ - display: inline; - line-height: 2em; +#siteLinkList li { + position: relative; + background:transparent url(images/tab-left.gif) no-repeat scroll left top; + display:block; + float:left; + margin:0 2px 0 0; + padding:0 0 0 11px; + border-bottom: 2px solid #013F68; } /*span shim for fine grained manipulation of link display (decorative)*/ @@ -318,30 +331,90 @@ #siteLinkList li span{ } -/*the current sites' link*/ -#siteLinkList .selectedTab a, - #siteLinkList .selectedTab a:link, - #siteLinkList .selectedTab a:visited, - #siteLinkList .selectedTab a:hover{ - color: #000; - cursor: text; +/*links to other sites*/ +#siteLinkList li a, #siteLinkList li a:link, #siteLinkList li a:visited { + background: transparent url(images/tab-right.gif) no-repeat right top; + color: #FFFFFF; + display: block; + float: left; + margin: 0pt; + padding: 8px 13px 3px 2px; text-decoration: none; } -/*links to other sites*/ -#siteLinkList a,#siteLinkList a:link,#siteLinkList a:visited{ - color: #fff; - padding: 2px 6px 2px 4px; +#siteLinkList a:hover { text-decoration: underline; - border-right: 1px solid #fff; +} + +/*the current sites' link - consists of the li and a*/ +#siteLinkList li.selectedTab { + background:transparent url(images/tab-left-selected.gif) no-repeat scroll left top; + border-width: 0; +} + +#siteLinkList li.selectedTab a, + #siteLinkList li.selectedTab a:link, + #siteLinkList li.selectedTab a:visited, + #siteLinkList li.selectedTab a:hover { + background:transparent url(images/tab-right-selected.gif) no-repeat scroll right top; + color:#000000; + font-weight: bolder; + text-decoration: none; + padding: 8px 11px 5px 0; +} + +#siteLinkList li.tab-dim { + background: transparent url(images/tab-left-selected.gif) no-repeat scroll left top; +} + +#siteLinkList li.tab-dim a, + #siteLinkList li.tab-dim a:link, + #siteLinkList li.tab-dim a:visited, + #siteLinkList li.tab-dim a:hover { + color: #666; + background:transparent url(images/tab-right-selected.gif) no-repeat scroll right top; + padding-bottom: 3px; +} + +#siteLinkList li.more-active { + background: transparent url(images/tab-left-selected.gif) no-repeat scroll left top; + border-width: 0; +} + +#siteLinkList li.more-active a, + #siteLinkList li.more-active a:link, + #siteLinkList li.more-active a:visited { + background:transparent url(images/tab-right-selected.gif) no-repeat scroll right top; + color:#000000; + font-weight: bolder; + text-decoration: none; + padding-bottom: 5px; +} + +#siteLinkList li.more-tab a:hover { + text-decoration: none; +} + +#siteLinkList li.more-tab span.outer { + background-image: url(images/tab-arrow-down.gif); + background-repeat: no-repeat; + background-position: 100% 36%; + padding-right: 20px; + text-decoration: none; +} + +#siteLinkList li.more-active span.outer { + background-image: url(images/tab-arrow-down-active.gif); } -/*hover state for links to other sites*/ -#siteLinkList a:hover{ - color: #fff; +#siteLinkList li.more-tab a:hover span.outer { text-decoration: none; } +#siteLinkList li.more-tab a:hover span.inner { + text-decoration: underline; +} + .fixTabsIE{ visibility: hidden; display: none; @@ -348,6 +421,80 @@ border-width: 0; } +/*wrapper for the site