upported recent documentation changes from branch/3.1 to trunk/

3 files changed, 23 insertions, 6 deletions

diff --git a/framework/Web/UI/WebControls/TColorPicker.php b/framework/Web/UI/WebControls/TColorPicker.php
index 0fc7eef4..1066bf76 100644
--- a/framework/Web/UI/WebControls/TColorPicker.php
+++ b/framework/Web/UI/WebControls/TColorPicker.php
@@ -13,8 +13,25 @@
 /**

  * TColorPicker class.

  *

- * Be aware, this control is EXPERIMENTAL and is not stablized yet.

+ * TColorPicker displays a text box for color input purpose.

+ * Next to the textbox there's a button filled with the current chosen color.

+ * Users can write a color name directly in the text box as an hex triplet (also known as HTML notation, eg: #FF00FF).

+ * Alternatively, if the <b>ShowColorPicker</b> property is enabled (it is by default), users can click the button

+ * to have a color picker UI appear. A color chan be chosen directly by clicking on the color picker.

  *

+ * TColorPicker has three different color picker UI <b>Mode</b>s:

+ *  # <b>Simple</b> - Grid with 12 simple colors.

+ *  # <b>Basic</b> - Grid with the most common 70 colors. This is the default mode.

+ *  # <b>Full</b> - Full-featured color picker.

+ * 

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

+ * for the color picker panel. The <b>ColorStyle</b> property sets the packages

+ * styles available. E.g. <b>default</b>.

+ * 

+ * If the <b>Mode</b> property is set to <b>Full</b>, the color picker panel will

+ * display an "Ok" and "Cancel" buttons. You can customize the button labels setting the <b>OKButtonText</b>

+ * and <b>CancelButtonText</b> properties.

+ * 

  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>

  * @version $Id$

  * @package System.Web.UI.WebControls

@@ -226,9 +243,9 @@ class TColorPicker extends TTextBox
  * that a {@link TColorPicker} control can take.

  *

  * The following enumerable values are defined:

- * - Simple

- * - Basic

- * - Full

+ * # Simple - Grid with 12 simple colors.

+ * # Basic - Grid with the most common 70 colors. This is the default mode.

+ * # Full - Full-featured color picker.

  *

  * @author Qiang Xue <qiang.xue@gmail.com>

  * @version $Id$

diff --git a/framework/Web/UI/WebControls/TDatePicker.php b/framework/Web/UI/WebControls/TDatePicker.php
index 1bac5a1c..5d5a17e6 100644
--- a/framework/Web/UI/WebControls/TDatePicker.php
+++ b/framework/Web/UI/WebControls/TDatePicker.php
@@ -56,7 +56,7 @@ Prado::using('System.Web.UI.WebControls.TTextBox');
  *

  * The <b>InputMode</b> 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

+ * In <b>DropDownList</b> mode, in addition to the popup date picker, three

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

  *

  * The <b>PositionMode</b> property can be set to "Top" or "Bottom" with default

diff --git a/framework/Web/UI/WebControls/THead.php b/framework/Web/UI/WebControls/THead.php
index 36b81648..9daa6d3b 100644
--- a/framework/Web/UI/WebControls/THead.php
+++ b/framework/Web/UI/WebControls/THead.php
@@ -31,7 +31,7 @@
  * </code>

  *

  * Note, {@link TPage} has a property {@link TPage::getHead Head} that refers to

- * the THead control currently on the page. A page can have at most once THead

+ * the THead control currently on the page. A page can have at most one THead

  * control. Although not required, it is recommended to place a THead on your page.

  * Without a THead on the page, stylesheets and javascripts in the current page

  * theme will not be rendered.