From 6215202c20ab394f273c4b79b71f80003bf757f4 Mon Sep 17 00:00:00 2001
From: Fabio Bas <ctrlaltca@gmail.com>
Date: Tue, 14 Jan 2014 22:36:10 +0100
Subject: Removed TJavascriptLogger from demos and tests
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Any browser’s development tool is way better, and it stops exceptions
from being catched by the browser’s console
(cherry picked from commit 0a136fe37491281ada5084b6eb5a72d4ca8d948a)
---
 demos/quickstart/protected/pages/Tutorial/AjaxChat.page    | 7 +++----
 demos/quickstart/protected/pages/Tutorial/fr/AjaxChat.page | 5 ++---
 2 files changed, 5 insertions(+), 7 deletions(-)

(limited to 'demos/quickstart/protected/pages/Tutorial')

diff --git a/demos/quickstart/protected/pages/Tutorial/AjaxChat.page b/demos/quickstart/protected/pages/Tutorial/AjaxChat.page
index d94dfa89..4a8f23ab 100755
--- a/demos/quickstart/protected/pages/Tutorial/AjaxChat.page
+++ b/demos/quickstart/protected/pages/Tutorial/AjaxChat.page
@@ -170,7 +170,7 @@ as <tt>App_Code/chat.db</tt>.
 class ChatUserRecord extends TActiveRecord
 {
     const TABLE='chat_users';
-    
+
     public $username;
     public $last_activity;
 
@@ -431,7 +431,6 @@ and a button to send the message.
         Text="Send" /&gt;
 </div>
 &lt;/com:TForm&gt;
-&lt;com:TJavascriptLogger /&gt;
 </body>
 </html>
 </com:TTextHighlighter>
@@ -572,7 +571,7 @@ public function getUserMessages($user)
     $content = '';
     foreach($this->findAll('for_user = ?', $user) as $message)
         $content .= $this->formatMessage($message);
-    $this->deleteAll('for_user = ? OR created_on < ?',
+    $this->deleteAll('for_user = ? OR created_on < ?',
                           $user, time() - 300); //5 min inactivity
     return $content;
 }
@@ -581,7 +580,7 @@ protected function formatMessage($message)
 {
     $user = htmlspecialchars($message->from_user);
     $content = htmlspecialchars($message->message);
-    return "<div class=\"message\"><strong>{$user}:</strong>"
+    return "<div class=\"message\"><strong>{$user}:</strong>"
                   ." <span>{$content}</span></div>";
 }
 </com:TTextHighlighter>
diff --git a/demos/quickstart/protected/pages/Tutorial/fr/AjaxChat.page b/demos/quickstart/protected/pages/Tutorial/fr/AjaxChat.page
index 66bb0e43..39d7f9e5 100755
--- a/demos/quickstart/protected/pages/Tutorial/fr/AjaxChat.page
+++ b/demos/quickstart/protected/pages/Tutorial/fr/AjaxChat.page
@@ -430,7 +430,6 @@ and a button to send the message.
         Text="Send" /&gt;
 </div>
 &lt;/com:TForm&gt;
-&lt;com:TJavascriptLogger /&gt;
 </body>
 </html>
 </com:TTextHighlighter>
@@ -571,7 +570,7 @@ public function getUserMessages($user)
     $content = '';
     foreach($this->findAll('for_user = ?', $user) as $message)
         $content .= $this->formatMessage($message);
-    $this->deleteAll('for_user = ? OR created_on < ?',
+    $this->deleteAll('for_user = ? OR created_on < ?',
                           $user, time() - 300); //5 min inactivity
     return $content;
 }
@@ -580,7 +579,7 @@ protected function formatMessage($message)
 {
     $user = htmlspecialchars($message->from_user);
     $content = htmlspecialchars($message->message);
-    return "<div class=\"message\"><strong>{$user}:</strong>"
+    return "<div class=\"message\"><strong>{$user}:</strong>"
                   ." <span>{$content}</span></div>";
 }
 </com:TTextHighlighter>
-- 
cgit v1.2.3


From 21a909f819cc340564770ea63e383ee6013fc167 Mon Sep 17 00:00:00 2001
From: Fabio Bas <ctrlaltca@gmail.com>
Date: Wed, 15 Jan 2014 19:03:29 +0100
Subject: Removed ?> from buildscripts and demos

---
 buildscripts/classtree/DWExtension.php             |  1 -
 buildscripts/index/build.php                       |  2 -
 buildscripts/index/quickstart_index.php            |  1 -
 buildscripts/index/search.php                      |  4 +-
 buildscripts/phing/tasks/PradoPearTask.php         |  2 -
 buildscripts/phpbuilder/build.php                  |  2 -
 buildscripts/texbuilder/Page2Tex.php               |  2 -
 buildscripts/texbuilder/quickstart/build.php       |  3 -
 buildscripts/texbuilder/quickstart/pages.php       |  2 -
 buildscripts/texbuilder/sqlmap/build.php           |  3 -
 buildscripts/texbuilder/sqlmap/pages.php           |  2 -
 buildscripts/texbuilder/time-tracker/pages.php     |  2 -
 .../protected/pages/Day1/CreateContact.page        | 31 +++++----
 .../blog-tutorial/protected/pages/Day1/Setup.page  |  5 +-
 .../protected/pages/Day1/ShareLayout.page          |  2 -
 .../protected/pages/Day1/fr/CreateContact.page     | 33 +++++-----
 .../protected/pages/Day1/fr/Setup.page             |  7 +--
 .../protected/pages/Day1/fr/ShareLayout.page       |  4 +-
 .../protected/pages/Day1/id/CreateContact.page     | 31 +++++----
 .../protected/pages/Day1/id/Setup.page             |  5 +-
 .../protected/pages/Day1/id/ShareLayout.page       |  2 -
 .../Controls/Samples/TTextHighlighter/Home.page    |  1 -
 .../protected/pages/Controls/TextHighlighter.page  |  1 -
 .../pages/Controls/id/TextHighlighter.page         |  1 -
 .../protected/pages/Tutorial/AjaxChat.page         |  1 -
 .../pages/Tutorial/CurrencyConverter.page          | 63 +++++++++----------
 .../protected/pages/Tutorial/fr/AjaxChat.page      |  1 -
 .../pages/Tutorial/fr/CurrencyConverter.page       | 63 +++++++++----------
 .../protected/pages/Tutorial/id/AjaxChat.page      |  1 -
 .../pages/Tutorial/id/CurrencyConverter.page       | 73 +++++++++++-----------
 .../protected/pages/Manual/Tutorial/TestFirst.page |  7 +--
 .../pages/Manual/Tutorial/TestSecond.page          |  2 -
 framework/Web/UI/TClientScriptManager.php          |  1 -
 framework/pradolite.php                            | 29 +++++----
 requirements/index.php                             |  2 -
 35 files changed, 169 insertions(+), 223 deletions(-)

(limited to 'demos/quickstart/protected/pages/Tutorial')

diff --git a/buildscripts/classtree/DWExtension.php b/buildscripts/classtree/DWExtension.php
index 8849efea..a7a1ca30 100644
--- a/buildscripts/classtree/DWExtension.php
+++ b/buildscripts/classtree/DWExtension.php
@@ -252,4 +252,3 @@ class PradoTagChooser
 		return $this->_document->saveXML();
 	}
 }
-?>
\ No newline at end of file
diff --git a/buildscripts/index/build.php b/buildscripts/index/build.php
index bbe151e6..a2e57286 100644
--- a/buildscripts/index/build.php
+++ b/buildscripts/index/build.php
@@ -61,5 +61,3 @@ else
 {
 	echo "Usage: 'php build.php quickstart' or 'php build.php api'\n";
 }
-
-?>
diff --git a/buildscripts/index/quickstart_index.php b/buildscripts/index/quickstart_index.php
index 61e21514..5df0f549 100644
--- a/buildscripts/index/quickstart_index.php
+++ b/buildscripts/index/quickstart_index.php
@@ -104,4 +104,3 @@ class quickstart_index
 		echo "\nSaving search index ({$count}) to {$this->_dir}\n\n";
 	}
 }
-?>
\ No newline at end of file
diff --git a/buildscripts/index/search.php b/buildscripts/index/search.php
index 23948ca5..ff83e629 100644
--- a/buildscripts/index/search.php
+++ b/buildscripts/index/search.php
@@ -11,7 +11,7 @@ require_once('Zend/Search/Lucene.php');
 
 if($keyword!=='')
 {
-	$search=new Zend_Search_Lucene(realpath(dirname(__FILE__)));		
+	$search=new Zend_Search_Lucene(realpath(dirname(__FILE__)));
 	$results=$search->find(strtolower($keyword));
 	$content='';
 	foreach($results as $entry)
@@ -32,5 +32,3 @@ $page=preg_replace('/<!-- content begin -->.*<!-- content end -->/ms',$content,$
 if($keyword!=='')
 	$page=preg_replace('/<input type="text" name="keyword"/','<input type="text" name="keyword" value="'.htmlentities($keyword).'"',$page);
 echo $page;
-
-?>
\ No newline at end of file
diff --git a/buildscripts/phing/tasks/PradoPearTask.php b/buildscripts/phing/tasks/PradoPearTask.php
index 5d615084..541c972e 100644
--- a/buildscripts/phing/tasks/PradoPearTask.php
+++ b/buildscripts/phing/tasks/PradoPearTask.php
@@ -129,5 +129,3 @@ class PradoPearTask extends Task
 			echo $e->getMessage();
 	}
 }
-
-?>
\ No newline at end of file
diff --git a/buildscripts/phpbuilder/build.php b/buildscripts/phpbuilder/build.php
index 17e02806..47b7bec4 100644
--- a/buildscripts/phpbuilder/build.php
+++ b/buildscripts/phpbuilder/build.php
@@ -144,5 +144,3 @@ function unfold_file($fileName)
 	}
 	return $content;
 }
-
-?>
\ No newline at end of file
diff --git a/buildscripts/texbuilder/Page2Tex.php b/buildscripts/texbuilder/Page2Tex.php
index b0d37149..ce2ece7f 100644
--- a/buildscripts/texbuilder/Page2Tex.php
+++ b/buildscripts/texbuilder/Page2Tex.php
@@ -343,5 +343,3 @@ class Page2Tex
 		 return "<p id=\"".($page + (++self::$p_count))."\" class=\"block-content\">";
 	}
 }
-
-?>
diff --git a/buildscripts/texbuilder/quickstart/build.php b/buildscripts/texbuilder/quickstart/build.php
index a42d6be3..6a824125 100644
--- a/buildscripts/texbuilder/quickstart/build.php
+++ b/buildscripts/texbuilder/quickstart/build.php
@@ -76,6 +76,3 @@ if($argv[1] == 'pdf')
 		echo " Unable to find pdfLatex executable $pdflatexExec";
 	}
 }
-
-
-?>
diff --git a/buildscripts/texbuilder/quickstart/pages.php b/buildscripts/texbuilder/quickstart/pages.php
index cd11c4b1..1fb94431 100644
--- a/buildscripts/texbuilder/quickstart/pages.php
+++ b/buildscripts/texbuilder/quickstart/pages.php
@@ -177,5 +177,3 @@ $pages['Client-side Scripting'] = array(
 
 return $pages;
 //-------------- END CONFIG ----------------
-
-?>
\ No newline at end of file
diff --git a/buildscripts/texbuilder/sqlmap/build.php b/buildscripts/texbuilder/sqlmap/build.php
index 4ea4d75e..066af486 100644
--- a/buildscripts/texbuilder/sqlmap/build.php
+++ b/buildscripts/texbuilder/sqlmap/build.php
@@ -76,6 +76,3 @@ if($argv[1] == 'pdf')
 		echo " Unable to find pdfLatex executable $pdflatexExec";
 	}
 }
-
-
-?>
diff --git a/buildscripts/texbuilder/sqlmap/pages.php b/buildscripts/texbuilder/sqlmap/pages.php
index 57fff767..b0b7bca0 100644
--- a/buildscripts/texbuilder/sqlmap/pages.php
+++ b/buildscripts/texbuilder/sqlmap/pages.php
@@ -58,5 +58,3 @@ $pages['Advanced Topics'] = array(
 );
 
 return $pages;
-
-?>
\ No newline at end of file
diff --git a/buildscripts/texbuilder/time-tracker/pages.php b/buildscripts/texbuilder/time-tracker/pages.php
index 732f675d..a9c32347 100644
--- a/buildscripts/texbuilder/time-tracker/pages.php
+++ b/buildscripts/texbuilder/time-tracker/pages.php
@@ -14,5 +14,3 @@ $pages['Testing Business Code'] = array(
 	'Docs/UserClassAndExceptions.page'
 	);
 return $pages;
-
-?>
\ No newline at end of file
diff --git a/demos/blog-tutorial/protected/pages/Day1/CreateContact.page b/demos/blog-tutorial/protected/pages/Day1/CreateContact.page
index 28ad4b21..0d9fc026 100755
--- a/demos/blog-tutorial/protected/pages/Day1/CreateContact.page
+++ b/demos/blog-tutorial/protected/pages/Day1/CreateContact.page
@@ -45,11 +45,11 @@ We use template to organize the presentational layout of the feedback form. In t
 <h1>Contact</h1>
 <p>Please fill out the following form to let me know your feedback on my blog. Thanks!</p>
 
-&lt;com:TForm> 
+&lt;com:TForm>
 
 <span>Your Name:</span>
 &lt;com:TRequiredFieldValidator ControlToValidate="Name"
-    ErrorMessage="Please provide your name." 
+    ErrorMessage="Please provide your name."
     Display="Dynamic" />
 <br/>
 &lt;com:TTextBox ID="Name" />
@@ -57,10 +57,10 @@ We use template to organize the presentational layout of the feedback form. In t
 <br/>
 <span>Your Email:</span>
 &lt;com:TRequiredFieldValidator ControlToValidate="Email"
-    ErrorMessage="Please provide your email address." 
+    ErrorMessage="Please provide your email address."
     Display="Dynamic" />
 &lt;com:TEmailAddressValidator ControlToValidate="Email"
-    ErrorMessage="You entered an invalid email address." 
+    ErrorMessage="You entered an invalid email address."
     Display="Dynamic" />
 <br/>
 &lt;com:TTextBox ID="Email" />
@@ -68,11 +68,11 @@ We use template to organize the presentational layout of the feedback form. In t
 <br/>
 <span>Feedback:</span>
 &lt;com:TRequiredFieldValidator ControlToValidate="Feedback"
-    ErrorMessage="Please provide your feedback." 
+    ErrorMessage="Please provide your feedback."
     Display="Dynamic" />
 <br/>
-&lt;com:TTextBox ID="Feedback" 
-    TextMode="MultiLine" 
+&lt;com:TTextBox ID="Feedback"
+    TextMode="MultiLine"
     Rows="10"
     Columns="40" />
 
@@ -99,13 +99,13 @@ Besides <tt>TTextBox</tt> controls, the template also uses many validator contro
 
 <com:TTextHighlighter CssClass="source" Language="prado">
 <span>Your Email:</span>
-&lt;com:TRequiredFieldValidator 
+&lt;com:TRequiredFieldValidator
     ControlToValidate="Email"
-    ErrorMessage="Please provide your email address." 
+    ErrorMessage="Please provide your email address."
     Display="Dynamic" />
-&lt;com:TEmailAddressValidator 
+&lt;com:TEmailAddressValidator
     ControlToValidate="Email"
-    ErrorMessage="You entered an invalid email address." 
+    ErrorMessage="You entered an invalid email address."
     Display="Dynamic" />
 <br/>
 &lt;com:TTextBox ID="Email" />
@@ -152,28 +152,27 @@ class Contact extends TPage
     /**
      * Event handler for the OnClick event of the submit button.
      * @param TButton the button triggering the event
-     * @param TEventParameter event parameter (null here)    
+     * @param TEventParameter event parameter (null here)
      */
     public function submitButtonClicked($sender, $param)
     {
         if ($this->IsValid)  // check if input validation is successful
         {
             // obtain the user name, email, feedback from the textboxes
-            $name = $this->Name->Text;  
+            $name = $this->Name->Text;
             $email = $this->Email->Text;
             $feedback = $this->Feedback->Text;
-            
+
             // send an email to administrator with the above information
             $this->mailFeedback($name, $email, $feedback);
         }
     }
-    
+
     protected function mailFeedback($name, $email, $feedback)
     {
         // implementation of sending the feedback email
     }
 }
-?>
 </com:TTextHighlighter>
 
 <p>
diff --git a/demos/blog-tutorial/protected/pages/Day1/Setup.page b/demos/blog-tutorial/protected/pages/Day1/Setup.page
index e8316253..582d0399 100755
--- a/demos/blog-tutorial/protected/pages/Day1/Setup.page
+++ b/demos/blog-tutorial/protected/pages/Day1/Setup.page
@@ -52,7 +52,6 @@ require_once('path/to/prado.php');
 $application = new TApplication;
 // run the application and handle user requests
 $application->run();
-?>
 </com:TTextHighlighter>
 
 <com:InfoBox>
@@ -148,8 +147,8 @@ To change the location of the root page directory and change the name of homepag
 <?xml version="1.0" encoding="utf-8"?>
 <application id="blog" mode="Debug">
   <services>
-    <service id="page" 
-           class="TPageService" 
+    <service id="page"
+           class="TPageService"
            BasePath="path.to.pages"
            DefaultPage="NewHome"
            />
diff --git a/demos/blog-tutorial/protected/pages/Day1/ShareLayout.page b/demos/blog-tutorial/protected/pages/Day1/ShareLayout.page
index 9cd0410b..6115ef22 100755
--- a/demos/blog-tutorial/protected/pages/Day1/ShareLayout.page
+++ b/demos/blog-tutorial/protected/pages/Day1/ShareLayout.page
@@ -66,7 +66,6 @@ The class file <tt>MainLayout.php</tt> is very simple:
 class MainLayout extends TTemplateControl
 {
 }
-?>
 </com:TTextHighlighter>
 
 <com:InfoBox>
@@ -145,7 +144,6 @@ class Contact extends TPage
 
     // ...
 }
-?>
 </com:TTextHighlighter>
 
 <p>
diff --git a/demos/blog-tutorial/protected/pages/Day1/fr/CreateContact.page b/demos/blog-tutorial/protected/pages/Day1/fr/CreateContact.page
index e85d8bfe..0105f656 100755
--- a/demos/blog-tutorial/protected/pages/Day1/fr/CreateContact.page
+++ b/demos/blog-tutorial/protected/pages/Day1/fr/CreateContact.page
@@ -45,11 +45,11 @@ Nous utilisons un fichier gabarit pour organiser la présentation de notre formu
 <h1>Contact</h1>
 <p>Veuillez remplir le formulaire suivant pour me laisser vos impressions au sujet de mon blog. Merci !</p>
 
