6 files changed, 18 insertions, 11 deletions

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