11 files changed, 17 insertions, 14 deletions
diff --git a/demos/quickstart/protected/controls/Layout.tpl b/demos/quickstart/protected/controls/Layout.tpl
index b9e36e40..c3e67272 100755
--- a/demos/quickstart/protected/controls/Layout.tpl
+++ b/demos/quickstart/protected/controls/Layout.tpl
@@ -50,7 +50,7 @@
 </table>
 
 <div id="footer">
-Copyright &copy; 2005-2013 <a href="http://www.pradosoft.com">PradoSoft</a>.
+Copyright &copy; 2005-2014 <a href="http://www.pradosoft.com">PradoSoft</a>.
 <br/><br/>
 <%= Prado::poweredByPrado() %>
 <a href="http://validator.w3.org/check?uri=referer"><img border="0" src="http://www.w3.org/Icons/valid-xhtml10" alt="Valid XHTML 1.0 Transitional" height="31" width="88" /></a>
diff --git a/demos/quickstart/protected/controls/SampleLayout.tpl b/demos/quickstart/protected/controls/SampleLayout.tpl
index 5a5ca898..ba286f0f 100755
--- a/demos/quickstart/protected/controls/SampleLayout.tpl
+++ b/demos/quickstart/protected/controls/SampleLayout.tpl
@@ -19,7 +19,7 @@
 </div>
 <div class="samplemenu">
     <div class="copyright">
-        Copyright &copy; 2005-2013 <a href="http://www.pradosoft.com">PradoSoft</a>
+        Copyright &copy; 2005-2014 <a href="http://www.pradosoft.com">PradoSoft</a>
     </div>
 </div>
 
diff --git a/demos/quickstart/protected/controls/TopicList.tpl b/demos/quickstart/protected/controls/TopicList.tpl
index edc0ff3b..b8563c50 100644
--- a/demos/quickstart/protected/controls/TopicList.tpl
+++ b/demos/quickstart/protected/controls/TopicList.tpl
@@ -8,6 +8,7 @@
     <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.Upgrading32">Upgrading from v3.2</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>
@@ -19,7 +20,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>
 </ul>
 </div>
@@ -28,7 +28,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>
@@ -57,7 +58,9 @@
     <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=JuiControls.Home">Jui Controls (jQuery UI)</a></li>
     <li><a href="?page=Controls.NewControl">Writing New Controls</a></li>
 </ul>
 </div>
diff --git a/demos/quickstart/protected/controls/es/SampleLayout.tpl b/demos/quickstart/protected/controls/es/SampleLayout.tpl
index 24f0575a..d6d4d9b4 100755
--- a/demos/quickstart/protected/controls/es/SampleLayout.tpl
+++ b/demos/quickstart/protected/controls/es/SampleLayout.tpl
@@ -19,7 +19,7 @@
 </div>
 <div class="samplemenu">
     <div class="copyright">
-        Copyright &copy; 2005-2013 <a href="http://www.pradosoft.com">PradoSoft</a>
+        Copyright &copy; 2005-2014 <a href="http://www.pradosoft.com">PradoSoft</a>
     </div>
 </div>
 
diff --git a/demos/quickstart/protected/controls/es/TopicList.tpl b/demos/quickstart/protected/controls/es/TopicList.tpl
index c2725733..b0129826 100644
--- a/demos/quickstart/protected/controls/es/TopicList.tpl
+++ b/demos/quickstart/protected/controls/es/TopicList.tpl
@@ -1,7 +1,7 @@
 <div id="toc">
 
 <div class="topic">
-<div>Comenzar</div> 
+<div>Comenzar</div>
 <ul>
     <li><a href="?page=GettingStarted.Introduction">Introducción</a></li>
     <li><a href="?page=GettingStarted.AboutPrado">¿Que es PRADO?</a></li>
@@ -28,7 +28,7 @@
 <div>Básicos</div>
 <ul>
     <li><a href="?page=Fundamentals.Architecture">Arquitectura</a></li>
-    <li><a href="?page=Fundamentals.Components">Componentes</a></li>
+    <li><a href="?page=Fundamentals.Components1">Componentes</a></li>
     <li><a href="?page=Fundamentals.Controls">Controles</a></li>
     <li><a href="?page=Fundamentals.Pages">Páginas</a></li>
     <li><a href="?page=Fundamentals.Modules">Mádulos</a></li>
diff --git a/demos/quickstart/protected/controls/fr/SampleLayout.tpl b/demos/quickstart/protected/controls/fr/SampleLayout.tpl
index e421604c..e6fd2347 100755
--- a/demos/quickstart/protected/controls/fr/SampleLayout.tpl
+++ b/demos/quickstart/protected/controls/fr/SampleLayout.tpl
@@ -19,7 +19,7 @@
 </div>
 <div class="samplemenu">
     <div class="copyright">
-        Copyright &copy; 2005-2013 <a href="http://www.pradosoft.com">PradoSoft</a>
+        Copyright &copy; 2005-2014 <a href="http://www.pradosoft.com">PradoSoft</a>
     </div>
 </div>
 