-&lt;com:TForm> 
+&lt;com:TForm>
 
 <span>Votre nom:</span>
 &lt;com:TRequiredFieldValidator ControlToValidate="Name"
-    ErrorMessage="Veuillez indiquer votre nom." 
+    ErrorMessage="Veuillez indiquer votre nom."
     Display="Dynamic" />
 <br/>
 &lt;com:TTextBox ID="Name" />
@@ -57,10 +57,10 @@ Nous utilisons un fichier gabarit pour organiser la présentation de notre formu
 <br/>
 <span>Votre email:</span>
 &lt;com:TRequiredFieldValidator ControlToValidate="Email"
-    ErrorMessage="Veuillez indiquer votre email." 
+    ErrorMessage="Veuillez indiquer votre email."
     Display="Dynamic" />
 &lt;com:TEmailAddressValidator ControlToValidate="Email"
-    ErrorMessage="Vous avez saisi un email invalide." 
+    ErrorMessage="Vous avez saisi un email invalide."
     Display="Dynamic" />
 <br/>
 &lt;com:TTextBox ID="Email" />
@@ -68,11 +68,11 @@ Nous utilisons un fichier gabarit pour organiser la présentation de notre formu
 <br/>
 <span>Commentaires:</span>
 &lt;com:TRequiredFieldValidator ControlToValidate="Feedback"
-    ErrorMessage="Veuillez saisir un commentaire." 
+    ErrorMessage="Veuillez saisir un commentaire."
     Display="Dynamic" />
 <br/>
-&lt;com:TTextBox ID="Feedback" 
-    TextMode="MultiLine" 
+&lt;com:TTextBox ID="Feedback"
+    TextMode="MultiLine"
     Rows="10"
     Columns="40" />
 
@@ -99,13 +99,13 @@ Avant le contrôle <tt>TTextBox</tt>, le gabarit utilise aussi plusieurs validat
 
 <com:TTextHighlighter CssClass="source" Language="prado">
 <span>Your Email:</span>
-&lt;com:TRequiredFieldValidator 
+&lt;com:TRequiredFieldValidator
     ControlToValidate="Email"
-    ErrorMessage="Veuillez indiquer votre email." 
+    ErrorMessage="Veuillez indiquer votre email."
     Display="Dynamic" />
-&lt;com:TEmailAddressValidator 
+&lt;com:TEmailAddressValidator
     ControlToValidate="Email"
-    ErrorMessage="Vous avez saisi un email invalide." 
+    ErrorMessage="Vous avez saisi un email invalide."
     Display="Dynamic" />
 <br/>
 &lt;com:TTextBox ID="Email" />
@@ -152,28 +152,27 @@ class Contact extends TPage
     /**
      * Gestionnaire d'évènement pour OnClick (bouton submit).
      * @param TButton le bouton qui a générer l'évènement
-     * @param TEventParameter les paramètres de l'évènement (null dans ce cas)    
+     * @param TEventParameter les paramètres de l'évènement (null dans ce cas)
      */
     public function submitButtonClicked($sender, $param)
     {
         if ($this->IsValid)  // vérifie que les validations sont Ok
         {
             // récupère le nom de l'utilisateur, son email et son commentaire
-            $name = $this->Name->Text;  
+            $name = $this->Name->Text;
             $email = $this->Email->Text;
             $feedback = $this->Feedback->Text;
-            
-            // envoie un email à l'administrateur avec les informations 
+
+            // envoie un email à l'administrateur avec les informations
             $this->mailFeedback($name, $email, $feedback);
         }
     }
-    
+
     protected function mailFeedback($name, $email, $feedback)
     {
         // implémentation de l'envoi de l'email
     }
 }
-?>
 </com:TTextHighlighter>
 
 <p>
diff --git a/demos/blog-tutorial/protected/pages/Day1/fr/Setup.page b/demos/blog-tutorial/protected/pages/Day1/fr/Setup.page
index 22a7891c..0be1c1f0 100755
--- a/demos/blog-tutorial/protected/pages/Day1/fr/Setup.page
+++ b/demos/blog-tutorial/protected/pages/Day1/fr/Setup.page
@@ -49,11 +49,10 @@ require_once('path/to/prado.php');
 $application = new TApplication;
 // run the application and handle user requests
 $application->run();
-?>
 </com:TTextHighlighter>
 
 <com:InfoBox>
-Le nom du script ne doit pas être obligatoirement <tt>index.php</tt>. Il peut porter n'importe quel nom à partir du moment ou le serveur peut l'interpréter comme étant un script PHP5. Par exemple, sur certains hébergements mutualisés, le script devra porter le nom <tt>index.php5</tt>, ce qui permettra au serveur Web de le traiter correctement. 
+Le nom du script ne doit pas être obligatoirement <tt>index.php</tt>. Il peut porter n'importe quel nom à partir du moment ou le serveur peut l'interpréter comme étant un script PHP5. Par exemple, sur certains hébergements mutualisés, le script devra porter le nom <tt>index.php5</tt>, ce qui permettra au serveur Web de le traiter correctement.
 </com:InfoBox>
 
 <h3>Le fichier de configuration de l'application</h3>
@@ -145,8 +144,8 @@ Pour changer l'emplacement du dossier racine des pages et le nom de la page d'ac
 <?xml version="1.0" encoding="utf-8"?>
 <application id="blog" mode="Debug">
   <services>
-    <service id="page" 
-           class="TPageService" 
+    <service id="page"
+           class="TPageService"
            BasePath="path.to.pages"
            DefaultPage="NewHome"
            />
diff --git a/demos/blog-tutorial/protected/pages/Day1/fr/ShareLayout.page b/demos/blog-tutorial/protected/pages/Day1/fr/ShareLayout.page
index cefff770..539b8376 100755
--- a/demos/blog-tutorial/protected/pages/Day1/fr/ShareLayout.page
+++ b/demos/blog-tutorial/protected/pages/Day1/fr/ShareLayout.page
@@ -68,7 +68,6 @@ Le fichier de classe  <tt>MainLayout.php</tt> est très simple :
 class MainLayout extends TTemplateControl
 {
 }
-?>
 </com:TTextHighlighter>
 
 <com:InfoBox>
@@ -147,13 +146,12 @@ class Contact extends TPage
 
     // ...
 }
-?>
 </com:TTextHighlighter>
 
 <p>
 Ci-dessus, nous indiquons d'utiliser le gabarit principal <tt>MasterClass</tt> dans la méthode <tt>onPreInit()</tt> qui est héritée de <tt>TPage</tt>. Cette méthode est appelé par PRADO juste après que l'instance de la page soit créée. Nous pouvons ainsi déclarer au moment où la page est requise quel gabarit principal utiliser. Par exemple, quand la page est requise par un utilisateur enregistré, nous pouvons utiliser le gabarit A, et le gabarit B si l'utilisateur qui demande la page est un invité.
 </p>
-
+
 <p>
 Nous pouvons aussi spécifier quel gabarit principal utiliser dans le fichier de <a href="http://www.pradosoft.com/demos/quickstart/?page=Configurations.AppConfig">configuration de l'application</a> ou encore dans le fichier de <a href="http://www.pradosoft.com/demos/quickstart/?page=Configurations.PageConfig">configuration de la page</a>. Ci-dessous, le fichier de configuration de l'application modifié pour notre blog.
 </p>
diff --git a/demos/blog-tutorial/protected/pages/Day1/id/CreateContact.page b/demos/blog-tutorial/protected/pages/Day1/id/CreateContact.page
index 65be6417..caee30d0 100755
--- a/demos/blog-tutorial/protected/pages/Day1/id/CreateContact.page
+++ b/demos/blog-tutorial/protected/pages/Day1/id/CreateContact.page
@@ -45,11 +45,11 @@ Kita menggunakan template untuk menghatur tata letak penyajian terhadap formulir
 <h1>Contact</h1>
 <p>Please fill out the following form to let me know your feedback on my blog. Thanks!</p>
 
-&lt;com:TForm> 
+&lt;com:TForm>
 
 <span>Your Name:</span>
 &lt;com:TRequiredFieldValidator ControlToValidate="Name"
-    ErrorMessage="Please provide your name." 
+    ErrorMessage="Please provide your name."
     Display="Dynamic" />
 <br/>
 &lt;com:TTextBox ID="Name" />
@@ -57,10 +57,10 @@ Kita menggunakan template untuk menghatur tata letak penyajian terhadap formulir
 <br/>
 <span>Your Email:</span>
 &lt;com:TRequiredFieldValidator ControlToValidate="Email"
-    ErrorMessage="Please provide your email address." 
+    ErrorMessage="Please provide your email address."
     Display="Dynamic" />
 &lt;com:TEmailAddressValidator ControlToValidate="Email"
-    ErrorMessage="You entered an invalid email address." 
+    ErrorMessage="You entered an invalid email address."
     Display="Dynamic" />
 <br/>
 &lt;com:TTextBox ID="Email" />
@@ -68,11 +68,11 @@ Kita menggunakan template untuk menghatur tata letak penyajian terhadap formulir
 <br/>
 <span>Feedback:</span>
 &lt;com:TRequiredFieldValidator ControlToValidate="Feedback"
-    ErrorMessage="Please provide your feedback." 
+    ErrorMessage="Please provide your feedback."
     Display="Dynamic" />
 <br/>
-&lt;com:TTextBox ID="Feedback" 
-    TextMode="MultiLine" 
+&lt;com:TTextBox ID="Feedback"
+    TextMode="MultiLine"
     Rows="10"
     Columns="40" />
 
@@ -99,13 +99,13 @@ Selain kontrol <tt>TTextBox</tt>, template juga menggunakan banyak kontrol valid
 
 <com:TTextHighlighter CssClass="source" Language="prado">
 <span>Your Email:</span>
-&lt;com:TRequiredFieldValidator 
+&lt;com:TRequiredFieldValidator
     ControlToValidate="Email"
-    ErrorMessage="Please provide your email address." 
+    ErrorMessage="Please provide your email address."
     Display="Dynamic" />
-&lt;com:TEmailAddressValidator 
+&lt;com:TEmailAddressValidator
     ControlToValidate="Email"
-    ErrorMessage="You entered an invalid email address." 
+    ErrorMessage="You entered an invalid email address."
     Display="Dynamic" />
 <br/>
 &lt;com:TTextBox ID="Email" />
@@ -152,28 +152,27 @@ class Contact extends TPage
     /**
      * Pengendali event untuk event OnClick pada tombol submit.
      * @param TButton tombol yang memicu event
-     * @param TEventParameter parameter event (null di sini)    
+     * @param TEventParameter parameter event (null di sini)
      */
     public function submitButtonClicked($sender, $param)
     {
         if ($this->IsValid)  // memeriksa apakan validasi input berhasil
         {
             // mendapatkan nama pengguna, email, umpan balik dari kotak teks
-            $name = $this->Name->Text;  
+            $name = $this->Name->Text;
             $email = $this->Email->Text;
             $feedback = $this->Feedback->Text;
-            
+
             // mengirimkan email ke administrator dengan informasi di atas
             $this->mailFeedback($name, $email, $feedback);
         }
     }
-    
+
     protected function mailFeedback($name, $email, $feedback)
     {
         // implementasi pengiriman email umpan balik
     }
 }
-?>
 </com:TTextHighlighter>
 
 <p>
diff --git a/demos/blog-tutorial/protected/pages/Day1/id/Setup.page b/demos/blog-tutorial/protected/pages/Day1/id/Setup.page
index edc469d5..45ae8cf5 100755
--- a/demos/blog-tutorial/protected/pages/Day1/id/Setup.page
+++ b/demos/blog-tutorial/protected/pages/Day1/id/Setup.page
@@ -52,7 +52,6 @@ require_once('path/to/prado.php');
 $application = new TApplication;
 // jalankan aplikasi dan tangani permintaan pengguna
 $application->run();
-?>
 </com:TTextHighlighter>
 
 <com:InfoBox>
@@ -148,8 +147,8 @@ Untuk membuat lokasi akar direktori halaman dan mengubah nama homepage, seseoran
 <?xml version="1.0" encoding="utf-8"?>
 <application id="blog" mode="Debug">
   <services>
-    <service id="page" 
-           class="TPageService" 
+    <service id="page"
+           class="TPageService"
            BasePath="path.to.pages"
            DefaultPage="NewHome"
            />
diff --git a/demos/blog-tutorial/protected/pages/Day1/id/ShareLayout.page b/demos/blog-tutorial/protected/pages/Day1/id/ShareLayout.page
index d505beed..0c40181b 100755
--- a/demos/blog-tutorial/protected/pages/Day1/id/ShareLayout.page
+++ b/demos/blog-tutorial/protected/pages/Day1/id/ShareLayout.page
@@ -66,7 +66,6 @@ File kelas <tt>MainLayout.php</tt> sangat sederhana:
 class MainLayout extends TTemplateControl
 {
 }
-?>
 </com:TTextHighlighter>
 
 <com:InfoBox>
@@ -145,7 +144,6 @@ class Contact extends TPage
 
     // ...
 }
-?>
 </com:TTextHighlighter>
 
 <p>
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>
 
diff --git a/demos/quickstart/protected/pages/Controls/TextHighlighter.page b/demos/quickstart/protected/pages/Controls/TextHighlighter.page
index 1babbb33..5d3428f9 100755
--- a/demos/quickstart/protected/pages/Controls/TextHighlighter.page
+++ b/demos/quickstart/protected/pages/Controls/TextHighlighter.page
@@ -17,7 +17,6 @@ To use <tt>TTextHighlighter</tt>, simply enclose the contents to be syntax highl
 <?php
 $str = 'one|two|three|four';
 print_r(explode('|', $str, 2)); // will output an array
-?>
 &lt;/com:TTextHighlighter&gt;
 </com:TTextHighlighter>
 
diff --git a/demos/quickstart/protected/pages/Controls/id/TextHighlighter.page b/demos/quickstart/protected/pages/Controls/id/TextHighlighter.page
index b2b500b0..b1bb4ce7 100755
--- a/demos/quickstart/protected/pages/Controls/id/TextHighlighter.page
+++ b/demos/quickstart/protected/pages/Controls/id/TextHighlighter.page
@@ -17,7 +17,6 @@ Untuk menggunakan <tt>TTextHighlighter</tt>, cukup kurung konten yang sintaksnya
 <?php
 $str = 'one|two|three|four';
 print_r(explode('|', $str, 2)); // akan mengeluarkan array
-?>
 &lt;/com:TTextHighlighter&gt;
 </com:TTextHighlighter>
 
diff --git a/demos/quickstart/protected/pages/Tutorial/AjaxChat.page b/demos/quickstart/protected/pages/Tutorial/AjaxChat.page
index 4a8f23ab..92118720 100755
--- a/demos/quickstart/protected/pages/Tutorial/AjaxChat.page
+++ b/demos/quickstart/protected/pages/Tutorial/AjaxChat.page
@@ -59,7 +59,6 @@ php prado/framework/prado-cli.php -c chat
 class Login extends TPage
 {
 }
-?&gt;
 </com:TTextHighlighter>
 <com:TTextHighlighter Language="prado" CssClass="source block-content" id="code_90029">
 <!doctype html public "-//W3C//DTD XHTML 1.0 Strict//EN"
diff --git a/demos/quickstart/protected/pages/Tutorial/CurrencyConverter.page b/demos/quickstart/protected/pages/Tutorial/CurrencyConverter.page
index 4bec2a28..1abd68b9 100755
--- a/demos/quickstart/protected/pages/Tutorial/CurrencyConverter.page
+++ b/demos/quickstart/protected/pages/Tutorial/CurrencyConverter.page
@@ -34,9 +34,9 @@
 		<tt>currency-converter</tt> in your current working directory.
 		You may need to change to the appropriate directory
 		first.
-		See the <a href="?page=GettingStarted.CommandLine">Command Line Tool</a>
-		for more details.
-	</p>
+		See the <a href="?page=GettingStarted.CommandLine">Command Line Tool</a>
+		for more details.
+	</p>
 <com:TTextHighlighter Language="text" CssClass="source block-content" id="code111">
 php prado/framework/prado-cli.php -c currency-converter
 </com:TTextHighlighter>
@@ -52,7 +52,7 @@ php prado/framework/prado-cli.php -c currency-converter
 	<p id="80058" class="block-content">We start by editing the <tt>Home.page</tt> file found in the
 		<tt>currency-converter/protected/pages/</tt> directory. Files ending
 		with ".page" are page templates that contains HTML and Prado controls.
-		We simply add two textboxes, three labels and one button as follows.
+		We simply add two textboxes, three labels and one button as follows.
 	</p>
 <com:TTextHighlighter Language="prado" CssClass="source block-content" id="form1">
 &lt;com:TForm&gt;
@@ -75,7 +75,7 @@ php prado/framework/prado-cli.php -c currency-converter
         </div>
     </fieldset>
 &lt;/com:TForm&gt;
-</com:TTextHighlighter>
+</com:TTextHighlighter>
 	<p id="refresh" class="block-content">
 	If you refresh the page, you should see something similar to the following figure.
 	It may not look very pretty or orderly, but we shall change that later using CSS.
@@ -125,7 +125,7 @@ php prado/framework/prado-cli.php -c currency-converter
 		to add a "Home.php" to where "Home.page" is. The <tt>Home</tt> class
 		should extends the
 		<com:DocLink ClassPath="System.Web.UI.TPage" Text="TPage" />, the default base
-		class for all Prado pages.
+		class for all Prado pages.
 	</p>
 <com:TTextHighlighter Language="php" CssClass="source block-content" id="code3">
 &lt;?php
@@ -133,8 +133,7 @@ class Home extends TPage
 {
 
 }
-?&gt;
-</com:TTextHighlighter>
+</com:TTextHighlighter>
 	<p id="1111" class="block-content">
 		Prado uses PHP's <tt>__autoload</tt> method to load classes. The convention
 		is to use the class name with ".php" extension as filename.
@@ -151,15 +150,15 @@ class Home extends TPage
 		the converted total. To handle the user clicking of the "Convert" button
 		we simply add an <tt>OnClick</tt> property to the "Convert" button in
 	 	the "Home.page" template and add a corresponding event handler method
-		in the "Home.php".
+		in the "Home.php".
 	</p>
 <com:TTextHighlighter Language="prado" CssClass="source block-content" id="code4">
 &lt;com:TButton Text="Convert" OnClick="convert_clicked" /&gt;
 </com:TTextHighlighter>
