upported recent documentation changes from branch/3.1 to trunk/

4 files changed, 99 insertions, 5 deletions

diff --git a/demos/quickstart/protected/pages/Controls/ColorPicker.page b/demos/quickstart/protected/pages/Controls/ColorPicker.page
index cc931840..57c39857 100644
--- a/demos/quickstart/protected/pages/Controls/ColorPicker.page
+++ b/demos/quickstart/protected/pages/Controls/ColorPicker.page
@@ -3,8 +3,33 @@
 <h1 id="2201">TColorPicker</h1>

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

 

-<p id="270244" class="block-content">

-TBD

+<p class="block-content">

+<tt>TColorPicker</tt> 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).

+<br/>Alternatively, if the <tt>ShowColorPicker</tt> 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.

 </p>

 

+<p class="block-content">

+TColorPicker has three different color picker UI <tt>Mode</tt>s:</p>

+ <ul id="u1" class="block-content">

+ 	<li><tt>Simple</tt> - Grid with 12 simple colors.</li>

+	<li><tt>Basic</tt> - Grid with the most common 70 colors. This is the default mode.</li>

+	<li><tt>Full</tt> - Full-featured color picker.</li>

+ </ul>

+

+<p class="block-content">The <tt>CssClass</tt> property can be used to override the CSS class name

+for the color picker panel. The <tt>ColorStyle</tt> property changes the overall color picker style.

+The following <tt>ColorStyle</tt> values are available:</p>

+	<ul id="u2" class="block-content">

+		<li><tt>default</tt> - The default color picker style.</li>

+	</ul>

+

+<p class="block-content">If the <tt>Mode</tt> property is set to <tt>Full</tt>, the color picker panel will

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

+and <tt>CancelButtonText</tt> properties.</p>

+

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

+

 <div class="last-modified">$Id$</div></com:TContent>
\ No newline at end of file
diff --git a/demos/quickstart/protected/pages/Controls/Head.page b/demos/quickstart/protected/pages/Controls/Head.page
index 7e4a19ec..594bb069 100644
--- a/demos/quickstart/protected/pages/Controls/Head.page
+++ b/demos/quickstart/protected/pages/Controls/Head.page
@@ -4,7 +4,39 @@
 <com:DocLink ClassPath="System.Web.UI.WebControls.THead" />

 

 <p id="310261" class="block-content">

-TBD

+<tt>THead</tt> displays a head element on a page. It displays the content

+enclosed in its body and the page title set by the <tt>Title</tt> property.

+</p>

+

+<p class="block-content">

+In addition, stylesheets and JavaScripts registered via

+<ul>

+  <li><tt>TClientScriptManager::registerStyleSheet</tt>,</li>

+  <li><tt>TClientScriptManager::registerStyleSheetFile</tt>,</li>

+  <li><tt>TClientScriptManager::registerHeadJavaScript</tt> and</li>

+  <li><tt>TClientScriptManager::registerHeadJavaScriptFile</tt></li>

+</ul>

+will also be displayed in the head.</p>

+

+<p class="block-content">

+THead also manages and displays meta tags through its <tt>MetaTags</tt>

+property. You can add a meta object to the collection in code dynamically,

+or add it in template using the following syntax

+</p>

+

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

+&lt;com:THead&gt;

+  &lt;com:TMetaTag HttpEquiv="Pragma" Content="no-cache" /&gt;

+  &lt;com:TMetaTag Name="keywords" Content="Prado" /&gt;

+&lt;/com:THead&gt;

+</com:TTextHighlighter>

+

+<p class="block-content">

+Note, <tt>TPage</tt> has a property <tt>Head</tt> that refers to

+the <tt>THead</tt> control currently on the page. A page can have at most one <tt>THead</tt>

+control. Although not required, it is recommended to place a <tt>THead</tt> on your page.

+Without a <tt>THead</tt> on the page, stylesheets and javascripts in the current page

+theme will not be rendered.

 </p>

 

 <div class="last-modified">$Id$</div></com:TContent>
\ No newline at end of file
diff --git a/demos/quickstart/protected/pages/Controls/Samples/TColorPicker/Home.page b/demos/quickstart/protected/pages/Controls/Samples/TColorPicker/Home.page
new file mode 100644
index 00000000..0a1f3705
--- /dev/null
+++ b/demos/quickstart/protected/pages/Controls/Samples/TColorPicker/Home.page
@@ -0,0 +1,37 @@
+<com:TContent ID="body">

+

+<h1>TColorPicker Samples</h1>

+

+<table class="sampletable">

+

+<tr>

+	<td class="samplenote">Default TColorPicker, Mode="Basic"</td>

+	<td class="sampleaction">

+		<com:TColorPicker />

+	</td>

+</tr>

+

+<tr>

+	<td class="samplenote">Mode="Simple"<br />pre-selected red color</td>

+	<td class="sampleaction">

+		<com:TColorPicker Mode="Simple" Text="#FF0000"/>

+	</td>

+</tr>

+

+<tr>

+	<td class="samplenote">Mode="Full"</td>

+	<td class="sampleaction">

+		<com:TColorPicker Mode="Full"/>

+	</td>

+</tr>

+

+<tr>

+	<td class="samplenote">Disabled color picker panel: ShowColorPicker="false"</td>

+	<td class="sampleaction">

+		<com:TColorPicker ShowColorPicker="false"/>

+	</td>

+</tr>

+

+</table>

+

+<div class="last-modified">$Id: Home.page 1650 2007-01-24 06:55:32Z wei $</div></com:TContent>
\ No newline at end of file
diff --git a/demos/quickstart/protected/pages/Controls/Standard.page b/demos/quickstart/protected/pages/Controls/Standard.page
index 3b6079d6..9fde5a29 100644
--- a/demos/quickstart/protected/pages/Controls/Standard.page
+++ b/demos/quickstart/protected/pages/Controls/Standard.page
@@ -23,7 +23,7 @@
   <a href="?page=Controls.ClientScriptLoader">TClientScriptLoader</a> loads custom javascript libraries.

   </li>

 

-  <li>*

+  <li>

   <a href="?page=Controls.ColorPicker">TColorPicker</a> represents an input field taking color values via a color dialog.

   </li>

 

@@ -43,7 +43,7 @@
   <a href="?page=Controls.FileUpload">TFileUpload</a> represents a file upload field. It allows users to upload a file to server.

   </li>

 

-  <li>*

+  <li>

   <a href="?page=Controls.Head">THead</a> represents the &lt;head&gt; element on an HTML Web page. It is required by a PRADO page should it use themes.

   </li>