Author: musachy
Date: Tue Mar 13 18:32:19 2007
New Revision: 517968
URL: http://svn.apache.org/viewvc?view=rev&rev=517968
Log:
WW-1707
* Update action mapping to use "redirectAction" instead of "redirect-action",
and "plainText" instead of "plaintext"
WW-1607
* Fix tabbedpanel, datetimepicker, and tree examples to use Dojo plugin
Modified:
struts/struts2/trunk/apps/showcase/src/main/resources/struts-conversion.xml
struts/struts2/trunk/apps/showcase/src/main/resources/struts-tags-non-ui.xml
struts/struts2/trunk/apps/showcase/src/main/resources/struts-tags-ui.xml
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/commonInclude.jsp
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/example1.jsp
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/example2.jsp
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/example3.jsp
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/example4.jsp
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/example5.jsp
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/nodecorate/panel2.ftl
struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/datepicker/index.jsp
struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/example.jsp
struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/staticTreeSelect.jsp
struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/timepicker/index.jsp
struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/treeExampleDynamic.jsp
struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/treeExampleStatic.jsp
Modified:
struts/struts2/trunk/apps/showcase/src/main/resources/struts-conversion.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/struts-conversion.xml?view=diff&rev=517968&r1=517967&r2=517968
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/resources/struts-conversion.xml
(original)
+++ struts/struts2/trunk/apps/showcase/src/main/resources/struts-conversion.xml
Tue Mar 13 18:32:19 2007
@@ -18,13 +18,13 @@
<result name="input">enterPersonInfo.jsp</result>
</action>
<action name="showPersonJspCode">
- <result
type="plaintext">/conversion/enterPersonInfo.jsp</result>
+ <result
type="plainText">/conversion/enterPersonInfo.jsp</result>
</action>
<action name="showPersonActionJavaCode">
- <result
type="plaintext">/conversion/PersonAction.java.txt</result>
+ <result
type="plainText">/conversion/PersonAction.java.txt</result>
</action>
<action name="showPersonJavaCode">
- <result
type="plaintext">/conversion/Person.java.txt</result>
+ <result
type="plainText">/conversion/Person.java.txt</result>
</action>
@@ -37,13 +37,13 @@
<result name="input">enterAddressInfo.jsp</result>
</action>
<action name="showAddressJspCode">
- <result
type="plaintext">/conversion/enterAddressInfo.jsp</result>
+ <result
type="plainText">/conversion/enterAddressInfo.jsp</result>
</action>
<action name="showAddressActionJavaCode">
- <result
type="plaintext">/conversion/AddressAction.java.txt</result>
+ <result
type="plainText">/conversion/AddressAction.java.txt</result>
</action>
<action name="showAddressJavaCode">
- <result
type="plaintext">/conversion/Address.java.txt</result>
+ <result
type="plainText">/conversion/Address.java.txt</result>
</action>
@@ -56,19 +56,19 @@
<result name="input">enterOperations.jsp</result>
</action>
<action name="showEnumJspCode">
- <result
type="plaintext">/conversion/enterOperations.jsp</result>
+ <result
type="plainText">/conversion/enterOperations.jsp</result>
</action>
<action name="showOperationsEnumJavaCode">
- <result
type="plaintext">/conversion/OperationsEnum.java.txt</result>
+ <result
type="plainText">/conversion/OperationsEnum.java.txt</result>
</action>
<action name="showOperationEnumActionJavaCode">
- <result
type="plaintext">/conversion/OperationsEnumAction.java.txt</result>
+ <result
type="plainText">/conversion/OperationsEnumAction.java.txt</result>
</action>
<action name="showEnumTypeConverterJavaCode">
- <result
type="plaintext">/conversion/EnumTypeConverter.java.txt</result>
+ <result
type="plainText">/conversion/EnumTypeConverter.java.txt</result>
</action>
<action name="showOperationsEnumActionConversionProperties">
- <result
type="plaintext">/conversion/OperationsEnumActionConversion.txt</result>
+ <result
type="plainText">/conversion/OperationsEnumActionConversion.txt</result>
</action>
</package>
Modified:
struts/struts2/trunk/apps/showcase/src/main/resources/struts-tags-non-ui.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/struts-tags-non-ui.xml?view=diff&rev=517968&r1=517967&r2=517968
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/resources/struts-tags-non-ui.xml
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/resources/struts-tags-non-ui.xml
Tue Mar 13 18:32:19 2007
@@ -22,7 +22,7 @@
<result>/tags/non-ui/actionTag/includedPage3.jsp</result>
</action>
<action name="lookAtSource">
- <result
type="plaintext">/tags/non-ui/actionTag/showActionTagDemo.jsp</result>
+ <result
type="plainText">/tags/non-ui/actionTag/showActionTagDemo.jsp</result>
</action>
</package>
@@ -104,10 +104,10 @@
<result
type="freemarker">/tags/non-ui/actionPrefix/redirectActionPrefix.ftl</result>
</action>
<action name="redirectActionPrefixAction">
- <result type="redirect-action">redirectActionPrefix</result>
+ <result type="redirect">redirectActionPrefix</result>
</action>
<action name="viewSource">
- <result
type="plaintext">/tags/non-ui/actionPrefix/actionPrefixExample.ftl</result>
+ <result
type="plainText">/tags/non-ui/actionPrefix/actionPrefixExample.ftl</result>
</action>
</package>
Modified:
struts/struts2/trunk/apps/showcase/src/main/resources/struts-tags-ui.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/struts-tags-ui.xml?view=diff&rev=517968&r1=517967&r2=517968
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/resources/struts-tags-ui.xml
(original)
+++ struts/struts2/trunk/apps/showcase/src/main/resources/struts-tags-ui.xml
Tue Mar 13 18:32:19 2007
@@ -49,7 +49,7 @@
<action name="showComponentTagExampleCode">
- <result
type="plaintext">/tags/ui/componentTagExample.jsp</result>
+ <result
type="plainText">/tags/ui/componentTagExample.jsp</result>
</action>
</package>
Modified:
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/commonInclude.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/commonInclude.jsp?view=diff&rev=517968&r1=517967&r2=517968
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/commonInclude.jsp
(original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/commonInclude.jsp
Tue Mar 13 18:32:19 2007
@@ -1,4 +1,5 @@
<%@ taglib prefix="s" uri="/struts-tags" %>
+<%@ taglib prefix="sx" uri="/struts-dojo-tags" %>
<!--// START SNIPPET: common-include-->
-<s:head theme="ajax" debug="true"/>
+<sx:head debug="true"/>
<!--// END SNIPPET: common-include-->
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=517968&r1=517967&r2=517968
==============================================================================
---
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
Tue Mar 13 18:32:19 2007
@@ -1,26 +1,12 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ taglib prefix="s" uri="/struts-tags" %>
- <%@ taglib prefix="sx" uri="/struts-dojo-tags" %>
+<%@ taglib prefix="sx" uri="/struts-dojo-tags" %>
<html>
<head>
<title>Ajax examples - tabbled panel</title>
<jsp:include page="/ajax/commonInclude.jsp"/>
- <link rel="stylesheet" type="text/css" href="<s:url
value="/struts/tabs.css"/>">
- <link rel="stylesheet" type="text/css" href="<s:url
value="/struts/niftycorners/niftyCorners.css"/>">
- <link rel="stylesheet" type="text/css" href="<s:url
value="/struts/niftycorners/niftyPrint.css"/>" media="print">
- <script type="text/javascript" src="<s:url
value="/struts/niftycorners/nifty.js"/>"></script>
- <script type="text/javascript">
- dojo.event.connect(window, "onload", function() {
- if (!NiftyCheck())
- return;
- Rounded("li.tab_selected", "top", "white", "transparent", "border
#ffffffS");
- Rounded("li.tab_unselected", "top", "white", "transparent",
"border #ffffffS");
- // Rounded("div#tab_header_main
li","top","white","transparent","border #ffffffS");
- // "white" needs to be replaced with the background color
- });
- </script>
</head>
<s:url id="ajaxTest" value="/AjaxTest.action" />
@@ -30,7 +16,7 @@
<table cellpadding="0" cellspacing="10" border="0" width="600">
<tr>
<td align="top">
- <sx:tabbedPanel id="test" >
+ <sx:tabbedpanel id="test" >
<sx:div id="one" label="one" >
This is the first pane<br/>
<s:form>
@@ -44,10 +30,10 @@
<sx:div id="three" label="three" >
This is the three
</sx:div>
- </sx:tabbedPanel>
+ </sx:tabbedpanel>
</td>
<td align="top">
- <sx:tabbedPanel id="test2" >
+ <sx:tabbedpanel id="test2" >
<sx:div id="left" label="left" >
This is the left pane<br/>
<s:form>
@@ -65,46 +51,46 @@
</s:form>
</sx:div>
<sx:div href="%{ajaxTest}" id="ryh21" label="remote
right"/>
- </sx:tabbedPanel>
+ </sx:tabbedpanel>
</td>
</tr>
<tr>
<td align="top">
- <sx:tabbedPanel id="testremote">
+ <sx:tabbedpanel id="testremote">
<sx:div href="%{ajaxTest}" id="r1" label="remote one">
<s:action name="AjaxTest" executeResult="true" />
</sx:div>
<sx:div href="%{ajaxTest}" id="r2" label="remote
two"></sx:div>
<sx:div href="%{ajaxTest}" id="r3" label="remote
three"></sx:div>
- </sx:tabbedPanel>
+ </sx:tabbedpanel>
</td>
<td align="top">
- <sx:tabbedPanel id="test3" >
+ <sx:tabbedpanel id="test3" >
<sx:div id="left1" label="out one" >
Outer one<br/>
- <sx:tabbedPanel id="test11">
+ <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:tabbedpanel>
</sx:div>
<sx:div id="middle1" label="out two" >
Outer two<br/>
- <sx:tabbedPanel id="test12" >
+ <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:tabbedpanel>
</sx:div>
<sx:div id="right1" label="out three" >
Outer three<br/>
- <sx:tabbedPanel id="test13">
+ <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:tabbedpanel>
</sx:div>
- </sx:tabbedPanel>
+ </sx:tabbedpanel>
</td>
</tr>
</table>
Modified:
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/example2.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/example2.jsp?view=diff&rev=517968&r1=517967&r2=517968
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/example2.jsp
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/example2.jsp
Tue Mar 13 18:32:19 2007
@@ -7,9 +7,6 @@
<title>Ajax examples - tabbled panel</title>
<jsp:include page="/ajax/commonInclude.jsp"/>
- <link rel="stylesheet" type="text/css" href="<s:url
value="/struts/tabs.css"/>">
-
-
</head>
<body>
@@ -22,7 +19,7 @@
I'm the other Tab!!!
</sx:div >
- </xs:tabbedpanel>
+ </sx:tabbedpanel>
Modified:
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/example3.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/example3.jsp?view=diff&rev=517968&r1=517967&r2=517968
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/example3.jsp
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/example3.jsp
Tue Mar 13 18:32:19 2007
@@ -1,5 +1,6 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ taglib prefix="s" uri="/struts-tags" %>
+<%@ taglib prefix="sx" uri="/struts-dojo-tags" %>
<html>
<head>
@@ -30,24 +31,24 @@
<tr>
<td align="top">
<!--// START SNIPPET: tabbedpanel-tag-->
- <s:tabbedPanel id="test2" theme="simple" cssStyle="width:
500px; height: 300px;" doLayout="true">
- <s:div theme="ajax" id="left" label="left">
+ <sx:tabbedpanel id="test2" cssStyle="width: 500px; height:
300px;" doLayout="true">
+ <sx:div id="left" label="left">
This is the left pane<br/>
<s:form >
<s:textfield name="tt" label="Test Text" />
<br/>
<s:textfield name="tt2" label="Test Text2" />
</s:form>
- </s:div>
- <s:div theme="ajax" href="%{ajaxTest}" id="ryh1"
label="remote one" />
- <s:div theme="ajax" id="middle" label="middle">
+ </sx:div>
+ <sx:div href="%{ajaxTest}" id="ryh1" label="remote one"
/>
+ <sx:div id="middle" label="middle">
middle tab<br/>
<s:form >
<s:textfield name="tt" label="Test Text44" />
<br/>
<s:textfield name="tt2" label="Test Text442" />
</s:form>
- </s:div>
- <s:div theme="ajax" href="%{ajaxTest}" id="ryh21"
label="remote right" />
- </s:tabbedPanel>
+ </sx:div>
+ <sx:div href="%{ajaxTest}" id="ryh21" label="remote
right" />
+ </sx:tabbedpanel>
<!--// END SNIPPET: tabbedpanel-tag-->
</td>
</tr>
Modified:
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/example4.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/example4.jsp?view=diff&rev=517968&r1=517967&r2=517968
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/example4.jsp
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/example4.jsp
Tue Mar 13 18:32:19 2007
@@ -1,20 +1,21 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ taglib prefix="s" uri="/struts-tags" %>
+<%@ taglib prefix="sx" uri="/struts-dojo-tags" %>
+
<html>
<head>
<title>Example 4</title>
<jsp:include page="/ajax/commonInclude.jsp"/>
- <link rel="stylesheet" type="text/css" href="<s:url
value="/struts/tabs.css"/>" />
</head>
<body>
<s:url id="panel1url" action="panel1" namespace="/nodecorate" />
<s:url id="panel2url" action="panel2" namespace="/nodecorate" />
<s:url id="panel3url" action="panel3" namespace="/nodecorate" />
- <s:tabbedPanel id="tabbedpanel" >
- <s:div id="panel1" label="Panel1" href="%{#panel1url}"
theme="ajax" />
- <s:div id="panel2" label="Panel2" href="%{#panel2url}"
theme="ajax" />
- <s:div id="panel3" label="Panel3" href="%{#panel3url}"
theme="ajax" />
- </s:tabbedPanel>
+ <sx:tabbedpanel id="tabbedpanel" >
+ <sx:div id="panel1" label="Panel1" href="%{#panel1url}" />
+ <sx:div id="panel2" label="Panel2" href="%{#panel2url}" />
+ <sx:div id="panel3" label="Panel3" href="%{#panel3url}" />
+ </sx:tabbedpanel>
</body>
</html>
Modified:
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/example5.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/example5.jsp?view=diff&rev=517968&r1=517967&r2=517968
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/example5.jsp
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/example5.jsp
Tue Mar 13 18:32:19 2007
@@ -1,27 +1,25 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ taglib prefix="s" uri="/struts-tags" %>
+<%@ taglib prefix="sx" uri="/struts-dojo-tags" %>
<html>
<head>
<title>Ajax examples - tabbled panel</title>
<jsp:include page="/ajax/commonInclude.jsp"/>
- <link rel="stylesheet" type="text/css" href="<s:url
value="/struts/tabs.css"/>">
-
-
</head>
<body>
- <s:tabbedPanel id="test2" theme="simple"
cssStyle="width: 500px; height: 300px;" doLayout="true" closeButton="pane"
labelposition="bottom">
- <s:div id="left" label="test1" theme="ajax" >
+ <sx:tabbedpanel id="test2" cssStyle="width:
500px; height: 300px;" doLayout="true" closeButton="pane"
labelposition="bottom">
+ <sx:div id="left" label="test1" theme="ajax" >
I'm a Tab!!!
- </s:div >
- <s:div id="middle" label="test2" theme="ajax" >
+ </sx:div >
+ <sx:div id="middle" label="test2" theme="ajax" >
I'm the other Tab!!!
- </s:div >
+ </sx:div >
- </s:tabbedPanel>
+ </sx:tabbedpanel>
Modified:
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/nodecorate/panel2.ftl
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/nodecorate/panel2.ftl?view=diff&rev=517968&r1=517967&r2=517968
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/nodecorate/panel2.ftl
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/nodecorate/panel2.ftl
Tue Mar 13 18:32:19 2007
@@ -1,7 +1,7 @@
<div id="result">
</div>
-<@s.form action="panel2Submit" namespace="/nodecorate" theme="ajax">
- <@s.textfield label="Name" name="name" theme="ajax" />
- <@s.submit theme="ajax" resultDivId="result" />
-</@s.form>
+<@sx.form action="panel2Submit" namespace="/nodecorate">
+ <@s.textfield label="Name" name="name" />
+ <@sx.submit targets="result" />
+</@sx.form>
Modified:
struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/datepicker/index.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/datepicker/index.jsp?view=diff&rev=517968&r1=517967&r2=517968
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/datepicker/index.jsp
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/datepicker/index.jsp
Tue Mar 13 18:32:19 2007
@@ -1,23 +1,25 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib prefix="s" uri="/struts-tags" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
+<%@ taglib prefix="sx" uri="/struts-dojo-tags" %>
+
<html>
<head>
<title>UI Tags Example</title>
- <s:head />
+ <sx:head />
</head>
<body>
<table>
-<s:datetimepicker label="toggleType='wipe'" value="2006-10-31"
toggleType="wipe" toggleDuration="300" name="test"/>
-<s:datetimepicker label="toggleType='explode'" value="2006-07-22"
toggleType="explode" toggleDuration="500"/>
-<s:datetimepicker label="toggleType='fade'" value="2006-06-30"
toggleType="fade" toggleDuration="500"/>
-<s:datetimepicker label="With value='today'" name="dddp1" value="today" />
-<s:datetimepicker label="US format, empty" name="dddp2" language="en-us" />
-<s:datetimepicker label="US format with initial date of 2006-06-26"
name="dddp3" value="2006-06-26" language="en-us" />
-<s:datetimepicker label="With initial date of 1969-04-25 and a custom format
dd/MM/yyyy" name="dddp5" value="25/04/1969" displayFormat="dd/MM/yyyy" />
-<s:datetimepicker label="In German" name="dddp7" value="2006-06-28"
language="de" />
-<s:datetimepicker label="In Dutch" name="dddp8" value="2006-06-28"
language="nl" />
-<s:datetimepicker label="US format with initial date of 2006-06-26 and long
formatting (parse not supported)" name="dddp12" value="2006-06-26"
formatLength="long" language="en-us" />
-<s:datetimepicker label="German format with initial date of 2006-06-26 and
long formatting (parse not supported)" name="dddp13" value="2006-06-26"
formatLength="long" language="de" />
+<sx:datetimepicker label="toggleType='wipe'" value="2006-10-31"
toggleType="wipe" toggleDuration="300" name="test"/>
+<sx:datetimepicker label="toggleType='explode'" value="2006-07-22"
toggleType="explode" toggleDuration="500"/>
+<sx:datetimepicker label="toggleType='fade'" value="2006-06-30"
toggleType="fade" toggleDuration="500"/>
+<sx:datetimepicker label="With value='today'" name="dddp1" value="today" />
+<sx:datetimepicker label="US format, empty" name="dddp2" language="en-us" />
+<sx:datetimepicker label="US format with initial date of 2006-06-26"
name="dddp3" value="2006-06-26" language="en-us" />
+<sx:datetimepicker label="With initial date of 1969-04-25 and a custom format
dd/MM/yyyy" name="dddp5" value="25/04/1969" displayFormat="dd/MM/yyyy" />
+<sx:datetimepicker label="In German" name="dddp7" value="2006-06-28"
language="de" />
+<sx:datetimepicker label="In Dutch" name="dddp8" value="2006-06-28"
language="nl" />
+<sx:datetimepicker label="US format with initial date of 2006-06-26 and long
formatting (parse not supported)" name="dddp12" value="2006-06-26"
formatLength="long" language="en-us" />
+<sx:datetimepicker label="German format with initial date of 2006-06-26 and
long formatting (parse not supported)" name="dddp13" value="2006-06-26"
formatLength="long" language="de" />
</table>
</body>
</html>
Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/example.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/example.jsp?view=diff&rev=517968&r1=517967&r2=517968
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/example.jsp
(original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/example.jsp Tue
Mar 13 18:32:19 2007
@@ -1,9 +1,11 @@
<%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
<%@ taglib prefix="s" uri="/struts-tags" %>
+<%@ taglib prefix="sx" uri="/struts-dojo-tags" %>
+
<html>
<head>
<title>UI Tags Example</title>
- <s:head/>
+ <sx:head/>
</head>
<body>
@@ -19,7 +21,7 @@
name="name"
tooltip="Enter your Name here" />
- <s:datetimepicker
+ <sx:datetimepicker
tooltip="Select Your Birthday"
label="Birthday"
name="birthday" />
Modified:
struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/staticTreeSelect.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/staticTreeSelect.jsp?view=diff&rev=517968&r1=517967&r2=517968
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/staticTreeSelect.jsp
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/staticTreeSelect.jsp
Tue Mar 13 18:32:19 2007
@@ -1,4 +1,5 @@
<[EMAIL PROTECTED] prefix="s" uri="/struts-tags" %>
+<%@ taglib prefix="sx" uri="/struts-dojo-tags" %>
<%
request.setAttribute("decorator", "none");
Modified:
struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/timepicker/index.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/timepicker/index.jsp?view=diff&rev=517968&r1=517967&r2=517968
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/timepicker/index.jsp
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/timepicker/index.jsp
Tue Mar 13 18:32:19 2007
@@ -1,20 +1,22 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib prefix="s" uri="/struts-tags" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
+<%@ taglib prefix="sx" uri="/struts-dojo-tags" %>
+
<html>
<head>
<title>UI Tags Example</title>
- <s:head />
+ <sx:head />
</head>
<body>
<table>
-<s:datetimepicker label="toggleType='wipe'" type="time" value="10:30"
toggleType="wipe" toggleDuration="300"/>
-<s:datetimepicker label="toggleType='explode'" type="time" value="13:00"
toggleType="explode" toggleDuration="500"/>
-<s:datetimepicker label="toggleType='fade'" type="time" value="13:00"
toggleType="fade" toggleDuration="500"/>
-<s:datetimepicker label="With value='today'" name="dddp4" type="time"
value="today" />
-<s:datetimepicker label="US format, empty" name="dddp5" type="time"
language="en-us" />
-<s:datetimepicker label="US format, 13:00 hours" name="dddp6" type="time"
value="13:00" language="en-us" />
-<s:datetimepicker label="In German" name="dddp7" type="time" value="13:00"
language="de" />
-<s:datetimepicker label="In Dutch" name="dddp8" type="time" value="13:00"
language="nl" />
+<sx:datetimepicker label="toggleType='wipe'" type="time" value="10:30"
toggleType="wipe" toggleDuration="300"/>
+<sx:datetimepicker label="toggleType='explode'" type="time" value="13:00"
toggleType="explode" toggleDuration="500"/>
+<sx:datetimepicker label="toggleType='fade'" type="time" value="13:00"
toggleType="fade" toggleDuration="500"/>
+<sx:datetimepicker label="With value='today'" name="dddp4" type="time"
value="today" />
+<sx:datetimepicker label="US format, empty" name="dddp5" type="time"
language="en-us" />
+<sx:datetimepicker label="US format, 13:00 hours" name="dddp6" type="time"
value="13:00" language="en-us" />
+<sx:datetimepicker label="In German" name="dddp7" type="time" value="13:00"
language="de" />
+<sx:datetimepicker label="In Dutch" name="dddp8" type="time" value="13:00"
language="nl" />
</table>
</body>
</html>
Modified:
struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/treeExampleDynamic.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/treeExampleDynamic.jsp?view=diff&rev=517968&r1=517967&r2=517968
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/treeExampleDynamic.jsp
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/treeExampleDynamic.jsp
Tue Mar 13 18:32:19 2007
@@ -1,9 +1,10 @@
<[EMAIL PROTECTED] prefix="s" uri="/struts-tags" %>
+<%@ taglib prefix="sx" uri="/struts-dojo-tags" %>
<html>
<head>
<title>Showcase - UI Tag Example - Tree Example (Dynamic)</title>
-<s:head theme="ajax" debug="true" />
+<sx:head/>
</head>
<body>
@@ -27,14 +28,13 @@
<div style="float:left; margin-right: 50px;">
-<s:tree
- theme="ajax"
+<sx:tree
rootNode="%{treeRootNode}"
childCollectionProperty="children"
nodeIdProperty="id"
nodeTitleProperty="name"
treeSelectedTopic="treeSelected">
-</s:tree>
+</sx:tree>
</div>
<div id="displayId">
Modified:
struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/treeExampleStatic.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/treeExampleStatic.jsp?view=diff&rev=517968&r1=517967&r2=517968
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/treeExampleStatic.jsp
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/treeExampleStatic.jsp
Tue Mar 13 18:32:19 2007
@@ -1,8 +1,9 @@
<[EMAIL PROTECTED] prefix="s" uri="/struts-tags" %>
+<%@ taglib prefix="sx" uri="/struts-dojo-tags" %>
<html>
<head>
<title>Showcase - UI Tag Example - Tree Example (Static)</title>
-<s:head theme="ajax" debug="true" />
+<sx:head />
</head>
<body>
@@ -25,21 +26,21 @@
<div style="float:left; margin-right: 50px;">
-<s:tree label="parent" id="parentId" theme="ajax"
templateCssPath="/struts/tree.css"
+<sx:tree label="parent" id="parentId" templateCssPath="/struts/tree.css"
showRootGrid="true" showGrid="true" treeSelectedTopic="treeSelected">
- <s:treenode theme="ajax" label="child1" id="child1Id">
- <s:treenode theme="ajax" label="grandchild1" id="grandchild1Id"/>
- <s:treenode theme="ajax" label="grandchild2" id="grandchild2Id"/>
- <s:treenode theme="ajax" label="grandchild3" id="grandchild3Id"/>
- </s:treenode>
- <s:treenode theme="ajax" label="child2" id="child2Id"/>
- <s:treenode theme="ajax" label="child3" id="child3Id"/>
- <s:treenode theme="ajax" label="child4" id="child4Id"/>
- <s:treenode theme="ajax" label="child5" id="child5Id">
- <s:treenode theme="ajax" label="gChild1" id="gChild1Id"/>
- <s:treenode theme="ajax" label="gChild2" id="gChild2Id"/>
- </s:treenode>
-</s:tree>
+ <sx:treenode label="child1" id="child1Id">
+ <sx:treenode label="grandchild1" id="grandchild1Id"/>
+ <sx:treenode label="grandchild2" id="grandchild2Id"/>
+ <sx:treenode label="grandchild3" id="grandchild3Id"/>
+ </sx:treenode>
+ <sx:treenode label="child2" id="child2Id"/>
+ <sx:treenode label="child3" id="child3Id"/>
+ <sx:treenode label="child4" id="child4Id"/>
+ <sx:treenode label="child5" id="child5Id">
+ <sx:treenode label="gChild1" id="gChild1Id"/>
+ <sx:treenode label="gChild2" id="gChild2Id"/>
+ </sx:treenode>
+</sx:tree>
</div>
