Merge up to r3319

3 files changed, 65 insertions, 2 deletions

diff --git a/demos/quickstart/protected/pages/Controls/Samples/TConditional/Home.page b/demos/quickstart/protected/pages/Controls/Samples/TConditional/Home.page
index 7baa16d6..9e37b675 100644
--- a/demos/quickstart/protected/pages/Controls/Samples/TConditional/Home.page
+++ b/demos/quickstart/protected/pages/Controls/Samples/TConditional/Home.page
@@ -1,9 +1,9 @@
 <com:TContent ID="body">

 <h1>TConditional Samples</h1>

 

-<com:TConditional Condition="Prado::getVersion()==='3.2.1'">

+<com:TConditional Condition="Prado::getVersion()==='3.2.2'">

 <prop:TrueTemplate>

-  <com:TLabel Text="You are using PRADO 3.2.1" />

+  <com:TLabel Text="You are using PRADO 3.2.2" />

 </prop:TrueTemplate>

 <prop:FalseTemplate>

   <com:TLabel Text="You are using PRADO <%= Prado::getVersion() %>" />

diff --git a/demos/quickstart/protected/pages/Controls/Samples/THtmlArea4/Home.page b/demos/quickstart/protected/pages/Controls/Samples/THtmlArea4/Home.page
new file mode 100755
index 00000000..6bb6449c
--- /dev/null
+++ b/demos/quickstart/protected/pages/Controls/Samples/THtmlArea4/Home.page
@@ -0,0 +1,43 @@
+<com:TContent ID="body">
+
+<h1>THtmlArea4 Samples</h1>
+
+<table class="sampletable">
+
+<tr><td class="samplenote">
+THtmlArea4 with default settings:
+</td><td class="sampleaction">
+<com:THtmlArea4 ID="HtmlArea1" />
+<com:TButton Text="Submit" OnClick="button1Clicked" />
+<br/>
+<com:TLiteral Encode="true" ID="Result1" />
+</td></tr>
+
+<tr><td class="samplenote">
+THtmlArea4 with manually set options
+</td><td class="sampleaction">
+<com:THtmlArea4 ID="HtmlArea2" Width="670px" Height="300px">
+  <prop:Options>
+  	resize: false
+    plugins: "charmap code wordcount"
+    toolbar: "undo redo | styleselect | bold italic | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | code charmap | ",
+  </prop:Options>
+</com:THtmlArea4>
+<com:TButton Text="Submit" OnClick="button2Clicked" />
+<br/>
+<com:TLiteral Encode="true" ID="Result2" />
+</td></tr>
+
+<tr><td class="samplenote">
+THtmlArea4 with visual editting disabled:
+</td><td class="sampleaction">
+<com:THtmlArea4 ID="HtmlArea3" EnableVisualEdit="false" />
+<br/>
+<com:TButton Text="Submit" OnClick="button3Clicked" />
+<br/>
+<com:TLiteral Encode="true" ID="Result3" />
+</td></tr>
+
+</table>
+
+</com:TContent>
diff --git a/demos/quickstart/protected/pages/Controls/Samples/THtmlArea4/Home.php b/demos/quickstart/protected/pages/Controls/Samples/THtmlArea4/Home.php
new file mode 100755
index 00000000..c513c8f7
--- /dev/null
+++ b/demos/quickstart/protected/pages/Controls/Samples/THtmlArea4/Home.php
@@ -0,0 +1,20 @@
+<?php
+
+class Home extends TPage
+{
+	public function button1Clicked($sender,$param)
+	{
+		$this->Result1->Text="You have entered: ".$this->HtmlArea1->Text;
+	}
+
+	public function button2Clicked($sender,$param)
+	{
+		$this->Result2->Text="You have entered: ".$this->HtmlArea2->Text;
+	}
+
+	public function button3Clicked($sender,$param)
+	{
+		$this->Result3->Text="You have entered: ".$this->HtmlArea3->Text;
+	}
+}
+