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

Backports for Prado 3.2.4

1 files changed, 5 insertions, 3 deletions

diff --git a/demos/quickstart/protected/controls/TopicList.tpl b/demos/quickstart/protected/controls/TopicList.tpl
index adcdff4a..de10398c 100755
--- a/demos/quickstart/protected/controls/TopicList.tpl
+++ b/demos/quickstart/protected/controls/TopicList.tpl
@@ -8,6 +8,8 @@
     <li><a href="?page=GettingStarted.Installation">Installation</a></li>

     <li><a href="?page=GettingStarted.NewFeatures">New Features</a></li>

     <li><a href="?page=GettingStarted.Upgrading">Upgrading from v2.x and v1.x</a></li>

+    <li><a href="?page=GettingStarted.Wsat">Web Site Administration Tool</a></li>

+    <li><a href="?page=GettingStarted.CommandLine">Command Line Tool</a></li>

 </ul>

 </div>

 

@@ -17,9 +19,7 @@
     <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>

 </div>

 

@@ -27,7 +27,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>

@@ -56,6 +57,7 @@
     <li><a href="?page=Controls.Validation">Validation Controls</a></li>

     <li><a href="?page=Controls.List">List Controls</a></li>

     <li><a href="?page=Controls.Data">Data Controls</a></li>

+    <li><a href="?page=ActiveControls.Introduction">AJAX: Introduction</a></li>

     <li><a href="?page=ActiveControls.Home">Active Controls (AJAX)</a></li>

     <li><a href="?page=Controls.NewControl">Writing New Controls</a></li>

 </ul>