From 3db08b4d991c02870d04f7198d65fd926805709c Mon Sep 17 00:00:00 2001
From: Fabio Bas <ctrlaltca@gmail.com>
Date: Tue, 25 Feb 2014 22:43:00 +0100
Subject: Ensure all tests have a proper doctype and html structure, to avoid
 browser's quirks mode (cherry picked from commit
 a0d6864093cf13a96dafa8a47b5c43891b2b864f)

Conflicts:
	tests/FunctionalTests/active-controls/protected/pages/ActivePanelTest.page
	tests/FunctionalTests/active-controls/protected/pages/PostLoadingTest.page
---
 .../protected/pages/ActiveBricksTest.page          |  4 +--
 .../protected/pages/ActiveButtonTest.page          |  4 +--
 .../protected/pages/ActiveCheckBoxTest.page        |  4 +--
 .../pages/ActiveControlExpressionTag.page          |  4 +--
 .../protected/pages/ActiveControlWithTinyMce.page  |  4 +--
 .../protected/pages/ActiveDatePicker.page          |  9 ++---
 .../protected/pages/ActiveDropDownList.page        |  4 +--
 .../protected/pages/ActiveHiddenFieldTest.page     |  4 +--
 .../protected/pages/ActiveHyperLinkTest.page       |  4 +--
 .../protected/pages/ActiveImageButtonTest.page     |  4 +--
 .../protected/pages/ActiveLinkButtonTest.page      |  4 +--
 .../protected/pages/ActiveListBoxTest.page         |  4 +--
 .../protected/pages/ActivePanelTest.page           |  8 ++---
 .../protected/pages/ActivePanelVisibleTest.page    |  4 +--
 .../protected/pages/ActiveRadioButtonListTest.page |  4 +--
 .../protected/pages/ActiveRadioButtonTest.page     |  4 +--
 .../pages/ActiveRatingListAllowInputTest.page      |  5 ++-
 .../pages/ActiveRatingListAutoPostBackTest.page    |  5 ++-
 .../pages/ActiveRatingListCheckBoxesTest.page      |  5 ++-
 .../pages/ActiveRatingListEnabledTest.page         |  5 ++-
 .../pages/ActiveRatingListHoverCaptionTest.page    |  5 ++-
 .../pages/ActiveRatingListRatingTest.page          |  5 ++-
 .../pages/ActiveRatingListReadOnlyTest.page        |  5 ++-
 .../pages/ActiveRatingListSelectedIndexTest.page   |  5 ++-
 .../protected/pages/ActiveRedirectionTest.page     |  4 +--
 .../protected/pages/ActiveTextBoxCallback.page     |  4 +--
 .../protected/pages/AutoCompleteTest.page          |  4 +--
 .../protected/pages/Calculator.page                | 18 +++++-----
 .../active-controls/protected/pages/Callback.page  |  4 +--
 .../pages/CallbackCustomValidatorTest.page         |  4 +--
 .../protected/pages/CallbackOptionsTest.page       |  4 +--
 .../protected/pages/ClientSideDispatch.page        |  4 +--
 .../protected/pages/ControlAdapterTest.page        |  4 +--
 .../protected/pages/CustomTemplateControlTest.page |  4 +--
 .../protected/pages/CustomValidatorByPass.page     |  4 +--
 .../protected/pages/DatePickerInCallback.page      |  4 +--
 .../protected/pages/DelayedCallback.page           |  4 +--
 .../protected/pages/DisplayStyleTest.page          |  4 +--
 .../protected/pages/DynamicRepeaterDataTest.page   |  4 +--
 .../protected/pages/EventTriggeredCallback.page    |  4 +--
 .../protected/pages/FeatureList.page               |  6 ++--
 .../active-controls/protected/pages/GerTurno2.page |  4 +--
 .../protected/pages/InPlaceWithValidator.page      |  5 ++-
 .../protected/pages/LargePageStateTest.page        |  4 +--
 .../protected/pages/LargePageStateTest2.page       |  4 +--
 .../active-controls/protected/pages/Layout.php     |  5 +++
 .../active-controls/protected/pages/Layout.tpl     | 38 ++++++++++++++++++++++
 .../protected/pages/MessagesPanelTest.page         |  4 +--
 .../protected/pages/MyTabPanelTest.page            |  4 +--
 .../protected/pages/NestedActiveControls.page      |  4 +--
 .../protected/pages/NullStateTest.page             |  4 +--
 .../protected/pages/PopulateActiveList.page        |  4 +--
 .../protected/pages/PostLoadingTest.page           |  5 ++-
 .../protected/pages/RadioButtonListTest.page       |  4 +--
 .../protected/pages/RatingList.page                |  5 ++-
 .../pages/RepeaterWithActiveControls.page          |  4 +--
 .../protected/pages/ReplaceContentTest.page        |  4 +--
 .../protected/pages/Sessioned/PageStateTest.page   |  7 ++--
 .../protected/pages/TActiveCheckBoxListTest.page   |  4 +--
 .../pages/TActiveFileUploadAutoPostBackTest.page   |  4 +--
 .../protected/pages/TInPlaceTextBoxTest.page       |  5 ++-
 .../protected/pages/TextBoxValidationCallback.page |  4 +--
 .../protected/pages/TimeTriggeredCallbackTest.page |  4 +--
 .../protected/pages/ValueTriggerCallbackTest.page  |  5 ++-
 .../active-controls/protected/pages/config.xml     |  5 +++
 tests/test_tools/PradoGenericSelenium2Test.php     | 22 +++++++------
 tests/test_tools/PradoGenericSeleniumTest.php      | 24 +++++++-------
 67 files changed, 207 insertions(+), 176 deletions(-)
 create mode 100755 tests/FunctionalTests/active-controls/protected/pages/Layout.php
 create mode 100755 tests/FunctionalTests/active-controls/protected/pages/Layout.tpl
 create mode 100755 tests/FunctionalTests/active-controls/protected/pages/config.xml

(limited to 'tests')

diff --git a/tests/FunctionalTests/active-controls/protected/pages/ActiveBricksTest.page b/tests/FunctionalTests/active-controls/protected/pages/ActiveBricksTest.page
index 4ea65f04..f3df76a2 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/ActiveBricksTest.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/ActiveBricksTest.page
@@ -1,4 +1,4 @@
-<com:TForm>
+<com:TContent ID="Content">
 	<h3 class="ContentAlternating">Some AJAX Tests</h3>
 	<com:TPanel CssClass="Content">
 
@@ -37,4 +37,4 @@
 		AIP
 	</com:TActivePanel>
 
-</com:TForm>
\ No newline at end of file
+</com:TContent>
\ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/ActiveButtonTest.page b/tests/FunctionalTests/active-controls/protected/pages/ActiveButtonTest.page
index a5788625..9e293934 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/ActiveButtonTest.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/ActiveButtonTest.page
@@ -1,4 +1,4 @@
-<com:TForm ID="form1">
+<com:TContent ID="Content">
 
 	<h1>TActiveButton Functional Test</h1>
 	<com:TActiveButton ID="button2" Text="Button 1"
