From 588727c7e2b8954ec3dbde293cf4c4d68b119f9b Mon Sep 17 00:00:00 2001 From: xue <> Date: Mon, 19 Jun 2006 18:38:29 +0000 Subject: Merge from 3.0 branch till 1185. --- .../protected/pages/Advanced/Collections.page | 12 ++++++------ .../protected/pages/Configurations/Templates3.page | 14 ++++++++++++++ demos/quickstart/protected/pages/Search.page | 18 ------------------ demos/quickstart/protected/pages/Search.php | 7 +------ 4 files changed, 21 insertions(+), 30 deletions(-) (limited to 'demos') diff --git a/demos/quickstart/protected/pages/Advanced/Collections.page b/demos/quickstart/protected/pages/Advanced/Collections.page index 181dc556..7fc3443d 100644 --- a/demos/quickstart/protected/pages/Advanced/Collections.page +++ b/demos/quickstart/protected/pages/Advanced/Collections.page @@ -1,6 +1,6 @@ -

Collections

+

Collections

Collection is a basic data structure in programming. In traditional PHP programming, array is used widely to represent collection data structure. A PHP array is a mix of cardinal-indxed array and hash table.

@@ -8,7 +8,7 @@ Collection is a basic data structure in programming. In traditional PHP programm To enable object-oriented manipulation of collections, PRADO provides a set of powerful collection classes. Among them, the TList and TMap are the most fundamental and usually serve as the base classes for other collection classes. Since many PRADO components have properties that are of collection type, it is very important for developers to master the usage of PRADO collection classes.

-

Using TList

+

Using TList

A TList object represents a cardinal-indexed array, i.e., an array (object) with the index 0, 1, 2, ...

@@ -42,7 +42,7 @@ In addition, TList implements a few commonly used convenient methods fo
  • mergeWith(): appends the list with data from an array or traversable object (including TList).
    • -

    Using TList-based component properties

    +

    Using TList-based component properties

    As aforementioned, many PRADO component properties are based on TList or TList-derived collection classes. These properties all share the above usages.

    @@ -62,7 +62,7 @@ foreach($control->Controls as $childControl) ... Another example is the Items property, available in list controls, TRepeater, TDataList and TDataGrid. In these controls, the ancestor class of Items is TList.

    -

    Extending TList

    +

    Extending TList

    Often, we want to extend TList to perform additional operations for each addition or removal of an item. The only methods that the child class needs to override are insertAt() and removeAt(). For example, to ensure the list only contains items that are of TControl type, we can override insertAt() as follows,

    @@ -77,7 +77,7 @@ public function insertAt($index,$item) -

    Using TMap

    +

    Using TMap

    A TMap object represents a hash table (or we say string-indexed array).

    @@ -107,7 +107,7 @@ The following methods are provided by TMap for convenience,
  • mergeWith(): appends the map with data from an array or traversable object (including TMap).
    • -

    Using of TAttributeCollection

    +

    Using of TAttributeCollection

    TAttributeCollection is a special class extending from TMap. It is mainly used by the Attributes property of TControl.

    diff --git a/demos/quickstart/protected/pages/Configurations/Templates3.page b/demos/quickstart/protected/pages/Configurations/Templates3.page index 99d43665..bc3b1f87 100644 --- a/demos/quickstart/protected/pages/Configurations/Templates3.page +++ b/demos/quickstart/protected/pages/Configurations/Templates3.page @@ -44,6 +44,20 @@ The format of databind tags is as follows, <%# PhpExpression %> +

    +Since v3.0.2, expression tags and databind tags can be embedded within static strings. For example, you can write the following in a template, +

    + +<com:TLabel> + <prop:Text> + Today is <%= date('F d, Y',time()) >. + The page class is <%= get_class($this) %>. + </prop:Text> +</com:TLabel> + +

    +Previously, you would have to use a single expression with string concatenations to achieve the same effect. +

    Parameter Tags

    diff --git a/demos/quickstart/protected/pages/Search.page b/demos/quickstart/protected/pages/Search.page index d3391222..ae7f07bc 100644 --- a/demos/quickstart/protected/pages/Search.page +++ b/demos/quickstart/protected/pages/Search.page @@ -4,24 +4,6 @@ - - -
    - Found <%# $this->Parent->Data->Count %> classes in API documentation. -
    -     - -
    -
    - <%# $this->ItemIndex + 1 %>. - - <%# $this->DataItem->title %> - -
    -
    -     -     -
    diff --git a/demos/quickstart/protected/pages/Search.php b/demos/quickstart/protected/pages/Search.php index 297d2f50..f1d07ffa 100644 --- a/demos/quickstart/protected/pages/Search.php +++ b/demos/quickstart/protected/pages/Search.php @@ -13,13 +13,8 @@ class Search extends TPage $hits_1 = $quickstart->find($text); $this->quickstart_results->setDataSource($hits_1); $this->quickstart_results->dataBind(); - - $api = $this->getApplication()->getModule("api_search"); - $hits_2 = $api->find($text); - $this->api_results->setDataSource($hits_2); - $this->api_results->dataBind(); - $this->emptyResult->setVisible(count($hits_1)+count($hits_2) == 0); + $this->emptyResult->setVisible(!count($hits_1)); } } -- cgit v1.2.3