11 files changed, 163 insertions, 11 deletions
diff --git a/demos/quickstart/protected/application.xml b/demos/quickstart/protected/application.xml
index f028b9b7..0091ec5f 100644
--- a/demos/quickstart/protected/application.xml
+++ b/demos/quickstart/protected/application.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <application id="QuickStart" Mode="Debug">
+  <paths>
+    <alias id="Controls" path="controls" />
+    <using namespace="Controls.*" />
+  </paths>
   <services>
     <service id="page" class="TPageService" DefaultPage="GettingStarted.Introduction" />
   </services>
diff --git a/demos/quickstart/protected/controls/Layout.php b/demos/quickstart/protected/controls/Layout.php
new file mode 100644
index 00000000..a82d2fff
--- /dev/null
+++ b/demos/quickstart/protected/controls/Layout.php
@@ -0,0 +1,15 @@
+<?php
+
+class Layout extends TTemplateControl
+{
+	public function toggleTopicPanel($sender,$param)
+	{
+		$this->TopicPanel->Visible=!$this->TopicPanel->Visible;
+		if($this->TopicPanel->Visible)
+			$sender->Text="Hide TOC";
+		else
+			$sender->Text="Show TOC";
+	}
+}
+
+?>
+\ No newline at end of file
diff --git a/demos/quickstart/protected/controls/Layout.tpl b/demos/quickstart/protected/controls/Layout.tpl
new file mode 100644
index 00000000..4382c787
--- /dev/null
+++ b/demos/quickstart/protected/controls/Layout.tpl
@@ -0,0 +1,39 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" >
+
+<com:THead Title="PRADO QuickStart Tutorial">
+<meta http-equiv="content-language" content="en"/>
+</com:THead>
+
+<body>
+<com:TForm>
+<div id="header">
+Prado QuickStart Tutorial
+</div>
+
+<div id="menu">
+<a href="?">Home</a> |
+<a href="http://www.pradosoft.com">PradoSoft.com</a> |
+<com:TLinkButton Text="Hide TOC" Click="toggleTopicPanel" />
+</div>
+
+<table width="100%" border="0" cellspacing="0" cellpadding="0">
+<tr>
+<td valign="top">
+<div id="content" width="100%">
+<com:TContentPlaceHolder ID="body" />
+</div>
+</td>
+<td valign="top" width="1">
+<com:TopicList ID="TopicPanel" />
+</td>
+</tr>
+</table>
+
+<div id="footer">
+Copyright &copy; 2005 <a href="http://www.pradosoft.com">PradoSoft</a>.
+</div>
+
+</com:TForm>
+</body>
+</html>
+\ No newline at end of file
diff --git a/demos/quickstart/protected/controls/TopicList.php b/demos/quickstart/protected/controls/TopicList.php
new file mode 100644
index 00000000..ce827cc0
--- /dev/null
+++ b/demos/quickstart/protected/controls/TopicList.php
@@ -0,0 +1,8 @@
+<?php
+
+class TopicList extends TTemplateControl
+{
+
+}
+
+?>
+\ No newline at end of file
diff --git a/demos/quickstart/protected/controls/TopicList.tpl b/demos/quickstart/protected/controls/TopicList.tpl
new file mode 100644
index 00000000..35c062d2
--- /dev/null
+++ b/demos/quickstart/protected/controls/TopicList.tpl
@@ -0,0 +1,79 @@
+<div id="toc">
+
+<div class="topic">
+<span>Getting Started</span><br/>
+<a href="?page=GettingStarted.Introduction">Introduction</a><br/>
+<a href="?page=GettingStarted.AboutPrado">What is PRADO?</a><br/>
+<a href="?page=GettingStarted.Installation">Installation</a><br/>
+</div>
+
+<div class="topic">
+<span>Fundamentals</span><br/>
+<a href="?page=Fundamentals.Architecture">Architecture</a><br/>
+<a href="?page=Fundamentals.Components">Components</a><br/>
+<a href="?page=Fundamentals.Controls">Controls</a><br/>
+<a href="?page=Fundamentals.Pages">Pages</a><br/>
+<a href="?page=Fundamentals.Modules">Modules</a><br/>
+<a href="?page=Fundamentals.Services">Services</a><br/>
+<a href="?page=Fundamentals.Applications">Applications</a><br/>
+</div>
+
+<div class="topic">
+<span>Configurations</span><br/>
+<a href="?page=Configurations.Overview">Overview</a><br/>
+<a href="?page=Configurations.Templates1">Templates: Part I</a><br/>
+<a href="?page=Configurations.Templates2">Templates: Part II</a><br/>
+<a href="?page=Configurations.Templates3">Templates: Part III</a><br/>
+<a href="?page=Configurations.AppConfig">Application Configurations</a><br/>
+<a href="?page=Configurations.PageConfig">Page Configurations</a><br/>
+</div>
+
+<div class="topic">
+<span>Samples</span><br/>
+<a href="?page=Samples.HelloWorld">Hello World</a><br/>
+<a href="?page=Samples.Hangman">Hangman Game</a><br/>
+</div>
+
+<div class="topic">
+<span>Controls</span><br/>
+<a href="?page=Controls.Overview">Overview</a><br/>
+<a href="?page=Controls.Simple">Simple HTML Controls</a><br/>
+<a href="?page=Construction">Validation Controls</a><br/>
+<a href="?page=Construction">List Controls</a><br/>
+<a href="?page=Construction">TRepeater</a><br/>
+<a href="?page=Construction">TDataList</a><br/>
+<a href="?page=Construction">TDataGrid</a><br/>
+<a href="?page=Construction">Active Controls</a><br/>
+<a href="?page=Construction">Authoring New Controls</a><br/>
+</div>
+
+<div class="topic">
+<span>Data Access</span><br/>
+<a href="?page=Construction">DataBinding</a><br/>
+<a href="?page=Construction">Data Bound Controls</a><br/>
+<a href="?page=Construction">Data Source Controls</a><br/>
+</div>
+
+<div class="topic">
+<span>Avanced Features</span><br/>
+<a href="?page=Construction">Overview</a><br/>
+<a href="?page=Construction">Assets</a><br/>
+<a href="?page=Construction">Themes and Skins</a><br/>
+<a href="?page=Construction">Internationalization</a><br/>
+</div>
+
+<div class="topic">
+<span>Security</span><br/>
+<a href="?page=Construction">Overview</a><br/>
+<a href="?page=Construction">Authentication</a><br/>
+<a href="?page=Construction">Authorization</a><br/>
+<a href="?page=Construction">ViewState Protection</a><br/>
+</div>
+
+<div class="topic">
+<span>Performance</span><br/>
+<a href="?page=Construction">Caching</a><br/>
+<a href="?page=Construction">Performance Tuning</a><br/>
+</div>
+
+</div>
+\ No newline at end of file
diff --git a/demos/quickstart/protected/pages/Controls/Overview.page b/demos/quickstart/protected/pages/Controls/Overview.page
index da16d170..03b4a2a2 100644
--- a/demos/quickstart/protected/pages/Controls/Overview.page
+++ b/demos/quickstart/protected/pages/Controls/Overview.page
@@ -1,13 +1,7 @@
 <com:TContent ID="body" >
 <h1>Controls Overview</h1>
 <p>