@@ -6,4 +6,4 @@
 
 	<com:TActiveLabel ID="label1" Text="Label 1" />
 
-</com:TForm>
\ No newline at end of file
+</com:TContent>
\ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/ActiveCheckBoxTest.page b/tests/FunctionalTests/active-controls/protected/pages/ActiveCheckBoxTest.page
index cea4d3d8..297cde15 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/ActiveCheckBoxTest.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/ActiveCheckBoxTest.page
@@ -1,4 +1,4 @@
-<com:TForm ID="form1">
+<com:TContent ID="Content">
 	<h1>Active CheckBox Test</h1>
 	<com:TActiveCheckBox ID="checkbox1" Text="CheckBox 1" OnCallback="checkbox_requested" />
 	<com:TActiveCheckBox ID="checkbox2" Text="CheckBox 2" OnCallback="checkbox_requested">
@@ -25,4 +25,4 @@
 		position: absolute; right: 0; top: 0">
 		Loading...
 	</div>
-</com:TForm>
\ No newline at end of file
+</com:TContent>
\ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/ActiveControlExpressionTag.page b/tests/FunctionalTests/active-controls/protected/pages/ActiveControlExpressionTag.page
index b4ce61d4..5a1c5023 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/ActiveControlExpressionTag.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/ActiveControlExpressionTag.page
@@ -1,4 +1,4 @@
-<com:TForm>
+<com:TContent ID="Content">
 
 <h1>Active Control With Expression Tag Test</h1>
 
@@ -23,4 +23,4 @@
 	OnCallback="button2_callback" />
 
 
-</com:TForm>
\ No newline at end of file
+</com:TContent>
\ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/ActiveControlWithTinyMce.page b/tests/FunctionalTests/active-controls/protected/pages/ActiveControlWithTinyMce.page
index c6748403..9a561458 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/ActiveControlWithTinyMce.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/ActiveControlWithTinyMce.page
@@ -1,4 +1,4 @@
-<com:TForm>
+<com:TContent ID="Content">
 <h1>Active Control with TinyMCE</h1>
 
 <com:THtmlArea ID="text1" />
@@ -7,4 +7,4 @@
 
 <com:TActiveLabel ID="label1" />
 
-</com:TForm>
\ No newline at end of file
+</com:TContent>
\ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/ActiveDatePicker.page b/tests/FunctionalTests/active-controls/protected/pages/ActiveDatePicker.page
index 88117744..8d38c758 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/ActiveDatePicker.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/ActiveDatePicker.page
@@ -1,7 +1,4 @@
-<html>
-<com:THead/>
-<body>
-<com:TForm>
+<com:TContent ID="Content">
 <h1>TActiveDatePicker test</h1>
 <p>
 <com:TActiveDatePicker ID="datepicker" DateFormat="MM-dd-yyyy" OnCallback="testDatePicker"/>
@@ -23,6 +20,4 @@ ShowCalendar=false
 <com:TActiveDatePicker ID="datepicker3" DateFormat="MMMM/yyyy" OnCallback="testDatePicker3" InputMode="DropDownList" ShowCalendar="true"/>
 <com:TActiveLabel ID="status3" /><br/>
 
-</com:TForm>
-</body>
-</html>
\ No newline at end of file
+</com:TContent>
\ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/ActiveDropDownList.page b/tests/FunctionalTests/active-controls/protected/pages/ActiveDropDownList.page
index 4fcd789a..bf15ba0e 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/ActiveDropDownList.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/ActiveDropDownList.page
@@ -1,4 +1,4 @@
-<com:TForm ID="form1">
+<com:TContent ID="Content">
 	<h1>Active Drop Down List Test Case</h1>
 
 	<com:TActiveDropDownList ID="list1" AutoPostBack="true" SelectedIndex="0" OnSelectedIndexChanged="list1_changed">
@@ -26,4 +26,4 @@
 		<com:TButton ID="button5" Text="Post Back" OnClick="do_postback"/>
 	</div>
 
-</com:TForm>
\ No newline at end of file
+</com:TContent>
\ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/ActiveHiddenFieldTest.page b/tests/FunctionalTests/active-controls/protected/pages/ActiveHiddenFieldTest.page
index 837cc580..317da643 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/ActiveHiddenFieldTest.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/ActiveHiddenFieldTest.page
@@ -1,4 +1,4 @@
-<com:TForm ID="form1">
+<com:TContent ID="Content">
     <h1>Active HiddenField Test Case</h1>
 
     <com:TActiveHiddenField ID="HiddenFieldEmpty" />
@@ -12,4 +12,4 @@
     <div>
         <com:TActiveLabel ID="ResponseLabel" Text="Value of current hidden field" />
     </div>
-</com:TForm>
\ No newline at end of file
+</com:TContent>
\ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/ActiveHyperLinkTest.page b/tests/FunctionalTests/active-controls/protected/pages/ActiveHyperLinkTest.page
index 740c3b21..9b149b45 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/ActiveHyperLinkTest.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/ActiveHyperLinkTest.page
@@ -1,4 +1,4 @@
-<com:TForm ID="form1">
+<com:TContent ID="Content">
 	<h1>Active HyperLink Test Case</h1>
 
 	<div style="margin:1em; padding:1em; border:1px solid #ccc; text-align:center;">
@@ -8,4 +8,4 @@
 	<com:TActiveButton ID="button2" Text="Change Image" OnClick="change_image" />
 	<com:TActiveButton ID="button3" Text="Change Target" OnClick="change_target" />
 	<com:TActiveButton ID="button4" Text="Change URL" OnClick="change_url" />
-</com:TForm>
\ No newline at end of file
+</com:TContent>
\ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/ActiveImageButtonTest.page b/tests/FunctionalTests/active-controls/protected/pages/ActiveImageButtonTest.page
index ff0f588f..15cf2380 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/ActiveImageButtonTest.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/ActiveImageButtonTest.page
@@ -1,4 +1,4 @@
-<com:TForm ID="form1">
+<com:TContent ID="Content">
 
 	<h1>TActiveImageButton Functional Test</h1>
 
@@ -19,4 +19,4 @@
 	<com:TActiveButton ID="button3" Text="Change Align" OnClick="change_align" />
 	<com:TActiveButton ID="button4" Text="Change Description" OnClick="change_description" />
 
-</com:TForm>
\ No newline at end of file
+</com:TContent>
\ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/ActiveLinkButtonTest.page b/tests/FunctionalTests/active-controls/protected/pages/ActiveLinkButtonTest.page
index 39c53fe8..16ea578d 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/ActiveLinkButtonTest.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/ActiveLinkButtonTest.page
@@ -1,4 +1,4 @@
-<com:TForm ID="form1">
+<com:TContent ID="Content">
 
 	<h1>TActiveLinkButton Functional Test</h1>
 	<com:TActiveLinkButton ID="button2" Text="Button 1"
@@ -6,4 +6,4 @@
 
 	<com:TActiveLabel ID="label1" Text="Label 1" />
 
