12:18 p.m.
Author: roy.russo(a)jboss.com
Date: 2007-01-23 13:18:21 -0500 (Tue, 23 Jan 2007)
New Revision: 6086
Modified:
trunk/core-cms/src/bin/portal-cms-war/images/cms/admin/style.css
trunk/core-cms/src/resources/portal-cms-sar/META-INF/jboss-service.xml
trunk/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp
trunk/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp
Log:
JBPORTAL-1202 - fixed css dropdown submenus not showing in css nav in ie6
Modified: trunk/core-cms/src/bin/portal-cms-war/images/cms/admin/style.css
===================================================================
--- trunk/core-cms/src/bin/portal-cms-war/images/cms/admin/style.css 2007-01-23 18:06:26
UTC (rev 6085)
+++ trunk/core-cms/src/bin/portal-cms-war/images/cms/admin/style.css 2007-01-23 18:18:21
UTC (rev 6086)
@@ -14,6 +14,7 @@
.menu ul ul {
width: 150px;
+ list-style-type: none;
}
/* float the list to make it horizontal and a relative positon so that you can control
the dropdown menu positon */
@@ -36,18 +37,15 @@
line-height: 20px;
}
-/* a hack so that IE5.5 faulty box model is corrected */
* html .menu a, * html .menu a:visited {
width: 150px;
w\idth: 139px;
}
-/* style the second level background */
.menu ul ul a.drop, .menu ul ul a.drop:visited {
background: #DFE8ED;
}
-/* style the second level hover */
.menu ul ul a.drop:hover {
background: #C0D3DC;
}
@@ -56,7 +54,6 @@
background: #C0D3DC;
}
-/* hide the sub levels and give them a positon absolute so that they take up no room */
.menu ul ul {
visibility: hidden;
position: absolute;
@@ -66,26 +63,24 @@
width: 150px;
}
-/* another hack for IE5.5 */
* html .menu ul ul {
top: 20px;
t\op: 20px;
}
-/* style the table so that it takes no ppart in the layout - required for IE to work */
+/* not used */
.menu table {
position: absolute;
top: 0;
left: 0;
}
-/* style the second level links */
.menu ul ul a, .menu ul ul a:visited {
background: #DFE8ED;
height: auto;
line-height: 20px;
padding: 5px 10px;
- width: 129px /* yet another hack for IE5.5 */
+ width: 129px
}
* html .menu ul ul a {
@@ -93,15 +88,14 @@
w\idth: 129px;
}
-/* style the top level hover */
.menu a:hover, .menu ul ul a:hover {
+ visibility: visible;
}
.menu :hover > a, .menu ul ul :hover > a {
background: #C0D3DC;
}
-/* make the second level visible when hover on first level list OR link */
.menu ul li:hover ul,
.menu ul a:hover ul {
visibility: visible;
Modified: trunk/core-cms/src/resources/portal-cms-sar/META-INF/jboss-service.xml
===================================================================
--- trunk/core-cms/src/resources/portal-cms-sar/META-INF/jboss-service.xml 2007-01-23
18:06:26 UTC (rev 6085)
+++ trunk/core-cms/src/resources/portal-cms-sar/META-INF/jboss-service.xml 2007-01-23
18:18:21 UTC (rev 6086)
@@ -59,10 +59,8 @@
<depends>portal:service=Hibernate,type=CMS</depends>
<depends optional-attribute-name="IdentityServiceController"
proxy-type="attribute">portal:service=Module,type=IdentityServiceController</depends>
<!-- Add this to activate publish/approval workflow integration -->
- <!--
<depends optional-attribute-name="ApprovePublishWorkflow"
proxy-type="attribute">portal:service=ApprovePublish,type=Workflow</depends>
- -->
- <depends optional-attribute-name="StackFactory"
proxy-type="attribute">portal:service=InterceptorStackFactory,type=Cms</depends>
+ <depends optional-attribute-name="StackFactory"
proxy-type="attribute">portal:service=InterceptorStackFactory,type=Cms</depends>
<attribute name="DoChecking">true</attribute>
<attribute
name="DefaultContentLocation">portal/cms/conf/default-content/default/</attribute>
<attribute name="DefaultLocale">en</attribute>
Modified: trunk/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp
===================================================================
--- trunk/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp 2007-01-23
18:06:26 UTC (rev 6085)
+++ trunk/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp 2007-01-23
18:18:21 UTC (rev 6086)
@@ -67,7 +67,9 @@
<ul>
<li><a href="#">Select Action <img
src="<%= renderRequest.getContextPath() +
CMSAdminConstants.DEFAULT_IMAGES_PATH%>/downarrow.gif"
- border="0"></a>
+ border="0">
+ <!--[if IE 7]><!--></a><!--<![endif]-->
+ <!--[if lte IE 6]><table><tr><td><![endif]-->
<ul>
<li><a href="<portlet:renderURL>
<portlet:param name="op" value="<%=
CMSAdminConstants.OP_CONFIRM_CREATE_COLLECTION %>"/>
@@ -118,6 +120,7 @@
</portlet:renderURL>">${n:i18n("CMS_DELETE")}</a></li>
<% } %>
</ul>
+ <!--[if lte IE
6]></td></tr></table></a><![endif]-->
</li>
</ul>
</div>
Modified: trunk/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp
===================================================================
---
trunk/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp 2007-01-23
18:06:26 UTC (rev 6085)
+++
trunk/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp 2007-01-23
18:18:21 UTC (rev 6086)
@@ -83,7 +83,9 @@
<ul>
<li><a href="#">Select Action <img
src="<%= renderRequest.getContextPath() +
CMSAdminConstants.DEFAULT_IMAGES_PATH%>/downarrow.gif"
- border="0"></a>
+ border="0">
+ <!--[if IE 7]><!--></a><!--<![endif]-->
+ <!--[if lte IE 6]><table><tr><td><![endif]-->
<ul>
<%
if (sType.equals("text/html") ||
sType.equals("text/plain"))
@@ -129,6 +131,7 @@
<portlet:param name="path" value="<%= sCurrPath %>"/>
</portlet:renderURL>">${n:i18n("CMS_APPROVAL")}</a></li>
</ul>
+ <!--[if lte IE
6]></td></tr></table></a><![endif]-->
</li>
</ul>
</div>