-	<p id="222" class="block-content">
+	<p id="222" class="block-content">
 		The value of the <tt>OnClick</tt>, "<tt>convert_clicked</tt>", will be the method
 		name in the "Home.php" that will called when the user clicks on the
-		"Convert" button.
+		"Convert" button.
 	</p>
 <com:TTextHighlighter Language="php" CssClass="source block-content" id="code5">
 class Home extends TPage
@@ -171,8 +170,8 @@ class Home extends TPage
         $this->total->Text = $rate * $dollars;
     }
 }
-</com:TTextHighlighter>
-<div id="3332" class="block-content">
+</com:TTextHighlighter>
+<div id="3332" class="block-content">
 	<p id="333">
 		If you run the application in your web browser, enter some values and click
 		the "Convert" button then you should see that calculated value displayed next
@@ -186,24 +185,24 @@ class Home extends TPage
 	</p>
 
 	<p id="80067">We shall now examine, the three lines that implements the simply currency
-		conversion in the "<tt>convert_clicked</tt>" method.
-	</p>
+		conversion in the "<tt>convert_clicked</tt>" method.
+	</p>
 </div>
 <com:TTextHighlighter Language="php" CssClass="source block-content" id="code6" >
 $rate = floatval($this->currencyRate->Text);
-</com:TTextHighlighter>
+</com:TTextHighlighter>
 	<p id="444" class="block-content">
 		The statement <tt>$this->currencyRate</tt> corresponds to the
 		<tt>TTextBox</tt> component with <tt>ID</tt> value "currencyRate" in the
 		"Home.page" template. The <tt>Text</tt> property of the <tt>TTextBox</tt>
 		contains the value that the user entered. So, we obtain this
 		value by <tt>$this->currencyRate->Text</tt> which we convert the
-		value to a float value.
+		value to a float value.
 	</p>
 <com:TTextHighlighter Language="php" CssClass="source block-content" id="code7">
 $dollars = floatval($this->dollars->Text);
-</com:TTextHighlighter>
-<div id="5551" class="block-content">
+</com:TTextHighlighter>
+<div id="5551" class="block-content">
 	<p id="555">
 		The next line does a similar things, it takes the user value from
 		the <tt>TTextBox</tt> with <tt>ID</tt> value "dollars and converts it to
@@ -212,9 +211,9 @@ $dollars = floatval($this->dollars->Text);
 
 	<p id="80068">The third line calculates the new amount and set this value in the
 		<tt>Text</tt> property of the <tt>TLabel</tt> with <tt>ID="total"</tt>.
-		Thus, we display the new amount to the user in the label.
+		Thus, we display the new amount to the user in the label.
 	</p>
-</div>
+</div>
 <com:TTextHighlighter Language="php" CssClass="source block-content" id="code8">
 $this->total->Text = $rate * $dollars;
 </com:TTextHighlighter>
@@ -233,14 +232,14 @@ $this->total->Text = $rate * $dollars;
 			<li>the user enters a value,</li>
 			<li>the currency rate is a valid number,</li>
 			<li>the currency rate is positive.</li>
-		</ol>
+		</ol>
 	<p id="666" class="block-content">
 	 To ensure 1 we add one
 	<com:DocLink ClassPath="System.Web.UI.WebControls.TRequiredFieldValidator" Text="TRequiredFieldValidator" />. To ensure 2 and 3, we add one
 	<com:DocLink ClassPath="System.Web.UI.WebControls.TCompareValidator" Text="TCompareValidator" />. We may add these validators any where within
 	the "Home.page" template. Further details regarding these validator and other
 	validators can be found in the
-	<a href="?page=Controls.Validation">Validation Controls</a> page.
+	<a href="?page=Controls.Validation">Validation Controls</a> page.
 	</p>
 <com:TTextHighlighter Language="prado" CssClass="source block-content" id="code9">
 &lt;com:TRequiredFieldValidator
@@ -258,12 +257,12 @@ $this->total->Text = $rate * $dollars;
 		<ol id="o222" class="block-content">
 			<li>the user enters a value,</li>
 			<li>the value is a valid number (not including any currency or dollar signs).</li>
-		</ol>
+		</ol>
 	<p id="777" class="block-content">
 	To ensure 1 we just add another <tt>TRequiredFieldValidator</tt>, for 2
 	we could use a
 	<com:DocLink ClassPath="System.Web.UI.WebControls.TDataTypeValidator" Text="TDataTypeValidator" />. For simplicity we only allow the user to enter
-	a number for the amount they wish to convert.
+	a number for the amount they wish to convert.
 	</p>
 <com:TTextHighlighter Language="prado" CssClass="source block-content" id="code9a">
 &lt;com:TRequiredFieldValidator
@@ -283,7 +282,7 @@ $this->total->Text = $rate * $dollars;
 		using both javascript and server side. The server side validation
 		is <b>always performed</b>. For the server side, we
 		should skip the calculation if the validators are not satisfied. This can
-		done as follows.
+		done as follows.
 	</p>
 <com:TTextHighlighter Language="php" CssClass="source block-content" id="code10" >
 public function convert_clicked($sender, $param)
@@ -313,7 +312,7 @@ public function convert_clicked($sender, $param)
 		In addition, we can change the "totals" <tt>TLabel</tt> with the
 		Active Control counter part,
 		<com:DocLink ClassPath="System.Web.UI.ActiveControls.TActiveLabel" Text="TActiveLabel" />, such that the server side can update the browser without
-		reloading the page.
+		reloading the page.
 	</p>
 <com:TTextHighlighter Language="prado" CssClass="source block-content" id="code11">
 <div class="total-field">
@@ -323,11 +322,11 @@ public function convert_clicked($sender, $param)
     <div class="convert-button">
         &lt;com:TActiveButton Text="Convert" OnClick="convert_clicked" /&gt;
 </div>
-</com:TTextHighlighter>
+</com:TTextHighlighter>
 	<p id="1232" class="block-content">
 		The server side logic remains the same, we just need to import the
 		Active Controls name space as they are not included by default. We
-		add the following line to the begin of "Home.php".
+		add the following line to the begin of "Home.php".
 	</p>
 <com:TTextHighlighter Language="php" CssClass="source block-content" id="code12">
 Prado::using('System.Web.UI.ActiveControls.*');
@@ -345,7 +344,7 @@ Prado::using('System.Web.UI.ActiveControls.*');
 	<p id="80076" class="block-content">To indicate that the calculation is in progress, we can change the text
 		of the "total" label as follows. We add a <tt>ClientSide.OnLoading</tt> property
 		to the "Convert" button (since this button is responsible for requesting
-		the calculation).
+		the calculation).
 	</p>
 <com:TTextHighlighter Language="prado" CssClass="source block-content" id="code13">
 &lt;com:TActiveButton Text="Convert" OnClick="convert_clicked" &gt;
@@ -383,7 +382,7 @@ Prado::using('System.Web.UI.ActiveControls.*');
 
 	<p id="80080" class="block-content">We simply create a CSS file named "common.css" and save it in the
 		<tt>themes/Basic</tt> directory. Then we add the following code
-		to the beginning of "Home.page" (we add a little more HTML as well).
+		to the beginning of "Home.page" (we add a little more HTML as well).
 	</p>
 <com:TTextHighlighter Language="prado" CssClass="source block-content" id="code14">
 &lt;%@ Theme="Basic" %&gt;
@@ -392,7 +391,7 @@ Prado::using('System.Web.UI.ActiveControls.*');
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" >
 &lt;com:THead Title="Currency Converter" /&gt;
 <body>
-</com:TTextHighlighter>
+</com:TTextHighlighter>
 	<p id="4334" class="block-content">
 		The first line <tt>&lt;%@ Theme="Basic" %&gt;</tt> defines the
 		theme to be used for this page. The
diff --git a/demos/quickstart/protected/pages/Tutorial/fr/AjaxChat.page b/demos/quickstart/protected/pages/Tutorial/fr/AjaxChat.page
index 39d7f9e5..568e920f 100755
--- a/demos/quickstart/protected/pages/Tutorial/fr/AjaxChat.page
+++ b/demos/quickstart/protected/pages/Tutorial/fr/AjaxChat.page
@@ -58,7 +58,6 @@ php prado/framework/prado-cli.php -c chat
 class Login extends TPage
 {
 }
-?&gt;
 </com:TTextHighlighter>
 <com:TTextHighlighter Language="prado" CssClass="source block-content" id="code_90029">
 <!doctype html public "-//W3C//DTD XHTML 1.0 Strict//EN"
diff --git a/demos/quickstart/protected/pages/Tutorial/fr/CurrencyConverter.page b/demos/quickstart/protected/pages/Tutorial/fr/CurrencyConverter.page
index 2cce2336..6b8c7bc3 100755
--- a/demos/quickstart/protected/pages/Tutorial/fr/CurrencyConverter.page
+++ b/demos/quickstart/protected/pages/Tutorial/fr/CurrencyConverter.page
@@ -34,9 +34,9 @@
 		<tt>currency-converter</tt> in your current working directory.
 		You may need to change to the appropriate directory
 		first.
-		See the <a href="?page=GettingStarted.CommandLine">Command Line Tool</a>
-		for more details.
-	</p>
+		See the <a href="?page=GettingStarted.CommandLine">Command Line Tool</a>
+		for more details.
+	</p>
 <com:TTextHighlighter Language="text" CssClass="source block-content" id="code111">
 php prado/framework/prado-cli.php -c currency-converter
 </com:TTextHighlighter>
@@ -52,7 +52,7 @@ php prado/framework/prado-cli.php -c currency-converter
 	<p id="80058" class="block-content">We start by editing the <tt>Home.page</tt> file found in the
 		<tt>currency-converter/protected/pages/</tt> directory. Files ending
 		with ".page" are page templates that contains HTML and Prado controls.
-		We simply add two textboxes, three labels and one button as follows.
+		We simply add two textboxes, three labels and one button as follows.
 	</p>
 <com:TTextHighlighter Language="prado" CssClass="source block-content" id="form1">
 &lt;com:TForm&gt;
@@ -75,7 +75,7 @@ php prado/framework/prado-cli.php -c currency-converter
         </div>
     </fieldset>
 &lt;/com:TForm&gt;
-</com:TTextHighlighter>
+</com:TTextHighlighter>
 	<p id="refresh" class="block-content">
 	If you refresh the page, you should see something similar to the following figure.
 	It may not look very pretty or orderly, but we shall change that later using CSS.
@@ -125,7 +125,7 @@ php prado/framework/prado-cli.php -c currency-converter
 		to add a "Home.php" to where "Home.page" is. The <tt>Home</tt> class
 		should extends the
 		<com:DocLink ClassPath="System.Web.UI.TPage" Text="TPage" />, the default base
-		class for all Prado pages.
+		class for all Prado pages.
 	</p>
 <com:TTextHighlighter Language="php" CssClass="source block-content" id="code3">
 &lt;?php
@@ -133,8 +133,7 @@ class Home extends TPage
 {
 
 }
-?&gt;
-</com:TTextHighlighter>
+</com:TTextHighlighter>
 	<p id="1111" class="block-content">
 		Prado uses PHP's <tt>__autoload</tt> method to load classes. The convention
 		is to use the class name with ".php" extension as filename.
@@ -151,15 +150,15 @@ class Home extends TPage
 		the converted total. To handle the user clicking of the "Convert" button
 		we simply add an <tt>OnClick</tt> property to the "Convert" button in
 	 	the "Home.page" template and add a corresponding event handler method
-		in the "Home.php".
+		in the "Home.php".
 	</p>
 <com:TTextHighlighter Language="prado" CssClass="source block-content" id="code4">
 &lt;com:TButton Text="Convert" OnClick="convert_clicked" /&gt;
 </com:TTextHighlighter>
-	<p id="222" class="block-content">
+	<p id="222" class="block-content">
 		The value of the <tt>OnClick</tt>, "<tt>convert_clicked</tt>", will be the method
 		name in the "Home.php" that will called when the user clicks on the
-		"Convert" button.
+		"Convert" button.
 	</p>
 <com:TTextHighlighter Language="php" CssClass="source block-content" id="code5">
 class Home extends TPage
@@ -171,8 +170,8 @@ class Home extends TPage
         $this->total->Text = $rate * $dollars;
     }
 }
-</com:TTextHighlighter>
-<div id="3332" class="block-content">
+</com:TTextHighlighter>
+<div id="3332" class="block-content">
 	<p id="333">
 		If you run the application in your web browser, enter some values and click
 		the "Convert" button then you should see that calculated value displayed next
@@ -186,24 +185,24 @@ class Home extends TPage
 	</p>
 
 	<p id="80067">We shall now examine, the three lines that implements the simply currency
-		conversion in the "<tt>convert_clicked</tt>" method.
-	</p>
+		conversion in the "<tt>convert_clicked</tt>" method.
+	</p>
 </div>
 <com:TTextHighlighter Language="php" CssClass="source block-content" id="code6" >
 $rate = floatval($this->currencyRate->Text);
-</com:TTextHighlighter>
+</com:TTextHighlighter>
 	<p id="444" class="block-content">
 		The statement <tt>$this->currencyRate</tt> corresponds to the
 		<tt>TTextBox</tt> component with <tt>ID</tt> value "currencyRate" in the
 		"Home.page" template. The <tt>Text</tt> property of the <tt>TTextBox</tt>
 		contains the value that the user entered. So, we obtain this
 		value by <tt>$this->currencyRate->Text</tt> which we convert the
-		value to a float value.
+		value to a float value.
 	</p>
 <com:TTextHighlighter Language="php" CssClass="source block-content" id="code7">
 $dollars = floatval($this->dollars->Text);
-</com:TTextHighlighter>
-<div id="5551" class="block-content">
+</com:TTextHighlighter>
+<div id="5551" class="block-content">
 	<p id="555">
 		The next line does a similar things, it takes the user value from
 		the <tt>TTextBox</tt> with <tt>ID</tt> value "dollars and converts it to
@@ -212,9 +211,9 @@ $dollars = floatval($this->dollars->Text);
 
 	<p id="80068">The third line calculates the new amount and set this value in the
 		<tt>Text</tt> property of the <tt>TLabel</tt> with <tt>ID="total"</tt>.
-		Thus, we display the new amount to the user in the label.
+		Thus, we display the new amount to the user in the label.
 	</p>
-</div>
+</div>
 <com:TTextHighlighter Language="php" CssClass="source block-content" id="code8">
 $this->total->Text = $rate * $dollars;
 </com:TTextHighlighter>
@@ -233,14 +232,14 @@ $this->total->Text = $rate * $dollars;
 			<li>the user enters a value,</li>
 			<li>the currency rate is a valid number,</li>
 			<li>the currency rate is positive.</li>
-		</ol>
+		</ol>
 	<p id="666" class="block-content">
 	 To ensure 1 we add one
 	<com:DocLink ClassPath="System.Web.UI.WebControls.TRequiredFieldValidator" Text="TRequiredFieldValidator" />. To ensure 2 and 3, we add one
 	<com:DocLink ClassPath="System.Web.UI.WebControls.TCompareValidator" Text="TCompareValidator" />. We may add these validators any where within
 	the "Home.page" template. Further details regarding these validator and other
 	validators can be found in the
-	<a href="?page=Controls.Validation">Validation Controls</a> page.
+	<a href="?page=Controls.Validation">Validation Controls</a> page.
 	</p>
 <com:TTextHighlighter Language="prado" CssClass="source block-content" id="code9">
 &lt;com:TRequiredFieldValidator
@@ -258,12 +257,12 @@ $this->total->Text = $rate * $dollars;
 		<ol id="o222" class="block-content">
 			<li>the user enters a value,</li>
 			<li>the value is a valid number (not including any currency or dollar signs).</li>
-		</ol>
+		</ol>
 	<p id="777" class="block-content">
 	To ensure 1 we just add another <tt>TRequiredFieldValidator</tt>, for 2
 	we could use a
 	<com:DocLink ClassPath="System.Web.UI.WebControls.TDataTypeValidator" Text="TDataTypeValidator" />. For simplicity we only allow the user to enter
-	a number for the amount they wish to convert.
+	a number for the amount they wish to convert.
 	</p>
 <com:TTextHighlighter Language="prado" CssClass="source block-content" id="code9a">
 &lt;com:TRequiredFieldValidator
@@ -283,7 +282,7 @@ $this->total->Text = $rate * $dollars;
 		using both javascript and server side. The server side validation
 		is <b>always performed</b>. For the server side, we
 		should skip the calculation if the validators are not satisfied. This can
-		done as follows.
+		done as follows.
 	</p>
 <com:TTextHighlighter Language="php" CssClass="source block-content" id="code10" >
 public function convert_clicked($sender, $param)
@@ -310,7 +309,7 @@ public function convert_clicked($sender, $param)
 		In addition, we can change the "totals" <tt>TLabel</tt> with the
 		Active Control counter part,
 		<com:DocLink ClassPath="System.Web.UI.ActiveControls.TActiveLabel" Text="TActiveLabel" />, such that the server side can update the browser without
-		reloading the page.
+		reloading the page.
 	</p>
 <com:TTextHighlighter Language="prado" CssClass="source block-content" id="code11">
 <div class="total-field">
@@ -320,11 +319,11 @@ public function convert_clicked($sender, $param)
     <div class="convert-button">
         &lt;com:TActiveButton Text="Convert" OnClick="convert_clicked" /&gt;
 </div>
-</com:TTextHighlighter>
+</com:TTextHighlighter>
 	<p id="1232" class="block-content">
 		The server side logic remains the same, we just need to import the
 		Active Controls name space as they are not included by default. We
-		add the following line to the begin of "Home.php".
+		add the following line to the begin of "Home.php".
 	</p>
 <com:TTextHighlighter Language="php" CssClass="source block-content" id="code12">
 Prado::using('System.Web.UI.ActiveControls.*');
@@ -342,7 +341,7 @@ Prado::using('System.Web.UI.ActiveControls.*');
 	<p id="80076" class="block-content">To indicate that the calculation is in progress, we can change the text
 		of the "total" label as follows. We add a <tt>ClientSide.OnLoading</tt> property
 		to the "Convert" button (since this button is responsible for requesting
-		the calculation).
+		the calculation).
 	</p>
 <com:TTextHighlighter Language="prado" CssClass="source block-content" id="code13">
 &lt;com:TActiveButton Text="Convert" OnClick="convert_clicked" &gt;