-</com:TForm>
\ No newline at end of file
+</com:TContent>
\ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/ActiveListBoxTest.page b/tests/FunctionalTests/active-controls/protected/pages/ActiveListBoxTest.page
index bf13a61b..2bf480b4 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/ActiveListBoxTest.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/ActiveListBoxTest.page
@@ -1,4 +1,4 @@
-<com:TForm ID="form1">
+<com:TContent ID="Content">
 
 	<h1>Active List Box Functional Test</h1>
 
@@ -22,4 +22,4 @@
 		<com:TActiveButton ID="button6" Text="Change to Multi-Select" OnClick="change_to_multiple" />
 		<com:TActiveButton ID="button7" Text="Change to Single-Select" OnClick="change_to_single" />
 	</div>
-</com:TForm>
\ No newline at end of file
+</com:TContent>
\ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/ActivePanelTest.page b/tests/FunctionalTests/active-controls/protected/pages/ActivePanelTest.page
index a836de5b..2ba1c6ba 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/ActivePanelTest.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/ActivePanelTest.page
@@ -1,4 +1,4 @@
-<com:TForm ID="form1">
+<com:TContent ID="Content">
 	<h1>Active Panel replacement tests </h1>
 	<com:TCallback ID="callback1" OnCallback="callback1_requested" />
 	<com:TActivePanel ID="panel1">
@@ -16,6 +16,6 @@
 			{
 				Prado.Callback("<%= $this->callback1->UniqueID %>")
 			})
-		})
-	</script>
-</com:TForm>
\ No newline at end of file
+    })
+  </script>
+</com:TContent>
diff --git a/tests/FunctionalTests/active-controls/protected/pages/ActivePanelVisibleTest.page b/tests/FunctionalTests/active-controls/protected/pages/ActivePanelVisibleTest.page
index cb2802e5..93684bef 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/ActivePanelVisibleTest.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/ActivePanelVisibleTest.page
@@ -1,4 +1,4 @@
-<com:TForm>
+<com:TContent ID="Content">
 
 <h1>ActivePanel Visible Test</h1>
 
@@ -13,4 +13,4 @@
 <com:TActivePanel ID="pnlB">bar</com:TActivePanel>
 
 
-</com:TForm>
\ No newline at end of file
+</com:TContent>
\ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/ActiveRadioButtonListTest.page b/tests/FunctionalTests/active-controls/protected/pages/ActiveRadioButtonListTest.page
index 1c59cfed..e222a70f 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/ActiveRadioButtonListTest.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/ActiveRadioButtonListTest.page
@@ -1,4 +1,4 @@
-<com:TForm ID="form1">
+<com:TContent ID="Content">
 	<h1>TActiveRadioButtonList Test Case</h1>
 
 	<com:TActiveRadioButtonList ID="list1" OnCallback="list1_callback">
@@ -17,4 +17,4 @@
 		<com:TActiveButton ID="button4" Text="Select Index 4" OnClick="select_index_4" />
 	</div>
 
-</com:TForm>
\ No newline at end of file
+</com:TContent>
\ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/ActiveRadioButtonTest.page b/tests/FunctionalTests/active-controls/protected/pages/ActiveRadioButtonTest.page
index 18e4fc37..66587943 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/ActiveRadioButtonTest.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/ActiveRadioButtonTest.page
@@ -1,4 +1,4 @@
-<com:TForm ID="form1">
+<com:TContent ID="Content">
 	<h1>Active Radio Button Test</h1>
 	<com:TActiveRadioButton ID="radio1"
 			GroupName="group1" Text="Radio Button 1"
@@ -34,4 +34,4 @@
 		position: absolute; right: 0; top: 0">
 		Loading...
 	</div>
-</com:TForm>
\ No newline at end of file
+</com:TContent>
\ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/ActiveRatingListAllowInputTest.page b/tests/FunctionalTests/active-controls/protected/pages/ActiveRatingListAllowInputTest.page
index 35fcadc7..d3c551b4 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/ActiveRatingListAllowInputTest.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/ActiveRatingListAllowInputTest.page
@@ -1,5 +1,4 @@
-<com:THead />
-<com:TForm ID="form1">
+<com:TContent ID="Content">
 	<h1>TActiveRatingList AllowInput Test Case</h1>
 	<com:TActiveRatingList ID="RatingList" AllowInput="false"
 		OnSelectedIndexChanged="ratingChanged">
@@ -11,4 +10,4 @@
 		<com:TListItem Text="Super" />
 	</com:TActiveRatingList>
 	<com:TActiveLabel ID="Status" Text="AllowInput=false" />
-</com:TForm>
\ No newline at end of file
+</com:TContent>
\ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/ActiveRatingListAutoPostBackTest.page b/tests/FunctionalTests/active-controls/protected/pages/ActiveRatingListAutoPostBackTest.page
index 84ce4ef3..e0d3cbbe 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/ActiveRatingListAutoPostBackTest.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/ActiveRatingListAutoPostBackTest.page
@@ -1,5 +1,4 @@
-<com:THead />
-<com:TForm ID="form1">
+<com:TContent ID="Content">
 	<h1>TActiveRatingList AutoPostBack Test Case</h1>
 	<com:TActiveRatingList ID="RatingList" AutoPostback="false"
 		OnSelectedIndexChanged="ratingChanged">
@@ -13,4 +12,4 @@
 	<com:TActiveLabel ID="Status" Text="AutoPostback=false" />
 	<br />
 	<com:TActiveButton ID="Submit" Text="Submit" />
-</com:TForm>
\ No newline at end of file
+</com:TContent>
\ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/ActiveRatingListCheckBoxesTest.page b/tests/FunctionalTests/active-controls/protected/pages/ActiveRatingListCheckBoxesTest.page
index 36f4404d..cba50947 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/ActiveRatingListCheckBoxesTest.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/ActiveRatingListCheckBoxesTest.page
@@ -1,5 +1,4 @@
-<com:THead />
-<com:TForm ID="form1">
+<com:TContent ID="Content">
 	<h1>TActiveRatingList Check Boxes Test Case</h1>
 	<com:TActiveRatingList ID="RatingList">
 		<com:TListItem Text="Poor" />
@@ -9,4 +8,4 @@
 		<com:TListItem Text="Excellent" />
 		<com:TListItem Text="Super" />
 	</com:TActiveRatingList>
-</com:TForm>
\ No newline at end of file
+</com:TContent>
\ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/ActiveRatingListEnabledTest.page b/tests/FunctionalTests/active-controls/protected/pages/ActiveRatingListEnabledTest.page
index 5f732e0d..791176df 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/ActiveRatingListEnabledTest.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/ActiveRatingListEnabledTest.page
@@ -1,5 +1,4 @@
-<com:THead />
-<com:TForm ID="form1">
+<com:TContent ID="Content">
 	<h1>TActiveRatingList Enabled Test Case</h1>
 	<com:TActiveRatingList ID="RatingList" Enabled="false"
 		OnSelectedIndexChanged="ratingChanged">
