Author: hermanns
Date: Mon Nov 13 15:11:31 2006
New Revision: 474562
URL: http://svn.apache.org/viewvc?view=rev&rev=474562
Log:
upgrade struts2 dojo widget due to upgrading dojo to 0.4
o added samples for reworked ajax tags (date/time picker)
o updated tld
Note: Not everything is 100% working yet (remote divs, submit)
Issue Number: WW-1485
Submitted by: Musachy Barroso
Added:
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/datepicker/
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/datepicker/index.jsp
(with props)
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/dropdowndatepicker/
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/dropdowndatepicker/index.jsp
(with props)
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/dropdowntimepicker/
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/dropdowntimepicker/index.jsp
(with props)
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotebutton/
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotebutton/index.jsp
(with props)
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/timepicker/
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/timepicker/index.jsp
(with props)
Modified:
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/AjaxResult.jsp
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/index.jsp
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotediv/example1.jsp
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotediv/example2.jsp
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotediv/example3.jsp
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotediv/example4.jsp
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotediv/example7.jsp
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotediv/example8.jsp
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotediv/index.jsp
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remoteforms/index.jsp
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remoteforms/test1.jsp
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remoteforms/test2.jsp
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotelink/index.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/example5.jsp
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/index.jsp
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tree/getCategory.jsp
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/widgets/index.jsp
struts/struts2/trunk/apps/showcase/src/main/webapp/viewSource.jsp
Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/AjaxResult.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/AjaxResult.jsp?view=diff&rev=474562&r1=474561&r2=474562
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/AjaxResult.jsp
(original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/AjaxResult.jsp Mon
Nov 13 15:11:31 2006
@@ -7,4 +7,6 @@
response.setDateHeader ("Expires", 0); //prevents caching at the proxy
server
%>
-Result: <s:property value="count"/> @ <s:property value="serverTime"/>
+Result: <s:property value="count"/> @ <s:property value="serverTime"/>
+<br/>
+<s:property value="data"/>
Added:
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/datepicker/index.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/datepicker/index.jsp?view=auto&rev=474562
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/datepicker/index.jsp
(added)
+++
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/datepicker/index.jsp
Mon Nov 13 15:11:31 2006
@@ -0,0 +1,61 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
+
+<head>
+ <title>Ajax Examples</title>
+
+ <!--// START SNIPPET: common-include-->
+ <jsp:include page="/ajax/commonInclude.jsp"/>
+ <!--// END SNIPPET: common-include-->
+</head>
+
+<body>
+
+This should have the month label all on one line (problem in IE) appears fine
in FF though.
+<s:datepicker id="foo" language="en-us" displayWeeks="1"
staticDisplay="true"/>
+
+<p>A calendar in your locale, or the closest thing to it we currently
provide</p>
+<s:datepicker id="test" cssStyle="border:1px solid red;padding:1px;"/>
+
+<p>Same as above, but Friday is the first day of the week. WOOHOO!
value="today"</p>
+<s:datepicker value="today" weekStartsOn="5"/>
+
+<p>Same as first, but with only 3 weeks displayed</p>
+<s:datepicker displayWeeks="3"/>
+
+<p>Same as first, but with adjustWeeks="true"</p>
+<s:datepicker adjustWeeks="true"/>
+
+<p>Same as first, with startDate of 10 September 2006</p>
+<s:datepicker startDate="2006-09-10"/>
+
+<p>Same as first, with endDate of 10 September 2006</p>
+<s:datepicker endDate="2006-09-10"/>
+
+<p>Same as first, with startDate of 1 January 2006 and endDate of 31 December
2006</p>
+
+<s:datepicker startDate="2006-01-01" endDate="2006-12-31"/>
+
+<p>Same as first, with startDate of 10 September 2006 and endDate of 24
September 2006 (note how the controls<br/>
+ are disabled). This is considered a static display, because the range of
startDate and endDate is less than the displayWeeks.</p>
+
+<s:datepicker startDate="2006-09-10" endDate="2006-09-24"/>
+
+<p>Same as first, with startDate of 23 September 2006 and endDate of 10
October 2006 (note where the calendar<br/>
+display starts since the range overlaps the end of a month and the beginning
of a month and how the controls are disabled).<br/>
+ This is considered a static display, because the range of startDate and
endDate is less than the displayWeeks.</p>
+
+<s:datepicker startDate="2006-09-23" endDate="2006-10-10"/>
+
+<p>Same as first with staticDisplay=true and an initial of value="2005-12-25"
(Sunday, December 25, 2005)</p>
+<s:datepicker staticDisplay="true" value="2005-12-25"/>
+
+<p>now on to the locale stuff...</p>
+
+<p>en-us locale</p>
+<s:datepicker language="en-us" />
+<p>nl-nl locale</p>
+<s:datepicker language="nl-nl" />
+
+</body>
+</html>
Propchange:
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/datepicker/index.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Added:
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/dropdowndatepicker/index.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/dropdowndatepicker/index.jsp?view=auto&rev=474562
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/dropdowndatepicker/index.jsp
(added)
+++
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/dropdowndatepicker/index.jsp
Mon Nov 13 15:11:31 2006
@@ -0,0 +1,44 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
+
+<head>
+ <title>Ajax Examples</title>
+
+ <!--// START SNIPPET: common-include-->
+ <jsp:include page="/ajax/commonInclude.jsp"/>
+ <!--// END SNIPPET: common-include-->
+
+</head>
+
+<body>
+<p>toggleTye="wipe":</p>
+ <input dojoType="dropdowndatepicker" value="2006-10-31"
containerToggle="wipe" containerToggleDuration="300">
+<p>toggleTye="explode":</p>
+ <input dojoType="dropdowndatepicker" value="2006-07-22"
containerToggle="explode" containerToggleDuration="500">
+<p>toggleTye="fade":</p>
+ <input dojoType="dropdowndatepicker" value="2006-06-30"
containerToggle="fade" containerToggleDuration="500">
+<p>With value="today"</p>
+ <s:dropdowndatetimepicker name="dddp1" value="today" />
+<p>US format, empty</p>
+ <s:dropdowndatetimepicker name="dddp2" language="en-us" />
+<p>US format with initial date of 2006-06-26</p>
+ <s:dropdowndatetimepicker name="dddp3" value="2006-06-26"
language="en-us" />
+<p>With initial date of 1969-04-25 and a custom format dd/MM/yyyy</p>
+ <s:dropdowndatetimepicker name="dddp5" value="1969-04-25"
displayFormat="dd/MM/yyyy" />
+<p>In German:</p>
+ <s:dropdowndatetimepicker name="dddp7" value="2006-06-28"
language="de" />
+<p>In Dutch:</p>
+ <s:dropdowndatetimepicker name="dddp8" value="2006-06-28"
language="nl" />
+<p>US format with initial date of 2006-06-26 and long formatting (parse not
supported)</p>
+ <s:dropdowndatetimepicker name="dddp12" value="2006-06-26"
formatLength="long" language="en-us" />
+<p>German format with initial date of 2006-06-26 and long formatting (parse
not supported)</p>
+ <s:dropdowndatetimepicker name="dddp13" value="2006-06-26"
formatLength="long" language="de" />
+<p>Value sent as RFC3339</p>
+ <s:dropdowndatetimepicker name="dddp14" saveFormat="rfc"
value="2006-06-26" language="en-us" />
+<p>Custom save format: yyyy!dd!mm</p>
+ <s:dropdowndatetimepicker name="dddp15" saveFormat="yyyy!dd!MM"
value="2006-06-26" language="en-us" />
+<p>Value sent as time since Unix Epoch</p>
+ <s:dropdowndatetimepicker name="dddp16" saveFormat="posix"
value="2006-06-26" language="en-us" />
+
+</body>
+</html>
Propchange:
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/dropdowndatepicker/index.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Added:
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/dropdowntimepicker/index.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/dropdowntimepicker/index.jsp?view=auto&rev=474562
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/dropdowntimepicker/index.jsp
(added)
+++
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/dropdowntimepicker/index.jsp
Mon Nov 13 15:11:31 2006
@@ -0,0 +1,51 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
+
+<head>
+ <title>Ajax Examples</title>
+
+ <!--// START SNIPPET: common-include-->
+ <jsp:include page="/ajax/commonInclude.jsp"/>
+ <!--// END SNIPPET: common-include-->
+
+</head>
+
+<body>
+toggleTye="wipe":
+ <s:dropdowndatetimepicker type="time" value="10:30" toggleType="wipe"
toggleDuration="300"/>
+<br/>
+
+toggleTye="explode":
+ <s:dropdowndatetimepicker type="time" value="13:00"
toggleType="explode" toggleDuration="500"/>
+<br/>
+
+toggleTye="fade":
+ <s:dropdowndatetimepicker type="time" value="13:00" toggleType="fade"
toggleDuration="500"/>
+<br/>
+
+With value="today":
+ <s:dropdowndatetimepicker type="time" name="dddp1" value="today" />
+<br/>
+
+US format, empty
+ <s:dropdowndatetimepicker type="time" name="dddp2" language="en-us" />
+<br/>
+
+In German:
+ <s:dropdowndatetimepicker type="time" name="dddp7" language="de" />
+<br/>
+
+In Dutch:
+ <s:dropdowndatetimepicker type="time" name="dddp8" language="nl" />
+<br/>
+Value sent as RFC3339
+ <s:dropdowndatetimepicker type="time" name="dddp14" saveFormat="rfc"
value="01:00" language="en-us" />
+<br/>
+
+Value sent as time since Unix Epoch
+ <s:dropdowndatetimepicker type="time" name="dddp16" saveFormat="posix"
value="3:45" language="en-us" />
+<br/>
+
+
+</body>
+</html>
Propchange:
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/dropdowntimepicker/index.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/index.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/index.jsp?view=diff&rev=474562&r1=474561&r2=474562
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/index.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/index.jsp Mon Nov
13 15:11:31 2006
@@ -10,7 +10,12 @@
<ul>
<li><a href="remotediv">Remote div tag</a></li>
<li><a href="remotelink">Remote link tag</a></li>
+ <li><a href="remotebutton">Remote button tag</a></li>
<li><a href="tabbedpanel">Tabbed panel</a></li>
+ <li><a href="datepicker">DatePicker</a></li>
+ <li><a href="dropdowndatepicker">Dropdown DatePicker</a></li>
+ <li><a href="timepicker">TimePicker</a></li>
+ <li><a href="dropdowntimepicker">Dropdown TimePicker</a></li>
<li><a href="remoteforms">Remote forms</a></li>
<li><a href="widgets">Widgets </a> (experimental - may not work in all
browsers
see the <a href="http://www.dojotoolkit.org";>dojo website</a> for more
information</li>
Added:
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotebutton/index.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotebutton/index.jsp?view=auto&rev=474562
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotebutton/index.jsp
(added)
+++
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotebutton/index.jsp
Mon Nov 13 15:11:31 2006
@@ -0,0 +1,49 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
+
+<html>
+<head>
+ <title>Ajax Examples</title>
+ <jsp:include page="/ajax/commonInclude.jsp"/>
+</head>
+
+<script type="text/javascript">
+ function before() {alert("before request");}
+ function after() {alert("after request");}
+ function handler(widget, node) {
+ alert('I will handle this myself!');
+ dojo.byId(widget.targetsArray[0]).innerHTML = "Done";
+ }
+</script>
+
+<body>
+
+<div id="t1">Div 1</div>
+
+
+<br/><br/>
+
+A submit button
+<s:submit type="submit" theme="ajax" value="submit" targets="t1"
href="/AjaxTest.action"/>
+<br/><br/>
+
+Use an image as submit
+
+<s:submit type="image" theme="ajax" label="Alt Text" targets="t1"
src="${pageContext.request.contextPath}/images/struts-power.gif"
href="/AjaxTest.action"/>
+<br/><br/>
+
+<label for="textInput">Text to be echoed</label>
+<br/><br/>
+
+<form id="form">
+ <input type=textbox name="data">
+</form>
+Use a button as submit (custom text)
+<s:submit type="button" theme="ajax" label="Update Content" targets="t1"
href="/AjaxTest.action" formId="form"/>
+
+<br/><br/>
+
+<s:include value="../footer.jsp"/>
+
+</body>
+</html>
Propchange:
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotebutton/index.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotediv/example1.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotediv/example1.jsp?view=diff&rev=474562&r1=474561&r2=474562
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotediv/example1.jsp
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotediv/example1.jsp
Mon Nov 13 15:11:31 2006
@@ -7,15 +7,13 @@
<jsp:include page="/ajax/commonInclude.jsp"/>
</head>
-<body>
+<body>
<s:div
id="once"
theme="ajax"
cssStyle="border: 1px solid yellow;"
- href="/AjaxTest.action"
- delay="5000"
- loadingText="loading...">
+ href="/AjaxTest.action">
Initial Content</s:div>
<s:include value="../footer.jsp"/>
Modified:
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotediv/example2.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotediv/example2.jsp?view=diff&rev=474562&r1=474561&r2=474562
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotediv/example2.jsp
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotediv/example2.jsp
Mon Nov 13 15:11:31 2006
@@ -7,16 +7,17 @@
<jsp:include page="/ajax/commonInclude.jsp"/>
</head>
+
<body>
- <s:div
- id="twoseconds"
- cssStyle="border: 1px solid yellow;"
- href="/AjaxTest.action"
- theme="ajax"
- updateFreq="2000"
- errorText="There was an error"
- loadingText="loading...">Initial Content
- </s:div>
+
+<s:div
+ id="once"
+ theme="ajax"
+ cssStyle="border: 1px solid yellow;"
+ href="/AjaxTest.action"
+ updateInterval="2000"
+ >
+ Initial Content</s:div>
<s:include value="../footer.jsp"/>
Modified:
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotediv/example3.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotediv/example3.jsp?view=diff&rev=474562&r1=474561&r2=474562
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotediv/example3.jsp
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotediv/example3.jsp
Mon Nov 13 15:11:31 2006
@@ -15,7 +15,7 @@
href="/AjaxTest.action"
theme="ajax"
delay="2000"
- updateFreq="%{#parameters.period}"
+ updateInterval="%{#parameters.period}"
errorText="There was an error">Initial Content</s:div>
<s:include value="../footer.jsp"/>
Modified:
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotediv/example4.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotediv/example4.jsp?view=diff&rev=474562&r1=474561&r2=474562
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotediv/example4.jsp
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotediv/example4.jsp
Mon Nov 13 15:11:31 2006
@@ -15,7 +15,7 @@
href="/AjaxTest.action"
theme="ajax"
delay="1000"
- updateFreq="5000"
+ updateInterval="5000"
errorText="There was an error"
loadingText="reloading">loading now</s:div>
Modified:
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotediv/example7.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotediv/example7.jsp?view=diff&rev=474562&r1=474561&r2=474562
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotediv/example7.jsp
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotediv/example7.jsp
Mon Nov 13 15:11:31 2006
@@ -15,7 +15,7 @@
href="/Test3.action"
theme="ajax"
delay="1000"
- showErrorTransportText="true"
+ executeScripts="true"
loadingText="reloading">loading now</s:div>
<s:include value="../footer.jsp"/>
Modified:
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotediv/example8.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotediv/example8.jsp?view=diff&rev=474562&r1=474561&r2=474562
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotediv/example8.jsp
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotediv/example8.jsp
Mon Nov 13 15:11:31 2006
@@ -1,4 +1,3 @@
-
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ taglib prefix="s" uri="/struts-tags" %>
@@ -10,18 +9,46 @@
<body>
+<script>
+ var controller = {
+ refresh : function() {},
+ start : function() {},
+ stop : function() {}
+ };
+
+
+ dojo.event.topic.registerPublisher("/refresh", controller, "refresh");
+ dojo.event.topic.registerPublisher("/startTimer", controller, "start");
+ dojo.event.topic.registerPublisher("/stopTimer", controller, "stop");
+
+</script>
+<form id="form">
+ <label for="textInput"">Text to be echoed</label>
+ <input type=textbox id="textInput" name="data">
+</form>
+
+<br/><br/>
+
+<input type=button value="refresh" onclick="controller.refresh()">
+<input type=button value="start timer" onclick="controller.start()">
+<input type=button value="stop timer" onclick="controller.stop()">
+
<s:div
id="once"
theme="ajax"
cssStyle="border: 1px solid yellow;"
href="/AjaxTest.action"
- updateFreq="0"
- delay="0">
- Initial Content ... should not change</s:div>
+ loadingText="Loading..."
+ refreshListenTopic="/refresh"
+ startTimerListenTopic="/startTimer"
+ stopTimerListenTopic="/stopTimer"
+ updateInterval="3000"
+ autoStart="true"
+ formId="form"
+ >
+ Initial Content</s:div>
<s:include value="../footer.jsp"/>
</body>
</html>
-
-
Modified:
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotediv/index.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotediv/index.jsp?view=diff&rev=474562&r1=474561&r2=474562
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotediv/index.jsp
(original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotediv/index.jsp
Mon Nov 13 15:11:31 2006
@@ -14,35 +14,34 @@
<li>
<a href="example1.jsp">A simple DIV that refreshes only once</a>
</li>
+
+ <li>
+ <a href="example10.jsp">A simple DIV that uses a custom handler</a>
+ </li>
<li>
<a href="example2.jsp?url=/AjaxTest.action">A simple DIV that
updates every 2 seconds</a>
</li>
<li>
- <a href="example3.jsp?period=3000">A simple DIV that obtains the
update freq (3 secs) from the value
- stack/action</a>
+ <a href="example4.jsp">A simple DIV that updates every 5 seconds
with loading text and reloading text and delay</a>
</li>
<li>
- <a href="example4.jsp">A simple DIV that updates every 5 seconds
with loading text and reloading text</a>
+ <a href="example5.jsp">A simple DIV's that cannot contact the
serverm, with fixed error message</a>
</li>
- <li>
- <a href="example5.jsp">A simple DIV's that cannot contact the
server</a>
- </li>
-
- <li>
- <a href="example6.jsp">A simple DIV's that cannot contact the
server and displays the transport error
- message</a>
- </li>
<li>
<a href="example7.jsp">A div that calls the server, and JS in the
resulting page is executed</a>
</li>
<li>
- <a href="example8.jsp">A div that will not update itself
(updateFreq=0 and delay=0)</a>
+ <a href="example8.jsp">A div that will listen to events to refresh
and start/stop autoupdate</a>
+ </li>
+
+ <li>
+ <a href="example9.jsp">A div that will listen to events to refresh
and start/stop autoupdate and will call beforeLoading and afterLoading
functions</a>
</li>
</ol>
Modified:
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remoteforms/index.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remoteforms/index.jsp?view=diff&rev=474562&r1=474561&r2=474562
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remoteforms/index.jsp
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remoteforms/index.jsp
Mon Nov 13 15:11:31 2006
@@ -30,7 +30,7 @@
<input type='text' name='data' value='Struts User'>
- <s:submit value="GO2" theme="ajax" resultDivId="two"/>
+ <s:submit value="GO2" theme="ajax" targets="two"/>
</s:form>
@@ -45,7 +45,7 @@
<input type='text' name='data' value='Struts User'>
- <s:submit value="GO3" theme="ajax" resultDivId="theForm3"/>
+ <s:submit value="GO3" theme="ajax" targets="theForm3"/>
</s:form>
@@ -59,7 +59,7 @@
<input type='text' name='data' value='Struts User'>
- <s:submit value="GO4" theme="ajax" onLoadJS="alert('form submitted');"/>
+ <s:submit value="GO4" theme="ajax" afterLoading="alert('form
submitted');"/>
</s:form>
@@ -73,7 +73,7 @@
<input type='text' name='data' value='Struts User'>
- <s:submit value="GO3" theme="ajax" resultDivId="theForm5"
preInvokeJS="confirm('sure?');"/>
+ <s:submit value="GO3" theme="ajax" targets="theForm5"
beforeLoading="confirm('sure?');"/>
</s:form>
@@ -87,7 +87,7 @@
<input type='text' name='data' value='Struts User'>
- <s:submit value="GO3" theme="ajax" resultDivId="theForm6"
preInvokeJS="doSomething();"/>
+ <s:submit value="GO3" theme="ajax" targets="theForm6"
beforeLoading="doSomething();"/>
</s:form>
@@ -101,7 +101,7 @@
<input type='text' name='data' value='Struts User'>
- <s:submit value="Go AWAY" resultDivId="theForm7" />
+ <s:submit value="Go AWAY" targets="theForm7" />
</s:form>
Modified:
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remoteforms/test1.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remoteforms/test1.jsp?view=diff&rev=474562&r1=474561&r2=474562
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remoteforms/test1.jsp
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remoteforms/test1.jsp
Mon Nov 13 15:11:31 2006
@@ -8,7 +8,7 @@
<body>
<s:form name="test1" id="test1" action="/ajax/Test1.action" theme="ajax">
Test 1 Form
-<s:submit theme="ajax" resultDivId="result2"/>
+<s:submit theme="ajax" targets="result2"/>
</s:form>
<s:div id="result2" theme="ajax" >test2 - before</s:div>
Modified:
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remoteforms/test2.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remoteforms/test2.jsp?view=diff&rev=474562&r1=474561&r2=474562
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remoteforms/test2.jsp
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remoteforms/test2.jsp
Mon Nov 13 15:11:31 2006
@@ -2,5 +2,5 @@
<s:form name="test2" id="test2" action="/ajax/Test2.action" theme="ajax">
Test 2 form
-<s:submit theme="ajax" resultDivId="result3"/>
+<s:submit theme="ajax" targets="result3"/>
</s:form>
Modified:
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotelink/index.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotelink/index.jsp?view=diff&rev=474562&r1=474561&r2=474562
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotelink/index.jsp
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotelink/index.jsp
Mon Nov 13 15:11:31 2006
@@ -7,105 +7,85 @@
<jsp:include page="/ajax/commonInclude.jsp"/>
</head>
+<script type="text/javascript">
+ function before() {alert("before request");}
+ function after() {alert("after request");}
+ function handler(widget, node) {
+ alert('I will handle this myself!');
+ dojo.byId(widget.targetsArray[0]).innerHTML = "Done";
+ }
+</script>
+
<body>
-One Component:
-<s:div
- id="one"
- cssStyle="border: 1px solid yellow;"
- href="/AjaxTest.action"
- theme="ajax"
- listenTopics="mylink1_click"
- delay="1000">Initial Content</s:div>
+<div id="t1">Div 1</div>
-<br/><br/>
+<br/>
+
+<div id="t2">Div 2</div>
-Two Component:
-<s:div
- id="two"
- cssStyle="border: 1px solid yellow;"
- href="/AjaxTest.action"
- theme="ajax"
- listenTopics="mylink1_click,mylink2_click"
- delay="1000">Initial Content</s:div>
<br/><br/>
-Three Component:
-<s:div
- id="three"
- cssStyle="border: 1px solid yellow;"
- href="/AjaxTest.action"
+<s:a id="link1"
theme="ajax"
- listenTopics="mylink2_click"
- delay="1000">Initial Content</s:div>
-<br/><br/>
+ href="/AjaxTest.action"
+ targets="t1,t2">Update 'Div 1' and 'Div 2'</s:a>
-Fourth Component:
-<s:div
- id="four"
- theme="ajax"
- cssStyle="border: 1px solid yellow;"
- href="/AjaxTest.action"
- listenTopics="myLink3_click"
- delay="0"
- updateFreq="0">Initial Content</s:div>
<br/><br/>
+<s:a id="link2"
+ theme="ajax"
+ href="/AjaxNoUrl.jsp"
+ errorText="Error Loading"
+ targets="t1">Try to update 'Div 1', use custom error
message</s:a>
+
+<br/><br/>
-<s:url id="remoteLink" value ="/AjaxRemoteLink.action" />
-<s:url id="testLink" value ="/AjaxTest.action" />
-
-Remote link 1 updating "One Component" and "Two Component"<br/>
-
-<s:a
- id="link1"
+<s:a id="link3"
theme="ajax"
- href="%{remoteLink}"
- notifyTopics="mylink1_click"
- showErrorTransportText="true"
- errorText="An Error ocurred">Update</s:a>
+ href="/AjaxTest.action"
+ loadingText="Loading!!!"
+ beforeLoading="before()"
+ afterLoading="after()"
+ targets="t1">Update 'Div 1', use custom loading message,
execute javascript functions before and after the request is made</s:a>
+
<br/><br/>
-Remote link 2 updating "Two Component" and "Three Component"<br/>
-<s:a
- id="link2"
+<s:a id="link4"
theme="ajax"
- href="%{remoteLink}"
- notifyTopics="mylink2_click"
- showErrorTransportText="true"
- errorText="An Error ocurred">Update</s:a>
+ href="/Test3.action"
+ executeScripts="true"
+ targets="t2">Update 'Div 2' and execute returned javascript
</s:a>
+
<br/><br/>
-Remote DIV that is not connected to any remote links:
-<s:div
- id="five"
- cssStyle="border: 1px solid yellow;"
- href="/AjaxTest.action"
+<s:a id="link5"
theme="ajax"
- delay="1000">Initial Content</s:div>
+ href="/AjaxTest.action"
+ handler="handler"
+ targets="t2">Update 'Div 2' using a custom handler </s:a>
+
+
<br/><br/>
-A Remote link that doesn't trigger any remote DIV updates<br/>
+<label for="textInput">Text to be echoed</label>
+
+<form id="form">
+ <input type=textbox name="data">
+</form>
-<s:a
- id="link3"
- theme="ajax"
- href="%{remoteLink}"
- showErrorTransportText="true"
- errorText="An Error ocurred">Update
-</s:a>
<br/><br/>
-A Remote link that will update "Fourth Component"
-<s:a
- id="link4"
+<s:a id="link6"
theme="ajax"
- href="%{remoteLink}"
- notifyTopics="myLink3_click"
- showErrorTransportText="true"
- errorText="An Error Ocurred">Update</s:a>
-<br/><br/>
+ href="/AjaxTest.action"
+ targets="t2"
+ formId="form"
+ >Update 'Div 2' with the content of the textbox </s:a>
+
+<br/><br/>
+
<s:include value="../footer.jsp"/>
</body>
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=474562&r1=474561&r2=474562
==============================================================================
---
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
Mon Nov 13 15:11:31 2006
@@ -1,6 +1,6 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ taglib prefix="s" uri="/struts-tags" %>
-
+
<html>
<head>
<title>Ajax examples - tabbled panel</title>
@@ -28,79 +28,79 @@
<tr>
<td align="top">
<s:tabbedPanel id="test" >
- <s:panel id="one" tabName="one">
+ <s:div id="one" label="one" theme="ajax">
This is the first pane<br/>
<s:form>
<s:textfield name="tt" label="Test Text"/> <br/>
<s:textfield name="tt2" label="Test Text2"/>
</s:form>
- </s:panel>
- <s:panel id="two" tabName="two">
+ </s:div>
+ <s:div id="two" label="two" theme="ajax">
This is the second panel
- </s:panel>
- <s:panel id="three" tabName="three">
+ </s:div>
+ <s:div id="three" label="three" theme="ajax">
This is the three
- </s:panel>
+ </s:div>
</s:tabbedPanel>
</td>
<td align="top">
<s:tabbedPanel id="test2" >
- <s:panel id="left" tabName="left">
+ <s:div id="left" label="left" theme="ajax">
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:panel>
- <s:panel remote="true" href="/AjaxTest.action" id="ryh1"
theme="ajax"
- tabName="remote one"></s:panel>
- <s:panel id="middle" tabName="middle">
+ </s:div>
+ <s:div href="/AjaxTest.action" id="ryh1" theme="ajax"
+ label="remote one"></s:div>
+ <s:div id="middle" label="middle" theme="ajax">
middle tab<br/>
<s:form>
<s:textfield name="tt" label="Test Text44"/> <br/>
<s:textfield name="tt2" label="Test Text442"/>
</s:form>
- </s:panel>
- <s:panel remote="true" href="/AjaxTest.action" id="ryh21"
theme="ajax" tabName="remote right"/>
+ </s:div>
+ <s:div href="/AjaxTest.action" id="ryh21" theme="ajax"
label="remote right"/>
</s:tabbedPanel>
</td>
</tr>
<tr>
<td align="top">
<s:tabbedPanel id="testremote">
- <s:panel remote="true" href="/AjaxTest.action" id="r1"
theme="ajax" tabName="remote one">
+ <s:div href="/AjaxTest.action" id="r1" theme="ajax"
label="remote one" theme="ajax">
<s:action name="AjaxTest" executeResult="true" />
- </s:panel>
- <s:panel remote="true" href="/AjaxTest.action" id="r2"
theme="ajax" tabName="remote two"></s:panel>
- <s:panel remote="true" href="/AjaxTest.action" id="r3"
theme="ajax" tabName="remote three"></s:panel>
+ </s:div>
+ <s:div href="/AjaxTest.action" id="r2" theme="ajax"
label="remote two" theme="ajax"></s:div>
+ <s:div href="/AjaxTest.action" id="r3" theme="ajax"
label="remote three" theme="ajax"></s:div>
</s:tabbedPanel>
</td>
<td align="top">
<s:tabbedPanel id="test3" >
- <s:panel id="left1" tabName="out one">
+ <s:div id="left1" label="out one" theme="ajax">
Outer one<br/>
<s:tabbedPanel id="test11">
- <s:panel id="i11" tabName="inner 1 one">Inner
1</s:panel>
- <s:panel id="112" tabName="inner 1 two">Inner
2</s:panel>
- <s:panel id="i13" tabName="inner 1 three">Inner
3</s:panel>
+ <s:div id="i11" label="inner 1 one">Inner 1</s:div>
+ <s:div id="112" label="inner 1 two">Inner 2</s:div>
+ <s:div id="i13" label="inner 1 three">Inner
3</s:div>
</s:tabbedPanel>
- </s:panel>
- <s:panel id="middle1" tabName="out two">
+ </s:div>
+ <s:div id="middle1" label="out two" theme="ajax">
Outer two<br/>
<s:tabbedPanel id="test12" >
- <s:panel id="i21" tabName="inner 2 one">Inner
21</s:panel>
- <s:panel id="122" tabName="inner 2 two">Inner
22</s:panel>
- <s:panel id="i23" tabName="inner 2 three">Inner
23</s:panel>
+ <s:div id="i21" label="inner 2 one"
theme="ajax">Inner 21</s:div>
+ <s:div id="122" label="inner 2 two"
theme="ajax">Inner 22</s:div>
+ <s:div id="i23" label="inner 2 three"
theme="ajax">Inner 23</s:div>
</s:tabbedPanel>
- </s:panel>
- <s:panel id="right1" tabName="out three">
+ </s:div>
+ <s:div id="right1" label="out three" theme="ajax">
Outer three<br/>
<s:tabbedPanel id="test13">
- <s:panel id="i31" tabName="inner 3 one">Inner
31</s:panel>
- <s:panel id="132" tabName="inner 3 two">Inner
32</s:panel>
- <s:panel id="i33" tabName="inner 3 three">Inner
33</s:panel>
+ <s:div id="i31" label="inner 3 one"
theme="ajax">Inner 31</s:div>
+ <s:div id="132" label="inner 3 two"
theme="ajax">Inner 32</s:div>
+ <s:div id="i33" label="inner 3 three"
theme="ajax">Inner 33</s:div>
</s:tabbedPanel>
- </s:panel>
+ </s:div>
</s:tabbedPanel>
</td>
</tr>
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=474562&r1=474561&r2=474562
==============================================================================
---
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
Mon Nov 13 15:11:31 2006
@@ -7,44 +7,23 @@
<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">
- 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>
<body>
- <table cellpadding="0" cellspacing="10" border="0" width="600">
- <tr>
- <td align="top">
- <s:tabbedPanel id="test" theme="ajax">
- <s:panel id="one" tabName="one" theme="ajax" >
- This is the first pane<br/>
- <s:form>
- <s:textfield name="tt" label="Test Text"/> <br/>
- <s:textfield name="tt2" label="Test Text2"/>
- </s:form>
- </s:panel>
- <s:panel id="two" tabName="two" theme="ajax">
- This is the second panel
- </s:panel>
- <s:panel id="three" tabName="three" theme="ajax">
- This is the three
- </s:panel>
- </s:tabbedPanel>
- </td>
- </tr>
- </table>
+ <s:tabbedPanel id="test2" theme="simple"
cssStyle="width: 500px; height: 300px;" doLayout="true">
+ <s:div id="left" label="test1" theme="ajax" >
+ I'm a Tab!!!
+ </s:div >
+ <s:div id="middle" label="test2" theme="ajax" >
+ I'm the other Tab!!!
+ </s:div >
+
+ </s:tabbedPanel>
+
+
<s:include value="../footer.jsp"/>
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=474562&r1=474561&r2=474562
==============================================================================
---
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
Mon Nov 13 15:11:31 2006
@@ -28,23 +28,23 @@
<tr>
<td align="top">
<!--// START SNIPPET: tabbedpanel-tag-->
- <s:tabbedPanel id="test2" theme="simple" >
- <s:panel id="left" tabName="left">
+ <s:tabbedPanel id="test2" theme="simple" cssStyle="width:
500px; height: 300px;" doLayout="true">
+ <s:div theme="ajax" 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:panel>
- <s:panel remote="true" href="/AjaxTest.action" id="ryh1"
theme="ajax" tabName="remote one" />
- <s:panel id="middle" tabName="middle">
+ </s:div>
+ <s:div theme="ajax" href="/AjaxTest.action" id="ryh1"
theme="ajax" label="remote one" />
+ <s:div theme="ajax" 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:panel>
- <s:panel remote="true" href="/AjaxTest.action"
id="ryh21" theme="ajax" tabName="remote right" />
+ </s:div>
+ <s:div theme="ajax" href="/AjaxTest.action" id="ryh21"
theme="ajax" label="remote right" />
</s:tabbedPanel>
<!--// END SNIPPET: tabbedpanel-tag-->
</td>
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=474562&r1=474561&r2=474562
==============================================================================
---
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
Mon Nov 13 15:11:31 2006
@@ -1,27 +1,31 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8"
- pageEncoding="UTF-8"%>
-<[EMAIL PROTECTED] prefix="s" uri="/struts-tags" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
+
<html>
<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Insert title here</title>
+ <title>Ajax examples - tabbled panel</title>
-<link rel="stylesheet" type="text/css" href="<s:url value='/struts/tabs.css'
/>" />
-<s:head theme="ajax" />
+ <jsp:include page="/ajax/commonInclude.jsp"/>
+ <link rel="stylesheet" type="text/css" href="<s:url
value="/struts/tabs.css"/>">
+
+
</head>
+
<body>
-<s:url id="url" action="example5" namespace="/nodecorate"
includeContext="false" />
-<s:tabbedPanel id="tp" theme="ajax">
- <s:panel id="t1" tabName="Tab 1" href="%{#url}">
- <s:form action="example5" namespace="" theme="ajax"
validate="true" >
- <s:textfield label="Name" name="name" theme="ajax" />
- <s:textfield label="Age" name="age" theme="ajax" />
- <s:submit />
- </s:form>
- </s:panel>
-</s:tabbedPanel>
+
+ <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" >
+ I'm a Tab!!!
+ </s:div >
+ <s:div id="middle" label="test2" theme="ajax" >
+ I'm the other Tab!!!
+ </s:div >
+
+ </s:tabbedPanel>
+
+
+
+<s:include value="../footer.jsp"/>
</body>
</html>
-
Modified:
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/index.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/index.jsp?view=diff&rev=474562&r1=474561&r2=474562
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/index.jsp
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/index.jsp
Mon Nov 13 15:11:31 2006
@@ -11,17 +11,11 @@
<p>
<ol>
- <li><a href="example2.jsp">A local tabbed panel</a></li>
- <li><a href="example3.jsp">A remote and local tabbed panel</a></li>
- <li><a href="example1.jsp">Various remote and local tabbed panels
(with enclosed tabbed pannels)</a></li>
- <li>
- <s:url id="url" action="example4" />
- <s:a href="%{#url}">Only remove tabbed panel</s:a>
- </li>
- <li>
- <s:url id="url" value="/ajax/tabbedpanel/example5.jsp" />
- <s:a href="%{#url}">Remote form validation inside tabbed
panel</s:a>
- </li>
+ <li><a href="example2.jsp">A local tabbed panel width fixed size
(doLayout="true")</a></li>
+ <li><a href="example3.jsp">A remote(href != "") and local tabbed
panel</a></li>
+ <li><a href="example1.jsp">Various remote and local tabbed panels
(with enclosed tabbed pannels) with layout (doLayout="false")</a></li>
+ <li><a href="example4.jsp">A local tabbed panel width fixed size
(doLayout="true") with close button on tabs(closeButton="tab"), and tabs on the
right (labelposition="righ")</a></li>
+ <li><a href="example5.jsp">A local tabbed panel width fixed size
(doLayout="true") with close button on the tab pane(closeButton="pane"), and
tabs on the bottom (labelposition="bottom")</a></li>
</ol>
Added:
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/timepicker/index.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/timepicker/index.jsp?view=auto&rev=474562
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/timepicker/index.jsp
(added)
+++
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/timepicker/index.jsp
Mon Nov 13 15:11:31 2006
@@ -0,0 +1,35 @@
+<%@ taglib prefix="s" uri="/struts-tags" %>
+<html>
+<head>
+ <title>TimePicker tag</title>
+ <%@ include file="/ajax/commonInclude.jsp" %>
+</head>
+
+<body>
+
+<h2>Examples</h2>
+
+Normal English-US timepicker:
+<s:timepicker language="en-us"/>
+
+<br>
+Set time to current time (useDefaultTime="true")
+<s:timepicker id="tp0" useDefaultTime="true"/>
+
+<br>
+Set minutes to current time (useDefaultTime="true" and
useDefaultMinutes="true")
+<s:timepicker id="tp1" useDefaultTime="true" useDefaultMinutes="true"/>
+
+<br>
+Set time to 9:43(value="9:43")
+<s:timepicker id="tp2" value="9:43"/>
+
+<br>
+Set time to 1:00PM(value="13:00")
+<s:timepicker id="tp3" value="13:00"/>
+
+<br>
+<s:include value="../footer.jsp"/>
+
+</body>
+</html>
Propchange:
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/timepicker/index.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tree/getCategory.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tree/getCategory.jsp?view=diff&rev=474562&r1=474561&r2=474562
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tree/getCategory.jsp
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tree/getCategory.jsp
Mon Nov 13 15:11:31 2006
@@ -13,12 +13,12 @@
</s:if>
<s:else>
<s:set name="display" value="''"/>
- </s:else>
+ </s:else>
âº
<s:div theme="ajax"
id="children_%{id}"
cssStyle="display: %{display}"
href="getCategory.action?catId=%{id}"
- listenTopics="children_%{id}"/>
+ refreshListenTopic="children_%{id}"/>
</s:iterator>
</ul>
Modified:
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/widgets/index.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/widgets/index.jsp?view=diff&rev=474562&r1=474561&r2=474562
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/widgets/index.jsp
(original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/widgets/index.jsp
Mon Nov 13 15:11:31 2006
@@ -8,11 +8,14 @@
</head>
<body>
+
+<br/>
NOTES:
<ul>
<li>Make sure that there is a 'value' attribute in the textarea with the
content for the editor</li>
<li>This is experimental</li>
</ul>
+
Default Editor configuration:<br/>
<s:form id="form1" action="AjaxRemoteForm" method="post">
Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/viewSource.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/viewSource.jsp?view=diff&rev=474562&r1=474561&r2=474562
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/viewSource.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/viewSource.jsp Mon Nov
13 15:11:31 2006
@@ -23,14 +23,14 @@
<h1>View Sources</h1>
<s:tabbedPanel id="test" theme="ajax">
- <s:panel id="one" tabName="Page" theme="ajax">
+ <s:div id="one" label="Page" theme="ajax">
<h3>${empty page ? "Unknown page" : page}</h3>
<pre>
<s:iterator value="pageLines" status="row">
${row.count}: <s:property/></s:iterator>
</pre>
- </s:panel>
- <s:panel id="two" tabName="Configuration" theme="ajax" >
+ </s:div>
+ <s:div id="two" label="Configuration" theme="ajax" >
<h3>${empty config ? "Unknown configuration" : config}</h3>
<pre>
@@ -38,14 +38,14 @@
<span style="background-color:yellow">${configLine - padding + row.count - 1}:
<s:property/></span></s:if><s:else>
${configLine - padding + row.count - 1}: <s:property/></s:else></s:iterator>
</pre>
- </s:panel>
- <s:panel id="three" tabName="Java Action" theme="ajax">
+ </s:div>
+ <s:div id="three" label="Java Action" theme="ajax">
<h3>${empty className ? "Unknown or unavailable Action class" :
className}</h3>
<pre>
<s:iterator value="classLines" status="row">
${row.count}: <s:property/></s:iterator>
</pre>
- </s:panel>
+ </s:div>
</s:tabbedPanel>
