From f21d3433721308f5d0693f44bbfed56f7b2ecc2d Mon Sep 17 00:00:00 2001
From: wei <>
Date: Fri, 5 May 2006 00:45:35 +0000
Subject: Adding TActiveLabel

---
 .../features/protected/pages/ActiveControls/ActiveControl.page | 10 +++-------
 .../features/protected/pages/ActiveControls/ActiveControl.php  |  4 +---
 2 files changed, 4 insertions(+), 10 deletions(-)

(limited to 'tests/FunctionalTests/features/protected/pages')

diff --git a/tests/FunctionalTests/features/protected/pages/ActiveControls/ActiveControl.page b/tests/FunctionalTests/features/protected/pages/ActiveControls/ActiveControl.page
index 87522f72..2d43bb82 100644
--- a/tests/FunctionalTests/features/protected/pages/ActiveControls/ActiveControl.page
+++ b/tests/FunctionalTests/features/protected/pages/ActiveControls/ActiveControl.page
@@ -2,9 +2,9 @@
 	<h1>TCallback Demo</h1>
 	<com:TClientScript UsingPradoScripts="ajax" />
 	<com:TCallback id="control1" 
-		OnCallback="control1onCallback">
-		<com:TButton id="button2" Text="Hello" Visible="false"/>
-	</com:TCallback>
+		OnCallback="control1onCallback" />
+		
+	<com:TActiveLabel id="label1" Text="Name:" />
 	<com:TTextBox id="text1" />
 
 	<com:TCheckBoxList>
@@ -12,10 +12,6 @@
 		<com:TListItem Text="Two" />
 	</com:TCheckBoxList>
 
-	<com:TPanel id="panel2" Visible="false">
-		asdad <com:TCheckBox id="checkbox1" />
-	</com:TPanel>
-
 	<input type="hidden" name="PRADO_CALLBACK_TARGET" value="<%= $this->control1->UniqueID %>" />
 
 	<com:TButton id="button1" Text="Submit" CausesValidation="false" />
diff --git a/tests/FunctionalTests/features/protected/pages/ActiveControls/ActiveControl.php b/tests/FunctionalTests/features/protected/pages/ActiveControls/ActiveControl.php
index 43d93d30..8323667a 100644
--- a/tests/FunctionalTests/features/protected/pages/ActiveControls/ActiveControl.php
+++ b/tests/FunctionalTests/features/protected/pages/ActiveControls/ActiveControl.php
@@ -7,9 +7,7 @@ class ActiveControl extends TPage
 {
 	public function control1onCallback($sender, $param)
 	{
-		$this->button2->setVisible(true);
-		$this->button2->setText("Time is ".time());
-		$this->control1->render($param->getOutput());
+		$this->label1->setText("The time is ".time());
 	}
 }
 ?>
-- 
cgit v1.2.3