7:06 p.m.
Author: roy.russo(a)jboss.com
Date: 2007-01-23 13:06:26 -0500 (Tue, 23 Jan 2007)
New Revision: 6085
Modified:
trunk/core/src/bin/portal-core-war/themes/renaissance/portal_style.css
trunk/core/src/main/org/jboss/portal/core/aspects/controller/PageCustomizerInterceptor.java
Log:
JBPORTAL-1202 - fixed css dropdown submenus not showing in main nav in ie6
Modified: trunk/core/src/bin/portal-core-war/themes/renaissance/portal_style.css
===================================================================
--- trunk/core/src/bin/portal-core-war/themes/renaissance/portal_style.css 2007-01-23
17:53:38 UTC (rev 6084)
+++ trunk/core/src/bin/portal-core-war/themes/renaissance/portal_style.css 2007-01-23
18:06:26 UTC (rev 6085)
@@ -100,8 +100,7 @@
#content-container {
height: 100%;
- text-align: left;
- /*width: 100%;*/
+ text-align: left; /*width: 100%;*/
min-width: 770px;
position: absolute;
top: 70px;
@@ -343,7 +342,8 @@
color: #5078aa;
}
-UL#tabsHeader li:hover ul {
+UL#tabsHeader li:hover ul,
+ UL#tabsHeader a:hover ul {
visibility: visible;
}
Modified:
trunk/core/src/main/org/jboss/portal/core/aspects/controller/PageCustomizerInterceptor.java
===================================================================
---
trunk/core/src/main/org/jboss/portal/core/aspects/controller/PageCustomizerInterceptor.java 2007-01-23
17:53:38 UTC (rev 6084)
+++
trunk/core/src/main/org/jboss/portal/core/aspects/controller/PageCustomizerInterceptor.java 2007-01-23
18:06:26 UTC (rev 6085)
@@ -25,12 +25,13 @@
import org.jboss.portal.Mode;
import org.jboss.portal.WindowState;
import org.jboss.portal.api.node.PortalNode;
+import org.jboss.portal.core.controller.Controller;
import org.jboss.portal.core.controller.ControllerCommand;
+import org.jboss.portal.core.controller.ControllerContext;
import org.jboss.portal.core.controller.ControllerInterceptor;
-import org.jboss.portal.core.controller.ControllerContext;
-import org.jboss.portal.core.controller.Controller;
import org.jboss.portal.core.controller.command.SignOutCommand;
import org.jboss.portal.core.impl.model.portal.PortalObjectImpl;
+import org.jboss.portal.core.model.CustomizationManager;
import org.jboss.portal.core.model.instance.command.InvokePortletInstanceRenderCommand;
import org.jboss.portal.core.model.portal.Page;
import org.jboss.portal.core.model.portal.Portal;
@@ -39,10 +40,9 @@
import org.jboss.portal.core.model.portal.PortalObjectId;
import org.jboss.portal.core.model.portal.PortalObjectPermission;
import org.jboss.portal.core.model.portal.Window;
+import org.jboss.portal.core.model.portal.command.ImportPageToDashboardCommand;
import org.jboss.portal.core.model.portal.command.RenderPageCommand;
import org.jboss.portal.core.model.portal.command.ViewDashboardCommand;
-import org.jboss.portal.core.model.portal.command.ImportPageToDashboardCommand;
-import org.jboss.portal.core.model.CustomizationManager;
import org.jboss.portal.identity.User;
import org.jboss.portal.portlet.PortletParametersStateString;
import org.jboss.portal.security.PortalSecurityException;
@@ -215,7 +215,6 @@
label = "My Dashboard";
}
-
// Link to admin/default portal
String showadminURL = null;
@@ -351,8 +350,19 @@
{
html.append(" id=\"current\"");
}
- html.append("
onmouseover=\"this.className='hoverOn'\"
onmouseout=\"this.className='hoverOff'\"><a
href='").append(childURL).append("'>").append(name).append("</a>");
+ html.append("
onmouseover=\"this.className='hoverOn'\"
onmouseout=\"this.className='hoverOff'\"><a
href='").append(childURL).append("'>").append(name);
+ // ie 6 hack
+ if (hasChildPages(navElement))
+ {
+ html.append("<!--[if IE
7]><!--></a><!--<![endif]-->");
+ html.append("<!--[if lte IE
6]><table><tr><td><![endif]-->");
+ }
+ else
+ {
+ html.append("</a>");
+ }
+
// Submenu logic
if (hasChildPages(navElement))
{
@@ -369,6 +379,7 @@
}
}
html.append("</ul>");
+ html.append("<!--[if lte IE
6]></td></tr></table></a><![endif]-->");
}
html.append("</li>");
}