Fixed a bug in TDataGrid about columnspan of pager cell.

3 files changed, 5 insertions, 5 deletions

diff --git a/demos/quickstart/protected/pages/Controls/Samples/LabeledTextBox2/LabeledTextBox.php b/demos/quickstart/protected/pages/Controls/Samples/LabeledTextBox2/LabeledTextBox.php
index f4148148..0d410357 100644
--- a/demos/quickstart/protected/pages/Controls/Samples/LabeledTextBox2/LabeledTextBox.php
+++ b/demos/quickstart/protected/pages/Controls/Samples/LabeledTextBox2/LabeledTextBox.php
@@ -1,6 +1,6 @@
 <?php

 

-class LabeledTextBox extends TControl

+class LabeledTextBox extends TControl implements INamingContainer

 {

 	private $_label;

 	private $_textbox;

diff --git a/demos/quickstart/protected/pages/Controls/Samples/TCustomValidator/Home.page b/demos/quickstart/protected/pages/Controls/Samples/TCustomValidator/Home.page
index 840a6550..33d92985 100644
--- a/demos/quickstart/protected/pages/Controls/Samples/TCustomValidator/Home.page
+++ b/demos/quickstart/protected/pages/Controls/Samples/TCustomValidator/Home.page
@@ -24,7 +24,7 @@ Custom validator with default settings:
 	ValidationGroup="Group1"

 	ControlToValidate="TextBox1"

 	ClientValidationFunction="myValidationFunction"

-	ServerValidate="serverValidate"

+	OnServerValidate="serverValidate"

 	Text="You must enter 'test'." />

 <com:TButton Text="Submit" ValidationGroup="Group1" />

 </td>

@@ -41,7 +41,7 @@ Custom validator with client-side validation disabled:
 	EnableClientScript="false"

 	ControlToValidate="TextBox2"

 	ClientValidationFunction="myValidationFunction"

-	ServerValidate="serverValidate"

+	OnServerValidate="serverValidate"

 	Text="You must enter 'test'." />

 <com:TButton Text="Submit" ValidationGroup="Group2" />

 </td>

@@ -57,7 +57,7 @@ Custom validator with focus-on-error enabled and dynamic display:
 	ValidationGroup="Group3"

 	ControlToValidate="TextBox3"

 	ClientValidationFunction="myValidationFunction"

-	ServerValidate="serverValidate"

+	OnServerValidate="serverValidate"

 	FocusOnError="true"

 	Text="You must enter 'test'." />

 <com:TButton Text="Submit" ValidationGroup="Group3" />

diff --git a/demos/quickstart/protected/pages/Controls/Samples/TDataGrid/Sample5.page b/demos/quickstart/protected/pages/Controls/Samples/TDataGrid/Sample5.page
index 17f2c5d4..8fc393e7 100644
--- a/demos/quickstart/protected/pages/Controls/Samples/TDataGrid/Sample5.page
+++ b/demos/quickstart/protected/pages/Controls/Samples/TDataGrid/Sample5.page
@@ -24,7 +24,7 @@
 

 <com:TCheckBoxList

      AutoPostBack="true"

-	RepeatColumns="2"

+     RepeatColumns="2"

      OnSelectedIndexChanged="changePagerPosition">

 	<com:TListItem Text="Top" />

 	<com:TListItem Text="Bottom"  Selected="true" />