Merge pull request #530 from pradosoft/prado-3.2.43.2.4prado-3.2

Backports for Prado 3.2.4

6 files changed, 47 insertions, 6 deletions

diff --git a/demos/quickstart/protected/pages/Controls/Samples/TConditional/Home.page b/demos/quickstart/protected/pages/Controls/Samples/TConditional/Home.page
index 5702970a..a7383e8d 100755
--- 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.3'">

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

 <prop:TrueTemplate>

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

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

 </prop:TrueTemplate>

 <prop:FalseTemplate>

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

diff --git a/demos/quickstart/protected/pages/Controls/Samples/THtmlArea/Home.page b/demos/quickstart/protected/pages/Controls/Samples/THtmlArea/Home.page
index 5150922f..5f01c07e 100755
--- a/demos/quickstart/protected/pages/Controls/Samples/THtmlArea/Home.page
+++ b/demos/quickstart/protected/pages/Controls/Samples/THtmlArea/Home.page
@@ -29,7 +29,7 @@ THtmlArea with manually set options
 </td></tr>

 

 <tr><td class="samplenote">

-THtmlArea with visual editting disabled:

+THtmlArea with visual editing disabled:

 </td><td class="sampleaction">

 <com:THtmlArea ID="HtmlArea3" EnableVisualEdit="false" />

 <br/>

@@ -38,6 +38,12 @@ THtmlArea with visual editting disabled:
 <com:TLiteral Encode="true" ID="Result3" />

 </td></tr>

 

+<tr><td class="samplenote">

+Read-only THtmlArea:

+</td><td class="sampleaction">

+<com:THtmlArea ID="HtmlArea4" ReadOnly="true" Text="Sample html text: <b>bold</b> <i>italic</i>" />

+</td></tr>

+

 </table>

 

 </com:TContent>

diff --git a/demos/quickstart/protected/pages/Controls/Samples/THtmlArea4/Home.page b/demos/quickstart/protected/pages/Controls/Samples/THtmlArea4/Home.page
index 6bb6449c..2b6c7a7a 100755
--- a/demos/quickstart/protected/pages/Controls/Samples/THtmlArea4/Home.page
+++ b/demos/quickstart/protected/pages/Controls/Samples/THtmlArea4/Home.page
@@ -29,7 +29,7 @@ THtmlArea4 with manually set options
 </td></tr>
 
 <tr><td class="samplenote">
-THtmlArea4 with visual editting disabled:
+THtmlArea4 with visual editing disabled:
 </td><td class="sampleaction">
 <com:THtmlArea4 ID="HtmlArea3" EnableVisualEdit="false" />
 <br/>
@@ -38,6 +38,12 @@ THtmlArea4 with visual editting disabled:
 <com:TLiteral Encode="true" ID="Result3" />
 </td></tr>
 
+<tr><td class="samplenote">
+Read-only THtmlArea:
+</td><td class="sampleaction">
+<com:THtmlArea4 ID="HtmlArea4" ReadOnly="true" Text="Sample html text: <b>bold</b> <i>italic</i>" />
+</td></tr>
+
 </table>
 
 </com:TContent>
diff --git a/demos/quickstart/protected/pages/Controls/Samples/TMarkdown/Home.page b/demos/quickstart/protected/pages/Controls/Samples/TMarkdown/Home.page
new file mode 100755
index 00000000..4cd0f86b
--- /dev/null
+++ b/demos/quickstart/protected/pages/Controls/Samples/TMarkdown/Home.page
@@ -0,0 +1,31 @@
+<com:TContent ID="body">
+
+<h1>TMarkdown Samples</h1>
+
+<table class="sampletable">
+
+<tr><td class="samplenote">
+Formatting text and code:
+</td><td class="sampleaction">
+<com:TMarkdown ShowLineNumbers="true">
+PRADO Markdown Test
+===================
+
+Some text and a list:
+* item 1
+* item 2
+
+Now, some code:
+
+```php
+public function test() {
+  // comment
+  echo "look me i'm colorful";
+}
+```
+</com:TMarkdown>
+</td></tr>
+
+</table>
+
+</com:TContent>
diff --git a/demos/quickstart/protected/pages/Controls/Samples/TPanel/Home.page b/demos/quickstart/protected/pages/Controls/Samples/TPanel/Home.page
index de419172..6e6cb54d 100755
--- a/demos/quickstart/protected/pages/Controls/Samples/TPanel/Home.page
+++ b/demos/quickstart/protected/pages/Controls/Samples/TPanel/Home.page
@@ -67,6 +67,5 @@ will be clicked because it is set as the default button of the panel.
 </com:TPanel>

 </td></tr>

 </table>

-<com:TJavascriptLogger />

 

 </com:TContent>

diff --git a/demos/quickstart/protected/pages/Controls/Samples/TTextHighlighter/Home.page b/demos/quickstart/protected/pages/Controls/Samples/TTextHighlighter/Home.page
index 9bd86078..c7506c67 100755
--- a/demos/quickstart/protected/pages/Controls/Samples/TTextHighlighter/Home.page
+++ b/demos/quickstart/protected/pages/Controls/Samples/TTextHighlighter/Home.page
@@ -12,7 +12,6 @@ Highlighting PHP statements:
 $str = 'one|two|three|four';

 // will output an array

 print_r(explode('|', $str, 2));

-?>

 </com:TTextHighlighter>

 </td></tr>