struts-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From musa...@apache.org
Subject svn commit: r522050 - in /struts/struts2/trunk: apps/showcase/src/main/webapp/ajax/tabbedpanel/example1.jsp plugins/dojo/src/main/resources/template/ajax/tabbedpanel.ftl
Date Sat, 24 Mar 2007 16:16:59 GMT
Author: musachy
Date: Sat Mar 24 09:16:58 2007
New Revision: 522050

URL: http://svn.apache.org/viewvc?view=rev&rev=522050
Log:
WW-1775 Nested tabbedPanel does not work in IE

Modified:
    struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/example1.jsp
    struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/tabbedpanel.ftl

Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/example1.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/example1.jsp?view=diff&rev=522050&r1=522049&r2=522050
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/example1.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/example1.jsp Sat Mar
24 09:16:58 2007
@@ -13,9 +13,9 @@
 
 <body>
 
-    <table cellpadding="0" cellspacing="10" border="0" width="600">
+    <table cellpadding="0" cellspacing="10" border="0" width="900">
         <tr>
-            <td align="top">
+            <td align="top" width="400">
                 <sx:tabbedpanel id="test" >
                     <sx:div id="one" label="one" >
                         This is the first pane<br/>
@@ -66,30 +66,23 @@
             </td>
             <td align="top">
                 <sx:tabbedpanel id="test3" >
-                    <sx:div id="left1" label="out one" >
-                        Outer one<br/>
-                        <sx:tabbedpanel id="test11">
-                            <sx:div id="i11" label="inner 1 one">Inner 1</sx:div>
-                            <sx:div id="112" label="inner 1 two">Inner 2</sx:div>
-                            <sx:div id="i13" label="inner 1 three">Inner 3</sx:div>
-                        </sx:tabbedpanel>
-                    </sx:div>
-                    <sx:div id="middle1" label="out two" >
-                        Outer two<br/>
-                        <sx:tabbedpanel id="test12" >
-                            <sx:div id="i21" label="inner 2 one" >Inner 21</sx:div>
-                            <sx:div id="122" label="inner 2 two" >Inner 22</sx:div>
-                            <sx:div id="i23" label="inner 2 three" >Inner 23</sx:div>
-                        </sx:tabbedpanel>
-                    </sx:div>
-                    <sx:div id="right1" label="out three" >
-                        Outer three<br/>
-                        <sx:tabbedpanel id="test13">
-                            <sx:div id="i31" label="inner 3 one" >Inner 31</sx:div>
-                            <sx:div id="132" label="inner 3 two" >Inner 32</sx:div>
-                            <sx:div id="i33" label="inner 3 three" >Inner 33</sx:div>
-                        </sx:tabbedpanel>
-                    </sx:div>
+                    <sx:tabbedpanel id="test11" label="Container 1">
+                        <sx:div id="i11" label="inner 1 one">Inner 1</sx:div>
+                        <sx:div id="112" label="inner 1 two">Inner 2</sx:div>
+                        <sx:div id="i13" label="inner 1 three">Inner 3</sx:div>
+                    </sx:tabbedpanel>
+                   
+                    <sx:tabbedpanel id="test12" label="Container 2">
+                        <sx:div id="i21" label="inner 2 one" >Inner 21</sx:div>
+                        <sx:div id="122" label="inner 2 two" >Inner 22</sx:div>
+                        <sx:div id="i23" label="inner 2 three" >Inner 23</sx:div>
+                    </sx:tabbedpanel>
+                    
+                    <sx:tabbedpanel id="test13" label="Container 3">
+                        <sx:div id="i31" label="inner 3 one" >Inner 31</sx:div>
+                        <sx:div id="132" label="inner 3 two" >Inner 32</sx:div>
+                        <sx:div id="i33" label="inner 3 three" >Inner 33</sx:div>
+                    </sx:tabbedpanel>
                 </sx:tabbedpanel>
             </td>
         </tr>

Modified: struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/tabbedpanel.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/tabbedpanel.ftl?view=diff&rev=522050&r1=522049&r2=522050
==============================================================================
--- struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/tabbedpanel.ftl (original)
+++ struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/tabbedpanel.ftl Sat
Mar 24 09:16:58 2007
@@ -1,9 +1,3 @@
-<script type="text/javascript">
-  dojo.require("dojo.widget.TabContainer");
-  dojo.require("dojo.widget.LinkPane");
-  dojo.require("dojo.widget.ContentPane");
-</script>
-
 <div dojoType="TabContainer"
   <#if parameters.cssStyle?if_exists != "">
     style="${parameters.cssStyle?html}"<#rt/>
@@ -26,7 +20,12 @@
   <#if parameters.doLayout?exists>
     doLayout="${parameters.doLayout?string?html}"<#rt/>
   </#if>
+  <#if parameters.label?if_exists != "">
+    label="${parameters.label?html}"<#rt/>
+  </#if>
   <#if parameters.templateCssPath?exists>
 	templateCssPath="<@s.url value='${parameters.templateCssPath}' encode="false" includeParams='none'/>"
   </#if>
+  <#include "/${parameters.templateDir}/simple/scripting-events.ftl" />
+  <#include "/${parameters.templateDir}/simple/common-attributes.ftl" />
 >



Mime
View raw message