-A control is an instance of class <tt>TControl</tt> or its subclass. A control is a component defined in addition with user interface. The base class <tt>TControl</tt> defines the parent-child relationship among controls which reflects the containment relationship among user interface elements.
-</p>
-<p>
-Control classes constitute one of the major part of PRADO framework. Nearly every generic HTML element can find its representation in terms of a PRADO control. Mastering these controls becomes extremely important to effectively and efficiently compose applications using PRADO.
-</p>
-<p>
-In this section, we will first introduce the ...., then....
+Control are components defined in addition with user interface. Control classes constitute a major part of the PRADO framework. Nearly every generic HTML element can find its representation in terms of a PRADO control. Mastering these controls becomes extremely important for developers to compose effectively and efficiently applications using PRADO.
 </p>
 <p>
 To be continued...
diff --git a/demos/quickstart/protected/pages/Controls/Simple.page b/demos/quickstart/protected/pages/Controls/Simple.page
new file mode 100644
index 00000000..dc2e768d
--- /dev/null
+++ b/demos/quickstart/protected/pages/Controls/Simple.page
@@ -0,0 +1,14 @@
+<com:TContent ID="body" >
+
+<h1>Simple HTML Controls</h1>
+
+<h2>TLabel</h2>
+<p>
+<tt>TLabel</tt> displays a piece of text on a Web page. The text to be displayed is set via its <tt>Text</tt> property. If <tt>Text</tt> is empty, content enclosed within the <tt>TLabel</tt> component tag will be displayed. <tt>TLabel</tt> may also be used a form label associated with some control on the form. <tt>Text</tt> is not HTML-encoded when being rendered. Make sure it does not contain dangerous characters that you want to avoid.
+</p>
+<div class="runbar">
+<a href="#">Run Sample</a>
+<a href="#">View Source</a>
+</div>
+
+</com:TContent>
+\ No newline at end of file
diff --git a/demos/quickstart/protected/pages/Fundamentals/objectdiagram.gif b/demos/quickstart/protected/pages/Fundamentals/objectdiagram.gif
index 2a6e25c1..ac99faca 100644
--- a/demos/quickstart/protected/pages/Fundamentals/objectdiagram.gif
+++ b/demos/quickstart/protected/pages/Fundamentals/objectdiagram.gif
diff --git a/demos/quickstart/protected/pages/Fundamentals/objectdiagram.vsd b/demos/quickstart/protected/pages/Fundamentals/objectdiagram.vsd
index 2d5e8205..e536ec31 100644
--- a/demos/quickstart/protected/pages/Fundamentals/objectdiagram.vsd
+++ b/demos/quickstart/protected/pages/Fundamentals/objectdiagram.vsd
diff --git a/demos/quickstart/protected/pages/TopicList.tpl b/demos/quickstart/protected/pages/TopicList.tpl
index ac34b034..35c062d2 100644
--- a/demos/quickstart/protected/pages/TopicList.tpl
+++ b/demos/quickstart/protected/pages/TopicList.tpl
@@ -37,8 +37,7 @@
 <div class="topic">
 <span>Controls</span><br/>
 <a href="?page=Controls.Overview">Overview</a><br/>
