Author: thuy.nguyen Date: 2010-04-16 00:02:51 -0400 (Fri, 16 Apr 2010) New Revision: 2670 Modified: portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UISiteMap/DefaultStylesheet.css portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortal.js portal/trunk/web/portal/src/main/webapp/groovy/webui/core/UISitemapTree.gtmpl Log: GTNPORTAL-937: Problem with sitemap on IE7, GTNPORTAL-952: GateIn logo on SiteMap is obstructed Modified: portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UISiteMap/DefaultStylesheet.css =================================================================== --- portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UISiteMap/DefaultStylesheet.css 2010-04-15 23:53:06 UTC (rev 2669) +++ portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UISiteMap/DefaultStylesheet.css 2010-04-16 04:02:51 UTC (rev 2670) @@ -66,15 +66,15 @@ } .UISitemap .ExpandAll { - background: url('DefaultSkin/background/ExpandAllIcon.gif') no-repeat left center; /* orientation=lt */ - background: url('DefaultSkin/background/ExpandAllIcon-rt.gif') no-repeat right center; /* orientation=rt */ + background: url('DefaultSkin/background/ExpandAllIcon.gif') no-repeat left center; /* orientation=lt */ + background: url('DefaultSkin/background/ExpandAllIcon-rt.gif') no-repeat right center; /* orientation=rt */ padding: 0px 20px; cursor: pointer; } .UISitemap .SitemapContent { - background: url('DefaultSkin/background/RootTree.gif') no-repeat left top; /* orientation=lt */ - background: url('DefaultSkin/background/RootTree-rt.gif') no-repeat right top; /* orientation=rt */ + background: url('DefaultSkin/background/RootTree.gif') no-repeat left top; /* orientation=lt */ + background: url('DefaultSkin/background/RootTree-rt.gif') no-repeat right top; /* orientation=rt */ padding-top: 8px; margin: 20px 0px; } @@ -82,6 +82,7 @@ .UISitemap .SitemapContent .UISiteTree a { font-weight: bold; display: block; + float: left; } .UISitemap .SitemapContent .UISiteTree a:hover { @@ -89,13 +90,13 @@ } .UISitemap .UISiteTree .Node { - line-height: 25px; + line-height: 24px; background: url('DefaultSkin/background/Dotted.gif') repeat-y 4px top; /* orientation=lt */ background: url('DefaultSkin/background/Dotted-rt.gif') repeat-y 99.6% top; /* orientation=rt */ } .UISitemap .UISiteTree .LastNode { - line-height: 14px; + line-height: 24px; background: url('DefaultSkin/background/LastNode.gif') no-repeat 4px top; /* orientation=lt */ background: url('DefaultSkin/background/LastNode-rt.gif') no-repeat 99.6% top; /* orientation=rt */ } @@ -127,12 +128,10 @@ padding: 4px 20px 4px 0px; /* orientation=rt */ background-position: left center; /* orientation=lt */ background-position: right center; /* orientation=rt */ - background-color: white; width: auto; } .UISitemap .ChildrenContainer { - padding-top: 33px; padding-left: 31px; /* orientation=lt */ padding-right: 31px; /* orientation=rt */ float: none; Modified: portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortal.js =================================================================== --- portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortal.js 2010-04-15 23:53:06 UTC (rev 2669) +++ portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortal.js 2010-04-16 04:02:51 UTC (rev 2670) @@ -557,10 +557,10 @@ var className = element.className; if(!subGroup) return false; if(subGroup.style.display == "none") { - if (className.indexOf("ExpandIcon") == 0) element.className = "CollapseIcon FloatLeft" ; + if (className.indexOf("ExpandIcon") == 0) element.className = "CollapseIcon ClearFix" ; subGroup.style.display = "block" ; } else { - if (className.indexOf("CollapseIcon") == 0) element.className = "ExpandIcon FloatLeft" ; + if (className.indexOf("CollapseIcon") == 0) element.className = "ExpandIcon ClearFix" ; subGroup.style.display = "none" ; } return true; Modified: portal/trunk/web/portal/src/main/webapp/groovy/webui/core/UISitemapTree.gtmpl =================================================================== --- portal/trunk/web/portal/src/main/webapp/groovy/webui/core/UISitemapTree.gtmpl 2010-04-15 23:53:06 UTC (rev 2669) +++ portal/trunk/web/portal/src/main/webapp/groovy/webui/core/UISitemapTree.gtmpl 2010-04-16 04:02:51 UTC (rev 2670) @@ -49,28 +49,28 @@ if(treeNode.isHasChild()) { if (treeNode.isExpanded()) { println """ - <div class="$lastNode Node ClearFix"> - <div class="CollapseIcon FloatLeft" onclick="eXo.portal.UIPortal.collapseExpand(this);$actionCollapse"> + <div class="$lastNode Node"> + <div class="CollapseIcon ClearFix" onclick="eXo.portal.UIPortal.collapseExpand(this);$actionCollapse"> """; if(treeNode.getNode().getPageReference() == null) println "<a class='NodeIcon DefaultPageIcon' href='javascript:void(0);'>$label</a>"; else println "<a class='NodeIcon DefaultPageIcon' href='$actionLink'>$label</a>"; println """ </div> - <div class="ChildrenContainer FloatLeft" style="display: block"> + <div class="ChildrenContainer" style="display: block"> """; renderNodes(treeNode, portalUri, useAjax); } else { println """ - <div class="$lastNode Node ClearFix"> - <div class="ExpandIcon FloatLeft" onclick="if(eXo.portal.UIPortal.collapseExpand(this)){$actionExpand}"> + <div class="$lastNode Node"> + <div class="ExpandIcon ClearFix" onclick="if(eXo.portal.UIPortal.collapseExpand(this)){$actionExpand}"> """; if(treeNode.getNode().getPageReference() == null) println "<a class='NodeIcon DefaultPageIcon' href='javascript:void(0);'>$label</a>"; else println "<a class='NodeIcon DefaultPageIcon' href='$actionLink'>$label</a>"; println """ </div> - <div class="ChildrenContainer FloatLeft" style="display: none"> + <div class="ChildrenContainer" style="display: none"> """; } @@ -84,7 +84,7 @@ println """ <div class="$lastNode Node ClearFix"> <div class="NullItem"> - <div class=""> + <div class="ClearFix"> <a class="NodeIcon DefaultPageIcon" href="$actionLink">$label</a> </div> </div>