From 5ba6cd4be568f686d890835a77586077cde1a943 Mon Sep 17 00:00:00 2001
From: xue <>
Date: Tue, 25 Apr 2006 01:31:43 +0000
Subject: Merge from 3.0 branch till 967.

---
 .../features/protected/pages/DatePicker.page           | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'tests/FunctionalTests/features')

diff --git a/tests/FunctionalTests/features/protected/pages/DatePicker.page b/tests/FunctionalTests/features/protected/pages/DatePicker.page
index 4347f748..261a6994 100644
--- a/tests/FunctionalTests/features/protected/pages/DatePicker.page
+++ b/tests/FunctionalTests/features/protected/pages/DatePicker.page
@@ -12,45 +12,47 @@
 </tr>
 
 <tr>
-	<td class="samplenote">Button Mode</td>
+	<td class="samplenote">Button Mode, pre-selected date</td>
 	<td class="sampleaction">
-		<com:TDatePicker Mode="Button" />
+		<com:TDatePicker Mode="Button" Date="20-10-2005"/>
 	</td>
 </tr>
 
 <tr>
 	<td class="samplenote">InputMode="DropDownList", custom DateFormat</td>
 	<td class="sampleaction">
-		<com:TDatePicker DateFormat="yyyy/MMMM" InputMode="DropDownList"/>
+		<com:TDatePicker DateFormat="yyyy/MMM" InputMode="DropDownList"/>
 	</td>
 </tr>
 
 <tr>
 	<td class="samplenote">InputMode="DropDownList", custom DateFormat, Culture</td>
 	<td class="sampleaction">
-		<com:TDatePicker DateFormat="MM/yyyy" Culture="fr" InputMode="DropDownList"/>
+		<com:TDatePicker DateFormat="MMM/yyyy" Culture="fr" InputMode="DropDownList"/>
 	</td>
 </tr>
 
 
 <tr>
-	<td class="samplenote">Custom DateFormat, culture, ImageButton mode</td>
+	<td class="samplenote">Custom DateFormat, culture, ImageButton mode, pre-selected date</td>
 	<td class="sampleaction">
-		<com:TDatePicker Mode="ImageButton" Culture="zh_CN" DateFormat="日期：yyyy年M月d日"/>
+		<com:TDatePicker Mode="ImageButton" Culture="zh_CN" 
+			DateFormat="日期：yyyy年M月d日"  
+			Timestamp=<%= @strtotime("-1 year") %>/>
 	</td>
 </tr>
 
 <tr>
 	<td class="samplenote">Custom DateFormat, DropDownList, pre-selected date set in as Text</td>
 	<td class="sampleaction">
-		<com:TDatePicker DateFormat="yyyy/MMMM/dd" Text="2005/05/15" InputMode="DropDownList"/>
+		<com:TDatePicker DateFormat="yyyy/MMMM/dd" Date="2005/05/15" InputMode="DropDownList"/>
 	</td>
 </tr>
 
 <tr>
 	<td class="samplenote">DropDownList, pre-selected date as integer</td>
 	<td class="sampleaction">
-		<com:TDatePicker InputMode="DropDownList" Date=<%= @strtotime("-1 month") %>/>
+		<com:TDatePicker InputMode="DropDownList" Timestamp=<%= @strtotime("-1 month") %>/>
 	</td>
 </tr>
 	
-- 
cgit v1.2.3