@@ -14,4 +13,4 @@
 	<br />
 	<com:TActiveButton ID="Enable" Text="Enable" OnClick="enable" />
 	<com:TActiveButton ID="Disable" Text="Disable" OnClick="disable" />
-</com:TForm>
\ No newline at end of file
+</com:TContent>
\ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/ActiveRatingListHoverCaptionTest.page b/tests/FunctionalTests/active-controls/protected/pages/ActiveRatingListHoverCaptionTest.page
index 01e47a34..0a2a5f50 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/ActiveRatingListHoverCaptionTest.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/ActiveRatingListHoverCaptionTest.page
@@ -1,5 +1,4 @@
-<com:THead />
-<com:TForm ID="form1">
+<com:TContent ID="Content">
 	<h1>TActiveRatingList Hover Caption Test Case</h1>
 	<com:TActiveRatingList ID="RatingList" CaptionID="Status"
 		OnSelectedIndexChanged="ratingChanged" Rating="3.5">
@@ -11,4 +10,4 @@
 		<com:TListItem Text="Super" />
 	</com:TActiveRatingList>
 	<com:TActiveLabel ID="Status" Text="CaptionID='Status'" />
-</com:TForm>
\ No newline at end of file
+</com:TContent>
\ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/ActiveRatingListRatingTest.page b/tests/FunctionalTests/active-controls/protected/pages/ActiveRatingListRatingTest.page
index 942a5b45..c9aed5b4 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/ActiveRatingListRatingTest.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/ActiveRatingListRatingTest.page
@@ -1,5 +1,4 @@
-<com:THead />
-<com:TForm ID="form1">
+<com:TContent ID="Content">
 	<h1>TActiveRatingList Rating Test Case</h1>
 	<com:TActiveRatingList ID="RatingList" Rating="5"
 		OnSelectedIndexChanged="ratingChanged">
@@ -14,4 +13,4 @@
 	<br />
 	<com:TActiveButton ID="SetRating" Text="Set Rating=3"
 		OnClick="setRating" />
-</com:TForm>
\ No newline at end of file
+</com:TContent>
\ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/ActiveRatingListReadOnlyTest.page b/tests/FunctionalTests/active-controls/protected/pages/ActiveRatingListReadOnlyTest.page
index dad3fd6e..70220e58 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/ActiveRatingListReadOnlyTest.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/ActiveRatingListReadOnlyTest.page
@@ -1,5 +1,4 @@
-<com:THead />
-<com:TForm ID="form1">
+<com:TContent ID="Content">
 	<h1>TActiveRatingList ReadOnly Test Case</h1>
 	<com:TActiveRatingList ID="RatingList" ReadOnly="true"
 		OnSelectedIndexChanged="ratingChanged">
@@ -14,4 +13,4 @@
 	<br />
 	<com:TActiveButton ID="Writable" Text="Writable" OnClick="writable" />
 	<com:TActiveButton ID="ReadOnly" Text="ReadOnly" OnClick="readOnly" />
-</com:TForm>
\ No newline at end of file
+</com:TContent>
\ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/ActiveRatingListSelectedIndexTest.page b/tests/FunctionalTests/active-controls/protected/pages/ActiveRatingListSelectedIndexTest.page
index 6fb52822..ee26568d 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/ActiveRatingListSelectedIndexTest.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/ActiveRatingListSelectedIndexTest.page
@@ -1,5 +1,4 @@
-<com:THead />
-<com:TForm ID="form1">
+<com:TContent ID="Content">
 	<h1>TActiveRatingList SelectedIndex Test Case</h1>
 	<com:TActiveRatingList ID="RatingList" SelectedIndex="1"
 		OnSelectedIndexChanged="ratingChanged">
@@ -14,4 +13,4 @@
 	<br />
 	<com:TActiveButton ID="SetSelectedIndex" Text="Set SelectedIndex=5"
 		OnClick="setSelectedIndex" />
-</com:TForm>
\ No newline at end of file
+</com:TContent>
\ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/ActiveRedirectionTest.page b/tests/FunctionalTests/active-controls/protected/pages/ActiveRedirectionTest.page
index fa0d8caa..8f4e175d 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/ActiveRedirectionTest.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/ActiveRedirectionTest.page
@@ -1,7 +1,7 @@
-<com:TForm>
+<com:TContent ID="Content">
 <h1>Redirection Test</h1>
 
 <com:TActiveButton Text="Redirect to Default Page" OnClick="button_clicked" />
 
 
-</com:TForm>
\ No newline at end of file
+</com:TContent>
\ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/ActiveTextBoxCallback.page b/tests/FunctionalTests/active-controls/protected/pages/ActiveTextBoxCallback.page
index d0a750ac..50b244b5 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/ActiveTextBoxCallback.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/ActiveTextBoxCallback.page
@@ -1,5 +1,5 @@
-<com:TForm ID="form1">
+<com:TContent ID="Content">
 	<h1>ActiveTextBox Callback Test</h1>
 	<com:TActiveTextBox	ID="textbox1" AutoPostBack="true" OnCallback="textbox1_callback" />
 	<com:TActiveLabel ID="label1" Text="Label 1" />
-</com:TForm>
\ No newline at end of file
+</com:TContent>
\ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/AutoCompleteTest.page b/tests/FunctionalTests/active-controls/protected/pages/AutoCompleteTest.page
index f4fffc63..98745b55 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/AutoCompleteTest.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/AutoCompleteTest.page
@@ -1,4 +1,4 @@
-<com:TForm ID="form1">
+<com:TContent ID="Content">
 
 	<style>
 	.autocomplete
@@ -91,4 +91,4 @@
 	<p><br /></p>
 	<p><br /></p>
 	<p><br /></p>
-</com:TForm>
\ No newline at end of file
+</com:TContent>
\ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/Calculator.page b/tests/FunctionalTests/active-controls/protected/pages/Calculator.page
index 7a565658..e7b1f180 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/Calculator.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/Calculator.page
@@ -1,17 +1,17 @@
-<com:TForm ID="form1">
+<com:TContent ID="Content">
 	<h1>Callback Enabled Calculator</h1>
-	
+
 	<com:TActiveTextBox id="a" />
 	+
 	<com:TActiveTextBox id="b" />
 	=
 	<com:TActiveTextBox id="c" />
-	
-	<com:TActiveButton id="sum" 
-		onclick="do_sum" 
+
+	<com:TActiveButton id="sum"
+		onclick="do_sum"
 		text="Calculate!" />
-	
-	<com:TRequiredFieldValidator 
+
+	<com:TRequiredFieldValidator
 			ControlToValidate="a"
 			ErrorMessage="left summand is required."
 			ControlCssClass="required"
@@ -27,5 +27,5 @@
 			ID="summary"
 			HeaderText="Unable to calculate because" />
 	</div>
