Author: thuy.nguyen Date: 2010-02-03 03:12:15 -0500 (Wed, 03 Feb 2010) New Revision: 1511 Modified: portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIAdminToolbarPortlet.gtmpl portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIStarToolBarPortlet.gtmpl portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarDashboardPortlet.gtmpl portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarGroupPortlet.gtmpl portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarSitePortlet.gtmpl portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UINavigationPortlet/DefaultStylesheet.css Log: GTNPORTAL-514;GTNPORTAL-515;GTNPORTAL-517 Modified: portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIAdminToolbarPortlet.gtmpl =================================================================== --- portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIAdminToolbarPortlet.gtmpl 2010-02-03 08:03:06 UTC (rev 1510) +++ portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIAdminToolbarPortlet.gtmpl 2010-02-03 08:12:15 UTC (rev 1511) @@ -31,14 +31,14 @@ } String accountSetting = "javascript:if(document.getElementById('UIMaskWorkspace')) ajaxGet(eXo.env.server.createPortalURL('UIPortal', 'AccountSettings', true));" %> -<div class="UIAdminToolbarPortlet" id="$uicomponent.id"> +<div class="UIAdminToolbarPortlet" id="$uicomponent.id" > <div class="UIHorizontalTabs"> - <div class="TabsContainer" style="position: relative"> + <div class="TabsContainer" > <div class="UITab NormalToolbarTab"> <div class=""> <a class="EditorIcon TBIcon" href="#">$editorLabel</a> </div> - <div class="MenuItemContainer" style="position: absolute; display:none;"> + <div class="MenuItemContainer" style="display:none;"> <div class="SubBlock"> <% if(userCouldEditNavigation){ %> <div class="MenuItem"> Modified: portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIStarToolBarPortlet.gtmpl =================================================================== --- portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIStarToolBarPortlet.gtmpl 2010-02-03 08:03:06 UTC (rev 1510) +++ portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIStarToolBarPortlet.gtmpl 2010-02-03 08:12:15 UTC (rev 1511) @@ -10,12 +10,12 @@ String accountSetting = "if(document.getElementById('UIMaskWorkspace')) ajaxGet(eXo.env.server.createPortalURL('UIPortal', 'AccountSettings', true));"; String changeSkinAction = "if(document.getElementById('UIMaskWorkspace')) ajaxGet(eXo.env.server.createPortalURL('UIPortal', 'ChangeSkin', true));"; %> -<div class="UIStarToolBarPortlet" id="$uicomponent.id"> +<div class="UIStarToolBarPortlet" id="$uicomponent.id" > <div class="UIHorizontalTabs"> - <div class="TabsContainer" style="position: relative"> + <div class="TabsContainer"> <div class="UITab" style="width: 62px"> <div class=""></div> - <div class="MenuItemContainer" style="position: absolute; display:none;"> + <div class="MenuItemContainer" style="display:none;"> <div class="MenuItem" onclick="$changeLanguageAction"> <a href="#" class="ChangeLanguageIcon"><%=_ctx.appRes("UIStarToolbarPortlet.item.ChangeLanguage")%></a> </div> Modified: portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarDashboardPortlet.gtmpl =================================================================== --- portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarDashboardPortlet.gtmpl 2010-02-03 08:03:06 UTC (rev 1510) +++ portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarDashboardPortlet.gtmpl 2010-02-03 08:12:15 UTC (rev 1511) @@ -27,7 +27,7 @@ String clazz = ""; print """ - <div style="position: absolute; display:none" class="MenuItemContainer"> + <div style="display:none" class="MenuItemContainer"> <div class="SubBlock"> """; for(int i = 0; i < size; i++) { @@ -71,7 +71,7 @@ """ ; if(hasChild) { print """ - <div class="MenuItemContainer" style="position: absolute; display:none"> + <div class="MenuItemContainer"> <div class="SubBlock"> """ ; for(int j = 0; j < node.getChildren().size(); j++) { @@ -96,7 +96,7 @@ %> <div class="UIUserToolBarDashboardPortlet" id="$uicomponent.id"> <div class="UIHorizontalTabs"> - <div class="TabsContainer" style="position: relative"> + <div class="TabsContainer"> <div class="UITab NormalToolbarTab"> <div class=""> <a class="DashboardIcon TBIcon" href="<%= uicomponent.url("AddDefaultDashboard", defaultDashboardPage); %>">Dashboard</a> @@ -109,9 +109,9 @@ }else{ defaultDashboardPage = currentUserNavigation.getNodes().get(0).getName(); %> - <div class="UIUserToolBarDashboardPortlet" id="$uicomponent.id"> + <div class="UIUserToolBarDashboardPortlet" id="$uicomponent.id" > <div class="UIHorizontalTabs"> - <div class="TabsContainer" style="position: relative"> + <div class="TabsContainer" > <div class="UITab NormalToolbarTab"> <div class=""> <a class="DashboardIcon TBIcon" href="<%= portalURI + defaultDashboardPage %>">Dashboard</a> Modified: portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarGroupPortlet.gtmpl =================================================================== --- portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarGroupPortlet.gtmpl 2010-02-03 08:03:06 UTC (rev 1510) +++ portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarGroupPortlet.gtmpl 2010-02-03 08:12:15 UTC (rev 1511) @@ -79,15 +79,15 @@ """ ; } %> -<div class="UIUserToolBarGroupPortlet" id="$uicomponent.id"> +<div class="UIUserToolBarGroupPortlet" id="$uicomponent.id" > <div class="UIHorizontalTabs"> - <div class="TabsContainer" style="position: relative"> + <div class="TabsContainer"> <div class="UITab NormalToolbarTab"> <div class=""> <a class="GroupIcon TBIcon" href="<%= portalURI + "groupnavigation" %>">Group</a> </div> <% if (!groupNavigations.isEmpty()) { %> - <div style="position: absolute; display:none" class="MenuItemContainer"> + <div style="display:none" class="MenuItemContainer"> <% for(navigation in groupNavigations) { renderGroupPageNavigation(navigation); } %> Modified: portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarSitePortlet.gtmpl =================================================================== --- portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarSitePortlet.gtmpl 2010-02-03 08:03:06 UTC (rev 1510) +++ portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarSitePortlet.gtmpl 2010-02-03 08:12:15 UTC (rev 1511) @@ -114,9 +114,9 @@ } %> -<div class="UIUserToolBarSitePortlet" id="$uicomponent.id"> +<div class="UIUserToolBarSitePortlet" id="$uicomponent.id" > <div class="UIHorizontalTabs"> - <div class="TabsContainer" style="position: relative"> + <div class="TabsContainer"> <div class="UITab NormalToolbarTab"> <div class=""> <a class="SitesIcon TBIcon" href="<%= portalURI + "portalnavigation" %>"> Modified: portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UINavigationPortlet/DefaultStylesheet.css =================================================================== --- portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UINavigationPortlet/DefaultStylesheet.css 2010-02-03 08:03:06 UTC (rev 1510) +++ portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UINavigationPortlet/DefaultStylesheet.css 2010-02-03 08:12:15 UTC (rev 1511) @@ -205,7 +205,7 @@ .UINavigationPortlet .MenuItemContainer { white-space: nowrap; - border: solid #b7b7b7 1px; + border: solid #b7b7b7 1px; /*fix for IE*/ text-align: left; /* orientation=lt */ text-align: right; /* orientation=rt */ }