From 4654ab3c0a8c6bcd5d0a98da56469144fa72cd30 Mon Sep 17 00:00:00 2001 From: Musachy Barroso Date: Sat, 24 Mar 2007 16:16:58 +0000 Subject: [PATCH] WW-1775 Nested tabbedPanel does not work in IE git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@522050 13f79535-47bb-0310-9956-ffa450edef68 --- .../main/webapp/ajax/tabbedpanel/example1.jsp | 45 ++++++++----------- .../resources/template/ajax/tabbedpanel.ftl | 11 +++-- 2 files changed, 24 insertions(+), 32 deletions(-) diff --git a/apps/showcase/src/main/webapp/ajax/tabbedpanel/example1.jsp b/apps/showcase/src/main/webapp/ajax/tabbedpanel/example1.jsp index 674324b88..372900ed4 100644 --- a/apps/showcase/src/main/webapp/ajax/tabbedpanel/example1.jsp +++ b/apps/showcase/src/main/webapp/ajax/tabbedpanel/example1.jsp @@ -13,9 +13,9 @@ - +
- diff --git a/plugins/dojo/src/main/resources/template/ajax/tabbedpanel.ftl b/plugins/dojo/src/main/resources/template/ajax/tabbedpanel.ftl index c7e55f9a8..b989fcf61 100644 --- a/plugins/dojo/src/main/resources/template/ajax/tabbedpanel.ftl +++ b/plugins/dojo/src/main/resources/template/ajax/tabbedpanel.ftl @@ -1,9 +1,3 @@ - -
style="${parameters.cssStyle?html}"<#rt/> @@ -26,7 +20,12 @@ <#if parameters.doLayout?exists> doLayout="${parameters.doLayout?string?html}"<#rt/> + <#if parameters.label?if_exists != ""> + label="${parameters.label?html}"<#rt/> + <#if parameters.templateCssPath?exists> templateCssPath="<@s.url value='${parameters.templateCssPath}' encode="false" includeParams='none'/>" + <#include "/${parameters.templateDir}/simple/scripting-events.ftl" /> + <#include "/${parameters.templateDir}/simple/common-attributes.ftl" /> >
+ This is the first pane
@@ -66,30 +66,23 @@ 		- - Outer one
- - Inner 1 - Inner 2 - Inner 3 - - - - Outer two
- - Inner 21 - Inner 22 - Inner 23 - - - - Outer three
- - Inner 31 - Inner 32 - Inner 33 - - + + Inner 1 + Inner 2 + Inner 3 + + + + Inner 21 + Inner 22 + Inner 23 + + + + Inner 31 + Inner 32 + Inner 33 +