-	
-</com:TForm>
\ No newline at end of file
+
+</com:TContent>
\ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/Callback.page b/tests/FunctionalTests/active-controls/protected/pages/Callback.page
index 3404cf6e..f8489af3 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/Callback.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/Callback.page
@@ -1,4 +1,4 @@
-<com:TForm>
+<com:TContent ID="Content">
 
 	<com:TCallback ID="callback1" OnCallback="callback1_Requested" />
 	 <script type="text/javascript">
@@ -10,4 +10,4 @@
 	</script>
 	<div onclick="do_callback1()">Click Me!</div>
 
-</com:TForm>
\ No newline at end of file
+</com:TContent>
\ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/CallbackCustomValidatorTest.page b/tests/FunctionalTests/active-controls/protected/pages/CallbackCustomValidatorTest.page
index 4c82da40..134e45cb 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/CallbackCustomValidatorTest.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/CallbackCustomValidatorTest.page
@@ -1,4 +1,4 @@
-<com:TForm ID="form1">
+<com:TContent ID="Content">
 <style>
 	.loader
 	{
@@ -37,4 +37,4 @@
 
 	<span id="loader" style="display:none;" onfocus="alert('ok')" class="loader">Loading...</span>
 
-</com:TForm>
\ No newline at end of file
+</com:TContent>
\ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/CallbackOptionsTest.page b/tests/FunctionalTests/active-controls/protected/pages/CallbackOptionsTest.page
index 3cecbade..a82a0d0a 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/CallbackOptionsTest.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/CallbackOptionsTest.page
@@ -1,4 +1,4 @@
-<com:TForm ID="form1">
+<com:TContent ID="Content">
 	<h1>TCallbackOptions Test</h1>
 
 	<com:TCallbackOptions ID="options1">
@@ -31,4 +31,4 @@
 	<div id="status" style="display:none; background-color: #c00; color:white; text-align:center; padding: 1em" >
 		Loading...
 	</div>
-</com:TForm>
\ No newline at end of file
+</com:TContent>
diff --git a/tests/FunctionalTests/active-controls/protected/pages/ClientSideDispatch.page b/tests/FunctionalTests/active-controls/protected/pages/ClientSideDispatch.page
index de4ea482..3b5ed15f 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/ClientSideDispatch.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/ClientSideDispatch.page
@@ -1,4 +1,4 @@
-<com:TForm>
+<com:TContent ID="Content">
 
 <com:TCallback ID="callback1" OnCallback="method1" />
 
@@ -23,4 +23,4 @@
 <com:TActiveLabel ID="status2" />
 
 
-</com:TForm>
\ No newline at end of file
+</com:TContent>
\ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/ControlAdapterTest.page b/tests/FunctionalTests/active-controls/protected/pages/ControlAdapterTest.page
index c5642712..2dc07852 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/ControlAdapterTest.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/ControlAdapterTest.page
@@ -1,4 +1,4 @@
-<com:TForm ID="form1">
+<com:TContent ID="Content">
 	<h1>Control Adapter - State Tracking Tests</h1>
 	<com:TActiveButton ID="button1" Text="Test Button 1" />
 	<com:TActiveButton ID="button2" Text="Test Button 2"
@@ -19,4 +19,4 @@
 		<com:TActiveButton ID="test8" Text="Change Button 1 Attributes" OnClick="change_attributes1"/>
 		<com:TActiveButton ID="test9" Text="Change Button 2 Attributes" OnClick="change_attributes2"/>
 	</div>
-</com:TForm>
\ No newline at end of file
+</com:TContent>
\ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/CustomTemplateControlTest.page b/tests/FunctionalTests/active-controls/protected/pages/CustomTemplateControlTest.page
index 4c0eaf03..cd34ff98 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/CustomTemplateControlTest.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/CustomTemplateControlTest.page
@@ -1,4 +1,4 @@
-<com:TForm ID="form1">
+<com:TContent ID="Content">
 
 	<h1>Add Dynamic Custom TTemplateControl Test</h1>
 	<com:TActivePanel ID="Foo">
@@ -10,4 +10,4 @@
 	<com:TActivePanel ID="placeholder" />
 
 	<com:TActiveLabel ID="label1" Text="Label 1" />
-</com:TForm>
\ No newline at end of file
+</com:TContent>
\ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/CustomValidatorByPass.page b/tests/FunctionalTests/active-controls/protected/pages/CustomValidatorByPass.page
index 28f27b8f..b1fd18ff 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/CustomValidatorByPass.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/CustomValidatorByPass.page
@@ -1,4 +1,4 @@
-<com:TForm>
+<com:TContent ID="Content">
 
 <h1>Custom Login</h1>
 
@@ -34,4 +34,4 @@
 </div>
 
 
-</com:TForm>
\ No newline at end of file
+</com:TContent>
diff --git a/tests/FunctionalTests/active-controls/protected/pages/DatePickerInCallback.page b/tests/FunctionalTests/active-controls/protected/pages/DatePickerInCallback.page
index 8b39dc55..2f51eff2 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/DatePickerInCallback.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/DatePickerInCallback.page
@@ -1,7 +1,7 @@
-<com:TForm>
+<com:TContent ID="Content">
 <h1>DatePicker in Callback</h1>
 
 <com:TDatePicker ID="datepicker" />
 <com:TActiveLinkButton OnCallback="testDatePicker" Text="testDatePicker" />
 <com:TActiveLabel ID="status" />
-</com:TForm>
\ No newline at end of file
+</com:TContent>
\ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/DelayedCallback.page b/tests/FunctionalTests/active-controls/protected/pages/DelayedCallback.page
index d3447635..f858e8eb 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/DelayedCallback.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/DelayedCallback.page
@@ -1,6 +1,6 @@
-<com:TForm>
+<com:TContent ID="Content">
 <h1>Delayed Callback Test</h1>
 <com:TActiveButton ID="button1" Text="Delayed 4000" OnCallback="callback1" />
 <com:TActiveButton ID="button2" Text="Delayed 2000" OnCallback="callback2" />
 <com:TActiveLabel ID="status" />
-</com:TForm>
\ No newline at end of file
+</com:TContent>
\ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/DisplayStyleTest.page b/tests/FunctionalTests/active-controls/protected/pages/DisplayStyleTest.page
index 09ec16ed..c27ea397 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/DisplayStyleTest.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/DisplayStyleTest.page
@@ -1,4 +1,4 @@
-<com:TForm>
+<com:TContent ID="Content">
 <h1>Display Style Test</h1>
 
 <div>
@@ -18,4 +18,4 @@ here.
 <com:TActiveLabel ID="status" />
 
 
-</com:TForm>
\ No newline at end of file
+</com:TContent>
\ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/DynamicRepeaterDataTest.page b/tests/FunctionalTests/active-controls/protected/pages/DynamicRepeaterDataTest.page
index 7863fafe..26407827 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/DynamicRepeaterDataTest.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/DynamicRepeaterDataTest.page
@@ -1,4 +1,4 @@
-<com:TForm>
+<com:TContent ID="Content">
 <h1>Dynamic Repeater Data Test</h1>
 <com:TActiveButton Text="Click Me!" OnClick="button_clicked" OnCallback="button_callback"/>
 
@@ -12,4 +12,4 @@
 </com:TActivePanel>
 
 
-</com:TForm>
\ No newline at end of file
+</com:TContent>
\ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/EventTriggeredCallback.page b/tests/FunctionalTests/active-controls/protected/pages/EventTriggeredCallback.page
index 80d94cbb..1adbaac1 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/EventTriggeredCallback.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/EventTriggeredCallback.page
@@ -1,4 +1,4 @@
-<com:TForm ID="form1">
+<com:TContent ID="Content">
 
 	<h1>Event Triggered Callback Test</h1>
 
@@ -27,4 +27,4 @@
 	<div style="padding: 2em; border:1px solid #ccc; margin-top:2em">
 		<com:TActiveLabel ID="label1" Text="Label 1" />
 	</div>
-</com:TForm>
\ No newline at end of file
+</com:TContent>
\ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/FeatureList.page b/tests/FunctionalTests/active-controls/protected/pages/FeatureList.page
index eab14a87..a01e6b5e 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/FeatureList.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/FeatureList.page
@@ -1,3 +1,3 @@
-<com:TForm ID="form1">
-	<com:TBulletedList ID="List" DisplayMode="HyperLink"/>	
-</com:TForm>
+<com:TContent ID="Content">
+	<com:TBulletedList ID="List" DisplayMode="HyperLink"/>
+</com:TContent>
diff --git a/tests/FunctionalTests/active-controls/protected/pages/GerTurno2.page b/tests/FunctionalTests/active-controls/protected/pages/GerTurno2.page
index 2952c36c..bf2b48b7 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/GerTurno2.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/GerTurno2.page
@@ -1,4 +1,4 @@
-<com:TForm>
+<com:TContent ID="Content">
 
 <com:TLabel ForControl="DDropTurno" Text="Turno:"/>
 <com:TActiveDropDownList ID="DDropTurno"
@@ -12,4 +12,4 @@
 
 
 
-</com:TForm>
\ No newline at end of file
+</com:TContent>
\ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/InPlaceWithValidator.page b/tests/FunctionalTests/active-controls/protected/pages/InPlaceWithValidator.page
index 2a80a57a..e4fd93e9 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/InPlaceWithValidator.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/InPlaceWithValidator.page
@@ -1,4 +1,4 @@
-
+<com:TContent ID="Content">
 <style>
 	.textbox
 	{
@@ -35,7 +35,6 @@
 	}
 </style>
 
-<com:TForm>
   <com:TInPlaceTextBox
   	ID="Firstname"
   	Text="firstname"
@@ -74,4 +73,4 @@
     />
   <br />
   <com:TActiveLabel ID="status" Text="Status:" />
-</com:TForm>
\ No newline at end of file
+</com:TContent>
\ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/LargePageStateTest.page b/tests/FunctionalTests/active-controls/protected/pages/LargePageStateTest.page
index c265f9d2..b4798fe1 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/LargePageStateTest.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/LargePageStateTest.page
@@ -1,4 +1,4 @@
-<com:TForm>
+<com:TContent ID="Content">
 
 <h1>Large Page State Test</h1>
 
@@ -8,4 +8,4 @@
 
 </com:TPanel>
 
-</com:TForm>
\ No newline at end of file
+</com:TContent>
\ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/LargePageStateTest2.page b/tests/FunctionalTests/active-controls/protected/pages/LargePageStateTest2.page
index 168b7b8c..56ad075e 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/LargePageStateTest2.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/LargePageStateTest2.page
@@ -1,5 +1,5 @@
 <%@ StatePersisterClass="System.Web.UI.TSessionPageStatePersister" %>
-<com:TForm>
+<com:TContent ID="Content">
 
 <h1>Large Page State Test (using Session page state)</h1>
 
@@ -9,4 +9,4 @@
 
 </com:TPanel>
 
-</com:TForm>
\ No newline at end of file
+</com:TContent>
\ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/Layout.php b/tests/FunctionalTests/active-controls/protected/pages/Layout.php
new file mode 100755
index 00000000..723f200c
--- /dev/null
+++ b/tests/FunctionalTests/active-controls/protected/pages/Layout.php
@@ -0,0 +1,5 @@
+<?php
+
+class Layout extends TTemplateControl
+{
+}
diff --git a/tests/FunctionalTests/active-controls/protected/pages/Layout.tpl b/tests/FunctionalTests/active-controls/protected/pages/Layout.tpl
new file mode 100755
index 00000000..ead6c66f
--- /dev/null
+++ b/tests/FunctionalTests/active-controls/protected/pages/Layout.tpl
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC
+	"-//W3C//DTD XHTML 1.0 Strict//EN"
+	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<com:THead Title="PRADO Functional Tests">
+	<meta http-equiv="Content-type" content="text/html; charset=UTF-8" />
+	<style type="text/css">
+	/*<![CDATA[*/
+	.defect
+	{
+		color: #c00;
+		font-size: 1.15em;
+	}
+	body
+	{
+		font-family: Georgia, "Times New Roman", Times, serif;
+	}
+	.w3c
+	{
+		margin-top: 2em;
+		display: block;
+	}
+	.required
+	{
+		border: 1px solid red;
+		background-color: pink;
+	}
+	/*]]>*/
+	</style>
+</com:THead>
+<body>
+<com:TForm>
+<com:TContentPlaceHolder ID="Content" />
+<hr style="margin-top: 2em" />
+</com:TForm>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/MessagesPanelTest.page b/tests/FunctionalTests/active-controls/protected/pages/MessagesPanelTest.page
index 248d1760..33868332 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/MessagesPanelTest.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/MessagesPanelTest.page
@@ -1,6 +1,6 @@
-<com:TForm>
+<com:TContent ID="Content">
 
 <com:Application.pages.DMessagesPanel ID="panel1" PanelCssClass="one1" />
 <com:TActiveButton Text="Show" OnClick="show_clicked" />
 <com:TActiveButton Text="Hide" OnClick="hide_clicked" />
-</com:TForm>
\ No newline at end of file
+</com:TContent>
\ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/MyTabPanelTest.page b/tests/FunctionalTests/active-controls/protected/pages/MyTabPanelTest.page
index 5e04cd28..c877c083 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/MyTabPanelTest.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/MyTabPanelTest.page
@@ -1,4 +1,4 @@
-<com:TForm ID="form1">
+<com:TContent ID="Content">
 
 <h1>My Tab Panel Test</h1>
 
@@ -37,4 +37,4 @@
 </com:TActivePanel>
 
 
-</com:TForm>
+</com:TContent>
diff --git a/tests/FunctionalTests/active-controls/protected/pages/NestedActiveControls.page b/tests/FunctionalTests/active-controls/protected/pages/NestedActiveControls.page
index a7875c0d..2c6304b2 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/NestedActiveControls.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/NestedActiveControls.page
@@ -1,4 +1,4 @@
-<com:TForm ID="form1">
+<com:TContent ID="Content">
 	<h1>Nested Active Controls Test</h1>
 	<com:TCallback ID="callback1" OnCallback="callback1_requested" />
 	<com:TActivePanel ID="panel1">
@@ -24,4 +24,4 @@
 		})
 	</script>
 
