Author: bayard
Date: Mon Jun 11 14:55:17 2007
New Revision: 546299
URL: http://svn.apache.org/viewvc?view=rev&rev=546299
Log:
Applying revisions 546294,546295,546298 from
https://svn.apache.org/repos/asf/struts/struts1/branches/STRUTS_1_3_BRANCH
Modified:
struts/struts1/trunk/apps/el-example/src/main/webapp/html-file.jsp
struts/struts1/trunk/apps/el-example/src/main/webapp/html-multibox.jsp
struts/struts1/trunk/apps/el-example/src/main/webapp/html-radio.jsp
struts/struts1/trunk/apps/el-example/src/main/webapp/html-setters.jsp
Modified: struts/struts1/trunk/apps/el-example/src/main/webapp/html-file.jsp
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/apps/el-example/src/main/webapp/html-file.jsp?view=diff&rev=546299&r1=546298&r2=546299
==============================================================================
--- struts/struts1/trunk/apps/el-example/src/main/webapp/html-file.jsp
(original)
+++ struts/struts1/trunk/apps/el-example/src/main/webapp/html-file.jsp Mon Jun
11 14:55:17 2007
@@ -32,19 +32,22 @@
</div>
<html-el:form action="html-file.do">
- <table>
+ <table cellpadding="10">
<tr>
+ <td>As String property</td>
<td>
<html-el:file property="stringProperty"/>
</td>
</tr>
<tr>
+ <td>As String property, disabled if not empty pageScope</td>
<td>
<html-el:file property="stringProperty"
disabled="${!empty pageScope}"/>
</td>
</tr>
<tr>
+ <td>Iterating over a collection as String properties</td>
<td>
<logic-el:iterate collection="${pageScope}" id="item">
<html-el:file property="stringProperty"
Modified: struts/struts1/trunk/apps/el-example/src/main/webapp/html-multibox.jsp
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/apps/el-example/src/main/webapp/html-multibox.jsp?view=diff&rev=546299&r1=546298&r2=546299
==============================================================================
--- struts/struts1/trunk/apps/el-example/src/main/webapp/html-multibox.jsp
(original)
+++ struts/struts1/trunk/apps/el-example/src/main/webapp/html-multibox.jsp Mon
Jun 11 14:55:17 2007
@@ -31,7 +31,7 @@
</div>
Whatever changes you make to properties should be reflected when the page
-is redisplayed. When first started, all of the listed checkboxes should
+is redisplayed. When first started, all of the listed checkboxes should not
be selected. Press "Save" to update, or "Cancel" to return to the
main menu.
Modified: struts/struts1/trunk/apps/el-example/src/main/webapp/html-radio.jsp
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/apps/el-example/src/main/webapp/html-radio.jsp?view=diff&rev=546299&r1=546298&r2=546299
==============================================================================
--- struts/struts1/trunk/apps/el-example/src/main/webapp/html-radio.jsp
(original)
+++ struts/struts1/trunk/apps/el-example/src/main/webapp/html-radio.jsp Mon Jun
11 14:55:17 2007
@@ -39,7 +39,7 @@
title="Flag One" tabindex="3" accesskey="1"
disabled="${!empty pageScope}"/>
</td>
- <td>flag one</td>
+ <td>flag one (disabled if not empty pageScope)</td>
</tr>
<tr>
<td>
Modified: struts/struts1/trunk/apps/el-example/src/main/webapp/html-setters.jsp
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/apps/el-example/src/main/webapp/html-setters.jsp?view=diff&rev=546299&r1=546298&r2=546299
==============================================================================
--- struts/struts1/trunk/apps/el-example/src/main/webapp/html-setters.jsp
(original)
+++ struts/struts1/trunk/apps/el-example/src/main/webapp/html-setters.jsp Mon
Jun 11 14:55:17 2007
@@ -158,7 +158,8 @@
<tr>
<th align="right">stringIndexed[1]</th>
<td align="left">
- <html-el:textarea property="stringIndexed[1]" rows="${1+3}"/>
+ <html-el:textarea disabled="${!empty pageScope}"
+ property="stringIndexed[1]" rows="${1+3}"/>
</td>
<th align="right">nested.stringIndexed[1]</th>
<td align="left">
@@ -170,7 +171,8 @@
<tr>
<th align="right">stringIndexed[1]</th>
<td align="left">
- <html-el:text property="stringIndexed[1]" size="32"/>
+ <html-el:text property="stringIndexed[1]"
+ disabled="${!empty pageScope}" size="32"/>
</td>
<th align="right">nested.stringIndexed[1]</th>
<td align="left">
