4 files changed, 69 insertions, 3 deletions
diff --git a/demos/quickstart/protected/pages/ActiveControls/ActiveLabel.page b/demos/quickstart/protected/pages/ActiveControls/ActiveLabel.page
new file mode 100644
index 00000000..8db4cf34
--- /dev/null
+++ b/demos/quickstart/protected/pages/ActiveControls/ActiveLabel.page
@@ -0,0 +1,16 @@
+<com:TContent ID="body" >
+
+<h1>TActiveLabel</h1>
+<com:DocLink ClassPath="System.Web.UI.ActiveControls.TActiveLabel" />
+
+<p class="block-content">
+<tt>TActiveLabel</tt> is the active control counterpart of <tt>TLabel</tt> component. When
+<tt>ActiveControl.EnableUpdate</tt> property is true during a callback request, setting <tt>Text</tt>
+property will also set the text of the label on the client upon callback
+completion. Similarly, setting <tt>ForControl</tt> will also set
+the client-side "for" attribute on the label.
+</p>
+
+<com:RunBar PagePath="ActiveControls.Samples.TActiveLabel.Home" />
+
+<div class="last-modified">$Id$</div></com:TContent>
+\ No newline at end of file
diff --git a/demos/quickstart/protected/pages/ActiveControls/Home.page b/demos/quickstart/protected/pages/ActiveControls/Home.page
index 0490733b..7e0e551a 100644
--- a/demos/quickstart/protected/pages/ActiveControls/Home.page
+++ b/demos/quickstart/protected/pages/ActiveControls/Home.page
@@ -54,9 +54,9 @@ TActiveButton</a> control. See also the later part of the <a href="?page=Tutoria
   </li>
 
   <li>
-  * <a href="?page=ActiveControls.ActiveLabel">TActiveLabel</a>
-	represents a label on a Web page.
-	The label can be customized via various CSS attributes.
+  <a href="?page=ActiveControls.ActiveLabel">TActiveLabel</a>
+  represents a label on a Web page.
+  The label can be customized via various CSS attributes.
   </li>
 
   <li>
diff --git a/demos/quickstart/protected/pages/ActiveControls/Samples/TActiveLabel/Home.page b/demos/quickstart/protected/pages/ActiveControls/Samples/TActiveLabel/Home.page
new file mode 100644
index 00000000..a1e242d3
--- /dev/null
+++ b/demos/quickstart/protected/pages/ActiveControls/Samples/TActiveLabel/Home.page
@@ -0,0 +1,34 @@
+<com:TContent ID="body">
+
+<h1>TActiveLabel Samples</h1>
+
+<table class="sampletable">
+
+<tr><td class="samplenote">
+An active label text being set as the result of a callback:
+</td><td class="sampleaction">
+<com:TActiveLabel Text="This is a label" ID="label1"
+/>
+
+<com:TActiveButton
+	Text="click me"
+	OnClick="buttonClicked"
+/>
+</td></tr>
+
+<tr><td class="samplenote">
+Upon button click, the textbox contents will be set on the label. Note that text needs to be properly escaped to avoid html injections:
+</td><td class="sampleaction">
+<com:TActiveTextBox ID="txt2"
+/>
+<com:TActiveButton
+	Text="=>"
+	OnClick="buttonClicked2"
+/>
+<com:TActiveLabel Text="" ID="label2"
+/>
+</td></tr>
+
+</table>
+
+<div class="last-modified">$Id$</div></com:TContent>
+\ No newline at end of file
diff --git a/demos/quickstart/protected/pages/ActiveControls/Samples/TActiveLabel/Home.php b/demos/quickstart/protected/pages/ActiveControls/Samples/TActiveLabel/Home.php
new file mode 100644
index 00000000..aa26fbe5
--- /dev/null
+++ b/demos/quickstart/protected/pages/ActiveControls/Samples/TActiveLabel/Home.php
@@ -0,0 +1,16 @@
+<?php
+
+class Home extends TPage
+{
+	public function buttonClicked($sender,$param)
+	{
+		$this->label1->Text="You clicked the button, didn't you?";
+	}
+
+	public function buttonClicked2($sender,$param)
+	{
+		$this->label2->Text=THttpUtility::htmlEncode($this->txt2->Text);
+	}
+}
+
+?>
+\ No newline at end of file