From b9f9a16d7eefc48ac489c8cb2b87749459bb3d38 Mon Sep 17 00:00:00 2001 From: "ctrlaltca@gmail.com" <> Date: Thu, 2 Jun 2011 09:56:29 +0000 Subject: merged documentation changes from branch/3.1 to trunk/ --- .gitattributes | 21 ++-- buildscripts/texbuilder/quickstart/pages.php | 41 +++++-- .../pages/ActiveControls/ActiveDataGrid.page | 83 +++++++++++++ .../pages/ActiveControls/ActiveDataList.page | 23 ++++ .../pages/ActiveControls/ActiveRepeater.page | 24 ++++ .../protected/pages/ActiveControls/Home.page | 6 +- .../Samples/TActiveDataGrid/Sample1.page | 3 +- .../Samples/TActiveDataGrid/Sample1.php | 10 +- .../Samples/TActiveDataGrid/Sample2.page | 17 ++- .../Samples/TActiveDataGrid/Sample2.php | 7 +- .../Samples/TActiveDataGrid/Sample3.page | 4 +- .../Samples/TActiveDataGrid/Sample3.php | 2 +- .../Samples/TActiveDataGrid/Sample4.page | 2 +- .../Samples/TActiveDataGrid/Sample4.php | 2 +- .../Samples/TActiveDataGrid/Sample5.page | 39 +----- .../Samples/TActiveDataGrid/Sample5.php | 16 ++- .../Samples/TActiveDataGrid/Sample6.page | 26 ---- .../Samples/TActiveDataGrid/Sample6.php | 56 --------- .../Samples/TActiveDataList/Home.page | 125 +++++++++++++++++++ .../Samples/TActiveDataList/Home.php | 132 +++++++++++++++++++++ .../Samples/TActiveRepeater/Home.page | 92 ++++++++++++++ .../Samples/TActiveRepeater/Home.php | 79 ++++++++++++ .../Samples/TActiveRepeater/RegionDisplay.php | 28 ----- .../Samples/TActiveRepeater/RegionDisplay.tpl | 34 ------ .../Samples/TActiveRepeater/Sample1.page | 47 -------- .../Samples/TActiveRepeater/Sample1.php | 41 ------- .../Samples/TActiveRepeater/Sample2.page | 58 --------- .../Samples/TActiveRepeater/Sample2.php | 79 ------------ .../Samples/TActiveRepeater/Sample3.page | 104 ---------------- .../Samples/TActiveRepeater/Sample3.php | 84 ------------- .../Samples/TActiveRepeater/Sample4.page | 27 ----- .../Samples/TActiveRepeater/Sample4.php | 43 ------- .../Samples/TActiveRepeater/Sample5.page | 18 --- .../Samples/TActiveRepeater/Sample5.php | 52 -------- .../protected/pages/Controls/DataGrid.page | 3 +- .../protected/pages/Controls/DataList.page | 2 + .../protected/pages/Controls/Repeater.page | 1 + .../Web/UI/ActiveControls/TActiveDataGrid.php | 5 + framework/Web/UI/ActiveControls/TActivePanel.php | 4 +- 39 files changed, 640 insertions(+), 800 deletions(-) create mode 100644 demos/quickstart/protected/pages/ActiveControls/ActiveDataGrid.page create mode 100644 demos/quickstart/protected/pages/ActiveControls/ActiveDataList.page create mode 100644 demos/quickstart/protected/pages/ActiveControls/ActiveRepeater.page delete mode 100644 demos/quickstart/protected/pages/ActiveControls/Samples/TActiveDataGrid/Sample6.page delete mode 100644 demos/quickstart/protected/pages/ActiveControls/Samples/TActiveDataGrid/Sample6.php create mode 100644 demos/quickstart/protected/pages/ActiveControls/Samples/TActiveDataList/Home.page create mode 100644 demos/quickstart/protected/pages/ActiveControls/Samples/TActiveDataList/Home.php create mode 100644 demos/quickstart/protected/pages/ActiveControls/Samples/TActiveRepeater/Home.page create mode 100644 demos/quickstart/protected/pages/ActiveControls/Samples/TActiveRepeater/Home.php delete mode 100644 demos/quickstart/protected/pages/ActiveControls/Samples/TActiveRepeater/RegionDisplay.php delete mode 100644 demos/quickstart/protected/pages/ActiveControls/Samples/TActiveRepeater/RegionDisplay.tpl delete mode 100644 demos/quickstart/protected/pages/ActiveControls/Samples/TActiveRepeater/Sample1.page delete mode 100644 demos/quickstart/protected/pages/ActiveControls/Samples/TActiveRepeater/Sample1.php delete mode 100644 demos/quickstart/protected/pages/ActiveControls/Samples/TActiveRepeater/Sample2.page delete mode 100644 demos/quickstart/protected/pages/ActiveControls/Samples/TActiveRepeater/Sample2.php delete mode 100644 demos/quickstart/protected/pages/ActiveControls/Samples/TActiveRepeater/Sample3.page delete mode 100644 demos/quickstart/protected/pages/ActiveControls/Samples/TActiveRepeater/Sample3.php delete mode 100644 demos/quickstart/protected/pages/ActiveControls/Samples/TActiveRepeater/Sample4.page delete mode 100644 demos/quickstart/protected/pages/ActiveControls/Samples/TActiveRepeater/Sample4.php delete mode 100644 demos/quickstart/protected/pages/ActiveControls/Samples/TActiveRepeater/Sample5.page delete mode 100644 demos/quickstart/protected/pages/ActiveControls/Samples/TActiveRepeater/Sample5.php diff --git a/.gitattributes b/.gitattributes index 0d0b1761..122e33ea 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1289,6 +1289,8 @@ demos/quickstart/protected/index/quickstart/segments -text demos/quickstart/protected/pages/ActiveControls/ActiveButton.page -text demos/quickstart/protected/pages/ActiveControls/ActiveCheckBox.page -text demos/quickstart/protected/pages/ActiveControls/ActiveCustomValidator.page -text +demos/quickstart/protected/pages/ActiveControls/ActiveDataGrid.page -text +demos/quickstart/protected/pages/ActiveControls/ActiveDataList.page -text demos/quickstart/protected/pages/ActiveControls/ActiveHyperLink.page -text demos/quickstart/protected/pages/ActiveControls/ActiveImage.page -text demos/quickstart/protected/pages/ActiveControls/ActiveImageButton.page -text @@ -1298,6 +1300,7 @@ demos/quickstart/protected/pages/ActiveControls/ActiveMultiView.page -text demos/quickstart/protected/pages/ActiveControls/ActivePager.page -text demos/quickstart/protected/pages/ActiveControls/ActivePanel.page -text demos/quickstart/protected/pages/ActiveControls/ActiveRadioButton.page -text +demos/quickstart/protected/pages/ActiveControls/ActiveRepeater.page -text demos/quickstart/protected/pages/ActiveControls/ActiveTextBox.page -text demos/quickstart/protected/pages/ActiveControls/AutoComplete.page -text demos/quickstart/protected/pages/ActiveControls/DragDrop.page -text @@ -1323,8 +1326,8 @@ demos/quickstart/protected/pages/ActiveControls/Samples/TActiveDataGrid/Sample4. demos/quickstart/protected/pages/ActiveControls/Samples/TActiveDataGrid/Sample4.php -text demos/quickstart/protected/pages/ActiveControls/Samples/TActiveDataGrid/Sample5.page -text demos/quickstart/protected/pages/ActiveControls/Samples/TActiveDataGrid/Sample5.php -text -demos/quickstart/protected/pages/ActiveControls/Samples/TActiveDataGrid/Sample6.page -text -demos/quickstart/protected/pages/ActiveControls/Samples/TActiveDataGrid/Sample6.php -text +demos/quickstart/protected/pages/ActiveControls/Samples/TActiveDataList/Home.page -text +demos/quickstart/protected/pages/ActiveControls/Samples/TActiveDataList/Home.php -text demos/quickstart/protected/pages/ActiveControls/Samples/TActiveHyperLink/Home.page -text demos/quickstart/protected/pages/ActiveControls/Samples/TActiveHyperLink/Home.php -text demos/quickstart/protected/pages/ActiveControls/Samples/TActiveHyperLink/hello_world.gif -text @@ -1347,18 +1350,8 @@ demos/quickstart/protected/pages/ActiveControls/Samples/TActivePanel/Home.page - demos/quickstart/protected/pages/ActiveControls/Samples/TActivePanel/Home.php -text demos/quickstart/protected/pages/ActiveControls/Samples/TActiveRadioButton/Home.page -text demos/quickstart/protected/pages/ActiveControls/Samples/TActiveRadioButton/Home.php -text -demos/quickstart/protected/pages/ActiveControls/Samples/TActiveRepeater/RegionDisplay.php -text -demos/quickstart/protected/pages/ActiveControls/Samples/TActiveRepeater/RegionDisplay.tpl -text -demos/quickstart/protected/pages/ActiveControls/Samples/TActiveRepeater/Sample1.page -text -demos/quickstart/protected/pages/ActiveControls/Samples/TActiveRepeater/Sample1.php -text -demos/quickstart/protected/pages/ActiveControls/Samples/TActiveRepeater/Sample2.page -text -demos/quickstart/protected/pages/ActiveControls/Samples/TActiveRepeater/Sample2.php -text -demos/quickstart/protected/pages/ActiveControls/Samples/TActiveRepeater/Sample3.page -text -demos/quickstart/protected/pages/ActiveControls/Samples/TActiveRepeater/Sample3.php -text -demos/quickstart/protected/pages/ActiveControls/Samples/TActiveRepeater/Sample4.page -text -demos/quickstart/protected/pages/ActiveControls/Samples/TActiveRepeater/Sample4.php -text -demos/quickstart/protected/pages/ActiveControls/Samples/TActiveRepeater/Sample5.page -text -demos/quickstart/protected/pages/ActiveControls/Samples/TActiveRepeater/Sample5.php -text +demos/quickstart/protected/pages/ActiveControls/Samples/TActiveRepeater/Home.page -text +demos/quickstart/protected/pages/ActiveControls/Samples/TActiveRepeater/Home.php -text demos/quickstart/protected/pages/ActiveControls/Samples/TActiveTableRow/Home.page -text demos/quickstart/protected/pages/ActiveControls/Samples/TActiveTableRow/Home.php -text demos/quickstart/protected/pages/ActiveControls/Samples/TActiveTextBox/Home.page -text diff --git a/buildscripts/texbuilder/quickstart/pages.php b/buildscripts/texbuilder/quickstart/pages.php index 324af67a..d7191c07 100644 --- a/buildscripts/texbuilder/quickstart/pages.php +++ b/buildscripts/texbuilder/quickstart/pages.php @@ -30,18 +30,14 @@ $pages['Tutorial: Addressbook'] = array( 'Tutorial/AddressBook.page' ); -$pages['Tutorial: Addressbook'] = array( - 'Tutorial/AddressBook.page' - ); - $pages['Fundamentals'] = array( 'Fundamentals/Architecture.page', - 'Fundamentals/Components.page', - 'Fundamentals/Controls.page', - 'Fundamentals/Pages.page', - 'Fundamentals/Modules.page', - 'Fundamentals/Services.page', - 'Fundamentals/Applications.page' + 'Fundamentals/Components.page', + 'Fundamentals/Controls.page', + 'Fundamentals/Pages.page', + 'Fundamentals/Modules.page', + 'Fundamentals/Services.page', + 'Fundamentals/Applications.page' ); $pages['Configurations'] = array( @@ -55,9 +51,13 @@ $pages['Configurations'] = array( ); $pages['Control Reference : Standard Controls'] = array( + 'Controls/Standard.page', 'Controls/Button.page', + 'Controls/Captcha.page', 'Controls/CheckBox.page', 'Controls/ClientScript.page', + 'Controls/ClientScriptLoader.page', + 'Controls/Conditional.page', 'Controls/ColorPicker.page', 'Controls/DatePicker.page', 'Controls/Expression.page', @@ -71,6 +71,7 @@ $pages['Control Reference : Standard Controls'] = array( 'Controls/Image.page', 'Controls/InlineFrame.page', 'Controls/JavascriptLogger.page', + 'Controls/Keyboard.page', 'Controls/Label.page', 'Controls/LinkButton.page', 'Controls/Literal.page', @@ -81,9 +82,10 @@ $pages['Control Reference : Standard Controls'] = array( 'Controls/PlaceHolder.page', 'Controls/RadioButton.page', 'Controls/SafeHtml.page', + 'Controls/Slider.page', 'Controls/Statements.page', - 'Controls/TabPanel.page', 'Controls/Table.page', + 'Controls/TabPanel.page', 'Controls/TextBox.page', 'Controls/TextHighlighter.page', 'Controls/Wizard.page'); @@ -103,7 +105,22 @@ $pages['Control Reference : Data Controls'] = array( $pages['Control Reference : Active Controls (AJAX)'] = array( 'ActiveControls/ActiveButton.page', 'ActiveControls/ActiveCheckBox.page', - 'ActiveControls/ActiveCustomValidator.page'); + 'ActiveControls/ActiveCustomValidator.page', + 'ActiveControls/ActiveDataList.page', + 'ActiveControls/ActiveDataGrid.page', + 'ActiveControls/ActiveHyperLink.page', + 'ActiveControls/ActiveImage.page', + 'ActiveControls/ActiveImageButton.page', + 'ActiveControls/ActiveLabel.page', + 'ActiveControls/ActiveLinkButton.page', + 'ActiveControls/ActiveMultiView.page', + 'ActiveControls/ActivePager.page', + 'ActiveControls/ActivePanel.page', + 'ActiveControls/ActiveRadioButton.page', + 'ActiveControls/ActiveRepeater.page', + 'ActiveControls/ActiveTextBox.page', + 'ActiveControls/AutoComplete.page', + 'ActiveControls/DragDrop.page'); $pages['Active Control Overview'] = array( 'ActiveControls/Home.page', diff --git a/demos/quickstart/protected/pages/ActiveControls/ActiveDataGrid.page b/demos/quickstart/protected/pages/ActiveControls/ActiveDataGrid.page new file mode 100644 index 00000000..9a82743d --- /dev/null +++ b/demos/quickstart/protected/pages/ActiveControls/ActiveDataGrid.page @@ -0,0 +1,83 @@ + + +

TActiveDataGrid

+ + +

+TActiveDataGrid represents a data bound and updatable grid control which is the +active counterpart to the original TDataGrid control. +

+ +

+This component can be used in the same way as the regular datagrid, the only +difference is that the active datagrid uses callbacks instead of postbacks +for interaction. +

+ +

+PRADO provides eight new types of active columns that can be used inside TActiveDataGrid; +they are the active counterpart of TDataGrid's columns: +

+ + +

+Please refer to the original documentation of TDataGrid for basic usage. +

+ + +

Columns

+ +

Automatically Generated Columns

+

+TDataGrid by default will create a list of columns based on the structure of the bound data. TDataGrid will read the first row of the data, extract the field names of the row, and construct a column for each field. Each column is of type TActiveBoundColumn. All of this happens in an ajax callback. +

+ + + +

Manually Specified Columns

+

+The following example uses manually specified columns to show a list of book information, +

+
    +
  • Book title - displayed as a hyperlink pointing to the corresponding amazon.com book page. TActiveHyperLinkColumn is used.
  • +
  • Publisher - displayed as a piece of text using TvBoundColumn.
  • +
  • Price - displayed as a piece of text using TActiveBoundColumn with output formatting string and customized styles.
  • +
  • In-stock or not - displayed as a checkbox using TActiveCheckBoxColumn.
  • +
  • Rating - displayed as an image using TActiveTemplateColumn which allows maximum freedom in specifying cell contents.
  • +
+

+Each column can be shown or hidden in a callback. +

+ + + +

Interacting with TActiveDataGrid

+

+The following example shows how to make the previous book information table an interactive one. It allows users to edit and delete book items from the table. Two additional columns are used in the example to allow users interact with the datagrid: TActiveEditCommandColumn and TActiveButtonColumn. In addition, +TActiveDropDownListColumn replaces the previous TActiveTemplateColumn to allow users to select a rating from a dropdown list. Note, it is also possible to use TActiveTemplateColumn to achieve the same task. +All the iteration is done using AJAX callbacks. +

+ + +

Sorting

+

+The following example turns the datagrid in Example 2 into a sortable one. Users can click on the link button displayed in the header of any column, and the data will be sorted in ascending order along that column. The grid is sorted and rendered upon a callback request. +

+ + +

Paging

+

+The following example enables the paging functionality of the datagrid shown in Example 1. In this example, you move between the datagrid pages clicking on the pager links. The grid reacts to paging rendering itself as the result of a callback request. Note that you can't change the pager style upon callback. +

+ + +
$Id$
\ No newline at end of file diff --git a/demos/quickstart/protected/pages/ActiveControls/ActiveDataList.page b/demos/quickstart/protected/pages/ActiveControls/ActiveDataList.page new file mode 100644 index 00000000..12fb941f --- /dev/null +++ b/demos/quickstart/protected/pages/ActiveControls/ActiveDataList.page @@ -0,0 +1,23 @@ + + +

TActiveDataList

+ + +

+TActiveDataList represents a data bound and updatable list control which is the +active counterpart to the original TDataList control. +

+ +

+This component can be used in the same way as the regular datalist, the only +difference is that the active datalist uses callbacks instead of postbacks +for interaction. +

+ +

+Please refer to the original documentation of TDataList for usage. +

+ + + +
$Id$
\ No newline at end of file diff --git a/demos/quickstart/protected/pages/ActiveControls/ActiveRepeater.page b/demos/quickstart/protected/pages/ActiveControls/ActiveRepeater.page new file mode 100644 index 00000000..d22a7467 --- /dev/null +++ b/demos/quickstart/protected/pages/ActiveControls/ActiveRepeater.page @@ -0,0 +1,24 @@ + + +

TActiveRepeater

+ + +

+TActiveRepeater represents a data bound and updatable repeater control which is the +active counterpart to the original TRepeater control. +

+ +

+This component can be used in the same way as the regular repeater, the only +difference is that the active repeater uses callbacks instead of postbacks +for interaction. +

+ +

+Please refer to the original documentation of TRepeater for usage. +

+ + + + +
$Id$
\ No newline at end of file diff --git a/demos/quickstart/protected/pages/ActiveControls/Home.page b/demos/quickstart/protected/pages/ActiveControls/Home.page index 93b5b6eb..798bc267 100644 --- a/demos/quickstart/protected/pages/ActiveControls/Home.page +++ b/demos/quickstart/protected/pages/ActiveControls/Home.page @@ -136,19 +136,19 @@ TActiveButton control. See also the later part of the Active Data Controls