From 4226093cc034dfbd25a5b9e9aee2778e795ee42a Mon Sep 17 00:00:00 2001 From: xue <> Date: Fri, 7 Apr 2006 03:46:10 +0000 Subject: Merge from 3.0 till 868. --- .../pages/Controls/Samples/TDataGrid/Sample2.page | 2 +- .../pages/Controls/Samples/TDataGrid/Sample2.php | 2 ++ .../pages/Controls/Samples/TDataGrid/Sample6.page | 1 + .../pages/Controls/Samples/TDataList/Sample1.page | 10 +++++----- .../pages/Controls/Samples/TDataList/Sample2.page | 12 ++++++------ .../pages/Controls/Samples/TExpression/Home.page | 6 ------ .../pages/Controls/Samples/TRepeater/Sample1.page | 20 ++++++++++---------- .../pages/Controls/Samples/TRepeater/Sample2.page | 8 ++++---- .../pages/Controls/Samples/TRepeater/Sample3.page | 12 ++++++------ .../pages/Controls/Samples/TStatements/Home.page | 9 --------- 10 files changed, 35 insertions(+), 47 deletions(-) (limited to 'demos/quickstart/protected/pages/Controls/Samples') diff --git a/demos/quickstart/protected/pages/Controls/Samples/TDataGrid/Sample2.page b/demos/quickstart/protected/pages/Controls/Samples/TDataGrid/Sample2.page index 6de3063a..79c1890c 100644 --- a/demos/quickstart/protected/pages/Controls/Samples/TDataGrid/Sample2.page +++ b/demos/quickstart/protected/pages/Controls/Samples/TDataGrid/Sample2.page @@ -42,7 +42,7 @@ Rating - + diff --git a/demos/quickstart/protected/pages/Controls/Samples/TDataGrid/Sample2.php b/demos/quickstart/protected/pages/Controls/Samples/TDataGrid/Sample2.php index d40e3be3..a49077b5 100644 --- a/demos/quickstart/protected/pages/Controls/Samples/TDataGrid/Sample2.php +++ b/demos/quickstart/protected/pages/Controls/Samples/TDataGrid/Sample2.php @@ -78,6 +78,8 @@ class Sample2 extends TPage { foreach($this->DataGrid->Columns as $index=>$column) $column->Visible=$sender->Items[$index]->Selected; + $this->DataGrid->DataSource=$this->Data; + $this->DataGrid->dataBind(); } } diff --git a/demos/quickstart/protected/pages/Controls/Samples/TDataGrid/Sample6.page b/demos/quickstart/protected/pages/Controls/Samples/TDataGrid/Sample6.page index d2277bc5..3d1a33a8 100644 --- a/demos/quickstart/protected/pages/Controls/Samples/TDataGrid/Sample6.page +++ b/demos/quickstart/protected/pages/Controls/Samples/TDataGrid/Sample6.page @@ -6,6 +6,7 @@
-Total <%# $this->Parent->Parent->ItemCount %> products. +Total <%# $this->Parent->ItemCount %> products.
@@ -36,10 +36,10 @@ Total <%# $this->Parent->Parent->ItemCount %> products. IDNameQuantityPrice - <%#$this->Parent->DataItem['id'] %> - <%#$this->Parent->DataItem['name'] %> - <%#$this->Parent->DataItem['quantity'] %> - $<%#$this->Parent->DataItem['price'] %> + <%#$this->DataItem['id'] %> + <%#$this->DataItem['name'] %> + <%#$this->DataItem['quantity'] %> + $<%#$this->DataItem['price'] %> diff --git a/demos/quickstart/protected/pages/Controls/Samples/TDataList/Sample2.page b/demos/quickstart/protected/pages/Controls/Samples/TDataList/Sample2.page index 07980c49..4b484b21 100644 --- a/demos/quickstart/protected/pages/Controls/Samples/TDataList/Sample2.page +++ b/demos/quickstart/protected/pages/Controls/Samples/TDataList/Sample2.page @@ -29,7 +29,7 @@ Text=<%#$this->Parent->DataItem['id']%> CommandName="select" /> - <%#$this->Parent->DataItem['name']%> + <%#$this->DataItem['name']%> IDNameQuantityPrice - <%#$this->Parent->DataItem['id'] %> - <%#$this->Parent->DataItem['name'] %> - <%#$this->Parent->DataItem['quantity'] %> - $<%#$this->Parent->DataItem['price'] %> + <%#$this->DataItem['id'] %> + <%#$this->DataItem['name'] %> + <%#$this->DataItem['quantity'] %> + $<%#$this->DataItem['price'] %> @@ -77,7 +77,7 @@ - + diff --git a/demos/quickstart/protected/pages/Controls/Samples/TExpression/Home.page b/demos/quickstart/protected/pages/Controls/Samples/TExpression/Home.page index 2273f3c1..8c736ca9 100644 --- a/demos/quickstart/protected/pages/Controls/Samples/TExpression/Home.page +++ b/demos/quickstart/protected/pages/Controls/Samples/TExpression/Home.page @@ -10,12 +10,6 @@ Using expression component tag: - -
ID<%#$this->Parent->DataItem['id']%><%#$this->DataItem['id']%>
Name
-Using shortcut expression tag: - -<%= $this->Page->PagePath %> -
\ No newline at end of file diff --git a/demos/quickstart/protected/pages/Controls/Samples/TRepeater/Sample1.page b/demos/quickstart/protected/pages/Controls/Samples/TRepeater/Sample1.page index e28ef6fb..f519342d 100644 --- a/demos/quickstart/protected/pages/Controls/Samples/TRepeater/Sample1.page +++ b/demos/quickstart/protected/pages/Controls/Samples/TRepeater/Sample1.page @@ -17,21 +17,21 @@ -<%#$this->Parent->DataItem['id']%> -<%#$this->Parent->DataItem['name']%> -<%#$this->Parent->DataItem['quantity']%> -<%#$this->Parent->DataItem['price']%> -<%#$this->Parent->DataItem['imported']?'Yes':'No'%> +<%#$this->DataItem['id']%> +<%#$this->DataItem['name']%> +<%#$this->DataItem['quantity']%> +<%#$this->DataItem['price']%> +<%#$this->DataItem['imported']?'Yes':'No'%> -<%#$this->Parent->DataItem['id']%> -<%#$this->Parent->DataItem['name']%> -<%#$this->Parent->DataItem['quantity']%> -<%#$this->Parent->DataItem['price']%> -<%#$this->Parent->DataItem['imported']?'Yes':'No'%> +<%#$this->DataItem['id']%> +<%#$this->DataItem['name']%> +<%#$this->DataItem['quantity']%> +<%#$this->DataItem['price']%> +<%#$this->DataItem['imported']?'Yes':'No'%> diff --git a/demos/quickstart/protected/pages/Controls/Samples/TRepeater/Sample2.page b/demos/quickstart/protected/pages/Controls/Samples/TRepeater/Sample2.page index b939c586..ce0942c3 100644 --- a/demos/quickstart/protected/pages/Controls/Samples/TRepeater/Sample2.page +++ b/demos/quickstart/protected/pages/Controls/Samples/TRepeater/Sample2.page @@ -14,7 +14,7 @@ - <%#$this->NamingContainer->DataItem %> + <%#$this->DataItem %> - <%#$this->NamingContainer->DataItem['name'] %> + <%#$this->DataItem['name'] %> - <%#$this->NamingContainer->DataItem['age'] %> + <%#$this->DataItem['age'] %> - <%#$this->NamingContainer->DataItem['position'] %> + <%#$this->DataItem['position'] %> diff --git a/demos/quickstart/protected/pages/Controls/Samples/TRepeater/Sample3.page b/demos/quickstart/protected/pages/Controls/Samples/TRepeater/Sample3.page index fde06a36..38636962 100644 --- a/demos/quickstart/protected/pages/Controls/Samples/TRepeater/Sample3.page +++ b/demos/quickstart/protected/pages/Controls/Samples/TRepeater/Sample3.page @@ -69,12 +69,12 @@ The following example allows users to modify the existing tabular data using a < - -<%#$this->Parent->DataItem['id']%> -<%#$this->Parent->DataItem['name']%> -<%#$this->Parent->DataItem['category']%> -<%#$this->Parent->DataItem['price']%> -<%#$this->Parent->DataItem['imported']?'Yes':'No'%> + +<%#$this->DataItem['id']%> +<%#$this->DataItem['name']%> +<%#$this->DataItem['category']%> +<%#$this->DataItem['price']%> +<%#$this->DataItem['imported']?'Yes':'No'%> diff --git a/demos/quickstart/protected/pages/Controls/Samples/TStatements/Home.page b/demos/quickstart/protected/pages/Controls/Samples/TStatements/Home.page index 66734ce0..d07bf159 100644 --- a/demos/quickstart/protected/pages/Controls/Samples/TStatements/Home.page +++ b/demos/quickstart/protected/pages/Controls/Samples/TStatements/Home.page @@ -15,15 +15,6 @@ Using TStatements component tag: - -Using shortcut statements tag: - -<%% - $uid=$this->UniqueID; - echo "UniqueID is '$uid'."; -%> - - \ No newline at end of file -- cgit v1.2.3