-</com:TForm>
+</com:TContent>
diff --git a/tests/FunctionalTests/active-controls/protected/pages/NullStateTest.page b/tests/FunctionalTests/active-controls/protected/pages/NullStateTest.page
index 64643177..6b5ed334 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/NullStateTest.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/NullStateTest.page
@@ -1,4 +1,4 @@
-<com:TForm>
+<com:TContent ID="Content">
 
 <h1>Null State Test</h1>
 
@@ -6,4 +6,4 @@
 <com:TActiveButton OnCallback="btnTest_OnCallback" Text="Clickme"/>
 
 
-</com:TForm>
\ No newline at end of file
+</com:TContent>
\ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/PopulateActiveList.page b/tests/FunctionalTests/active-controls/protected/pages/PopulateActiveList.page
index 24cdb366..3ab9d8fb 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/PopulateActiveList.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/PopulateActiveList.page
@@ -1,4 +1,4 @@
-<com:TForm>
+<com:TContent ID="Content">
 <h1>Populate active list controls</h1>
 
 <com:TActiveListBox ID="list1" OnCallback="list_changed" />
@@ -13,4 +13,4 @@
 <com:TActiveButton ID="button2" Text="populate list 2" OnClick="populate_list2" />
 
 
-</com:TForm>
\ No newline at end of file
+</com:TContent>
\ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/PostLoadingTest.page b/tests/FunctionalTests/active-controls/protected/pages/PostLoadingTest.page
index 885b368f..980ea4d8 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/PostLoadingTest.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/PostLoadingTest.page
@@ -1,4 +1,4 @@
-<com:TForm>
+<com:TContent ID="Content">
 
 	<h1 id="heading">PostLoading Test</h1>
 	<com:TCallback ID="callback1" OnCallback="Page.callback1_requested" />