-<a href="?page=Controls.Simple1">Simple Controls: Part I</a><br/>
-<a href="?page=Construction">Simple Controls: Part II</a><br/>
+<a href="?page=Controls.Simple">Simple HTML Controls</a><br/>
 <a href="?page=Construction">Validation Controls</a><br/>
 <a href="?page=Construction">List Controls</a><br/>
 <a href="?page=Construction">TRepeater</a><br/>
@@ -58,8 +57,8 @@
 <div class="topic">
 <span>Avanced Features</span><br/>
 <a href="?page=Construction">Overview</a><br/>
-<a href="?page=Construction">Themes and Skins</a><br/>
 <a href="?page=Construction">Assets</a><br/>
+<a href="?page=Construction">Themes and Skins</a><br/>
 <a href="?page=Construction">Internationalization</a><br/>
 </div>
 
diff --git a/demos/quickstart/protected/pages/config.xml b/demos/quickstart/protected/pages/config.xml
index 929b26e7..92aec985 100644
--- a/demos/quickstart/protected/pages/config.xml
+++ b/demos/quickstart/protected/pages/config.xml
@@ -4,7 +4,7 @@
   <paths>
     <alias id="Pages" path="." />
   </paths>
-  <pages MasterClass="Pages.Layout" Theme="Simple">
+  <pages MasterClass="Layout" Theme="Simple">
     <page id="ViewSource" MasterClass="" />
   </pages>
 </configuration>
 \ No newline at end of file