diff --git a/demos/quickstart/protected/controls/fr/TopicList.tpl b/demos/quickstart/protected/controls/fr/TopicList.tpl
index 3020b24f..f7bd5f5a 100644
--- a/demos/quickstart/protected/controls/fr/TopicList.tpl
+++ b/demos/quickstart/protected/controls/fr/TopicList.tpl
@@ -27,7 +27,7 @@
 <div>Fundamentaux</div>
 <ul>
     <li><a href="?page=Fundamentals.Architecture">Architecture</a></li>
-    <li><a href="?page=Fundamentals.Components">Composants</a></li>
+    <li><a href="?page=Fundamentals.Components1">Composants</a></li>
     <li><a href="?page=Fundamentals.Controls">Contrôles</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/controls/id/TopicList.tpl b/demos/quickstart/protected/controls/id/TopicList.tpl
index 75fa8614..bedf6c6f 100644
--- a/demos/quickstart/protected/controls/id/TopicList.tpl
+++ b/demos/quickstart/protected/controls/id/TopicList.tpl
@@ -28,7 +28,7 @@
 <div>Fundamental</div>
 <ul>
     <li><a href="?page=Fundamentals.Architecture">Arsitektur</a></li>
-    <li><a href="?page=Fundamentals.Components">Komponen</a></li>
+    <li><a href="?page=Fundamentals.Components1">Komponen</a></li>
     <li><a href="?page=Fundamentals.Controls">Kontrol</a></li>
     <li><a href="?page=Fundamentals.Pages">Halaman</a></li>
     <li><a href="?page=Fundamentals.Modules">Modul</a></li>
diff --git a/demos/quickstart/protected/controls/ja/TopicList.tpl b/demos/quickstart/protected/controls/ja/TopicList.tpl
index dbfc7eb4..456e13c4 100644
--- a/demos/quickstart/protected/controls/ja/TopicList.tpl
+++ b/demos/quickstart/protected/controls/ja/TopicList.tpl
@@ -28,7 +28,7 @@
 <div>動作原理</div>
 <ul>
     <li><a href="?page=Fundamentals.Architecture">アーキテクチャ</a></li>
-    <li><a href="?page=Fundamentals.Components">コンポーネント</a></li>
+    <li><a href="?page=Fundamentals.Components1">コンポーネント</a></li>
     <li><a href="?page=Fundamentals.Controls">コントロール</a></li>
     <li><a href="?page=Fundamentals.Pages">ページ</a></li>
     <li><a href="?page=Fundamentals.Modules">モジュール</a></li>
diff --git a/demos/quickstart/protected/controls/pl/TopicList.tpl b/demos/quickstart/protected/controls/pl/TopicList.tpl
index 33d8a126..c57cba76 100644
--- a/demos/quickstart/protected/controls/pl/TopicList.tpl
+++ b/demos/quickstart/protected/controls/pl/TopicList.tpl
@@ -19,7 +19,7 @@
     <li><a href="?page=GettingStarted.HelloWorld">Tworzenie pierwszej aplikacji PRADO</a></li>
     <li><a href="?page=Fundamentals.Hangman">Przykład: gra wisielec</a></li>
     <li><a href="?page=Tutorial.CurrencyConverter">Konwenter walut</a></li>
-    <li><a href="?page=Tutorial.AddressBook">Książka adresowa</a></li>    
+    <li><a href="?page=Tutorial.AddressBook">Książka adresowa</a></li>
     <li><a href="?page=Tutorial.AjaxChat">AJAX-owy klient czat</a></li>
 </ul>
 </div>
@@ -28,7 +28,7 @@
 <div>Postawy</div>
 <ul>
     <li><a href="?page=Fundamentals.Architecture">Architektura</a></li>
-    <li><a href="?page=Fundamentals.Components">Komponenty</a></li>
+    <li><a href="?page=Fundamentals.Components1">Komponenty</a></li>
     <li><a href="?page=Fundamentals.Controls">Kontrolki</a></li>
     <li><a href="?page=Fundamentals.Pages">Strony</a></li>
     <li><a href="?page=Fundamentals.Modules">Moduły</a></li>
diff --git a/demos/quickstart/protected/controls/zh/TopicList.tpl b/demos/quickstart/protected/controls/zh/TopicList.tpl
index 6a4c6e17..160455b4 100644
--- a/demos/quickstart/protected/controls/zh/TopicList.tpl
+++ b/demos/quickstart/protected/controls/zh/TopicList.tpl
@@ -27,7 +27,7 @@
 <div>基础概念</div>
 <ul>
     <li><a href="?page=Fundamentals.Architecture">框架结构</a></li>
-    <li><a href="?page=Fundamentals.Components">部件</a></li>
+    <li><a href="?page=Fundamentals.Components1">部件</a></li>
     <li><a href="?page=Fundamentals.Controls">控件</a></li>
     <li><a href="?page=Fundamentals.Pages">页面</a></li>
     <li><a href="?page=Fundamentals.Modules">模块</a></li>