@@ -380,7 +379,7 @@ Prado::using('System.Web.UI.ActiveControls.*');
 
 	<p id="80080" class="block-content">We simply create a CSS file named "common.css" and save it in the
 		<tt>themes/Basic</tt> directory. Then we add the following code
-		to the beginning of "Home.page" (we add a little more HTML as well).
+		to the beginning of "Home.page" (we add a little more HTML as well).
 	</p>
 <com:TTextHighlighter Language="prado" CssClass="source block-content" id="code14">
 &lt;%@ Theme="Basic" %&gt;
@@ -389,7 +388,7 @@ Prado::using('System.Web.UI.ActiveControls.*');
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" >
 &lt;com:THead Title="Currency Converter" /&gt;
 <body>
-</com:TTextHighlighter>
+</com:TTextHighlighter>
 	<p id="4334" class="block-content">
 		The first line <tt>&lt;%@ Theme="Basic" %&gt;</tt> defines the
 		theme to be used for this page. The
diff --git a/demos/quickstart/protected/pages/Tutorial/id/AjaxChat.page b/demos/quickstart/protected/pages/Tutorial/id/AjaxChat.page
index 00222bca..50759868 100755
--- a/demos/quickstart/protected/pages/Tutorial/id/AjaxChat.page
+++ b/demos/quickstart/protected/pages/Tutorial/id/AjaxChat.page
@@ -55,7 +55,6 @@ php prado/framework/prado-cli.php -c chat
 class Login extends TPage
 {
 }
-?&gt;
 </com:TTextHighlighter>
 <com:TTextHighlighter Language="prado" CssClass="source block-content" id="code_90029">
 <!doctype html public "-//W3C//DTD XHTML 1.0 Strict//EN"
diff --git a/demos/quickstart/protected/pages/Tutorial/id/CurrencyConverter.page b/demos/quickstart/protected/pages/Tutorial/id/CurrencyConverter.page
index d8f8e2b4..c1eae035 100755
--- a/demos/quickstart/protected/pages/Tutorial/id/CurrencyConverter.page
+++ b/demos/quickstart/protected/pages/Tutorial/id/CurrencyConverter.page
@@ -1,8 +1,8 @@
 <com:TContent ID="body">
 	<h1 id="16001">Membangun Pengubah Kurs Sederhana</h1>
 	<p id="80053" class="block-content">Tutorial ini memperkenalkan kerangka kerja aplikasi web Prado dan mengajarkan Anda bagaimana untuk
-		membangun aplikasi web sederhana dalam beberapa langkah sederhana. Tutorial 
-		ini menganggap bahwa Anda terbiasa dengan PHP dan Anda telah mengakses 
+		membangun aplikasi web sederhana dalam beberapa langkah sederhana. Tutorial
+		ini menganggap bahwa Anda terbiasa dengan PHP dan Anda telah mengakses
 		server web yang dapat melayani naskah PHP5.
 	</p>
 
@@ -25,9 +25,9 @@
 	<p id="80056" class="block-content">Cara tercepat dan termudah untuk membuat aplikasi web Prado baru adalah menggunakan piranti perintah <tt>prado-cli.php</tt> yang ditemukan dalam direktori <tt>framework</tt>
 		pada distribusi Prado.  Kita membuat aplikasi baru dengan menjalankan perintah berikut dalam prompt perintah atau konsol Anda. Perintah membuat direktori baru bernama <tt>currency-converter</tt> dalam direktori kerja Anda saat ini.
 		Anda perlu mengubahnya ke direktori yang benar terlebih dahulu.
-		Lihat <a href="?page=GettingStarted.CommandLine">Piranti Baris Perintah</a>
-		untuk lebih jelasnya.
-	</p>
+		Lihat <a href="?page=GettingStarted.CommandLine">Piranti Baris Perintah</a>
+		untuk lebih jelasnya.
+	</p>
 <com:TTextHighlighter Language="text" CssClass="source block-content" id="code111">
 php prado/framework/prado-cli.php -c currency-converter
 </com:TTextHighlighter>
@@ -39,7 +39,7 @@ php prado/framework/prado-cli.php -c currency-converter
 
 	<h1 id="16003">Membuat Antarmuka Pengguna Pengubah Kurs</h1>
 	<p id="80058" class="block-content">Kita mulai dengan mengedit file <tt>Home.page</tt> yang ditemukan dalam direktori <tt>currency-converter/protected/pages/</tt>. File yang berakhiran dengan ".page" adalah template halaman yang berisi HTML dan kontrol Prado.
-		Kita cukup menambah dua kotak teks, tiga label dan satu tombol seperti berikut.
+		Kita cukup menambah dua kotak teks, tiga label dan satu tombol seperti berikut.
 	</p>
 <com:TTextHighlighter Language="prado" CssClass="source block-content" id="form1">
 &lt;com:TForm&gt;
@@ -62,7 +62,7 @@ php prado/framework/prado-cli.php -c currency-converter
         </div>
     </fieldset>
 &lt;/com:TForm&gt;
-</com:TTextHighlighter>
+</com:TTextHighlighter>
 	<p id="refresh" class="block-content">
 	Jika Anda menyegarkan halaman, Anda akan melihat sesuatu mirip dengan gambar berikut.
 	Ia mungkin terlihat tidak cukup bagus atau berurut, tapi kita akan mengubahnya nanti dengan menggunakan CSS.
@@ -82,7 +82,7 @@ php prado/framework/prado-cli.php -c currency-converter
 		<com:DocLink ClassPath="System.Web.UI.WebControls.TTextBox" Text="TTextBox" />
 		yang pada dasarnya mendefinisikan sebuah label dan kotak teks bagi pengguna aplikasi
 		untuk memasukan nilai pertukaran kurs.
-		Nilai properti <tt>ForControl</tt> property menentukan komponen mana label 
+		Nilai properti <tt>ForControl</tt> property menentukan komponen mana label
 		diperuntukan. Ini membolehkan pengguna aplikasi mengklik pada label
 		untuk memfokuskan pada field (hal yang baik). Anda mungkin telah menggunakan elemen
 		biasa HTML <tt>&lt;label&gt;</tt> untuk melakukan hal yang sama, tapi
@@ -109,7 +109,7 @@ php prado/framework/prado-cli.php -c currency-converter
 	<p id="80063" class="block-content">Jika Anda mencoba mengklik pada tombol "Convert" kemudian halaman akan menyegarkan
 		dan tidak melakukan apapun. Agar tombol melakukan beberapa pekerjaan, kita perlu
 		menambahkan "Home.php" ke di mana "Home.page" berada. Kelas <tt>Home</tt> harus
-		memperluas <com:DocLink ClassPath="System.Web.UI.TPage" Text="TPage" />, basis kelas standar untuk semua halaman Prado.
+		memperluas <com:DocLink ClassPath="System.Web.UI.TPage" Text="TPage" />, basis kelas standar untuk semua halaman Prado.
 	</p>
 <com:TTextHighlighter Language="php" CssClass="source block-content" id="code3">
 &lt;?php
@@ -117,8 +117,7 @@ class Home extends TPage
 {
 
 }
-?&gt;
-</com:TTextHighlighter>
+</com:TTextHighlighter>
 	<p id="1111" class="block-content">
 		Prado menggunakan metode PHP <tt>__autoload</tt> untuk mengambil kelas. Konvensi
 		adalah untuk menggunakan nama kelas dengan ekstensi ".php" sebagai nama file.
@@ -134,14 +133,14 @@ class Home extends TPage
 		nilai dalam kotak teks, melakukan beberapa perhitungan dan menyajikan kepada pengguna dengan
 		total nilai yang dikonversi. Untuk menangani pengguna mengklik pada tombo "Convert",
 		kita cukup menambahkan sebuah properti <tt>OnClick</tt> ke tombol "Convert" dalam
-	 	template "Home.page" dan menambahkan metode pengendali event terkait dalam "Home.php".
+	 	template "Home.page" dan menambahkan metode pengendali event terkait dalam "Home.php".
 	</p>
 <com:TTextHighlighter Language="prado" CssClass="source block-content" id="code4">
 &lt;com:TButton Text="Convert" OnClick="convert_clicked" /&gt;
 </com:TTextHighlighter>
-	<p id="222" class="block-content">
+	<p id="222" class="block-content">
 		Nilai dari <tt>OnClick</tt>, "<tt>convert_clicked</tt>", akan menjadi nama metode
-		dalam "Home.php" yang akan dipanggil saat pengguna mengklik tombol "Convert".
+		dalam "Home.php" yang akan dipanggil saat pengguna mengklik tombol "Convert".
 	</p>
 <com:TTextHighlighter Language="php" CssClass="source block-content" id="code5">
 class Home extends TPage
@@ -153,8 +152,8 @@ class Home extends TPage
         $this->total->Text = $rate * $dollars;
     }
 }
-</com:TTextHighlighter>
-<div id="3332" class="block-content">
+</com:TTextHighlighter>
+<div id="3332" class="block-content">
 	<p id="333">
 		Jika Anda menjalankan aplikasi dalam web browser Anda, masukkan beberapa nilai
 		dan klik tombol "Convert" kemudian Anda akan melihat nilai yang dihitung ditampilkan
@@ -168,24 +167,24 @@ class Home extends TPage
 	</p>
 
 	<p id="80067">Sekarang kita akan memeriksa, tiga baris yang mengimplementasikan konversi
-		kurs sederhana dalam metode "<tt>convert_clicked</tt>".
-	</p>
+		kurs sederhana dalam metode "<tt>convert_clicked</tt>".
+	</p>
 </div>
 <com:TTextHighlighter Language="php" CssClass="source block-content" id="code6" >
 $rate = floatval($this->currencyRate->Text);
-</com:TTextHighlighter>
+</com:TTextHighlighter>
 	<p id="444" class="block-content">
 		Pernyataan <tt>$this->currencyRate</tt> berhubungan dengan komponen
 		<tt>TTextBox</tt> dengan nilai <tt>ID</tt> "currencyRate" dalam template
 		"Home.page". Properti <tt>Text</tt> dari <tt>TTextBox</tt> berisi
 		nilai yang dimasukan oleh pengguna. Maka kita memperoleh nilai ini dengan
 		<tt>$this->currencyRate->Text</tt> yang kita konversi nilainya ke nilai
-		pecahan.
+		pecahan.
 	</p>
 <com:TTextHighlighter Language="php" CssClass="source block-content" id="code7">
 $dollars = floatval($this->dollars->Text);
-</com:TTextHighlighter>
-<div id="5551" class="block-content">
+</com:TTextHighlighter>
+<div id="5551" class="block-content">
 	<p id="555">
 		Baris berikutnya melakukan hal yang mirip, ia mengambil nilai pengguna
 		dari <tt>TTextBox</tt> dengan nilai <tt>ID</tt> "dollars dang mengubahnya
@@ -194,9 +193,9 @@ $dollars = floatval($this->dollars->Text);
 
 	<p id="80068">Baris ketiga menghitung jumlah baru dan menyetel nilai ini dalam properti
 		<tt>Text</tt> dari <tt>TLabel</tt> dengan <tt>ID="total"</tt>.
-		Selanjutnya, kita tampilkan jumlah baru ke pengguna dalam label.
+		Selanjutnya, kita tampilkan jumlah baru ke pengguna dalam label.
 	</p>
-</div>
+</div>
 <com:TTextHighlighter Language="php" CssClass="source block-content" id="code8">
 $this->total->Text = $rate * $dollars;
 </com:TTextHighlighter>
@@ -210,11 +209,11 @@ $this->total->Text = $rate * $dollars;
 			<li>pengguna memasukan sebuah nilai,</li>
 			<li>kurs mata uang adalah angka yang benar,</li>
 			<li>kurs mata uang adalah positif.</li>
-		</ol>
+		</ol>
 	<p id="666" class="block-content">
 	 Untuk memastikan poin 1 kita menambahkan satu
 	<com:DocLink ClassPath="System.Web.UI.WebControls.TRequiredFieldValidator" Text="TRequiredFieldValidator" />. Untuk memastikan poin 2 dan 3, kita menambahkan satu <com:DocLink ClassPath="System.Web.UI.WebControls.TCompareValidator" Text="TCompareValidator" />. Kita dapat menambahkan validator ini di mana saja di dalam template "Home.page". Perincian selanjutnya mengenai validator ini dan validator lainnya dapat ditemukan dalam halaman
-	<a href="?page=Controls.Validation">Validation Controls</a>.
+	<a href="?page=Controls.Validation">Validation Controls</a>.
 	</p>
 <com:TTextHighlighter Language="prado" CssClass="source block-content" id="code9">
 &lt;com:TRequiredFieldValidator
@@ -232,11 +231,11 @@ $this->total->Text = $rate * $dollars;
 		<ol id="o222" class="block-content">
 			<li>pengguna memasukan sebuah nilai,</li>
 			<li>nilai adalah angka yang benar (tidak menyertakan tanda kurs atau dolar).</li>
-		</ol>
+		</ol>
 	<p id="777" class="block-content">
 	Untuk memastikan 1 kita cukup menambahkan <tt>TRequiredFieldValidator</tt> lainnya, untuk 2
 	kita dapat menggunakan
-	<com:DocLink ClassPath="System.Web.UI.WebControls.TDataTypeValidator" Text="TDataTypeValidator" />. Untuk memudahkan kita hanya membolehkan pengguna untuk memasukan sebuah angka untuk jumlah yang ingin mereka ubah.
+	<com:DocLink ClassPath="System.Web.UI.WebControls.TDataTypeValidator" Text="TDataTypeValidator" />. Untuk memudahkan kita hanya membolehkan pengguna untuk memasukan sebuah angka untuk jumlah yang ingin mereka ubah.
 	</p>
 <com:TTextHighlighter Language="prado" CssClass="source block-content" id="code9a">
 &lt;com:TRequiredFieldValidator
@@ -249,8 +248,8 @@ $this->total->Text = $rate * $dollars;
 </com:TTextHighlighter>
 	</p>
 
-	<p id="80072" class="block-content">Sekarang jika Anda mencoba memasukan beberapa data tidak benar dalam aplikasi atau membiarkan field kosong 
-		validators akan diaktifkan dan menyajikan pesan kesalahan kepada pengguna. Catatan bahwa pesan kesalahan disajikan tanpa mengambil ulang halaman. Validator Prado standarnya memvalidasi javascript dan di dalam server. Validasi di dalam server <b>selalu dilakukan</b>. Untuk sisi server, kita harus melewati perhitungan jika validator tidak memuaskan. Ini dapat dilakukan seperti berikut.
+	<p id="80072" class="block-content">Sekarang jika Anda mencoba memasukan beberapa data tidak benar dalam aplikasi atau membiarkan field kosong
+		validators akan diaktifkan dan menyajikan pesan kesalahan kepada pengguna. Catatan bahwa pesan kesalahan disajikan tanpa mengambil ulang halaman. Validator Prado standarnya memvalidasi javascript dan di dalam server. Validasi di dalam server <b>selalu dilakukan</b>. Untuk sisi server, kita harus melewati perhitungan jika validator tidak memuaskan. Ini dapat dilakukan seperti berikut.
 	</p>
 <com:TTextHighlighter Language="php" CssClass="source block-content" id="code10" >
 public function convert_clicked($sender, $param)
@@ -276,7 +275,7 @@ memperbaiki pengalaman pengguna dengan meningkatkan tanggapan aplikasi. Satu car
 		<com:DocLink ClassPath="System.Web.UI.ActiveControls.TActiveButton" Text="TActiveButton" />,
 		yang dapat memicu event klik di dalam server tanpa mengambil ulang halaman.
 		Sebagai tambahan, kita dapat mengubah "total" <tt>TLabel</tt> dengan pasangan Kontrol Aktif,
-		<com:DocLink ClassPath="System.Web.UI.ActiveControls.TActiveLabel" Text="TActiveLabel" />, dengan demikian di dalam server dapat memutakhirkan browser tanpa mengambil ulang halaman.
+		<com:DocLink ClassPath="System.Web.UI.ActiveControls.TActiveLabel" Text="TActiveLabel" />, dengan demikian di dalam server dapat memutakhirkan browser tanpa mengambil ulang halaman.
 	</p>
 <com:TTextHighlighter Language="prado" CssClass="source block-content" id="code11">
 <div class="total-field">
@@ -286,10 +285,10 @@ memperbaiki pengalaman pengguna dengan meningkatkan tanggapan aplikasi. Satu car
     <div class="convert-button">
         &lt;com:TActiveButton Text="Convert" OnClick="convert_clicked" /&gt;
 </div>
-</com:TTextHighlighter>
+</com:TTextHighlighter>
 	<p id="1232" class="block-content">
 		Logika di dalam server tetap sama, kita hanya perlu mengimpor
-		ruang nama Kontrol Aktif karena secara standar tidak disertakan. Kita menambahkan baris berikut ke awal "Home.php".
+		ruang nama Kontrol Aktif karena secara standar tidak disertakan. Kita menambahkan baris berikut ke awal "Home.php".
 	</p>
 <com:TTextHighlighter Language="php" CssClass="source block-content" id="code12">
 Prado::using('System.Web.UI.ActiveControls.*');
@@ -300,7 +299,7 @@ Prado::using('System.Web.UI.ActiveControls.*');
 		Selanjutnya kita bisa memperbaiki pengalaman pengguna dengan mengunah label teks "total" menjadi "calculating..." saat pengguna mengklik tombol "Convert". Label teks "total" masih dimutakhirkan dengan jumlah perhitungan baru seperti sebelumnya.
 	</p>
 
-	<p id="80076" class="block-content">Untuk mengindikasikan bahwa perhitungan sedang berlangsung, kita dapat mengubah label teks  "total" sebagai berikut. Kita menambahkan properti <tt>ClientSide.OnLoading</tt> ke tombol "Convert" (karena tombol ini bertanggung jawab terhadap permintaan perhitungan).
+	<p id="80076" class="block-content">Untuk mengindikasikan bahwa perhitungan sedang berlangsung, kita dapat mengubah label teks  "total" sebagai berikut. Kita menambahkan properti <tt>ClientSide.OnLoading</tt> ke tombol "Convert" (karena tombol ini bertanggung jawab terhadap permintaan perhitungan).
 	</p>
 <com:TTextHighlighter Language="prado" CssClass="source block-content" id="code13">
 &lt;com:TActiveButton Text="Convert" OnClick="convert_clicked" &gt;
@@ -325,7 +324,7 @@ Prado::using('System.Web.UI.ActiveControls.*');
 	</p>
 
 	<p id="80080" class="block-content">Kita cukup dengan membuat file CSS bernama "common.css" dan menyimpannya dalam direktori
