4 files changed, 42 insertions, 9 deletions
diff --git a/demos/quickstart/protected/controls/SampleLayout.tpl b/demos/quickstart/protected/controls/SampleLayout.tpl
index f1237010..8dc32436 100644
--- a/demos/quickstart/protected/controls/SampleLayout.tpl
+++ b/demos/quickstart/protected/controls/SampleLayout.tpl
@@ -8,22 +8,22 @@
 <body>
 <com:TForm>
 
-<div class="samplebar">
+<div class="sampleheader">
+
 <div style="float:left">
 <a href="?">PRADO QuickStart Tutorial</a> Sample
 </div>
+
 <div style="text-align:right">
 Copyright &copy; 2005 <a href="http://www.pradosoft.com">PradoSoft</a>
 </div>
+
 </div>
-</div>
+
 <div style="margin:15px;">
-<div>
 <com:TContentPlaceHolder ID="body" />
 </div>
 
-</div>
-
 </com:TForm>
 </body>
 </html>
 \ No newline at end of file
diff --git a/demos/quickstart/protected/pages/Controls/Samples/Label.page b/demos/quickstart/protected/pages/Controls/Samples/Label.page
index 2fe542a9..2fa77988 100644
--- a/demos/quickstart/protected/pages/Controls/Samples/Label.page
+++ b/demos/quickstart/protected/pages/Controls/Samples/Label.page
@@ -1,3 +1,30 @@
 <com:TContent ID="body">
-test
+
+<h1>TLabel Samples</h1>
+
+<div class="samplepanel">
+<com:TLabel
+	Text="This is a label with customized color and font."
+	ForeColor="yellow"
+	BackColor="blue"
+	Font.Name="Arial"
+	Font.Size="12pt"
+/>
+</div>
+
+<div class="samplepanel">
+<com:TLabel
+	Text="This is a form label associated with the TTextBox control below."
+	AssociatedControlID="test"
+/>
+<br/>
+<com:TTextBox ID="test" />
+</div>
+
+<div class="samplepanel">
+<com:TLabel>
+This is a label with empty Text property and <b>nonempty body</b>.
+</com:TLabel>
+</div>
+
 </com:TContent>
 \ No newline at end of file
diff --git a/demos/quickstart/themes/Simple/style.css b/demos/quickstart/themes/Simple/style.css
index a4e15ff8..2bdddae8 100644
--- a/demos/quickstart/themes/Simple/style.css
+++ b/demos/quickstart/themes/Simple/style.css
@@ -146,12 +146,18 @@ tt {
 	border-bottom: 1px dotted silver;
 }
 
-.samplebar {
+.sampleheader {
 	background:#00487D;
 	color:white;
 	padding:3px;
 }
 
-.samplebar a {
+.sampleheader a {
 	color:white;
+}
+
+.samplepanel {
+	margin: 10px;
+	border: 1px solid silver;
+	padding: 10px;
 }
 \ No newline at end of file
diff --git a/framework/Web/UI/WebControls/TLabel.php b/framework/Web/UI/WebControls/TLabel.php
index af40f897..5a53def4 100644
--- a/framework/Web/UI/WebControls/TLabel.php
+++ b/framework/Web/UI/WebControls/TLabel.php
@@ -18,7 +18,7 @@
  * TLabel will render the contents enclosed within its component tag
  * if {@link setText Text} is empty.
  * To use TLabel as a form label, associate it with a control by setting the
- * {@link setAssociateControlID AssociateControlID} property.
+ * {@link setAssociatedControlID AssociatedControlID} property.
  * The associated control must be locatable within the label's naming container.
  *
  * Note, {@link setText Text} will NOT be encoded for rendering.