Merge pull request #530 from pradosoft/prado-3.2.43.2.4prado-3.2

Backports for Prado 3.2.4

2 files changed, 14 insertions, 15 deletions

diff --git a/tests/FunctionalTests/validators/protected/pages/Layout.tpl b/tests/FunctionalTests/validators/protected/pages/Layout.tpl
index 25dbea09..47591ef3 100755
--- a/tests/FunctionalTests/validators/protected/pages/Layout.tpl
+++ b/tests/FunctionalTests/validators/protected/pages/Layout.tpl
@@ -33,7 +33,6 @@
 <com:TForm>

 <com:TContentPlaceHolder ID="Content" />

 <hr style="margin-top: 2em" />

-<com:TJavascriptLogger />

 </com:TForm>

 </body>

 </html>
\ No newline at end of file
diff --git a/tests/FunctionalTests/validators/protected/pages/ListControl.page b/tests/FunctionalTests/validators/protected/pages/ListControl.page
index 1429e184..a75dc3ff 100755
--- a/tests/FunctionalTests/validators/protected/pages/ListControl.page
+++ b/tests/FunctionalTests/validators/protected/pages/ListControl.page
@@ -1,58 +1,58 @@
 <com:TContent ID="Content">

-	<h1>List Control Required Field Validation Test</h1>	

+	<h1>List Control Required Field Validation Test</h1>

 	<com:TCheckBoxList ID="list1">

 		<com:TListItem Text="Select a color below" Value="" />

 		<com:TListItem Text="Red" />

 		<com:TListItem Text="Blue" />

 		<com:TListItem Text="Green" />

 	</com:TCheckBoxList>

-	

+

 	<com:TRequiredFieldValidator ID="validator1"

 		ControlToValidate="list1"

 		InitialValue="Select a color below"

 		ErrorMessage="*" />

-	

+

 	<hr />

-	

+

 	<com:TDropDownList ID="list2">

 		<com:TListItem Text="--- Select a color ---" />

 		<com:TListItem Text="Red" />

 		<com:TListItem Text="Blue" />

 		<com:TListItem Text="Green" />

 	</com:TDropDownList>

-	

+

 	<com:TRequiredFieldValidator ID="validator2"

 		ControlToValidate="list2"

 		InitialValue="--- Select a color ---"

 		ErrorMessage="*" />

-	

+

 	<hr />

-	

+

 	<com:TListBox ID="list3">

-		<com:TListItem Text="Don't select this one" />

+		<com:TListItem Text="Dont select this one" />

 		<com:TListItem Text="Red" />

 		<com:TListItem Text="Blue" />

 		<com:TListItem Text="Green" />

 	</com:TListBox>

-	

+

 	<com:TRequiredFieldValidator ID="validator3"

 		ControlToValidate="list3"

-		InitialValue="Don't select this one"

+		InitialValue="Dont select this one"

 		ErrorMessage="*" />

-	

+

 	<hr />

-	

+

 	<com:TRadioButtonList ID="list4">

 		<com:TListItem Text="Select something else" />

 		<com:TListItem Text="Red" />

 		<com:TListItem Text="Blue" />

 		<com:TListItem Text="Green" />

 	</com:TRadioButtonList>

-	

+

 	<com:TRequiredFieldValidator ID="validator4"

 		ControlToValidate="list4"

 		InitialValue="Select something else"

 		ErrorMessage="*" />

-	

+

 	<com:TButton ID="submit1" Text="Submit!" />

 </com:TContent>
\ No newline at end of file