-		<tt>themes/Basic</tt>. Kemudian kita menambahkan kode berikut ke awal "Home.page" (kita menambahkan sedikit kode HTML juga).
+		<tt>themes/Basic</tt>. Kemudian kita menambahkan kode berikut ke awal "Home.page" (kita menambahkan sedikit kode HTML juga).
 	</p>
 <com:TTextHighlighter Language="prado" CssClass="source block-content" id="code14">
 &lt;%@ Theme="Basic" %&gt;
@@ -334,10 +333,10 @@ Prado::using('System.Web.UI.ActiveControls.*');
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" >
 &lt;com:THead Title="Currency Converter" /&gt;
 <body>
-</com:TTextHighlighter>
+</com:TTextHighlighter>
 	<p id="4334" class="block-content">
 		Baris pertama <tt>&lt;%@ Theme="Basic" %&gt;</tt> mendefinisikan tema
-		yang dipakai untuk halaman ini. 
+		yang dipakai untuk halaman ini.
 		<com:DocLink ClassPath="System.Web.UI.WebControls.THead" Text="THead" />
 		merujuk ke elemen HTML <tt>&lt;head&gt;</tt>. Sebagai tambahan terhadap
 		tampilan properti <tt>Title</tt> pada <tt>THead</tt>, semua file CSS
diff --git a/demos/sqlmap/protected/pages/Manual/Tutorial/TestFirst.page b/demos/sqlmap/protected/pages/Manual/Tutorial/TestFirst.page
index 80a155cb..55d55c31 100755
--- a/demos/sqlmap/protected/pages/Manual/Tutorial/TestFirst.page
+++ b/demos/sqlmap/protected/pages/Manual/Tutorial/TestFirst.page
@@ -46,7 +46,6 @@ class PersonTest extends UnitTestCase
         $this->assertNotNull($person, "Person not returned");
     }
 }
-?&gt;
 </com:TTextHighlighter>
 
 <p>Well, the example sure looks easy enough! We ask a method to "select all", and
@@ -54,7 +53,7 @@ it returns a list of person objects. But, what code do we need to write to
 pass this test?</p>
 
 <div class="note"><b class="tip">Note:</b>
-    Save the <tt>PersonTest.php</tt> into a <tt>tests</tt> directory. 
+    Save the <tt>PersonTest.php</tt> into a <tt>tests</tt> directory.
     The unit tests are written for the <a href="http://simpletest.sf.net">SimpleTest Unit Testing framework</a>.
 </div>
 
@@ -74,7 +73,6 @@ error_reporting(E_ALL);
 
 $test = new GroupTest('All tests');
 $test->addTestFile('Tests/PersonTest.php'); $test->run(new HtmlReporter());
-?&gt;
 </com:TTextHighlighter>
 
 <p>To run the tests, point your browser to the "<tt>run_test.php</tt>" script file
@@ -108,7 +106,6 @@ class Person
         $this->_birthDate = $value;
     }
 }
-?&gt;
 </com:TTextHighlighter>
 
 <p>OK, that was fun! The <tt>$this->assertXXX(...)</tt> methods are built into
@@ -125,7 +122,7 @@ method executes our SQL statement (or stored procedure) and returns the result
 as a list. Each row in the result becomes an entry in the list. Along with
 <tt>queryForList()</tt>, there are also <tt>delete()</tt>, <tt>insert()</tt>,
 <tt>queryForObject()</tt>, <tt>queryForPagedList()</tt> and a few other methods in the
-<a href="?page=Manual.DataMapperAPI">SQLMap API</a>. 
+<a href="?page=Manual.DataMapperAPI">SQLMap API</a>.
 
 <p>Looking at unit test example, we see that the <tt>queryForList()</tt> method
 takes the name of the statement we want to run. OK. Easy enough. But where
diff --git a/demos/sqlmap/protected/pages/Manual/Tutorial/TestSecond.page b/demos/sqlmap/protected/pages/Manual/Tutorial/TestSecond.page
index 706b5220..b128c413 100755
--- a/demos/sqlmap/protected/pages/Manual/Tutorial/TestSecond.page
+++ b/demos/sqlmap/protected/pages/Manual/Tutorial/TestSecond.page
@@ -58,7 +58,6 @@ error_reporting(E_ALL);
 require_once('/path/to/prado/framework/prado.php');
 $application=new TApplication;
 $application->run();
-?>
 </com:TTextHighlighter>
 
 <p>Now we are ready to setup a page to display our list of people.
@@ -106,7 +105,6 @@ class Home extends TPage
             $this->loadData();
     }
 }
-?&gt;
 </com:TTextHighlighter>
 
 <p>If we run this now, we'll get a list like the one shown the figure below.</p>
diff --git a/framework/Web/UI/TClientScriptManager.php b/framework/Web/UI/TClientScriptManager.php
index 2a8ae6ae..cc59292a 100644
--- a/framework/Web/UI/TClientScriptManager.php
+++ b/framework/Web/UI/TClientScriptManager.php
@@ -367,7 +367,6 @@ class TClientScriptManager extends TApplicationComponent
 	 *     $this->Page->ClientScript->registerStyleSheetFile($url, $url);
 	 *   }
 	 * }
-	 * ?>
 	 * </code>
 	 *
 	 * @param string a unique key identifying the file
diff --git a/framework/pradolite.php b/framework/pradolite.php
index d9627d13..dfe5e1d2 100644
--- a/framework/pradolite.php
+++ b/framework/pradolite.php
@@ -1248,7 +1248,7 @@ class TTextWriter extends TComponent implements ITextWriter
 		$this->write($str."\n");
 	}
 }
-class TPriorityList extends TList 
+class TPriorityList extends TList
 {
 	private $_d=array();
 	private $_o=false;
@@ -1483,7 +1483,7 @@ class TPriorityList extends TList
 		foreach($this->_d as $priority=>$items) {
 			if(($index=array_search($item,$items,true))!==false) {
 				$absindex+=$index;
-				return $withindex?array($priority,$index,$absindex, 
+				return $withindex?array($priority,$index,$absindex,
 						'priority'=>$priority,'index'=>$index,'absindex'=>$absindex):$priority;
 			} else
 				$absindex+=count($items);
@@ -1500,7 +1500,7 @@ class TPriorityList extends TList
 			if($index>=($c=count($items)))
 				$index-=$c;
 			else
-				return $withindex?array($priority,$index,$absindex, 
+				return $withindex?array($priority,$index,$absindex,
 						'priority'=>$priority,'index'=>$index,'absindex'=>$absindex):$priority;
 		}
 		return false;
@@ -3129,7 +3129,7 @@ class THttpRequest extends TApplicationComponent implements IteratorAggregate,Ar
 		if($this->getEnableCache())
 		{
 			$cache = $this->getApplication()->getCache();
-			if($cache !== null) 
+			if($cache !== null)
 			{
 				$dependencies = null;
 				if($this->getApplication()->getMode() !== TApplicationMode::Performance)
@@ -4524,7 +4524,7 @@ class TControl extends TApplicationComponent implements IRenderable, IBindable
 	const IS_DISABLE_THEMING=0x10;
 	const IS_CHILD_CREATED=0x20;
 	const IS_CREATING_CHILD=0x40;
-	const RF_CONTROLS=0;				const RF_CHILD_STATE=1;				const RF_NAMED_CONTROLS=2;			const RF_NAMED_CONTROLS_ID=3;		const RF_SKIN_ID=4;					const RF_DATA_BINDINGS=5;			const RF_EVENTS=6;					const RF_CONTROLSTATE=7;			const RF_NAMED_OBJECTS=8;			const RF_ADAPTER=9;					const RF_AUTO_BINDINGS=10;		
+	const RF_CONTROLS=0;				const RF_CHILD_STATE=1;				const RF_NAMED_CONTROLS=2;			const RF_NAMED_CONTROLS_ID=3;		const RF_SKIN_ID=4;					const RF_DATA_BINDINGS=5;			const RF_EVENTS=6;					const RF_CONTROLSTATE=7;			const RF_NAMED_OBJECTS=8;			const RF_ADAPTER=9;					const RF_AUTO_BINDINGS=10;
 	private $_id='';
 	private $_uid;
 	private $_parent;
@@ -6385,7 +6385,7 @@ class TWebControlDecorator extends TComponent {
 			$this->_posttagtemplate = $value;
 	}
 	public function instantiate($outercontrol = null) {
-		if($this->getPreTagTemplate() || $this->getPreContentsTemplate() || 
+		if($this->getPreTagTemplate() || $this->getPreContentsTemplate() ||
 			$this->getPostContentsTemplate() || $this->getPostTagTemplate()) {
 			$this->_outercontrol = $outercontrol;
 			if($this->getUseState())
@@ -6684,7 +6684,7 @@ class TWebControl extends TControl implements IStyleable
 			$decorator->renderPostContentsText($writer);
 			$writer->renderEndTag();
 			$decorator->renderPostTagText($writer);
-		} else 
+		} else
 			$writer->renderEndTag($writer);
 	}
 }
@@ -7306,7 +7306,7 @@ class TClientScriptManager extends TApplicationComponent
 		if($str!=='')
 			$writer->write("<div style=\"visibility:hidden;\">\n".$str."</div>\n");
 	}
-	public function getHiddenFields()	
+	public function getHiddenFields()
 	{
 		return $this->_hiddenFields;
 	}
@@ -9672,7 +9672,7 @@ class TPageConfiguration extends TComponent
 			$this->loadFromPhp($fcontent,dirname($fname),$configPagePath);
 		}
 		else
-		{	
+		{
 			$dom=new TXmlDocument;
 			if($dom->loadFromFile($fname))
 				$this->loadFromXml($dom,dirname($fname),$configPagePath);
@@ -9759,7 +9759,7 @@ class TPageConfiguration extends TComponent
 				if(isset($page['properties']))
 				{
 					$properties=$page['properties'];
-					unset($page['properties']);	
+					unset($page['properties']);
 				}
 				$matching=false;
 				$id=($configPagePath==='')?$id:$configPagePath.'.'.$id;
@@ -10173,7 +10173,7 @@ class TApplication extends TComponent
 	const STATE_PERFORMANCE='Performance';
 	const PAGE_SERVICE_ID='page';
 	const CONFIG_FILE_XML='application.xml';
-	const CONFIG_FILE_EXT_XML='.xml';	
+	const CONFIG_FILE_EXT_XML='.xml';
 	const CONFIG_TYPE_XML = 'xml';
 	const CONFIG_FILE_PHP='application.php';
 	const CONFIG_FILE_EXT_PHP='.php';
@@ -10822,7 +10822,7 @@ class TApplicationConfiguration extends TComponent
 				$this->_properties[$name]=$value;
 			}
 			$this->_empty = false;
-		}	
+		}
 		if(isset($config['paths']) && is_array($config['paths']))
 			$this->loadPathsPhp($config['paths'],$configPath);
 		if(isset($config['modules']) && is_array($config['modules']))
@@ -10946,7 +10946,7 @@ class TApplicationConfiguration extends TComponent
 			$properties['id'] = $id;
 			$this->_modules[$id]=array($type,$properties,$module);
 			$this->_empty=false;
-		}	
+		}
 	}
 	protected function loadModulesXml($modulesNode,$configPath)
 	{
@@ -10982,7 +10982,7 @@ class TApplicationConfiguration extends TComponent
 			$properties['id'] = $id;
 			$this->_services[$id] = array($type,$properties,$service);
 			$this->_empty = false;
-		}	
+		}
 	}
 	protected function loadServicesXml($servicesNode,$configPath)
 	{
@@ -11152,4 +11152,3 @@ class TShellApplication extends TApplication
 		$this->initApplication();
 	}
 }
-?>
\ No newline at end of file
diff --git a/requirements/index.php b/requirements/index.php
index 58fb1ea3..2fd392ba 100644
--- a/requirements/index.php
+++ b/requirements/index.php
@@ -290,5 +290,3 @@ function getPradoVersion()
 	}
 	return '';
 }
-
-?>
\ No newline at end of file
-- 
cgit v1.2.3


From 1144e49b8e00fa75b1593e4637c9218d7d944b97 Mon Sep 17 00:00:00 2001
From: Fabio Bas <ctrlaltca@gmail.com>
Date: Sun, 12 Jan 2014 21:33:46 +0100
Subject: Big quickstart doc overhaul, pt. 1

---
 demos/quickstart/protected/controls/TopicList.tpl  |   4 +-
 .../protected/pages/Configurations/Templates1.page |   2 +-
 .../quickstart/protected/pages/Controls/Data.page  |   6 +
 .../protected/pages/Controls/Standard.page         |   4 +-
 .../protected/pages/Fundamentals/Applications.page |   4 +
 .../protected/pages/Fundamentals/Architecture.page |  25 +-
 .../protected/pages/Fundamentals/Components.page   | 360 ---------------------
 .../protected/pages/Fundamentals/Components1.page  | 157 +++++++++
 .../protected/pages/Fundamentals/Components2.page  | 207 ++++++++++++
 .../protected/pages/Fundamentals/Pages.page        |  14 +-
 .../protected/pages/Fundamentals/Services.page     |   5 +-
 .../protected/pages/GettingStarted/AboutPrado.page |  10 +-
 .../pages/GettingStarted/Installation.page         |  41 ++-
 .../protected/pages/Tutorial/AddressBook.page      |   9 -
 14 files changed, 464 insertions(+), 384 deletions(-)
 delete mode 100755 demos/quickstart/protected/pages/Fundamentals/Components.page
 create mode 100755 demos/quickstart/protected/pages/Fundamentals/Components1.page
 create mode 100644 demos/quickstart/protected/pages/Fundamentals/Components2.page
 delete mode 100755 demos/quickstart/protected/pages/Tutorial/AddressBook.page

(limited to 'demos/quickstart/protected/pages/Tutorial')

diff --git a/demos/quickstart/protected/controls/TopicList.tpl b/demos/quickstart/protected/controls/TopicList.tpl
index adcdff4a..586b7f75 100755
--- a/demos/quickstart/protected/controls/TopicList.tpl
+++ b/demos/quickstart/protected/controls/TopicList.tpl
@@ -17,7 +17,6 @@
     <li><a href="?page=GettingStarted.HelloWorld">Creating First PRADO Application</a></li>
     <li><a href="?page=Fundamentals.Hangman">Sample: Hangman Game</a></li>
     <li><a href="?page=Tutorial.CurrencyConverter">Currency Converter</a></li>
-	<li><a href="?page=Tutorial.AddressBook">Address Book</a></li>
 	<li><a href="?page=Tutorial.AjaxChat">AJAX Chat Client</a></li>
     <li><a href="?page=GettingStarted.CommandLine">Command Line Tool</a></li>
 </ul>
@@ -27,7 +26,8 @@
 <div>Fundamentals</div>
 <ul>
     <li><a href="?page=Fundamentals.Architecture">Architecture</a></li>
-    <li><a href="?page=Fundamentals.Components">Components</a></li>
+    <li><a href="?page=Fundamentals.Components1">Components: Part I</a></li>
+    <li><a href="?page=Fundamentals.Components2">Components: Part II</a></li>
     <li><a href="?page=Fundamentals.Controls">Controls</a></li>
     <li><a href="?page=Fundamentals.Pages">Pages</a></li>
     <li><a href="?page=Fundamentals.Modules">Modules</a></li>
diff --git a/demos/quickstart/protected/pages/Configurations/Templates1.page b/demos/quickstart/protected/pages/Configurations/Templates1.page
index 22b693a6..6c2870f2 100755
--- a/demos/quickstart/protected/pages/Configurations/Templates1.page
+++ b/demos/quickstart/protected/pages/Configurations/Templates1.page
@@ -3,7 +3,7 @@
 <p id="180166" class="block-content">
 Templates are used to specify the presentational layout of controls. A template can contain static text, components, or controls that contribute to the ultimate presentation of the associated control. By default, an instance of <tt>TTemplateControl</tt> or its subclass may automatically load and instantiate a template from a file whose name is the same as the control class name. For page templates, the file name suffix must be <tt>.page</tt>; for other regular template controls, the suffix is <tt>.tpl</tt>.
 </p>
-<p id="180167" class="block-content">The template format is like HTML, with a few PRADO-specifc tags, including <a href="#ct">component tags</a>, <a href="#tct">template control tags</a>, <a href="#cot">comment tags</a>, <a href="?page=Configurations.Templates2#dct">dynamic content tags</a>, and <a href="?page=Configurations.Templates3#dpt">dynamic property tags</a>. .
+<p id="180167" class="block-content">The template format is like HTML, with a few PRADO-specifc tags, including <a href="#ct">component tags</a>, <a href="#tct">template control tags</a>, <a href="#cot">comment tags</a>, <a href="?page=Configurations.Templates2#dct">dynamic content tags</a>, and <a href="?page=Configurations.Templates3#dpt">dynamic property tags</a>.
 </p>
 
 <a name="ct"></a>
diff --git a/demos/quickstart/protected/pages/Controls/Data.page b/demos/quickstart/protected/pages/Controls/Data.page
index 3843b332..829a4ef5 100755
--- a/demos/quickstart/protected/pages/Controls/Data.page
+++ b/demos/quickstart/protected/pages/Controls/Data.page
@@ -2,6 +2,12 @@
 
 <h1 id="5001">Data Controls</h1>
 
+<p class="block-content">
+Data controls are used to display a repeated content like a list or a table. The content is generated from a collection of items containing the data, called the <tt>DataSource</tt>, and a template describing the appearance, called <tt>Renderer</tt>.
+<br/>
+The process of assigning a DataSource to a Data control and render the template for each item is called <tt>data binding</tt>.
+</p>
+
 <ul id="u1" class="block-content">
   <li>
   <a href="?page=Controls.DataList">TDataList</a> is used to display or modify a list of data items.
diff --git a/demos/quickstart/protected/pages/Controls/Standard.page b/demos/quickstart/protected/pages/Controls/Standard.page
index 463f90a5..bac51351 100755
--- a/demos/quickstart/protected/pages/Controls/Standard.page
+++ b/demos/quickstart/protected/pages/Controls/Standard.page
@@ -1,7 +1,9 @@
 <com:TContent ID="body" >
 
 <h1 id="52001">Standard Controls</h1>
-<p id="260001" class="block-content">* the tutorial for this control is not completed yet.</p>
+<p class="block-content">
+  Standard controls are the most basic controls in PRADO. They can represent a simple html tag like an &lt;input&gt; or even more comple controls like a date picker or a WYSIWYG text area. Standard controls are in the <tt>System.Web.UI.WebControls</tt> namespace.
+</p>
 <ul id="u1" class="block-content">
   <li>
   <a href="?page=Controls.Accordion">TAccordion</a> displays an accordion consisting of multiple views. At any time, only one view is visible.
