Merge from 3.0 branch till 1409.

3 files changed, 31 insertions, 0 deletions

diff --git a/demos/quickstart/protected/pages/Advanced/MasterContent.page b/demos/quickstart/protected/pages/Advanced/MasterContent.page
index 2698f865..b7bcc9bb 100644
--- a/demos/quickstart/protected/pages/Advanced/MasterContent.page
+++ b/demos/quickstart/protected/pages/Advanced/MasterContent.page
@@ -39,4 +39,19 @@ Then, the contents are inserted into the master control according to the followi
 </p>

 <img src=<%~ mastercontent.gif %> alt="Master and Content" />

 <img src=<%~ pcrelation.gif %> alt="Parent-child relationship between master and content" />

+

+<h2>Master vs. External Template</h2>

+<p>

+Master is very similar to external templates which are introduced since version 3.0.5. A special <a href="?page=Configurations.Templates1">include tag</a> is used to include an external template file into a base template.

+</p>

+<p>

+Both master and external template can be used to share common contents among pages. A master is a template control whose template contains the common content and whose class file contains the logic associated with the master. An external template, on the other hand, is a pure template file without any class files.

+</p>

+<p>

+Therefore, use master control if the common content has to be associated with some logic, such as a page header with search box or login box. A master control allows you to specify how the common content should interact with end users. If you use external templates, you will have to put the needed logic in the page or control class who owns the base template.

+</p>

+<p>

+Performancewise, external template is lighter than master as the latter is a self-contained control participating the page lifecycles, while the former is used only when the template is being parsed.

+</p>

+

 </com:TContent>
\ No newline at end of file
diff --git a/demos/quickstart/protected/pages/Configurations/Templates1.page b/demos/quickstart/protected/pages/Configurations/Templates1.page
index 3f2fcc5e..7acd92d0 100644
--- a/demos/quickstart/protected/pages/Configurations/Templates1.page
+++ b/demos/quickstart/protected/pages/Configurations/Templates1.page
@@ -85,4 +85,19 @@ Comments INVISIBLE to end-users
 Note, template comments (by &lt;!-- ... --!&gt;) cannot appear in a property value.

 </p>

 

+<h2>Include Tags</h2>

+<p>

+Since version 3.0.5, PRADO starts to support external template inclusion. This is accomplished via include tags, where external template files are specified in namespace format and their file name must be terminated as <tt>.tpl</tt>.

+</p>

+<com:TTextHighlighter Language="prado" CssClass="source">

+&lt;%include path.to.templateFile %&gt;

+</com:TTextHighlighter>

+

+<p>

+External templates will be inserted at the places where the include tags occur in the base template.

+</p>

+<p>

+Note, nested template inclusion is not supported, i.e., you cannot have include tags in an external template.

+</p>

+

 </com:TContent>
\ No newline at end of file
diff --git a/demos/quickstart/protected/pages/Controls/DataGrid.page b/demos/quickstart/protected/pages/Controls/DataGrid.page
index 2a51a3de..4697d0e5 100644
--- a/demos/quickstart/protected/pages/Controls/DataGrid.page
+++ b/demos/quickstart/protected/pages/Controls/DataGrid.page
@@ -21,6 +21,7 @@ PRADO provides five types of columns:
 </p>

 <ul>

   <li><tt>TBoundColumn</tt> associates cells with a specific field of data and displays the cells according to their modes.</li>

+  <li><tt>TLiteralColumn</tt> associates cells with a specific field of data and displays the cells with static texts.</li>

   <li><tt>TCheckBoxColumn</tt> associates cells with a specific field of data and displays in each cell a checkbox whose check state is determined by the data field value.</li>

   <li><tt>TDropDownListColumn</tt> associates cells with a specific field of data and displays the cells according to their modes. If in edit mode, a cell will be displayed with a <tt>TDropDownList</tt>.</li>

   <li><tt>THyperLinkColumn</tt> displays in the cells a hyperlink whose caption and URL can be either statically specified or bound to some fields of data.</li>