Author: musachy
Date: Tue May  8 18:10:00 2007
New Revision: 536388

URL: http://svn.apache.org/viewvc?view=rev&rev=536388
Log:
* Fix velocity UI tags example (use sx instead of s)
* Add a field to UI tags example show off timepicker

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/example.vm
    
struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/exampleSubmited.jsp
    
struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/exampleSubmited.vm

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?view=diff&rev=536388&r1=536387&r2=536388
==============================================================================
--- 
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 May  8 18:10:00 2007
@@ -43,6 +43,7 @@
 
     String name;
     Date birthday;
+    Date wakeup;
     String bio;
     String favouriteColor;
     List friends;
@@ -241,7 +242,13 @@
         return this.thoughts;
     }
 
+    public Date getWakeup() {
+        return wakeup;
+    }
 
+    public void setWakeup(Date wakeup) {
+        this.wakeup = wakeup;
+    }
 
     public String doSubmit() {
         return SUCCESS;

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=536388&r1=536387&r2=536388
==============================================================================
--- 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 
May  8 18:10:00 2007
@@ -25,7 +25,13 @@
             tooltip="Select Your Birthday"
             label="Birthday"
             name="birthday" />
-
+            
+    <sx:datetimepicker
+            tooltip="Enter the time you wake up"
+            label="Wake up time"
+            name="wakeup" 
+            type="time"/>
+            
     <s:textarea
             tooltip="Enter your Biography"
             label="Biography"

Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/example.vm
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/example.vm?view=diff&rev=536388&r1=536387&r2=536388
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/example.vm 
(original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/example.vm Tue 
May  8 18:10:00 2007
@@ -2,6 +2,7 @@
 <head>
     <title>UI Tags Example</title>
     #shead()
+    #sxhead()
 </head>
 
 <body>
@@ -12,7 +13,8 @@
 
 #sform ("action=exampleSubmitVelocity" "method=post" 
"enctype=multipart/form-data")
     #stextfield ("label=Name" "name=name")
-    #sdatetimepicker ("label=Birthday" "name=birthday")
+    #sxdatetimepicker ("label=Birthday" "name=birthday")
+    #sxdatetimepicker ("label=Wake up time" "name=wakeup" "type=time")
     #stextarea ("label=Biography" "name=bio" "cols=20" "rows=3")
     #sselect ("label=Favourite Color" "list={'Red', 'Blue', 'Green'}" 
"name=favouriteColor" "emptyOption=true" "headerKey=None" "headerValue=None")
     #sselect ("label=Favourite Language" "list=favouriteLanguages" 
"name=favouriteLanguage" "listKey=key" "listValue=description" 
"emptyOption=true" "headerKey=None" "headerValue=None")

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?view=diff&rev=536388&r1=536387&r2=536388
==============================================================================
--- 
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 May  8 18:10:00 2007
@@ -10,6 +10,12 @@
 <table>
     <s:label label="Name" name="name" /> 
     <s:label label="Birthday" name="birthday" />
+    <tr>
+        <td><label class="label">Wake up time:</label></td>
+        <td>
+           <s:date name="wakeup" format="hh:mm aa" />
+        </td>
+    </tr>
     <s:label label="Biography" name="bio" /> 
     <s:label label="Favourite Color" name="favouriteColor" /> 
     <s:label label="Friends" name="friends" /> 

Modified: 
struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/exampleSubmited.vm
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/exampleSubmited.vm?view=diff&rev=536388&r1=536387&r2=536388
==============================================================================
--- 
struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/exampleSubmited.vm 
(original)
+++ 
struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/exampleSubmited.vm 
Tue May  8 18:10:00 2007
@@ -8,6 +8,12 @@
 <table>
        #slabel ("label=Name" "name=name")
        #slabel ("label=Birthday" "name=birthday")
+       <tr>
+        <td><label class="label">Wake up time:</label></td>
+        <td>
+           #sdate ("name=wakeup" "format=hh:mm aa")
+        </td>
+    </tr>
        #slabel ("label=Biography" "name=bio")
        #slabel ("label=Favourite Color" "name=favouriteColor")
        #slabel ("label=Friends" "name=friends")


Reply via email to