diff --git a/demos/quickstart/protected/pages/Fundamentals/Applications.page b/demos/quickstart/protected/pages/Fundamentals/Applications.page
index 8e0b9e9a..71901170 100755
--- a/demos/quickstart/protected/pages/Fundamentals/Applications.page
+++ b/demos/quickstart/protected/pages/Fundamentals/Applications.page
@@ -7,7 +7,11 @@ An application is an instance of <tt>TApplication</tt> or its derived class. It
 <p id="160158" class="block-content">
 Applications are configured via <a href="?page=Configurations.AppConfig">application configurations</a>. They are usually created in entry scripts like the following,
 <com:TTextHighlighter CssClass="source block-content" id="code_160071">
+// load the prado entry script
 require_once('/path/to/prado.php');
+// or, if using composer:
+require_once('vendor/autoload.php');
+
 $application = new TApplication;
 $application->run();
 </com:TTextHighlighter>
diff --git a/demos/quickstart/protected/pages/Fundamentals/Architecture.page b/demos/quickstart/protected/pages/Fundamentals/Architecture.page
index 10f16c3f..c6bee7de 100755
--- a/demos/quickstart/protected/pages/Fundamentals/Architecture.page
+++ b/demos/quickstart/protected/pages/Fundamentals/Architecture.page
@@ -2,12 +2,31 @@
 <h1 id="601">Architecture</h1>
 
 <p id="100111" class="block-content">
-PRADO is primarily a presentational framework, although it is not limited to be so. The framework focuses on making Web programming, which deals most of the time with user interactions, to be component-based and event-driven so that developers can be more productive. The following class tree depicts some of the major classes provided by PRADO,
+PRADO is primarily a presentational framework, although it is not limited to be so. The framework focuses on making Web programming, which deals most of the time with user interactions, to be component-based and event-driven so that developers can be more productive. The following class tree depicts some of the major classes provided by PRADO:
 </p>
 <img src="<%~classtree.gif%>" />
 
 <p id="100112" class="block-content">
-When a PRADO application is processing a page request, its static object diagram can be shown as follows,
+When a PRADO application is processing a page request, its static object diagram can be shown as follows:
 </p>
 <img src="<%~objectdiagram.gif%>" />
