Merge from 3.0 branch till 1264.

1 files changed, 17 insertions, 17 deletions

diff --git a/demos/quickstart/protected/pages/Controls/DatePicker.page b/demos/quickstart/protected/pages/Controls/DatePicker.page
index a37ff048..36d2f435 100644
--- a/demos/quickstart/protected/pages/Controls/DatePicker.page
+++ b/demos/quickstart/protected/pages/Controls/DatePicker.page
@@ -3,14 +3,14 @@
 <h1 id="2301">TDatePicker</h1>

 <com:DocLink ClassPath="System.Web.UI.WebControls.TDatePicker" />

 

-<p><tt>TDatePicker</tt> displays a text box for date input purpose. 

+<p><tt>TDatePicker</tt> displays a text box for date input purpose.

 When the text box receives focus, a calendar will pop up and users can

 pick up from it a date that will be automatically entered into the text box.

 The format of the date string displayed in the text box is determined by

 the <tt>DateFormat</tt> property. Valid formats are the combination of the

 following tokens:

- 

-<com:TTextHighlighter Language="text" CssClass="source"> 

+

+<com:TTextHighlighter Language="text" CssClass="source">

 Character      Format Pattern (en-US)

 ---------------------------------------------------------------------

  d              day digit

@@ -32,7 +32,7 @@ only accepts integers such as the Unix timestamp.
 </p>

 

 <p>

-TDatePicker has three <tt>Mode</tt> to show the date picker popup. 

+TDatePicker has three <tt>Mode</tt> to show the date picker popup.

  <ul>

  	<li><tt>Basic</tt> - Only shows a text input, focusing on the input shows the date picker.</li>

 	<li><tt>Button</tt> - Shows a button next to the text input, clicking on the button shows the date, button text can be by the <tt>ButtonText</tt> property.</li>

@@ -40,8 +40,8 @@ TDatePicker has three <tt>Mode</tt> to show the date picker popup.
  </ul>

 </p>

 

-<p>The <tt>CssClass</tt> property can be used to override the css class name 

-for the date picker panel. The <tt>CalendarStyle</tt> property changes the overall calendar style. 

+<p>The <tt>CssClass</tt> property can be used to override the CSS class name

+for the date picker panel. The <tt>CalendarStyle</tt> property changes the overall calendar style.

 The following <tt>CalendarStyle</tt> values are available:

 	<ul>

 		<li><tt>default</tt> - The default calendar style.</li>

@@ -50,9 +50,9 @@ The following <tt>CalendarStyle</tt> values are available:
 

 <p>The <tt>InputMode</tt> property can be set to "TextBox" or "DropDownList" with

 default as "TextBox". In <tt>DropDownList</tt> mode, in addition to the popup date picker, three

-drop down list (day, month and year) are presented to select the date . 

+drop down list (day, month and year) are presented to select the date .

 When <tt>InputMode</tt> equals "DropDownList", the order and appearance of the date, month, and year

-will depend on the pattern specified in <tt>DateFormat</tt> property. 

+will depend on the pattern specified in <tt>DateFormat</tt> property.

 </p>

 

 <p>The popup date picker can be hidden by specifying <tt>ShowCalendar</tt> as false. Much of the

@@ -64,20 +64,20 @@ where <tt>FromYear</tt> is the starting year and <tt>UpToYear</tt> is the last y
 The starting day of the week can be changed by the <tt>FirstDayOfWeek</tt> property, with 0 as Sunday, 1 as Monday, etc.

 </p>

 

-<p><b>Note 1:</b> If the <tt>InputMode</tt> is "TextBox", the <tt>DateFormat</tt> should 

-only <b>NOT</b> contain <code>MMM</code> or <code>MMMM</code> patterns. The 

+<p><b>Note 1:</b> If the <tt>InputMode</tt> is "TextBox", the <tt>DateFormat</tt> should

+only <b>NOT</b> contain <code>MMM</code> or <code>MMMM</code> patterns. The

 server side date parser will not be able to determine the correct date if <code>MMM</code> or

 <code>MMMM</code> are used. When <tt>InputMode</tt> equals "DropDownList", all patterns can be used.</p>

- 

+

 <p><b>Note 2:</b> When the <tt>TDatePicker</tt> is used together

-with a validator, the <tt>DateFormat</tt> property of the validator must be equal to 

-the <tt>DateFormat</tt> of the <tt>TDatePicker</tt> <b>AND</b> must set <tt>DataType</tt>="Date" 

-on the validator to ensure correct validation. See 

+with a validator, the <tt>DateFormat</tt> property of the validator must be equal to

+the <tt>DateFormat</tt> of the <tt>TDatePicker</tt> <b>AND</b> must set <tt>DataType</tt>="Date"

+on the validator to ensure correct validation. See

 <a href="?page=Controls.Validation#TCompareValidator">TCompareValidator</a>,

-<a href="?page=Controls.Validation#TDataTypeValidator">TDataTypeValidator</a> and  

-<a href="?page=Controls.Validation#TRangeValidator">TRangeValidator</a> 

+<a href="?page=Controls.Validation#TDataTypeValidator">TDataTypeValidator</a> and

+<a href="?page=Controls.Validation#TRangeValidator">TRangeValidator</a>

 for details.</p>

- 

+

 <com:RunBar PagePath="Controls.Samples.TDatePicker.Home" />

 

 </com:TContent>
\ No newline at end of file