Added Printer-friendly version of quickstart tutorial.

24 files changed, 68 insertions, 56 deletions

diff --git a/buildscripts/texbuilder/build.php b/buildscripts/texbuilder/build.php
index de3135be..44fbecf2 100644
--- a/buildscripts/texbuilder/build.php
+++ b/buildscripts/texbuilder/build.php
@@ -35,7 +35,8 @@ $pages['Controls'] = array(
 	'Controls/Repeater.page',

 	'Controls/DataList.page',

 	'Controls/DataGrid1.page',

-	'Controls/DataGrid2.page');

+	'Controls/DataGrid2.page',

+	'Controls/NewControl.page');

 

 $pages['Security'] = array(

 	'Security/Auth.page',

diff --git a/demos/quickstart/protected/controls/Layout.php b/demos/quickstart/protected/controls/Layout.php
index a82d2fff..21eb764e 100644
--- a/demos/quickstart/protected/controls/Layout.php
+++ b/demos/quickstart/protected/controls/Layout.php
@@ -2,13 +2,28 @@
 

 class Layout extends TTemplateControl

 {

-	public function toggleTopicPanel($sender,$param)

+	public function __construct()

 	{

-		$this->TopicPanel->Visible=!$this->TopicPanel->Visible;

-		if($this->TopicPanel->Visible)

-			$sender->Text="Hide TOC";

+		if(isset($this->Request['notheme']))

+			$this->Service->RequestedPage->EnableTheming=false;

+		parent::__construct();

+	}

+

+	public function onLoad($param)

+	{

+		parent::onLoad($param);

+		$url=$this->Request->RequestUri;

+		if(strpos($url,'?')===false)

+			$url.='index.php?notheme=true';

 		else

-			$sender->Text="Show TOC";

+			$url.='&notheme=true';

+		$this->PrinterLink->NavigateUrl=$url;

+

+		if(isset($this->Request['notheme']))

+		{

+			$this->MainMenu->Visible=false;

+			$this->TopicPanel->Visible=false;

+		}

 	}

 }

 

diff --git a/demos/quickstart/protected/controls/Layout.tpl b/demos/quickstart/protected/controls/Layout.tpl
index 52eb08f5..6d56b490 100644
--- a/demos/quickstart/protected/controls/Layout.tpl
+++ b/demos/quickstart/protected/controls/Layout.tpl
@@ -12,12 +12,12 @@
 <div class="image"></div>

 </div>

 

-<div id="menu">

+<com:TPanel ID="MainMenu" CssClass="mainmenu">

 <a href="?">Home</a> |

 <a href="http://www.pradosoft.com">PradoSoft.com</a> |

-<a href="prado3_quick_start.pdf">Download in PDF</a> |

-<com:TLinkButton Text="Hide TOC" OnClick="toggleTopicPanel" />

-</div>

+<a href="prado3_quick_start.pdf">PDF Version</a> |

+<com:THyperLink ID="PrinterLink" Text="Printer-friendly Version" />

+</com:TPanel>

 

 <table width="100%" border="0" cellspacing="0" cellpadding="0">

 <tr>

diff --git a/demos/quickstart/protected/controls/SampleLayout.php b/demos/quickstart/protected/controls/SampleLayout.php
index 2224572a..a89b905d 100644
--- a/demos/quickstart/protected/controls/SampleLayout.php
+++ b/demos/quickstart/protected/controls/SampleLayout.php
@@ -2,22 +2,12 @@
 

 class SampleLayout extends TTemplateControl

 {

-

 	public function __construct()

 	{

-		if(isset($this->Request['functionaltest']))

+		if(isset($this->Request['notheme']))

 			$this->Service->RequestedPage->EnableTheming=false;

 		parent::__construct();

 	}

-

-	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/themes/PradoSoft/style.css b/demos/quickstart/themes/PradoSoft/style.css
index e054d05a..df8d1e19 100644
--- a/demos/quickstart/themes/PradoSoft/style.css
+++ b/demos/quickstart/themes/PradoSoft/style.css
@@ -68,7 +68,7 @@ a
 

 

 

-#menu {

+.mainmenu {

 	padding:10px;

 	padding-right:10px;

 	background:#EDEDED;

@@ -79,12 +79,12 @@ a
 	font-size: 9pt;

 }

 

-#menu a {

+.mainmenu a {

 	color:#737373;

 	text-decoration:none;

 }

 

-#menu a:hover {

+.mainmenu a:hover {

 	color: #FF0000;

 }

 

diff --git a/framework/Web/THttpRequest.php b/framework/Web/THttpRequest.php
index b8db56d6..12d1ccd6 100644
--- a/framework/Web/THttpRequest.php
+++ b/framework/Web/THttpRequest.php
@@ -83,6 +83,12 @@ class THttpRequest extends TMap implements IModule
 	private $_urlFormat='Get';

 	private $_services;

 	private $_requestResolved=false;

+

+	/**

+	 * @var string request URL

+	 */

+	private $_url=null;

+

 	/**

 	 * @var string module id

 	 */

@@ -795,14 +801,14 @@ class TUri extends TComponent
 		if(($ret=@parse_url($uri))!==false)

 		{

 			// decoding???

-			$this->_scheme=$ret['scheme'];

-			$this->_host=$ret['host'];

-			$this->_port=$ret['port'];

-			$this->_user=$ret['user'];

-			$this->_pass=$ret['pass'];

-			$this->_path=$ret['path'];

-			$this->_query=$ret['query'];

-			$this->_fragment=$ret['fragment'];

+			$this->_scheme=isset($ret['scheme'])?$ret['scheme']:'';

+			$this->_host=isset($ret['host'])?$ret['host']:'';

+			$this->_port=isset($ret['port'])?$ret['port']:'';

+			$this->_user=isset($ret['user'])?$ret['user']:'';

+			$this->_pass=isset($ret['pass'])?$ret['pass']:'';

+			$this->_path=isset($ret['path'])?$ret['path']:'';

+			$this->_query=isset($ret['query'])?$ret['query']:'';

+			$this->_fragment=isset($ret['fragment'])?$ret['fragment']:'';

 			$this->_uri=$uri;

 		}

 		else

diff --git a/tests/FunctionalTests/quickstart_tests/Advanced/I18N.php b/tests/FunctionalTests/quickstart_tests/Advanced/I18N.php
index 3917b76d..fc45b096 100644
--- a/tests/FunctionalTests/quickstart_tests/Advanced/I18N.php
+++ b/tests/FunctionalTests/quickstart_tests/Advanced/I18N.php
@@ -5,43 +5,43 @@ class I18NTestCase extends SeleniumTestCase
 {

 	function test ()

 	{

-		$this->open("../../demos/quickstart/index.php?page=Advanced.Samples.I18N.Home&lang=en&functionaltest=true", "");

+		$this->open("../../demos/quickstart/index.php?page=Advanced.Samples.I18N.Home&lang=en&amp;notheme=true", "");

 		$this->verifyTitle("Internationlization in PRADO", "");

 		$this->verifyTextPresent("46.412,42 €", "");

 		$this->verifyTextPresent("$12.40", "");

 		$this->verifyTextPresent("€100.00", "");

 		$this->verifyTextPresent("December 6, 2004", "");

-		$this->open("../../demos/quickstart/index.php?page=Advanced.Samples.I18N.Home&lang=zh&functionaltest=true", "");

+		$this->open("../../demos/quickstart/index.php?page=Advanced.Samples.I18N.Home&lang=zh&amp;notheme=true", "");

 		$this->verifyTitle("PRADO 国际化", "");

 		$this->verifyTextPresent("2004 十二月", "");

 		$this->verifyTextPresent("US$ 12.40", "");

 		$this->verifyTextPresent("46.412,42 €", "");

 		$this->verifyTextPresent("€100.00 ", "");

-		$this->open("../../demos/quickstart/index.php?page=Advanced.Samples.I18N.Home&lang=zh_TW&functionaltest=true", "");

+		$this->open("../../demos/quickstart/index.php?page=Advanced.Samples.I18N.Home&lang=zh_TW&amp;notheme=true", "");

 		$this->verifyTitle("PRADO 國際化", "");

 		$this->verifyTextPresent("2004年12月6日", "");

 		$this->verifyTextPresent("US$12.40", "");

 		$this->verifyTextPresent("46.412,42 €", "");

 		$this->verifyTextPresent("€100.00", "");

-		$this->open("../../demos/quickstart/index.php?page=Advanced.Samples.I18N.Home&lang=de&functionaltest=true", "");

+		$this->open("../../demos/quickstart/index.php?page=Advanced.Samples.I18N.Home&lang=de&amp;notheme=true", "");

 		$this->verifyTitle("Internationalisierung in PRADO", "");

 		$this->verifyTextPresent("6. Dezember 2004 ", "");

 		$this->verifyTextPresent("$ 12,40", "");

 		$this->verifyTextPresent("46.412,42 €", "");

 		$this->verifyTextPresent("€100.00", "");

-		$this->open("../../demos/quickstart/index.php?page=Advanced.Samples.I18N.Home&lang=es&functionaltest=true", "");

+		$this->open("../../demos/quickstart/index.php?page=Advanced.Samples.I18N.Home&lang=es&amp;notheme=true", "");

 		$this->verifyTitle("Internationlization en PRADO", "");

 		$this->verifyTextPresent("6 de diciembre de 2004", "");

 		$this->verifyTextPresent("US$12.40", "");

 		$this->verifyTextPresent("46.412,42 €", "");

 		$this->verifyTextPresent("€100.00", "");

-		$this->open("../../demos/quickstart/index.php?page=Advanced.Samples.I18N.Home&lang=fr&functionaltest=true", "");

+		$this->open("../../demos/quickstart/index.php?page=Advanced.Samples.I18N.Home&lang=fr&amp;notheme=true", "");

 		$this->verifyTitle("Internationalisation dans PRADO", "");

 		$this->verifyTextPresent("6 décembre 2004", "");

 		$this->verifyTextPresent("12,40 $", "");

 		$this->verifyTextPresent("46.412,42 €", "");

 		$this->verifyTextPresent("€100.00", "");

-		$this->open("../../demos/quickstart/index.php?page=Advanced.Samples.I18N.Home&lang=pl&functionaltest=true", "");

+		$this->open("../../demos/quickstart/index.php?page=Advanced.Samples.I18N.Home&lang=pl&amp;notheme=true", "");

 		$this->verifyTitle("Internacjonalizacja w PRADO", "");

 		$this->verifyTextPresent("6 grudnia 2004", "");

 		$this->verifyTextPresent("US$ 12,40", "");

diff --git a/tests/FunctionalTests/quickstart_tests/Controls/ButtonTestCase.php b/tests/FunctionalTests/quickstart_tests/Controls/ButtonTestCase.php
index 26e9c773..032f5ff1 100644
--- a/tests/FunctionalTests/quickstart_tests/Controls/ButtonTestCase.php
+++ b/tests/FunctionalTests/quickstart_tests/Controls/ButtonTestCase.php
@@ -4,7 +4,7 @@ class ButtonTestCase extends SeleniumTestCase
 {

 	function test ()

 	{

-		$this->open("../../demos/quickstart/index.php?page=Controls.Samples.TButton.Home&functionaltest=true", "");

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

 

 		$this->verifyTitle("PRADO QuickStart Sample", "");

 

diff --git a/tests/FunctionalTests/quickstart_tests/Controls/CheckBoxListTestCase.php b/tests/FunctionalTests/quickstart_tests/Controls/CheckBoxListTestCase.php
index 4ac07ee2..783e2ccc 100644
--- a/tests/FunctionalTests/quickstart_tests/Controls/CheckBoxListTestCase.php
+++ b/tests/FunctionalTests/quickstart_tests/Controls/CheckBoxListTestCase.php
@@ -5,7 +5,7 @@ class CheckBoxListTestCase extends SeleniumTestCase
 {

 	function test ()

 	{

-		$this->open("../../demos/quickstart/index.php?page=Controls.Samples.TCheckBoxList.Home&functionaltest=true", "");

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

 

 		// Check box list with default settings:

 		$this->click("//input[@name='ctl0\$body\$ctl0\$0' and @value='value 1']", "");

diff --git a/tests/FunctionalTests/quickstart_tests/Controls/CheckBoxTestCase.php b/tests/FunctionalTests/quickstart_tests/Controls/CheckBoxTestCase.php
index b68f22d3..a24ce937 100644
--- a/tests/FunctionalTests/quickstart_tests/Controls/CheckBoxTestCase.php
+++ b/tests/FunctionalTests/quickstart_tests/Controls/CheckBoxTestCase.php
@@ -4,7 +4,7 @@ class CheckBoxTestCase extends SeleniumTestCase
 {

 	function test ()

 	{

-		$this->open("../../demos/quickstart/index.php?page=Controls.Samples.TCheckBox.Home&functionaltest=true", "");

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

 

 		$this->verifyTitle("PRADO QuickStart Sample", "");

 

diff --git a/tests/FunctionalTests/quickstart_tests/Controls/DropDownListTestCase.php b/tests/FunctionalTests/quickstart_tests/Controls/DropDownListTestCase.php
index f027eb70..cfb2047b 100644
--- a/tests/FunctionalTests/quickstart_tests/Controls/DropDownListTestCase.php
+++ b/tests/FunctionalTests/quickstart_tests/Controls/DropDownListTestCase.php
@@ -4,7 +4,7 @@ class DropDownListTestCase extends SeleniumTestCase
 {

 	function test ()

 	{

-		$this->open("../../demos/quickstart/index.php?page=Controls.Samples.TDropDownList.Home&functionaltest=true", "");

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

 

 		$this->verifyTitle("PRADO QuickStart Sample", "");

 

diff --git a/tests/FunctionalTests/quickstart_tests/Controls/HyperLinkTestCase.php b/tests/FunctionalTests/quickstart_tests/Controls/HyperLinkTestCase.php
index 5ef103f0..b0b964f8 100644
--- a/tests/FunctionalTests/quickstart_tests/Controls/HyperLinkTestCase.php
+++ b/tests/FunctionalTests/quickstart_tests/Controls/HyperLinkTestCase.php
@@ -4,7 +4,7 @@ class HyperLinkTestCase extends SeleniumTestCase
 {

 	function test ()

 	{

-		$this->open("../../demos/quickstart/index.php?page=Controls.Samples.THyperLink.Home&functionaltest=true", "");

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

 		$this->verifyTitle("PRADO QuickStart Sample", "");

 		$this->verifyElementPresent("//a[@href=\"http://www.pradosoft.com/\" and @target=\"_blank\"]");

 		$this->verifyTextPresent("Welcome to", "");

diff --git a/tests/FunctionalTests/quickstart_tests/Controls/ImageButtonTestCase.php b/tests/FunctionalTests/quickstart_tests/Controls/ImageButtonTestCase.php
index 079b3abf..cc0bda53 100644
--- a/tests/FunctionalTests/quickstart_tests/Controls/ImageButtonTestCase.php
+++ b/tests/FunctionalTests/quickstart_tests/Controls/ImageButtonTestCase.php
@@ -4,7 +4,7 @@ class ImageButtonTestCase extends SeleniumTestCase
 {

 	function test ()

 	{

-		$this->open("../../demos/quickstart/index.php?page=Controls.Samples.TImageButton.Home&functionaltest=true", "");

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

 

 		$this->verifyTitle("PRADO QuickStart Sample", "");

 

diff --git a/tests/FunctionalTests/quickstart_tests/Controls/ImageTestCase.php b/tests/FunctionalTests/quickstart_tests/Controls/ImageTestCase.php
index 34c37975..a0ad6d6b 100644
--- a/tests/FunctionalTests/quickstart_tests/Controls/ImageTestCase.php
+++ b/tests/FunctionalTests/quickstart_tests/Controls/ImageTestCase.php
@@ -5,7 +5,7 @@ class ImageTestCase extends SeleniumTestCase
 {

 	function test ()

 	{

-		$this->open("../../demos/quickstart/index.php?page=Controls.Samples.TImage.Home&functionaltest=true", "");

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

 

 		$this->verifyTitle("PRADO QuickStart Sample", "");

 

diff --git a/tests/FunctionalTests/quickstart_tests/Controls/LabelTestCase.php b/tests/FunctionalTests/quickstart_tests/Controls/LabelTestCase.php
index 33ec790c..aa045e0c 100644
--- a/tests/FunctionalTests/quickstart_tests/Controls/LabelTestCase.php
+++ b/tests/FunctionalTests/quickstart_tests/Controls/LabelTestCase.php
@@ -5,7 +5,7 @@ class LabelTestCase extends SeleniumTestCase
 {

 	function test ()

 	{

-		$this->open("../../demos/quickstart/index.php?page=Controls.Samples.TLabel.Home&functionaltest=true", "");

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

 		$this->verifyTitle("PRADO QuickStart Sample", "");

 		$this->verifyTextPresent("This is a label with customized color and font.", "");

 		$this->verifyTextPresent("This is a form label associated with the TTextBox control below", "");

diff --git a/tests/FunctionalTests/quickstart_tests/Controls/LinkButtonTestCase.php b/tests/FunctionalTests/quickstart_tests/Controls/LinkButtonTestCase.php
index dfffb1d8..49c3c61a 100644
--- a/tests/FunctionalTests/quickstart_tests/Controls/LinkButtonTestCase.php
+++ b/tests/FunctionalTests/quickstart_tests/Controls/LinkButtonTestCase.php
@@ -4,7 +4,7 @@ class LinkButtonTestCase extends SeleniumTestCase
 {

 	function test ()

 	{

-		$this->open("../../demos/quickstart/index.php?page=Controls.Samples.TLinkButton.Home&functionaltest=true", "");

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

 

 		$this->verifyTitle("PRADO QuickStart Sample", "");

 

diff --git a/tests/FunctionalTests/quickstart_tests/Controls/ListBoxTestCase.php b/tests/FunctionalTests/quickstart_tests/Controls/ListBoxTestCase.php
index e91ecd9e..6f86719a 100644
--- a/tests/FunctionalTests/quickstart_tests/Controls/ListBoxTestCase.php
+++ b/tests/FunctionalTests/quickstart_tests/Controls/ListBoxTestCase.php
@@ -5,7 +5,7 @@ class ListBoxTestCase extends SeleniumTestCase
 {

 	function test ()

 	{

-		$this->open("../../demos/quickstart/index.php?page=Controls.Samples.TListBox.Home&functionaltest=true", "");

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

 

 		// a default single selection listbox

 		$this->verifyAttribute("ctl0\$body\$ctl0@size","4");

diff --git a/tests/FunctionalTests/quickstart_tests/Controls/PanelTestCase.php b/tests/FunctionalTests/quickstart_tests/Controls/PanelTestCase.php
index 8eb8a127..32134512 100644
--- a/tests/FunctionalTests/quickstart_tests/Controls/PanelTestCase.php
+++ b/tests/FunctionalTests/quickstart_tests/Controls/PanelTestCase.php
@@ -4,7 +4,7 @@ class PanelTestCase extends SeleniumTestCase
 {

 	function test ()

 	{

-		$this->open("../../demos/quickstart/index.php?page=Controls.Samples.TPanel.Home&functionaltest=true", "");

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

 		$this->verifyTextPresent("This is panel content with", "");

 		$this->verifyElementPresent("//span[text()='label']");

 		$this->verifyTextPresent("grouping text", "");

diff --git a/tests/FunctionalTests/quickstart_tests/Controls/RadioButtonListTestCase.php b/tests/FunctionalTests/quickstart_tests/Controls/RadioButtonListTestCase.php
index b7156932..b6242d05 100644
--- a/tests/FunctionalTests/quickstart_tests/Controls/RadioButtonListTestCase.php
+++ b/tests/FunctionalTests/quickstart_tests/Controls/RadioButtonListTestCase.php
@@ -5,7 +5,7 @@ class RadioButtonListTestCase extends SeleniumTestCase
 {

 	function test ()

 	{

-		$this->open("../../demos/quickstart/index.php?page=Controls.Samples.TRadioButtonList.Home&functionaltest=true", "");

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

 

 		// RadioButton list with default settings:

 		$this->click("//input[@name='ctl0\$body\$ctl0' and @value='value 3']", "");

diff --git a/tests/FunctionalTests/quickstart_tests/Controls/RadioButtonTestCase.php b/tests/FunctionalTests/quickstart_tests/Controls/RadioButtonTestCase.php
index bda7ca2d..d6d5f2e3 100644
--- a/tests/FunctionalTests/quickstart_tests/Controls/RadioButtonTestCase.php
+++ b/tests/FunctionalTests/quickstart_tests/Controls/RadioButtonTestCase.php
@@ -4,7 +4,7 @@ class RadioButtonTestCase extends SeleniumTestCase
 {

 	function test ()

 	{

-		$this->open("../../demos/quickstart/index.php?page=Controls.Samples.TRadioButton.Home&functionaltest=true", "");

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

 

 		$this->verifyTitle("PRADO QuickStart Sample", "");

 

diff --git a/tests/FunctionalTests/quickstart_tests/Controls/TableTestCase.php b/tests/FunctionalTests/quickstart_tests/Controls/TableTestCase.php
index 24232b80..e9bd63be 100644
--- a/tests/FunctionalTests/quickstart_tests/Controls/TableTestCase.php
+++ b/tests/FunctionalTests/quickstart_tests/Controls/TableTestCase.php
@@ -4,7 +4,7 @@ class TableTestCase extends SeleniumTestCase
 {

 	function test ()

 	{

-		$this->open("../../demos/quickstart/index.php?page=Controls.Samples.TTable.Home&functionaltest=true", "");

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

 

 		$this->verifyElementPresent("//table[@rules='all' and @border='1']");

 		$this->verifyElementPresent("//table/caption[@align='bottom' and text()='This is table caption']");

diff --git a/tests/FunctionalTests/quickstart_tests/Controls/TextBoxTestCase.php b/tests/FunctionalTests/quickstart_tests/Controls/TextBoxTestCase.php
index 7bb06915..e1c76938 100644
--- a/tests/FunctionalTests/quickstart_tests/Controls/TextBoxTestCase.php
+++ b/tests/FunctionalTests/quickstart_tests/Controls/TextBoxTestCase.php
@@ -4,7 +4,7 @@ class TextBoxTestCase extends SeleniumTestCase
 {

 	function test ()

 	{

-		$this->open("../../demos/quickstart/index.php?page=Controls.Samples.TTextBox.Home&functionaltest=true", "");

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

 

 		$this->verifyTitle("PRADO QuickStart Sample", "");

 

diff --git a/tests/FunctionalTests/quickstart_tests/Fundamentals/HangmanTestCase.php b/tests/FunctionalTests/quickstart_tests/Fundamentals/HangmanTestCase.php
index 27537263..cad3dc0e 100644
--- a/tests/FunctionalTests/quickstart_tests/Fundamentals/HangmanTestCase.php
+++ b/tests/FunctionalTests/quickstart_tests/Fundamentals/HangmanTestCase.php
@@ -4,7 +4,7 @@ class HangmanTestCase extends SeleniumTestCase
 {

 	function test ()

 	{

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

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

 		$this->verifyTitle("Hangman Game", "");

 		$this->verifyTextPresent("Medium game; you are allowed 5 misses.", "");

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

diff --git a/tests/FunctionalTests/quickstart_tests/Fundamentals/HelloWorldTestCase.php b/tests/FunctionalTests/quickstart_tests/Fundamentals/HelloWorldTestCase.php
index 8aea86f6..e3da5a72 100644
--- a/tests/FunctionalTests/quickstart_tests/Fundamentals/HelloWorldTestCase.php
+++ b/tests/FunctionalTests/quickstart_tests/Fundamentals/HelloWorldTestCase.php
@@ -5,7 +5,7 @@ class HelloWorldTestCase extends SeleniumTestCase
 {

 	function test ()

 	{

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

+		$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']", "");