-</com:TContent>
+
+<p class="block-content">
+Once the main <tt>Application</tt> object gets created, it load the <a href="?page=Configurations.AppConfig">application configuration</a>.
+The minimal configuration defines a set of basic <a href="?page=Fundamentals.Modules">modules</a> to parse the <tt>Request</tt>, create a proper <tt>Response</tt>, mantain the user <tt>Session</tt>, handle any <tt>Error</tt> and publish the needed <tt>Assets</tt> (images, css, javascript, etc). These helpers module will be available from anywhere inside the application code.
+<br/>
+Additionally, any 3rd-party or <tt>custom module</tt> can be loaded, and external <tt>Parameters</tt> can be loaded from external configurations.
+</p>
+
+<p class="block-content">
+Once the basic infrastructure has been set up, the <tt>Request</tt> module parses the request trying to identify the requested route. Different routes can be handled by different services, but the default route for http requests is the <tt>Page Service</tt>.
+<br/>
+The <a href="?page=Configurations.AppConfig">Page Service</a>'s role is to instanciate the requested <tt>Page</tt>, run it, apply any defined <tt>Theme</tt> and grab the result in order to build the <tt>Response</tt>.
+</p>
+
+<p class="block-content">
+A <a href="?page=Fundamentals.Pages">Page</a> can be a simple script (.php), a <tt>Template</tt> (.page), or both. PRADO uses a very powerful <a href="?page=Configurations.Templates1">template engine</a> where <tt>Controls</tt> can be instanciated directly.
+<br/>
+A <a href="?page=Fundamentals.Controls">Control</a> is an self-contained widget that fullfills a specific task; they can be a simple script (.php), a <tt>Template</tt> (.page), or both.
+</p>
+</com:TContent>
\ No newline at end of file
diff --git a/demos/quickstart/protected/pages/Fundamentals/Components.page b/demos/quickstart/protected/pages/Fundamentals/Components.page
deleted file mode 100755
index 11235b56..00000000
--- a/demos/quickstart/protected/pages/Fundamentals/Components.page
+++ /dev/null
@@ -1,360 +0,0 @@
-<com:TContent ID="body" >
-<h1 id="701">Components</h1>
-<p id="110113" class="block-content">
-A component is an instance of <tt>TComponent</tt> or its child class. The base class <tt>TComponent</tt> implements the mechanism of component properties and events.
-</p>
-
-<h2 id="702">Component Properties</h2>
-<p id="110114" class="block-content">
-A component property can be viewed as a public variable describing a specific aspect of the component, such as the background color, the font size, etc. A property is defined by the existence of a getter and/or a setter method in the component class. For example, in <tt>TControl</tt>, we define its <tt>ID</tt> property using the following getter and setter methods,
-<com:TTextHighlighter CssClass="source block-content" id="code_110056">
-class TControl extends TComponent {
-    public function getID() {
-        ...
-    }
-    public function setID($value) {
-        ...
-    }
-}
-</com:TTextHighlighter>
-</p>
-<p id="110115" class="block-content">
-To get or set the <tt>ID</tt> property, do as follows, just like working with a variable,
-<com:TTextHighlighter CssClass="source block-content" id="code_110057">
-$id = $component->ID;
-$component->ID = $id;
-</com:TTextHighlighter>
-This is equivalent to the following,
-<com:TTextHighlighter CssClass="source block-content" id="code_110058">
-$id = $component->getID();
-$component->setID( $id );
-</com:TTextHighlighter>
-</p>
-<p id="110116" class="block-content">
-A property is read-only if it has a getter method but no setter method. Since PHP method names are case-insensitive, property names are also case-insensitive. A component class inherits all its ancestor classes' properties.
-</p>
-
-<h3 id="706">Subproperties</h3>
-<p id="110117" class="block-content">
-A subproperty is a property of some object-typed property. For example, <tt>TWebControl</tt> has a <tt>Font</tt> property which is of <tt>TFont</tt> type. Then the <tt>Name</tt> property of <tt>Font</tt> is referred to as a subproperty (with respect to <tt>TWebControl</tt>).
-</p>
-<p id="110118" class="block-content">
-To get or set the <tt>Name</tt> subproperty, use the following method,
-<com:TTextHighlighter CssClass="source block-content" id="code_110059">
-$name = $component-&gt;getSubProperty('Font.Name');
-$component->setSubProperty('Font.Name', $name);
-</com:TTextHighlighter>
-This is equivalent to the following,
-<com:TTextHighlighter CssClass="source block-content" id="code_110060">
-$name = $component->getFont()->getName();
-$component-&gt;getFont()-&gt;setName( $name );
-</com:TTextHighlighter>
-</p>
-
-<h3 id="26001">Js-friendly properties</h3>
-<p class="block-content">
-A JavaScript-friendly property is a property that can accept both simple strings and raw javascript.
-Prado automatically encodes all properties sent clientside inside javascript blocks to avoid security problems (like injections or cross site scripting).
-If a property is known to always contain only safe javascript code and its value needs to bypass this encoding, that property can be defined in a special way that will make Prado mark its value as "safe".
-Js-friendly properties are identified by their name starting with 'js' (case insensitive):
-<com:TTextHighlighter CssClass="source block-content">
-// getter, defines a readable property 'Text'
-function getJsText() { … }
-// setter, defines a writable property 'Text', with $value being the value to be set to the property
-function setJsText(TJavaScriptLiteral $value) { … }
-</com:TTextHighlighter>
-Js-friendly properties can be accessed using both their Js-less name and their Js-enabled name:
-<com:TTextHighlighter CssClass="source block-content">
-// set some simple text as property value 
-$component-&gt;Text = 'text';
-// set some javascript code as property value
-$component-&gt;JsText = 'raw javascript';
-</com:TTextHighlighter>
-In the first case, the property value will automatically gets encoded when sent clientside inside a javascript block.
-In the second case, the property will be 'marked' as being a safe javascript statement and will not be encoded when rendered inside a javascript block.
-This special handling makes use of the <tt>TJavaScriptLiteral</tt> class. 
-</p>
-
-
-<h2 id="703">Component Events</h2>
-<p id="110119" class="block-content">
-Component events are special properties that take method names as their values. Attaching (setting) a method to an event will hook up the method to the places at which the event is raised. Therefore, the behavior of a component can be modified in a way that may not be foreseen during the development of the component.
-</p>
-<p id="110120" class="block-content">
-A component event is defined by the existence of a method whose name starts with the word <tt>on</tt>. The event name is the method name and is thus case-insensitve. For example, in <tt>TButton</tt>, we have
-<com:TTextHighlighter CssClass="source block-content" id="code_110061">
-class TButton extends TWebControl {
-    public function onClick( $param ) {
-        ...
-    }
-}
-</com:TTextHighlighter>
-This defines an event named <tt>OnClick</tt>, and a handler can be attached to the event using one of the following ways,
-<com:TTextHighlighter CssClass="source block-content" id="code_110062">
-$button->OnClick = $callback;
-$button->OnClick->add( $callback );
-$button->OnClick[] = $callback;
-$button->attachEventHandler( 'OnClick' , $callback );
-</com:TTextHighlighter>
-</p>
- The variable <tt>$callback</tt> contains the definition of the event handler that can be either a string referring to a global function name, or an array whose first element refers to an object and second element a method name/path that is reachable by the object, e.g.
- </p>
-<ul>
-<li>'buttonClicked' : buttonClicked($sender,$param);</li>
-<li>array($object,'buttonClicked') : $object->buttonClicked($sender,$param);</li>
-<li>array($object,'MainContent.SubmitButton.buttonClicked') : $object->MainContent->SubmitButton->buttonClicked($sender,$param);</li>
-</ul>
-<com:SinceVersion Version="3.2.3" />
-<h2 id="26001">Global events</h2>
-<p id="130001" class="block-content">
-With the addition of behaviors, a more expansive event model is needed.  There 
-are two new event types (global and dynamic events) as well as a more comprehensive 
-behavior model that includes class wide behaviors.
-</p>
-<p id="130002" class="block-content">
-A global event is defined by all events whose name starts with 'fx'.
-The event name is potentially a method name and is thus case-insensitive. All 'fx' events 
-are valid as the whole 'fx' event/method space is global in nature. Any object may patch into
-any global event by defining that event as a method. Global events have priorities 
-just like 'on' events; so as to be able to order the event execution. Due to the 
-nature of all events which start with 'fx' being valid, in effect, every object 
-has every 'fx' global event. It is simply an issue of tapping into the desired 
-global event.
-</p>
-<p id="130003" class="block-content">
-A global event that starts with 'fx' can be called even if the object does not
-implement the method of the global event.  A call to a non-existing 'fx' method
-will, at minimal, function and return null.  If a method argument list has a first 
-parameter, it will be returned instead of null.  This allows filtering and chaining.
-'fx' methods do not automatically install and uninstall. To install and uninstall an
-object's global event listeners, call the object's <tt>listen</tt> and 
-<tt>unlisten</tt> methods, respectively.  An object may auto-install its global event
-during <tt>__construct</tt> by overriding <tt>getAutoGlobalListen</tt> and returning true.
-</p>
-<p id="130004" class="block-content">
-As of PHP version 5.3, nulled objects without code references will still continue to persist
-in the global event queue because <tt>__destruct</tt> is not automatically called.  In the common
-__destruct method, if an object is listening to global events, then <tt>unlisten</tt> is called.
-<tt>unlisten</tt> is required to be manually called before an object is
-left without references if it is currently listening to any global events. This includes 
-class wide behaviors.
-</p>
-<p id="130005" class="block-content">
-An object that contains a method that starts with 'fx' will have those functions 
-automatically receive those events of the same name after <tt>listen</tt> is called on the object.
-</p>
-<p id="130006" class="block-content">
-An object may listen to a global event without defining an 'fx' method of the same name by 
-adding an object method to the global event list.  For example
-</p>
-<com:TTextHighlighter CssClass="source block-content">
-$component->fxGlobalCheck=$callback;  // or $component->OnClick->add($callback);
-$component->attachEventHandler('fxGlobalCheck',array($object, 'someMethod'));
-</com:TTextHighlighter>
-<h2 id="26002">Events between Objects and their behaviors, Dynamic Events</h2>
-<p id="130007" class="block-content">
-An intra-object/behavior event is defined by methods that start with 'dy'.  Just as with 
-'fx' global events, every object has every dynamic event.  Any call to a method that
-starts with 'dy' will be handled, regardless of whether it is implemented.  These 
-events are for communicating with attached behaviors.
-</p>
-<p id="130008" class="block-content">
-Dynamic events can be used in a variety of ways.  They can be used to tell behaviors
-when a non-behavior method is called.  Dynamic events could be used as data filters.
-They could also be used to specify when a piece of code is to be run, eg. should the 
-loop process be performed on a particular piece of data.  In this way, some control
-is handed to the behaviors over the process and/or data.
-</p>
-<p id="130009" class="block-content">
-If there are no handlers for an 'fx' or 'dy' event, it will return the first
-parameter of the argument list.  If there are no arguments, these events
-will return null.  If there are handlers an 'fx' method will be called directly
-within the object.  Global 'fx' events are triggered by calling <tt>raiseEvent</tt>.
-For dynamic events where there are behaviors that respond to the dynamic events, a 
-<tt>TCallChain</tt> is developed.  A call chain allows the behavior dynamic event
-implementations to call further implementing behaviors within a chain.
-</p>
-<p id="130010" class="block-content">
-If an object implements <tt>IDynamicMethods</tt>, all global and object dynamic 
-events will be sent to <tt>__dycall</tt>.  In the case of global events, all 
-global events will trigger this method.  In the case of behaviors, all undefined
-dynamic events  which are called will be passed through to this method.
-</p>
-<p id="130011" class="block-content">
-<h2 id="26003">Behaviors</h2>
-<p id="130012" class="block-content">
-There are two types of behaviors.  There are individual object behaviors and
-there are class wide behaviors.  Class behaviors depend upon object behaviors.
-</p>
-<p id="130013" class="block-content">
-When a new class implements <tt>IBehavior</tt> or <tt>IClassBehavior</tt> or
-extends <tt>TBehavior</tt> or <tt>TClassBehavior</tt>, it may be added to an 
-object by calling the object's <tt>attachBehavior</tt>.  The behaviors associated
-name can then be used to <tt>enableBehavior</tt> or <tt>disableBehavior</tt> 
-the specific behavior.
-</p>
-<p id="130014" class="block-content">
-All behaviors may be turned on and off via <tt>enableBehaviors</tt> and 
-<tt>disableBehaviors</tt>, respectively.  To check if behaviors are on or off
-a call to <tt>getBehaviorsEnabled</tt> will provide the variable.
-</p>
-<p id="130015" class="block-content">
-Attaching and detaching whole sets of behaviors is done using 
-<tt>attachBehaviors</tt> and <tt>detachBehaviors</tt>.  <tt>clearBehaviors</tt>
-removes all of an object's behaviors.
-</p>
-<p id="130016" class="block-content">
-<tt>asa</tt> returns a behavior of a specific name.  <tt>isa</tt> is the
-behavior inclusive function that acts as the PHP operator <tt>instanceof</tt>.
-A behavior could provide the functionality of a specific class thus causing
-the host object to act similarly to a completely different class.  A behavior 
-would then implement <tt>IInstanceCheck</tt> to provide the identity of the 
-different class.
-</p>
-<p id="130017" class="block-content">
-Class behaviors are similar to object behaviors except that the class behavior 
-is the implementation for all instances of the class.  A class behavior
-will have the object upon which is being called be prepended to the parameter
-list.  This way the object is known across the class behavior implementation.
-</p>
-<p id="130018" class="block-content">
-Class behaviors are attached using <tt>attachClassBehavior</tt> and detached
-using <tt>detachClassBehavior</tt>.  Class behaviors are important in that
-they will be applied to all new instances of a particular class.  In this way
-class behaviors become default behaviors to a new instances of a class in
-<tt>__construct</tt>.  Detaching a class behavior will remove the behavior 
-from the default set of behaviors created for an object when the object
-is instanced.
-</p>
-<p id="130019" class="block-content">
-Class behaviors are also added to all existing instances via the global 'fx' 
-event mechanism.  When a new class behavior is added, the event 
-<tt>fxAttachClassBehavior</tt> is raised and all existing instances that are
-listening to this global event (primarily after <tt>listen</tt> is called)
-will have this new behavior attached.  A similar process is used when
-detaching class behaviors.  Any objects listening to the global 'fx' event
-<tt>fxDetachClassBehavior</tt> will have a class behavior removed.
-</p>
-<h2 id="26004">Dynamic Intra-Object Events</h2>
-<p id="130020" class="block-content">
-Dynamic events start with 'dy'.  This mechanism is used to allow objects
-to communicate with their behaviors directly.  The entire 'dy' event space
-is valid.  All attached, enabled behaviors that implement a dynamic event 
-are called when the host object calls the dynamic event.  If there is no 
-implementation or behaviors, this returns null when no parameters are
-supplied and will return the first parameter when there is at least one
-parameter in the dynamic event.
-</p>
-<com:TTextHighlighter CssClass="source block-content">
-	null == $this->dyBehaviorEvent();
-	5 == $this->dyBehaviorEvent(5); //when no behaviors implement this dynamic event
-</com:TTextHighlighter>
-<p id="130021" class="block-content">
-Dynamic events can be chained together within behaviors to allow for data 
-filtering. Dynamic events are implemented within behaviors by defining the
-event as a method.
-</p>
-<com:TTextHighlighter CssClass="source block-content">
-class TObjectBehavior extends TBehavior {
-    public function dyBehaviorEvent($param1, $callchain) {
-			//Do something, eg:  $param1 += 13;
-			return $callchain->dyBehaviorEvent($param1);
-    }
-}
-</com:TTextHighlighter>
-<p id="130022" class="block-content">
-This implementation of a behavior and dynamic event will flow through to the 
-next behavior implementing the dynamic event.  The first parameter is always 
-return when it is supplied.  Otherwise a dynamic event returns null.
-</p>
-<p id="130023" class="block-content">
-In the case of a class behavior, the object is also prepended to the dynamic
-event.
-</p>
-<com:TTextHighlighter CssClass="source block-content">
-class TObjectClassBehavior extends TClassBehavior {
-    public function dyBehaviorEvent($hostobject, $param1, $callchain) {
-			//Do something, eg:  $param1 += $hostobject->getNumber();
-			return $callchain->dyBehaviorEvent($param1);
-    }
-}
-</com:TTextHighlighter>
-</p>
-<p id="130024" class="block-content">
-When calling a dynamic event, only the parameters are passed.  The host object
-and the call chain are built into the framework.
-</p>
-
-<h2 id="26005">Global Event and Dynamic event catching</h2>
-
-<p id="130025" class="block-content">
-Given that all global 'fx' events and dynamic 'dy' events are valid and 
-operational, there is a mechanism for catching events called that are not
-implemented (similar to the built-in PHP method <tt>__call</tt>).  When
-a dynamic or global event is called but a behavior does not implement it, 
-yet desires to know when an undefined dynamic event is run, the behavior 
-implements the interface <tt>IDynamicMethods</tt> and method <tt>__dycall</tt>.
-</p>
-<p id="130026" class="block-content">
-In the case of dynamic events, <tt>__dycall</tt> is supplied with the method 
-name and its parameters.  When a global event is raised, via <tt>raiseEvent</tt>,
-the method is the event name and the parameters are supplied.
-</p>
-<p id="130027" class="block-content">
-When implemented, this catch-all mechanism is called for event global event event
-when implemented outside of a behavior.  Within a behavior, it will also be called
-when the object to which the behavior is attached calls any unimplemented dynamic 
-event.  This is the fall-back mechanism for informing a class and/or behavior 
-of when an global and/or undefined dynamic event is executed.
-</p>
-
-<h2 id="704">Namespaces</h2>
-<p id="110121" class="block-content">
-A namespace refers to a logical grouping of some class names so that they can be differentiated from other class names even if their names are the same. Since PHP does not support namespace intrinsically, you cannot create instances of two classes who have the same name but with different definitions. To differentiate from user defined classes, all PRADO classes are prefixed with a letter 'T' (meaning 'Type'). Users are advised not to name their classes like this. Instead, they may prefix their class names with any other letter(s).
-</p>
-<p id="110122" class="block-content">
-A namespace in PRADO is considered as a directory containing one or several class files. A class may be specified without ambiguity using such a namespace followed by the class name. Each namespace in PRADO is specified in the following format,
-<div class="source">
-PathAlias.Dir1.Dir2
-</div>
-where <tt>PathAlias</tt> is an alias of some directory, while <tt>Dir1</tt> and <tt>Dir2</tt> are subdirectories under that directory. A class named <tt>MyClass</tt> defined under <tt>Dir2</tt> may now be fully qualified as <tt>PathAlias.Dir1.Dir2.MyClass</tt>.
-</p>
-<p id="110123" class="block-content">
-To use a namespace in code, do as follows,
-<com:TTextHighlighter CssClass="source block-content" id="code_110063">
-Prado::using('PathAlias.Dir1.Dir2.*');
-</com:TTextHighlighter>
-which appends the directory referred to by <tt>PathAlias.Dir1.Dir2</tt> into PHP include path so that classes defined under that directory may be instantiated without the namespace prefix. You may also include an individual class definition by
-<com:TTextHighlighter CssClass="source block-content" id="code_110064">
-Prado::using('PathAlias.Dir1.Dir2.MyClass');
-</com:TTextHighlighter>
-which will include the class file if <tt>MyClass</tt> is not defined.
-</p>
-<p id="110124" class="block-content">
-For more details about defining path aliases, see <a href="?page=Configurations.AppConfig">application configuration</a> section.
-</p>
-
-<h2 id="705">Component Instantiation</h2>
-<p id="110125" class="block-content">
-Component instantiation means creating instances of component classes. There are two types of component instantation: static instantiation and dynamic instantiation. The created components are called static components and dynamic components, respectively.
-</p>
-
-<h3 id="707">Dynamic Component Instantiation</h3>
-<p id="110126" class="block-content">
-Dynamic component instantiation means creating component instances in PHP code. It is the same as the commonly referred object creation in PHP. A component can be dynamically created using one of the following two methods in PHP,
-<com:TTextHighlighter CssClass="source block-content" id="code_110065">
-$component = new ComponentClassName;
-$component = Prado::createComponent('ComponentType');
-</com:TTextHighlighter>
-where <tt>ComponentType</tt> refers to a class name or a type name in namespace format (e.g. <tt>System.Web.UI.TControl</tt>). The second approach is introduced to compensate for the lack of namespace support in PHP.
-</p>
-
-<h3 id="708">Static Component Instantiation</h3>
-<p id="110127" class="block-content">
-Static component instantiation is about creating components via <a href="?page=Configurations.Overview">configurations</a>. The actual creation work is done by the PRADO framework. For example, in an <a href="?page=Configurations.AppConfig">application configuration</a>, one can configure a module to be loaded when the application runs. The module is thus a static component created by the framework. Static component instantiation is more commonly used in <a href="?page=Configurations.Templates1">templates</a>. Every component tag in a template specifies a component that will be automatically created by the framework when the template is loaded. For example, in a page template, the following tag will lead to the creation of a <tt>TButton</tt> component on the page,
-<com:TTextHighlighter Language="prado" CssClass="source block-content" id="code_110066">
-&lt;com:TButton Text="Register" /&gt;
-</com:TTextHighlighter>
-</p>
-
-</com:TContent>
diff --git a/demos/quickstart/protected/pages/Fundamentals/Components1.page b/demos/quickstart/protected/pages/Fundamentals/Components1.page
new file mode 100755
index 00000000..a610045d
--- /dev/null
+++ b/demos/quickstart/protected/pages/Fundamentals/Components1.page
@@ -0,0 +1,157 @@
+<com:TContent ID="body" >
+<h1 id="701">Components: Part I</h1>
+<p id="110113" class="block-content">
+A component is an instance of <tt>TComponent</tt> or its child class. The base class <tt>TComponent</tt> implements the mechanism of component properties and events.
+</p>
+
+<h2 id="702">Component Properties</h2>
+<p id="110114" class="block-content">
+A component property can be viewed as a public variable describing a specific aspect of the component, such as the background color, the font size, etc. A property is defined by the existence of a getter and/or a setter method in the component class. For example, in <tt>TControl</tt>, we define its <tt>ID</tt> property using the following getter and setter methods,
+<com:TTextHighlighter CssClass="source block-content" id="code_110056">
+class TControl extends TComponent {
+    public function getID() {
+        ...
+    }
+    public function setID($value) {
+        ...
+    }
+}
+</com:TTextHighlighter>
+</p>
+<p id="110115" class="block-content">
+To get or set the <tt>ID</tt> property, do as follows, just like working with a variable,
+<com:TTextHighlighter CssClass="source block-content" id="code_110057">
+$id = $component->ID;
+$component->ID = $id;
+</com:TTextHighlighter>
+This is equivalent to the following,
+<com:TTextHighlighter CssClass="source block-content" id="code_110058">
+$id = $component->getID();
+$component->setID( $id );
+</com:TTextHighlighter>
+</p>
+<p id="110116" class="block-content">
+A property is read-only if it has a getter method but no setter method. Since PHP method names are case-insensitive, property names are also case-insensitive. A component class inherits all its ancestor classes' properties.
+</p>
+
+<h3 id="706">Subproperties</h3>
+<p id="110117" class="block-content">
+A subproperty is a property of some object-typed property. For example, <tt>TWebControl</tt> has a <tt>Font</tt> property which is of <tt>TFont</tt> type. Then the <tt>Name</tt> property of <tt>Font</tt> is referred to as a subproperty (with respect to <tt>TWebControl</tt>).
+</p>
+<p id="110118" class="block-content">
+To get or set the <tt>Name</tt> subproperty, use the following method,
+<com:TTextHighlighter CssClass="source block-content" id="code_110059">
+$name = $component-&gt;getSubProperty('Font.Name');
+$component->setSubProperty('Font.Name', $name);
+</com:TTextHighlighter>
+This is equivalent to the following,
+<com:TTextHighlighter CssClass="source block-content" id="code_110060">
+$name = $component->getFont()->getName();
+$component-&gt;getFont()-&gt;setName( $name );
+</com:TTextHighlighter>
+</p>
+
+<h3 id="26001">Js-friendly properties</h3>
+<p class="block-content">
+A JavaScript-friendly property is a property that can accept both simple strings and raw javascript.
+Prado automatically encodes all properties sent clientside inside javascript blocks to avoid security problems (like injections or cross site scripting).
+If a property is known to always contain only safe javascript code and its value needs to bypass this encoding, that property can be defined in a special way that will make Prado mark its value as "safe".
+Js-friendly properties are identified by their name starting with 'js' (case insensitive):
+<com:TTextHighlighter CssClass="source block-content">
+// getter, defines a readable property 'Text'
+function getJsText() { … }
+// setter, defines a writable property 'Text', with $value being the value to be set to the property
+function setJsText(TJavaScriptLiteral $value) { … }
+</com:TTextHighlighter>
+Js-friendly properties can be accessed using both their Js-less name and their Js-enabled name:
+<com:TTextHighlighter CssClass="source block-content">
+// set some simple text as property value
+$component-&gt;Text = 'text';
+// set some javascript code as property value
+$component-&gt;JsText = 'raw javascript';
+</com:TTextHighlighter>
+In the first case, the property value will automatically gets encoded when sent clientside inside a javascript block.
+In the second case, the property will be 'marked' as being a safe javascript statement and will not be encoded when rendered inside a javascript block.
+This special handling makes use of the <tt>TJavaScriptLiteral</tt> class.
+</p>
+
+
+<h2 id="703">Component Events</h2>
+<p id="110119" class="block-content">
+Component events are special properties that take method names as their values. Attaching (setting) a method to an event will hook up the method to the places at which the event is raised. Therefore, the behavior of a component can be modified in a way that may not be foreseen during the development of the component.
+</p>
+<p id="110120" class="block-content">
+A component event is defined by the existence of a method whose name starts with the word <tt>on</tt>. The event name is the method name and is thus case-insensitve. For example, in <tt>TButton</tt>, we have
+<com:TTextHighlighter CssClass="source block-content" id="code_110061">
+class TButton extends TWebControl {
+    public function onClick( $param ) {
+        ...
+    }
+}
+</com:TTextHighlighter>
+This defines an event named <tt>OnClick</tt>, and a handler can be attached to the event using one of the following ways,
+<com:TTextHighlighter CssClass="source block-content" id="code_110062">
+$button->OnClick = $callback;
+$button->OnClick->add( $callback );
+$button->OnClick[] = $callback;
+$button->attachEventHandler( 'OnClick' , $callback );
+</com:TTextHighlighter>
+</p>
+ The variable <tt>$callback</tt> contains the definition of the event handler that can be either a string referring to a global function name, or an array whose first element refers to an object and second element a method name/path that is reachable by the object, e.g.
+ </p>
+<ul>
+<li>'buttonClicked' : buttonClicked($sender,$param);</li>
+<li>array($object,'buttonClicked') : $object->buttonClicked($sender,$param);</li>
+<li>array($object,'MainContent.SubmitButton.buttonClicked') : $object->MainContent->SubmitButton->buttonClicked($sender,$param);</li>
+</ul>
+
+<h2 id="704">Namespaces</h2>
+<p id="110121" class="block-content">
+A namespace refers to a logical grouping of some class names so that they can be differentiated from other class names even if their names are the same. Since PHP does not support namespace intrinsically, you cannot create instances of two classes who have the same name but with different definitions. To differentiate from user defined classes, all PRADO classes are prefixed with a letter 'T' (meaning 'Type'). Users are advised not to name their classes like this. Instead, they may prefix their class names with any other letter(s).
+</p>
+<p id="110122" class="block-content">
+A namespace in PRADO is considered as a directory containing one or several class files. A class may be specified without ambiguity using such a namespace followed by the class name. Each namespace in PRADO is specified in the following format,
+<div class="source">
+PathAlias.Dir1.Dir2
+</div>
+where <tt>PathAlias</tt> is an alias of some directory, while <tt>Dir1</tt> and <tt>Dir2</tt> are subdirectories under that directory. A class named <tt>MyClass</tt> defined under <tt>Dir2</tt> may now be fully qualified as <tt>PathAlias.Dir1.Dir2.MyClass</tt>.
+</p>
+<p id="110123" class="block-content">
+To use a namespace in code, do as follows,
+<com:TTextHighlighter CssClass="source block-content" id="code_110063">
+Prado::using('PathAlias.Dir1.Dir2.*');
+</com:TTextHighlighter>
+which appends the directory referred to by <tt>PathAlias.Dir1.Dir2</tt> into PHP include path so that classes defined under that directory may be instantiated without the namespace prefix. You may also include an individual class definition by
+<com:TTextHighlighter CssClass="source block-content" id="code_110064">
+Prado::using('PathAlias.Dir1.Dir2.MyClass');
+</com:TTextHighlighter>
+which will include the class file if <tt>MyClass</tt> is not defined.
+</p>
+<p id="110124" class="block-content">
+For more details about defining path aliases, see <a href="?page=Configurations.AppConfig">application configuration</a> section.
+</p>
+
+<h2 id="705">Component Instantiation</h2>
+<p id="110125" class="block-content">
+Component instantiation means creating instances of component classes. There are two types of component instantation: static instantiation and dynamic instantiation. The created components are called static components and dynamic components, respectively.
+</p>
+
+<h3 id="707">Dynamic Component Instantiation</h3>
+<p id="110126" class="block-content">
+Dynamic component instantiation means creating component instances in PHP code. It is the same as the commonly referred object creation in PHP. A component can be dynamically created using one of the following two methods in PHP,
+<com:TTextHighlighter CssClass="source block-content" id="code_110065">
+$component = new ComponentClassName;
+$component = Prado::createComponent('ComponentType');
+</com:TTextHighlighter>
+where <tt>ComponentType</tt> refers to a class name or a type name in namespace format (e.g. <tt>System.Web.UI.TControl</tt>). The second approach is introduced to compensate for the lack of namespace support in PHP.
+</p>
+
+<h3 id="708">Static Component Instantiation</h3>
+<p id="110127" class="block-content">
+Static component instantiation is about creating components via <a href="?page=Configurations.Overview">configurations</a>. The actual creation work is done by the PRADO framework. For example, in an <a href="?page=Configurations.AppConfig">application configuration</a>, one can configure a module to be loaded when the application runs. The module is thus a static component created by the framework. Static component instantiation is more commonly used in <a href="?page=Configurations.Templates1">templates</a>. Every component tag in a template specifies a component that will be automatically created by the framework when the template is loaded. For example, in a page template, the following tag will lead to the creation of a <tt>TButton</tt> component on the page,
+<com:TTextHighlighter Language="prado" CssClass="source block-content" id="code_110066">
+&lt;com:TButton Text="Register" /&gt;
+</com:TTextHighlighter>
+</p>
+
+</com:TContent>
diff --git a/demos/quickstart/protected/pages/Fundamentals/Components2.page b/demos/quickstart/protected/pages/Fundamentals/Components2.page
new file mode 100644
index 00000000..7fc3e010
--- /dev/null
+++ b/demos/quickstart/protected/pages/Fundamentals/Components2.page
@@ -0,0 +1,207 @@
+<com:TContent ID="body" >
+<h1 id="701">Components: Part II</h1>
+<com:SinceVersion Version="3.2.3" />
+<h2 id="26001">Global events</h2>
+<p id="130001" class="block-content">
+With the addition of behaviors, a more expansive event model is needed.  There
+are two new event types (global and dynamic events) as well as a more comprehensive
+behavior model that includes class wide behaviors.
+</p>
+<p id="130002" class="block-content">
+A global event is defined by all events whose name starts with 'fx'.
+The event name is potentially a method name and is thus case-insensitive. All 'fx' events
+are valid as the whole 'fx' event/method space is global in nature. Any object may patch into
+any global event by defining that event as a method. Global events have priorities
+just like 'on' events; so as to be able to order the event execution. Due to the
+nature of all events which start with 'fx' being valid, in effect, every object
+has every 'fx' global event. It is simply an issue of tapping into the desired
+global event.
+</p>
+<p id="130003" class="block-content">
+A global event that starts with 'fx' can be called even if the object does not
+implement the method of the global event.  A call to a non-existing 'fx' method
+will, at minimal, function and return null.  If a method argument list has a first
+parameter, it will be returned instead of null.  This allows filtering and chaining.
+'fx' methods do not automatically install and uninstall. To install and uninstall an
+object's global event listeners, call the object's <tt>listen</tt> and
+<tt>unlisten</tt> methods, respectively.  An object may auto-install its global event
+during <tt>__construct</tt> by overriding <tt>getAutoGlobalListen</tt> and returning true.
+</p>
+<p id="130004" class="block-content">
+As of PHP version 5.3, nulled objects without code references will still continue to persist
+in the global event queue because <tt>__destruct</tt> is not automatically called.  In the common
+__destruct method, if an object is listening to global events, then <tt>unlisten</tt> is called.
+<tt>unlisten</tt> is required to be manually called before an object is
+left without references if it is currently listening to any global events. This includes
+class wide behaviors.
+</p>
+<p id="130005" class="block-content">
+An object that contains a method that starts with 'fx' will have those functions
+automatically receive those events of the same name after <tt>listen</tt> is called on the object.
+</p>
+<p id="130006" class="block-content">
+An object may listen to a global event without defining an 'fx' method of the same name by
+adding an object method to the global event list.  For example
+</p>
+<com:TTextHighlighter CssClass="source block-content">
+$component->fxGlobalCheck=$callback;  // or $component->OnClick->add($callback);
+$component->attachEventHandler('fxGlobalCheck',array($object, 'someMethod'));
+</com:TTextHighlighter>
+<h2 id="26002">Events between Objects and their behaviors, Dynamic Events</h2>
+<p id="130007" class="block-content">
+An intra-object/behavior event is defined by methods that start with 'dy'.  Just as with
+'fx' global events, every object has every dynamic event.  Any call to a method that
+starts with 'dy' will be handled, regardless of whether it is implemented.  These
+events are for communicating with attached behaviors.
+</p>
+<p id="130008" class="block-content">
+Dynamic events can be used in a variety of ways.  They can be used to tell behaviors
+when a non-behavior method is called.  Dynamic events could be used as data filters.
+They could also be used to specify when a piece of code is to be run, eg. should the
+loop process be performed on a particular piece of data.  In this way, some control
+is handed to the behaviors over the process and/or data.
+</p>
+<p id="130009" class="block-content">
+If there are no handlers for an 'fx' or 'dy' event, it will return the first
+parameter of the argument list.  If there are no arguments, these events
+will return null.  If there are handlers an 'fx' method will be called directly
+within the object.  Global 'fx' events are triggered by calling <tt>raiseEvent</tt>.
+For dynamic events where there are behaviors that respond to the dynamic events, a
+<tt>TCallChain</tt> is developed.  A call chain allows the behavior dynamic event
+implementations to call further implementing behaviors within a chain.
+</p>
+<p id="130010" class="block-content">
+If an object implements <tt>IDynamicMethods</tt>, all global and object dynamic
+events will be sent to <tt>__dycall</tt>.  In the case of global events, all
+global events will trigger this method.  In the case of behaviors, all undefined
+dynamic events  which are called will be passed through to this method.
+</p>
+<p id="130011" class="block-content">
+<h2 id="26003">Behaviors</h2>
+<p id="130012" class="block-content">
+There are two types of behaviors.  There are individual object behaviors and
+there are class wide behaviors.  Class behaviors depend upon object behaviors.
+</p>
+<p id="130013" class="block-content">
+When a new class implements <tt>IBehavior</tt> or <tt>IClassBehavior</tt> or
+extends <tt>TBehavior</tt> or <tt>TClassBehavior</tt>, it may be added to an
+object by calling the object's <tt>attachBehavior</tt>.  The behaviors associated
+name can then be used to <tt>enableBehavior</tt> or <tt>disableBehavior</tt>
+the specific behavior.
+</p>
+<p id="130014" class="block-content">
+All behaviors may be turned on and off via <tt>enableBehaviors</tt> and
+<tt>disableBehaviors</tt>, respectively.  To check if behaviors are on or off
+a call to <tt>getBehaviorsEnabled</tt> will provide the variable.
+</p>
+<p id="130015" class="block-content">
+Attaching and detaching whole sets of behaviors is done using
+<tt>attachBehaviors</tt> and <tt>detachBehaviors</tt>.  <tt>clearBehaviors</tt>
+removes all of an object's behaviors.
+</p>
+<p id="130016" class="block-content">
+<tt>asa</tt> returns a behavior of a specific name.  <tt>isa</tt> is the
+behavior inclusive function that acts as the PHP operator <tt>instanceof</tt>.
+A behavior could provide the functionality of a specific class thus causing
+the host object to act similarly to a completely different class.  A behavior
+would then implement <tt>IInstanceCheck</tt> to provide the identity of the
+different class.
+</p>
+<p id="130017" class="block-content">
+Class behaviors are similar to object behaviors except that the class behavior
+is the implementation for all instances of the class.  A class behavior
+will have the object upon which is being called be prepended to the parameter
+list.  This way the object is known across the class behavior implementation.
+</p>
+<p id="130018" class="block-content">
+Class behaviors are attached using <tt>attachClassBehavior</tt> and detached
+using <tt>detachClassBehavior</tt>.  Class behaviors are important in that
+they will be applied to all new instances of a particular class.  In this way
+class behaviors become default behaviors to a new instances of a class in
+<tt>__construct</tt>.  Detaching a class behavior will remove the behavior
+from the default set of behaviors created for an object when the object
+is instanced.
+</p>
+<p id="130019" class="block-content">
+Class behaviors are also added to all existing instances via the global 'fx'
+event mechanism.  When a new class behavior is added, the event
+<tt>fxAttachClassBehavior</tt> is raised and all existing instances that are
+listening to this global event (primarily after <tt>listen</tt> is called)
+will have this new behavior attached.  A similar process is used when
+detaching class behaviors.  Any objects listening to the global 'fx' event
+<tt>fxDetachClassBehavior</tt> will have a class behavior removed.
+</p>
+<h2 id="26004">Dynamic Intra-Object Events</h2>
+<p id="130020" class="block-content">
+Dynamic events start with 'dy'.  This mechanism is used to allow objects
+to communicate with their behaviors directly.  The entire 'dy' event space
+is valid.  All attached, enabled behaviors that implement a dynamic event
+are called when the host object calls the dynamic event.  If there is no
+implementation or behaviors, this returns null when no parameters are
+supplied and will return the first parameter when there is at least one
+parameter in the dynamic event.
+</p>
+<com:TTextHighlighter CssClass="source block-content">
+	null == $this->dyBehaviorEvent();
+	5 == $this->dyBehaviorEvent(5); //when no behaviors implement this dynamic event
+</com:TTextHighlighter>
+<p id="130021" class="block-content">
+Dynamic events can be chained together within behaviors to allow for data
+filtering. Dynamic events are implemented within behaviors by defining the
+event as a method.
+</p>
+<com:TTextHighlighter CssClass="source block-content">
+class TObjectBehavior extends TBehavior {
+    public function dyBehaviorEvent($param1, $callchain) {
+			//Do something, eg:  $param1 += 13;
+			return $callchain->dyBehaviorEvent($param1);
+    }
+}
+</com:TTextHighlighter>
+<p id="130022" class="block-content">
+This implementation of a behavior and dynamic event will flow through to the
+next behavior implementing the dynamic event.  The first parameter is always
+return when it is supplied.  Otherwise a dynamic event returns null.
+</p>
+<p id="130023" class="block-content">
+In the case of a class behavior, the object is also prepended to the dynamic
+event.
+</p>
+<com:TTextHighlighter CssClass="source block-content">
+class TObjectClassBehavior extends TClassBehavior {
+    public function dyBehaviorEvent($hostobject, $param1, $callchain) {
+			//Do something, eg:  $param1 += $hostobject->getNumber();
+			return $callchain->dyBehaviorEvent($param1);
+    }
+}
+</com:TTextHighlighter>
+</p>
+<p id="130024" class="block-content">
+When calling a dynamic event, only the parameters are passed.  The host object
+and the call chain are built into the framework.
+</p>
+
+<h2 id="26005">Global Event and Dynamic event catching</h2>
+
+<p id="130025" class="block-content">
+Given that all global 'fx' events and dynamic 'dy' events are valid and
+operational, there is a mechanism for catching events called that are not
+implemented (similar to the built-in PHP method <tt>__call</tt>).  When
+a dynamic or global event is called but a behavior does not implement it,
+yet desires to know when an undefined dynamic event is run, the behavior
+implements the interface <tt>IDynamicMethods</tt> and method <tt>__dycall</tt>.
+</p>
+<p id="130026" class="block-content">
+In the case of dynamic events, <tt>__dycall</tt> is supplied with the method
+name and its parameters.  When a global event is raised, via <tt>raiseEvent</tt>,
+the method is the event name and the parameters are supplied.
+</p>
+<p id="130027" class="block-content">
+When implemented, this catch-all mechanism is called for event global event event
+when implemented outside of a behavior.  Within a behavior, it will also be called
+when the object to which the behavior is attached calls any unimplemented dynamic
+event.  This is the fall-back mechanism for informing a class and/or behavior
+of when an global and/or undefined dynamic event is executed.
+</p>
+
+</com:TContent>
diff --git a/demos/quickstart/protected/pages/Fundamentals/Pages.page b/demos/quickstart/protected/pages/Fundamentals/Pages.page
index 19900937..0f3a8d9f 100755
--- a/demos/quickstart/protected/pages/Fundamentals/Pages.page
+++ b/demos/quickstart/protected/pages/Fundamentals/Pages.page
@@ -5,7 +5,7 @@
 Pages are top-most controls that have no parent. The presentation of pages are directly displayed to end-users. Users access pages by sending  page service requests.
 </p>
 <p id="130138" class="block-content">
