Rewrote Hello World tutorial.

9 files changed, 6 insertions, 74 deletions

diff --git a/.gitattributes b/.gitattributes
index 66171525..e5e16d8f 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -268,17 +268,12 @@ demos/quickstart/protected/pages/Fundamentals/Architecture.page -text
 demos/quickstart/protected/pages/Fundamentals/Components.page -text
 demos/quickstart/protected/pages/Fundamentals/Controls.page -text
 demos/quickstart/protected/pages/Fundamentals/Hangman.page -text
-demos/quickstart/protected/pages/Fundamentals/HelloWorld.page -text
 demos/quickstart/protected/pages/Fundamentals/Modules.page -text
 demos/quickstart/protected/pages/Fundamentals/Pages.page -text
 demos/quickstart/protected/pages/Fundamentals/Samples/Hangman/Home.page -text
 demos/quickstart/protected/pages/Fundamentals/Samples/Hangman/Home.php -text
 demos/quickstart/protected/pages/Fundamentals/Samples/Hangman/sequence.vsd -text
 demos/quickstart/protected/pages/Fundamentals/Samples/Hangman/words.txt -text
-demos/quickstart/protected/pages/Fundamentals/Samples/HelloWorld/Home.page -text
-demos/quickstart/protected/pages/Fundamentals/Samples/HelloWorld/Home.php -text
-demos/quickstart/protected/pages/Fundamentals/Samples/HelloWorld/sequence.gif -text
-demos/quickstart/protected/pages/Fundamentals/Samples/HelloWorld/sequence.vsd -text
 demos/quickstart/protected/pages/Fundamentals/Samples/config.xml -text
 demos/quickstart/protected/pages/Fundamentals/Services.page -text
 demos/quickstart/protected/pages/Fundamentals/applifecycles.gif -text
@@ -898,7 +893,6 @@ tests/FunctionalTests/quickstart/Controls/Repeater3TestCase.php -text
 tests/FunctionalTests/quickstart/Controls/TableTestCase.php -text
 tests/FunctionalTests/quickstart/Controls/TextBoxTestCase.php -text
 tests/FunctionalTests/quickstart/Fundamentals/HangmanTestCase.php -text
-tests/FunctionalTests/quickstart/Fundamentals/HelloWorldTestCase.php -text
 tests/FunctionalTests/selenium/SeleneseRunner.html -text
 tests/FunctionalTests/selenium/SeleniumLog.html -text
 tests/FunctionalTests/selenium/TestRunner-splash.html -text
diff --git a/buildscripts/texbuilder/build.php b/buildscripts/texbuilder/build.php
index 7395406c..4988bccd 100644
--- a/buildscripts/texbuilder/build.php
+++ b/buildscripts/texbuilder/build.php
@@ -14,7 +14,10 @@ $base = realpath(dirname(__FILE__).'/../../demos/quickstart/protected/pages/');
 $pages['Getting Started'] = array(

 	'GettingStarted/Introduction.page',

 	'GettingStarted/AboutPrado.page',

-	'GettingStarted/Installation.page');

+	'GettingStarted/Installation.page',

+	'GettingStarted/HelloWorld.page',

+	'GettingStarted/Upgrading.page'

