Author: wesw
Date: Tue Dec 6 17:01:50 2011
New Revision: 1211023
URL: http://svn.apache.org/viewvc?rev=1211023&view=rev
Log:
WW-3712
- added css.ftl to the radiomap.ftl template
- added s:radio to showcase to make it easier to test s:radio
Modified:
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/UITagExample.java
struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/example.jsp
struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/exampleSubmited.jsp
struts/struts2/trunk/core/src/main/resources/template/simple/radiomap.ftl
Modified:
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/UITagExample.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/UITagExample.java?rev=1211023&r1=1211022&r2=1211023&view=diff
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/UITagExample.java
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/UITagExample.java
Tue Dec 6 17:01:50 2011
@@ -20,6 +20,11 @@
*/
package org.apache.struts2.showcase;
+import com.opensymphony.xwork2.ActionSupport;
+import com.opensymphony.xwork2.Validateable;
+import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.ServletActionContext;
+
import java.io.File;
import java.util.ArrayList;
import java.util.Collections;
@@ -28,12 +33,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.struts2.ServletActionContext;
-
-import com.opensymphony.xwork2.ActionSupport;
-import com.opensymphony.xwork2.Validateable;
-import com.opensymphony.xwork2.util.ValueStack;
-
/**
*/
public class UITagExample extends ActionSupport implements Validateable {
@@ -47,6 +46,7 @@ public class UITagExample extends Action
String bio;
String favouriteColor;
List friends;
+ String bestFriend;
boolean legalAge;
String state;
String region;
@@ -185,6 +185,14 @@ public class UITagExample extends Action
this.friends = friends;
}
+ public String getBestFriend() {
+ return bestFriend;
+ }
+
+ public void setBestFriend(String bestFriend) {
+ this.bestFriend = bestFriend;
+ }
+
public boolean isLegalAge() {
return legalAge;
}
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?rev=1211023&r1=1211022&r2=1211023&view=diff
==============================================================================
--- 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
Dec 6 17:01:50 2011
@@ -62,9 +62,16 @@
<s:checkboxlist
tooltip="Choose your Friends"
label="Friends"
- list="{'Patrick', 'Jason', 'Jay', 'Toby', 'Rene'}"
+ list="{'Wes', 'Patrick', 'Jason', 'Jay', 'Toby', 'Rene'}"
name="friends"/>
+ <s:radio
+ tooltip="Choose your Best Friend"
+ label="Best Friend"
+ list="{'Wes', 'Patrick', 'Jason', 'Jay', 'Toby', 'Rene'}"
+ name="bestFriend"
+ cssErrorClass="foo" />
+
<s:checkbox
tooltip="Confirmed that your are Over 18"
label="Age 18+"
Modified:
struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/exampleSubmited.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/exampleSubmited.jsp?rev=1211023&r1=1211022&r2=1211023&view=diff
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/exampleSubmited.jsp
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/exampleSubmited.jsp
Tue Dec 6 17:01:50 2011
@@ -18,7 +18,8 @@
</tr>
<s:label label="Biography" name="bio" />
<s:label label="Favourite Color" name="favouriteColor" />
- <s:label label="Friends" name="friends" />
+ <s:label label="Friends" name="friends" />
+ <s:label label="Best Friend" name="bestFriend" />
<s:label label="Legal Age" name="legalAge" />
<s:label label="Region" name="region" />
<s:label label="State" name="state" />
Modified:
struts/struts2/trunk/core/src/main/resources/template/simple/radiomap.ftl
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/radiomap.ftl?rev=1211023&r1=1211022&r2=1211023&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/radiomap.ftl
(original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/radiomap.ftl
Tue Dec 6 17:01:50 2011
@@ -55,6 +55,7 @@
<#if parameters.cssStyle??>
style="${parameters.cssStyle?html}"<#rt/>
</#if>
+<#include "/${parameters.templateDir}/simple/css.ftl" />
<#if parameters.title??>
title="${parameters.title?html}"<#rt/>
</#if>