-Each page must have a <a href="?page=Configurations.Templates1">template</a> file. The file name suffix must be <tt>.page</tt>. The file name (without suffix) is the page name. PRADO will try to locate a page class file under the directory containing the page template file. Such a page class file must have the same file name (suffixed with <tt>.php</tt>) as the template file. If the class file is not found, the page will take class <tt>TPage</tt>.
+Each page can have a <a href="?page=Configurations.Templates1">template</a> file. The file name suffix must be <tt>.page</tt>. The file name (without suffix) is the page name. PRADO will try to locate a page class file under the directory containing the page template file. Such a page class file must have the same file name (suffixed with <tt>.php</tt>) as the template file. If the class file is not found, the page will take class <tt>TPage</tt>.
 </p>
 
 <h2 id="902">PostBack</h2>
@@ -14,6 +14,18 @@ A form submission is called <i>postback</i> if the submission is made to the pag
 
 </p>
 
+<h2>CallBack</h2>
+<p class="block-content">
+A <i>callback</i> is a special form submission that, instead of requiring a full page reload on the browser, gets executed in the background through an ajax call. So, a callback is considered a postback too, but not vice versa.
+<br/>
+A callback is handled as a normal postback but, instead of re-rendering the entire page, only the specific changes occured on the page gets sent back to the client and merged with the current browser page. A typical callback response consists of:
+<ol>
+	<li>one or more pieces of html code that will replace existing content on the page;</li>
+	<li>the javascript instructions needed to update the page;</li>
+	<li>some specific fields used by prado to mantain the pagestate and add the needed external resources (stylesheets, javascript files, etc..).</li>
+</ol>
+</p>
+
 <h2 id="903">Page Lifecycles</h2>
 <p id="130140" class="block-content">
 Understanding the page lifecycles is crucial to grasp PRADO programming. Page lifecycles refer to the state transitions of a page when serving this page to end-users. They can be depicted in the following statechart,
diff --git a/demos/quickstart/protected/pages/Fundamentals/Services.page b/demos/quickstart/protected/pages/Fundamentals/Services.page
index 5e5889df..ee19a159 100755
--- a/demos/quickstart/protected/pages/Fundamentals/Services.page
+++ b/demos/quickstart/protected/pages/Fundamentals/Services.page
@@ -16,7 +16,7 @@ Developers may implement additional services for their applications. To make a s
 
 <h2 id="1102">Page Service</h2>
 <p id="150154" class="block-content">
-PRADO implements <tt>TPageService</tt> to process users' page requests. Pages are stored under a directory specified by the <tt>BasePath</tt> property of the page service. The property defaults to <tt>pages</tt> directory under the application base path. You may change this default by configuring the service in the application configuration.
+PRADO implements <tt>TPageService</tt> to process users' page requests. Pages are stored under a directory specified by the <tt>BasePath</tt> property of the page service. The property defaults to <tt>Pages</tt> directory under the application base path. You may change this default by configuring the service in the application configuration.
 </p>
 <p id="150155" class="block-content">
 Pages may be organized into subdirectories under the <tt>BasePath</tt>. In each directory, there may be a page configuration file named <tt>config.xml</tt>, which contains configurations effective only when a page under that directory or a sub-directory is requested. For more details, see the <a href="?page=Configurations.PageConfig">page configuration</a> section.
@@ -30,5 +30,8 @@ http://hostname/index.php?page=Users.Register
 </com:TTextHighlighter>
 where the first example takes advantage of the fact that the page service is the default service and <tt>Home</tt> is the default page.
 </p>
+<p class="block-content">
+More advanced url routes, like masking real page names and permitting the use of dynamic parameters can be created using the <a href="?page=Configurations.UrlMapping">Url mapping</a> module.
+</p>
 
 </com:TContent>
diff --git a/demos/quickstart/protected/pages/GettingStarted/AboutPrado.page b/demos/quickstart/protected/pages/GettingStarted/AboutPrado.page
index 22437158..1a416a32 100755
--- a/demos/quickstart/protected/pages/GettingStarted/AboutPrado.page
+++ b/demos/quickstart/protected/pages/GettingStarted/AboutPrado.page
@@ -51,12 +51,12 @@ Most PHP frameworks mainly focuses on separating presentation and logic and prom
 
 <h2 id="4004">Is PRADO Stable Enough?</h2>
 <p id="20004" class="block-content">
-Yes. PRADO was initially released in August 2004. Many test suites have been written and conducted frequently to ensure its quality. It has been used by thousands of developers and many Web applications have been developed based on it. Bugs and feature requests are managed through TRAC system and we have a great user community and development team to ensure all questions are answered in a timely fashion.
+Yes. PRADO was initially released in August 2004. Many test suites have been written and conducted frequently to ensure its quality. It has been used by thousands of developers and many Web applications have been developed based on it. Bugs and feature requests are managed through GitHub and we have a great user community and development team to ensure all questions are answered in a timely fashion.
 </p>
 
 <h2 id="205">History of PRADO</h2>
 <p id="20014" class="block-content">
-The very original inspiration of PRADO came from Apache Tapestry. During the design and implementation, I borrowed many ideas from Borland Delphi and Microsoft ASP.NET. The first version of PRADO came out in June 2004 and was written in PHP 4. Driven by the Zend PHP 5 coding contest, I rewrote PRADO in PHP 5, which proved to be a wise move, thanks to the new object model provided by PHP 5. PRADO won the grand prize in the Zend contest, earning the highest votes from both the public and the judges' panel.
+The very original inspiration of PRADO came from Apache Tapestry. During the design and implementation, Qiang Xue borrowed many ideas from Borland Delphi and Microsoft ASP.NET. The first version of PRADO came out in June 2004 and was written in PHP 4. Driven by the Zend PHP 5 coding contest, Qiang rewrote PRADO in PHP 5, which proved to be a wise move, thanks to the new object model provided by PHP 5. PRADO won the grand prize in the Zend contest, earning the highest votes from both the public and the judges' panel.
 </p>
 <p id="20015" class="block-content">
 In August 2004, PRADO started to be hosted on SourceForge as an open source project. Soon after, the project site <a href="http://www.xisc.com/">xisc.com</a> was announced to public. With the fantastic support of PRADO developer team and PRADO users, PRADO evolved to version 2.0 in mid 2005. In this version, Wei Zhuo contributed to PRADO with the excellent I18N and L10N support.
@@ -64,6 +64,12 @@ In August 2004, PRADO started to be hosted on SourceForge as an open source proj
 <p id="20016" class="block-content">
 In May 2005, we decided to completely rewrite the PRADO framework to resolve a few fundamental issues found in version 2.0 and to catch up with some cool features available in Microsoft ASP.NET 2.0. After nearly a year's hard work with over 50,000 lines of new code, version 3.0 was finally made available in April 2006.
 </p>
+<p class="block-content">
+In October 2008, the original development team released a new framework called <a href="http://www.yiiframework.com/">Yii</a>. Inheriting most of the PRADO code, Yii left the pages/events concept, focusing on a pure MVC design pattern. Since 2009 a lot of people contributed to PRADO fixing issues, developing new features or backporting them from Yii.
+</p>
+<p class="block-content">
+To promote a model of community-driven development, the project repositories were moved first on <a href="http://code.google.com/p/prado3/">Google Code</a> and then, in September 2013, on <a href="http://github.com/pradosoft/prado">GitHub</a>.
+</p>
 <p id="20017" class="block-content">
 Starting from version 3.0, significant efforts are allocated to ensure the quality and stability of PRADO. If we say PRADO v2.x and v1.x are proof-of-concept work, we can say PRADO 3.x has grown up to a project that is suitable for serious business application development.
 </p>
diff --git a/demos/quickstart/protected/pages/GettingStarted/Installation.page b/demos/quickstart/protected/pages/GettingStarted/Installation.page
index 7919e733..956f53c2 100755
--- a/demos/quickstart/protected/pages/GettingStarted/Installation.page
+++ b/demos/quickstart/protected/pages/GettingStarted/Installation.page
@@ -5,16 +5,17 @@
 If you are viewing this page from your own Web server, you are already done with the installation.
 </p>
 <p id="30019">
-The minimum requirement by PRADO is that the Web server support PHP 5.2. PRADO has been tested with Apache Web server on Windows and Linux. Highly possibly it may also run on other platforms with other Web servers, as long as PHP 5.2 is supported.
+The minimum requirement by PRADO is that the Web server support PHP 5.3.3. PRADO has been tested with Apache Web server on Windows, MacOSX and various Linux distro. Highly possibly it may also run on other platforms with other Web servers, as long as PHP 5.3.3 is supported.
 </p>
 </div>
 
-<div id="install-steps" class="block-content">
 <p id="30020">
-Installation of PRADO mainly involves downloading and unpacking.
+PRADO can be installed as a standalone package or using <a href="http://getcomposer.org/">composer</a>
 </p>
+<div id="install-steps" class="block-content">
+<h3>Standalone package</h3>
 <ol>
-<li>Go to <a href="http://www.pradosoft.com/">pradosoft.com</a> to grab the latest version of PRADO.</li>
+<li>Go to <a href="http://www.pradosoft.com/download/">pradosoft.com</a> to grab the latest version of PRADO.</li>
 <li>Unpack the PRADO release file to a Web-accessible directory.
 </ol>
 </div>
@@ -25,5 +26,37 @@ Your installation of PRADO is done and you can start to play with the demo appli
 <p id="30022">
 If you encounter any problems with the demo applications, please use the PRADO requirement checker script, accessible via <tt>http://web-server-address/prado/requirements/index.php</tt>, to check first if your server configuration fulfills the conditions required by PRADO.
 </p>
+
+<div id="install-steps" class="block-content">
+<h3>Composer install</h3>
+<ol>
+<li>If you don't have installed composer already, install it globally:
+<com:TTextHighlighter CssClass="source block-content">
+$ curl -s http://getcomposer.org/installer | php
+$ php composer.phar install
+</com:TTextHighlighter>
+</li>
+<li>Create a composer.json file for your project:
+<com:TTextHighlighter CssClass="source block-content">
+{
+    "require": {
+        "pradosoft/prado": "~3.2"
+    }
+}
+</com:TTextHighlighter>
+</li>
+<li>Now run the actual installation:
+<com:TTextHighlighter CssClass="source block-content">
+$ composer install
+</com:TTextHighlighter>
+</li>
+<li>In your project include the autoloader, and you will have access to the library classes:
+<com:TTextHighlighter CssClass="source block-content">
+<?php
+require_once('vendor/autoload.php');
+</com:TTextHighlighter>
+</li>
+</ol>
 </div>
+
 </com:TContent>
diff --git a/demos/quickstart/protected/pages/Tutorial/AddressBook.page b/demos/quickstart/protected/pages/Tutorial/AddressBook.page
deleted file mode 100755
index f028a636..00000000
--- a/demos/quickstart/protected/pages/Tutorial/AddressBook.page
+++ /dev/null
@@ -1,9 +0,0 @@
-<com:TContent ID="body">
-	<h1 id="22007">A Simple Address Book</h1>
-	<p id="110006" class="block-content">This tutorial introduces the basics of connecting to a database
-	using <a href="?page=Database.ActiveRecord">ActiveRecord</a>
-	and using <a href="?page=Database.Scaffold">Active Record scaffolds </a>to quickly
-	build a simple address book.
-	</p>
-
-</com:TContent>
\ No newline at end of file
-- 
cgit v1.2.3