+	);

 

 $pages['Fundamentals'] = array(

 	'Fundamentals/Architecture.page',

@@ -24,7 +27,6 @@ $pages['Fundamentals'] = array(
     'Fundamentals/Modules.page',

     'Fundamentals/Services.page',

     'Fundamentals/Applications.page',

-    'Fundamentals/HelloWorld.page',

     'Fundamentals/Hangman.page');

 

 $pages['Configurations'] = array(

diff --git a/demos/quickstart/protected/controls/TopicList.tpl b/demos/quickstart/protected/controls/TopicList.tpl
index 254d67ad..d2cde711 100644
--- a/demos/quickstart/protected/controls/TopicList.tpl
+++ b/demos/quickstart/protected/controls/TopicList.tpl
@@ -6,7 +6,8 @@
     <li><a href="?page=GettingStarted.Introduction">Introduction</a></li>

     <li><a href="?page=GettingStarted.AboutPrado">What is PRADO?</a></li>

     <li><a href="?page=GettingStarted.Installation">Installation</a></li>

-    <li><a href="?page=GettingStarted.Upgrading">Upgrading from Earlier Versions</a></li>

+    <li><a href="?page=GettingStarted.HelloWorld">Creating First PRADO Application</a></li>

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

 </ul>

 </div>

 

@@ -20,7 +21,6 @@
     <li><a href="?page=Fundamentals.Modules">Modules</a></li>

     <li><a href="?page=Fundamentals.Services">Services</a></li>

     <li><a href="?page=Fundamentals.Applications">Applications</a></li>

-    <li><a href="?page=Fundamentals.HelloWorld">Sample: Hello World</a></li>

     <li><a href="?page=Fundamentals.Hangman">Sample: Hangman Game</a></li>

 </ul>

 </div>

diff --git a/demos/quickstart/protected/pages/Fundamentals/HelloWorld.page b/demos/quickstart/protected/pages/Fundamentals/HelloWorld.page
deleted file mode 100644
index 572c6766..00000000
--- a/demos/quickstart/protected/pages/Fundamentals/HelloWorld.page
+++ /dev/null
@@ -1,31 +0,0 @@
-<com:TContent ID="body" >

-<h1>Sample: Hello World</h1>

-<p>

-"Hello World" perhaps is the simplest <i>interactive</i> PRADO application that you can build. It displays to end-users a page with a submit button whose caption is <i>Click Me</i>. When the user clicks on the button, the button changes the caption to <i>Hello World</i>.

-</p>

-<p>

-There are many approaches that can achieve the above goal. One can submit the page to the server, examine the POST variable, and generate a new page with the button caption updated. Or one can simply use JavaScript to update the button caption upon its <i>onclick</i> event.

-</p>

-<p>

-PRADO promotes component-based and event-driven Web programming. The button is represented by a <i>TButton</i> object. It encapsulates the button caption as the <i>Text</i> property and associates the user button click action with a server-side <i>Click</i> event. Therefore, the "Hello World" task can be handled intuitively and easily. One simply needs to attach a function to the button's <i>Click</i> event. Within the function, the button's <i>Text</i> property is modified as "Hello World". The following diagram shows the above sequence,

-</p>

-<img src="<%~Samples/HelloWorld/sequence.gif%>" />

-<p>

-The code that a developer needs to write is merely the following event handler function, where <tt>$sender</tt> refers to the button object.

-<com:TTextHighlighter CssClass="source">

-public function buttonClicked($sender,$param)

-{

-	$sender->Text = "Hello World";

-}

-</com:TTextHighlighter>

-</p>

-<p>

-The following line in the page template attaches the <tt>buttonClicked()</tt> method to the <tt>OnClick</tt> event of the button,

-</p>

-<com:TTextHighlighter Language="prado" CssClass="source">

-&lt;com:TButton Text="Click Me" OnClick="buttonClicked" /&gt;

-</com:TTextHighlighter>

-

-<com:RunBar PagePath="Fundamentals.Samples.HelloWorld.Home" />

-

-</com:TContent>
\ No newline at end of file
diff --git a/demos/quickstart/protected/pages/Fundamentals/Samples/HelloWorld/Home.page b/demos/quickstart/protected/pages/Fundamentals/Samples/HelloWorld/Home.page
deleted file mode 100644
index 60c7c3e2..00000000
--- a/demos/quickstart/protected/pages/Fundamentals/Samples/HelloWorld/Home.page
+++ /dev/null
@@ -1,6 +0,0 @@
-<%@ Title="Hello World" %>

-<com:TContent ID="body">

-

-<com:TButton Text="Click Me" OnClick="buttonClicked" />

-

-</com:TContent>
\ No newline at end of file
diff --git a/demos/quickstart/protected/pages/Fundamentals/Samples/HelloWorld/Home.php b/demos/quickstart/protected/pages/Fundamentals/Samples/HelloWorld/Home.php
deleted file mode 100644
index b1a7f991..00000000
--- a/demos/quickstart/protected/pages/Fundamentals/Samples/HelloWorld/Home.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php

-

-class Home extends TPage

-{

-	public function buttonClicked($sender,$param)

-	{

-		$sender->Text="Hello World";

-	}

-}

-

-?>
\ No newline at end of file
diff --git a/demos/quickstart/protected/pages/Fundamentals/Samples/HelloWorld/sequence.gif b/demos/quickstart/protected/pages/Fundamentals/Samples/HelloWorld/sequence.gif
deleted file mode 100644
index a1e51200..00000000
--- a/demos/quickstart/protected/pages/Fundamentals/Samples/HelloWorld/sequence.gif
+++ /dev/null
diff --git a/demos/quickstart/protected/pages/Fundamentals/Samples/HelloWorld/sequence.vsd b/demos/quickstart/protected/pages/Fundamentals/Samples/HelloWorld/sequence.vsd
deleted file mode 100644
index e8c2f5a7..00000000
--- a/demos/quickstart/protected/pages/Fundamentals/Samples/HelloWorld/sequence.vsd
+++ /dev/null
diff --git a/tests/FunctionalTests/quickstart/Fundamentals/HelloWorldTestCase.php b/tests/FunctionalTests/quickstart/Fundamentals/HelloWorldTestCase.php
deleted file mode 100644
index e3da5a72..00000000
--- a/tests/FunctionalTests/quickstart/Fundamentals/HelloWorldTestCase.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php

-

-//New Test

-class HelloWorldTestCase extends SeleniumTestCase

-{

-	function test ()

-	{

-		$this->open("../../demos/quickstart/index.php?page=Fundamentals.Samples.HelloWorld.Home&amp;notheme=true", "");

-		$this->verifyTitle("Hello World", "");

-		$this->clickAndWait("//input[@type='submit' and @value='Click Me']", "");

-		$this->clickAndWait("//input[@type='submit' and @value='Hello World']", "");

-		$this->verifyTitle("Hello World", "");

-	}

-}

-

-?>
\ No newline at end of file