@@ -18,5 +18,4 @@
 			})
 		})
 	</script>
-
-</com:TForm>
\ No newline at end of file
+</com:TContent>
\ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/RadioButtonListTest.page b/tests/FunctionalTests/active-controls/protected/pages/RadioButtonListTest.page
index 9d900e15..e1a2cb93 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/RadioButtonListTest.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/RadioButtonListTest.page
@@ -1,4 +1,4 @@
-<com:TForm>
+<com:TContent ID="Content">
 
  <com:TRequiredFieldValidator
     ControlToValidate="rad_button_list"
@@ -26,4 +26,4 @@
     ValidationGroup="Group"  />
 
 
-</com:TForm>
\ No newline at end of file
+</com:TContent>
\ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/RatingList.page b/tests/FunctionalTests/active-controls/protected/pages/RatingList.page
index d50e5929..6cb9d34a 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/RatingList.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/RatingList.page
@@ -1,5 +1,4 @@
-<com:THead/>
-<com:TForm>
+<com:TContent ID="Content">
 <style>
 	.more td
 	{
@@ -94,4 +93,4 @@
 	</div>
 
 
-</com:TForm>
\ No newline at end of file
+</com:TContent>
\ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/RepeaterWithActiveControls.page b/tests/FunctionalTests/active-controls/protected/pages/RepeaterWithActiveControls.page
index 59410b0b..52fdea2d 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/RepeaterWithActiveControls.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/RepeaterWithActiveControls.page
@@ -1,4 +1,4 @@
-<com:TForm>
+<com:TContent ID="Content">
 <style>
 	.textbox
 	{
@@ -57,4 +57,4 @@
 <com:TActiveLabel ID="label1" />
 
 
-</com:TForm>
\ No newline at end of file
+</com:TContent>
\ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/ReplaceContentTest.page b/tests/FunctionalTests/active-controls/protected/pages/ReplaceContentTest.page
index 6127c313..c946d5fd 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/ReplaceContentTest.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/ReplaceContentTest.page
@@ -1,4 +1,4 @@
-<com:TForm>
+<com:TContent ID="Content">
 
 <h1>Callback Replace Content Test</h1>
 
@@ -27,4 +27,4 @@ Main Panel
 <com:TActiveButton id="btn_replace" Text="Replace" OnCallback="replaceContent"/>
 
 
-</com:TForm>
\ No newline at end of file
+</com:TContent>
\ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/Sessioned/PageStateTest.page b/tests/FunctionalTests/active-controls/protected/pages/Sessioned/PageStateTest.page
index 194f35d6..48d1207f 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/Sessioned/PageStateTest.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/Sessioned/PageStateTest.page
@@ -1,5 +1,4 @@
-<com:THead />
-<com:TForm>
+<com:TContent ID="Content">
 
 <com:TActiveButton ID="button1"
 	CustomData="0"
@@ -41,6 +40,4 @@
 		Loading...
 	</div>
 
-
-
-</com:TForm>
\ No newline at end of file
+</com:TContent>
\ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/TActiveCheckBoxListTest.page b/tests/FunctionalTests/active-controls/protected/pages/TActiveCheckBoxListTest.page
index 460d2f71..915092d2 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/TActiveCheckBoxListTest.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/TActiveCheckBoxListTest.page
@@ -1,4 +1,4 @@
-<com:TForm ID="form1">
+<com:TContent ID="Content">
 	<h1>TActiveCheckBoxList Test Case</h1>
 
 	<com:TActiveCheckBoxList ID="list1" OnCallback="list1_callback">
@@ -19,4 +19,4 @@
 		<com:TActiveButton ID="button5" Text="Select Values 'value 2', 'value 5'" OnClick="select_values_25" />
 	</div>
 
-</com:TForm>
\ No newline at end of file
+</com:TContent>
\ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/TActiveFileUploadAutoPostBackTest.page b/tests/FunctionalTests/active-controls/protected/pages/TActiveFileUploadAutoPostBackTest.page
index 66c2a0c4..e126f34a 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/TActiveFileUploadAutoPostBackTest.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/TActiveFileUploadAutoPostBackTest.page
@@ -1,4 +1,4 @@
-<com:TForm ID="form1">
+<com:TContent ID="Content">
 
 	<h1 id="heading">TActiveFileUpload AutoPostBack Functional Test</h1>
 	<com:TActiveFileUpload ID='uploader' OnFileUpload="uploadComplete" AutoPostBack="false"/>
@@ -9,4 +9,4 @@
 
 	<com:TActiveLabel ID="label1" Text="Label 1" />
 
-</com:TForm>
\ No newline at end of file
+</com:TContent>
\ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/TInPlaceTextBoxTest.page b/tests/FunctionalTests/active-controls/protected/pages/TInPlaceTextBoxTest.page
index 33ba6dda..6b0c5109 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/TInPlaceTextBoxTest.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/TInPlaceTextBoxTest.page
@@ -1,6 +1,5 @@
 <%@ Application.Globalization.Charset="UTF-8" %>
-<com:TForm ID="form1">
-
+<com:TContent ID="Content">
 <style>
 	.textbox
 	{
@@ -72,4 +71,4 @@
 
 	<com:TActiveButton Text="ad" OnCallback="button_clicked" />
 
-</com:TForm>
\ No newline at end of file
+</com:TContent>
\ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/TextBoxValidationCallback.page b/tests/FunctionalTests/active-controls/protected/pages/TextBoxValidationCallback.page
index 1746c628..b9d2c6f3 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/TextBoxValidationCallback.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/TextBoxValidationCallback.page
@@ -1,4 +1,4 @@
-<com:TForm>
+<com:TContent ID="Content">
 <h1>TextBox AutoPostBack With Group Validation</h1>
 <com:TTextBox ID="Address" Columns="60" Maxlength="128" />
 <com:TRequiredFieldValidator
@@ -17,4 +17,4 @@
 
 <com:TActiveTextBox ID="City" Columns="60" Maxlength="128" />
 
-</com:TForm>
+</com:TContent>
diff --git a/tests/FunctionalTests/active-controls/protected/pages/TimeTriggeredCallbackTest.page b/tests/FunctionalTests/active-controls/protected/pages/TimeTriggeredCallbackTest.page
index 680922a3..050f6681 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/TimeTriggeredCallbackTest.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/TimeTriggeredCallbackTest.page
@@ -1,4 +1,4 @@
-<com:TForm ID="form1">
+<com:TContent ID="Content">
 	<h1>TTimeTriggeredCallback + ViewState Tests</h1>
 	<com:TActiveButton id="button1" Text="Start Timer" OnCallback="start_timer" />
 	<com:TActiveButton Text="Stop Timer" OnCallback="stop_timer" />
@@ -17,4 +17,4 @@
 		position: absolute; right: 0; top: 0">
 		Loading...
 	</div>
-</com:TForm>
\ No newline at end of file
+</com:TContent>
\ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/ValueTriggerCallbackTest.page b/tests/FunctionalTests/active-controls/protected/pages/ValueTriggerCallbackTest.page
index 4097f69c..a164afc9 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/ValueTriggerCallbackTest.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/ValueTriggerCallbackTest.page
@@ -1,4 +1,4 @@
-<com:TForm>
+<com:TContent ID="Content">
 <h1>Value Trigger Callback Test</h1>
 
 <com:TTextBox ID="text1" />
@@ -9,5 +9,4 @@
 
 <com:TActiveLabel ID="label1" Text="Label 1" />
 
-
-</com:TForm>
\ No newline at end of file
+</com:TContent>
\ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/config.xml b/tests/FunctionalTests/active-controls/protected/pages/config.xml
new file mode 100755
index 00000000..05909075
--- /dev/null
+++ b/tests/FunctionalTests/active-controls/protected/pages/config.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<configuration>
+  <pages MasterClass="Application.pages.Layout" />
+</configuration>
\ No newline at end of file
diff --git a/tests/test_tools/PradoGenericSelenium2Test.php b/tests/test_tools/PradoGenericSelenium2Test.php
index b56fd9c8..77dd3ece 100644
--- a/tests/test_tools/PradoGenericSelenium2Test.php
+++ b/tests/test_tools/PradoGenericSelenium2Test.php
@@ -5,37 +5,39 @@ require_once 'PHPUnit/Extensions/Selenium2TestCase.php';
 class PradoGenericSelenium2Test extends PHPUnit_Extensions_Selenium2TestCase
 {
 	public static $browsers = array(
-		/*
+/*
 		array(
 			'name'    => 'Firefox on OSX',
-			'browser' => '*firefox',
+			'browserName' => '*firefox',
 			'host'    => '127.0.0.1',
 			'port'    => 4444,
 			'timeout' => 30000,
 		),
+*/
 		array(
 			'name'    => 'Chrome on OSX',
-			'browser' => '*chrome',
+			'browserName' => '*googlechrome',
 			'host'    => '127.0.0.1',
 			'port'    => 4444,
 			'timeout' => 30000,
 		),
+/*
 		array(
-			'name'    => 'Internet Explorer 11 on Windows8.1',
-			'browser' => '*iexplore',
-			'host'    => '192.168.253.39',
-			'port'    => 4444,
+			'name'    => 'Firefox on WindowsXP',
+			'browserName' => '*firefox',
+			'host'    => '127.0.0.1',
+			'port'    => 4445,
 		),
-		*/
 		array(
 			'name'    => 'Internet Explorer 8 on WindowsXP',
 			'browserName' => '*iehta',
 			'host'    => '127.0.0.1',
-			'port'    => 4444,
+			'port'    => 4445,
 		)
+*/
 	);
 
-	static $baseurl='http://10.0.2.2/prado-master/tests/FunctionalTests/';
+	static $baseurl='http://192.168.44.82/prado-master/tests/FunctionalTests/';
 
 	static $timeout=5; //seconds
 	static $wait=1000; //msecs
diff --git a/tests/test_tools/PradoGenericSeleniumTest.php b/tests/test_tools/PradoGenericSeleniumTest.php
index 66502210..c3d3f4f0 100644
--- a/tests/test_tools/PradoGenericSeleniumTest.php
+++ b/tests/test_tools/PradoGenericSeleniumTest.php
@@ -4,7 +4,7 @@ require_once 'PHPUnit/Extensions/SeleniumTestCase.php';
 class PradoGenericSeleniumTest extends PHPUnit_Extensions_SeleniumTestCase
 {
 	public static $browsers = array(
-		/*
+/*
 		array(
 			'name'    => 'Firefox on OSX',
 			'browser' => '*firefox',
@@ -12,33 +12,35 @@ class PradoGenericSeleniumTest extends PHPUnit_Extensions_SeleniumTestCase
 			'port'    => 4444,
 			'timeout' => 30000,
 		),
+*/
 		array(
 			'name'    => 'Chrome on OSX',
-			'browser' => '*chrome',
+			'browser' => '*googlechrome',
 			'host'    => '127.0.0.1',
 			'port'    => 4444,
 			'timeout' => 30000,
 		),
+/*
 		array(
-			'name'    => 'Internet Explorer 11 on Windows8.1',
-			'browser' => '*iexplore',
-			'host'    => '192.168.253.39',
-			'port'    => 4444,
+			'name'    => 'Firefox on WindowsXP',
+			'browser' => '*firefox',
+			'host'    => '127.0.0.1',
+			'port'    => 4445,
 		),
-		*/
 		array(
 			'name'    => 'Internet Explorer 8 on WindowsXP',
 			'browser' => '*iehta',
 			'host'    => '127.0.0.1',
-			'port'    => 4444,
-		)
+			'port'    => 4445,
+		),
+*/
 	);
 
-	static $baseurl='http://10.0.2.2/prado-master/tests/FunctionalTests/';
+	static $baseurl='http://192.168.44.82/prado-master/tests/FunctionalTests/';
 
 	protected function setUp()
 	{
-//		$this->shareSession(true);
+		$this->shareSession(true);
 		$this->setBrowserUrl(static::$baseurl);
 	}
 
-- 
cgit v1.2.3