instead of
-- TActiveRecord finder methods will always return a new object instance (identity mapping was removed).
-- TActiveRecord::findBySql() will return an object rather than an array
-- TActiveRecord::findAllBySql() will return an array of objects.
-
-Upgrading from v3.1a
----------------------
-- The signature of TActiveRecord::finder() is changed. This affects
- all TActiveRecord-descendant classes that override this method.
- Please use the following code to override the method:
- public static function finder($className=__CLASS__)
- {
- return parent::finder($className);
- }
-
-- The way to specify the table name for an active record class is changed.
- Previously, it used the static class member '_tablename'.
- Now it uses class constant as follows:
- class UserRecord extends TActiveRecord
- {
- const TABLE='users_table';
- }
-
-- Changed TActiveRatingList's javascript control class
- name from "Prado.WebUI.TRatingList" to "Prado.WebUI.TActiveRatingList".
-
-- PRADO's javascript library locations moved from Web/Javascripts/xxx to Web/Javascripts/source/xxx
-
-- IPostBackDataHandler added a new method getDataChanged(). Any control
- implementing this interface will be required to implement this new method.
-
-Upgrading from v3.0.x
----------------------
-- Validators ClientSide.OnSuccess becomes ClientSide.OnValidationSuccess,
-- Validators ClientSide.OnError becomes ClientSide.OnValidationError,
-- Validator OnSuccess event becomes OnValidationSuccess.
-- Validator OnError event becomes OnValidationError.
-- Content enclosed in is now parsed as normal template content.
- Previously, it was not parsed and was rendered as is.
-
-Upgrading from v3.0.7
----------------------
-
-Upgrading from v3.0.6
----------------------
-
-Upgrading from v3.0.5
----------------------
-- TRepeater does not render anymore for empty item template.
-- constructUrl() now encodes ampersand by default. This should have minimal
- impact on any existing PRADO applications, though.
-- TDataGrid does not generate default table styles. This may affect
- the appearance of existing PRADO applications that use TDataGrid.
-- If TUrlMapping is used, you need to set the UrlManager property of
- THttpRequest to the module ID of TUrlMapping.
-- TJavascriptLogger toggle key is changed from ALT-D to ALT-J.
- Use the ToggleKey property chanage to a different key.
-- Javascript Library rico was REMOVED.
-
-Upgrading from v3.0.4
----------------------
-- TFileUpload::saveAs() will return false instead of raising an exception
- if it encounters any error.
-- TDropDownListColumn.DataField is renamed to DataTextField and
- DataFormatString is renamed to DataTextFormatString.
- A new property named DataValueField is added.
-
-Upgrading from v3.0.3
----------------------
-- The 'Static' value is changed to 'Fixed' for the Display property of
- all validators as well as TValidationSummary, due to conflict with PHP keywords.
-- The 'List' value is changed to 'SimpleList' for TValidationSummary.DisplayMode.
-- The 'List' value is changed to 'DropDownList' for TPager.Mode
-- This change affects existing client-side javascript handlers such as
-
instead of
+- TActiveRecord finder methods will always return a new object instance (identity mapping was removed).
+- TActiveRecord::findBySql() will return an object rather than an array
+- TActiveRecord::findAllBySql() will return an array of objects.
+
+Upgrading from v3.1a
+---------------------
+- The signature of TActiveRecord::finder() is changed. This affects
+ all TActiveRecord-descendant classes that override this method.
+ Please use the following code to override the method:
+ public static function finder($className=__CLASS__)
+ {
+ return parent::finder($className);
+ }
+
+- The way to specify the table name for an active record class is changed.
+ Previously, it used the static class member '_tablename'.
+ Now it uses class constant as follows:
+ class UserRecord extends TActiveRecord
+ {
+ const TABLE='users_table';
+ }
+
+- Changed TActiveRatingList's javascript control class
+ name from "Prado.WebUI.TRatingList" to "Prado.WebUI.TActiveRatingList".
+
+- PRADO's javascript library locations moved from Web/Javascripts/xxx to Web/Javascripts/source/xxx
+
+- IPostBackDataHandler added a new method getDataChanged(). Any control
+ implementing this interface will be required to implement this new method.
+
+Upgrading from v3.0.x
+---------------------
+- Validators ClientSide.OnSuccess becomes ClientSide.OnValidationSuccess,
+- Validators ClientSide.OnError becomes ClientSide.OnValidationError,
+- Validator OnSuccess event becomes OnValidationSuccess.
+- Validator OnError event becomes OnValidationError.
+- Content enclosed in is now parsed as normal template content.
+ Previously, it was not parsed and was rendered as is.
+
+Upgrading from v3.0.7
+---------------------
+
+Upgrading from v3.0.6
+---------------------
+
+Upgrading from v3.0.5
+---------------------
+- TRepeater does not render anymore for empty item template.
+- constructUrl() now encodes ampersand by default. This should have minimal
+ impact on any existing PRADO applications, though.
+- TDataGrid does not generate default table styles. This may affect
+ the appearance of existing PRADO applications that use TDataGrid.
+- If TUrlMapping is used, you need to set the UrlManager property of
+ THttpRequest to the module ID of TUrlMapping.
+- TJavascriptLogger toggle key is changed from ALT-D to ALT-J.
+ Use the ToggleKey property chanage to a different key.
+- Javascript Library rico was REMOVED.
+
+Upgrading from v3.0.4
+---------------------
+- TFileUpload::saveAs() will return false instead of raising an exception
+ if it encounters any error.
+- TDropDownListColumn.DataField is renamed to DataTextField and
+ DataFormatString is renamed to DataTextFormatString.
+ A new property named DataValueField is added.
+
+Upgrading from v3.0.3
+---------------------
+- The 'Static' value is changed to 'Fixed' for the Display property of
+ all validators as well as TValidationSummary, due to conflict with PHP keywords.
+- The 'List' value is changed to 'SimpleList' for TValidationSummary.DisplayMode.
+- The 'List' value is changed to 'DropDownList' for TPager.Mode
+- This change affects existing client-side javascript handlers such as
+
+
Welcome, User->Name %> />!
This page contains site settings accessible only to site admin.
\ No newline at end of file
diff --git a/demos/personal/protected/Pages/config.php b/demos/personal/protected/Pages/config.php
index 7a6c9a6c..23cb184e 100644
--- a/demos/personal/protected/Pages/config.php
+++ b/demos/personal/protected/Pages/config.php
@@ -3,10 +3,8 @@ return array(
'authorization' => array(
array(
'action' => 'deny',
- 'properties' => array(
- 'pages' => 'Settings',
- 'users' => '?',
- ),
+ 'pages' => 'Settings',
+ 'users' => '?',
),
),
'pages' => array(
diff --git a/demos/personal/protected/application.php b/demos/personal/protected/application.php
index 0d9cadd4..26100576 100644
--- a/demos/personal/protected/application.php
+++ b/demos/personal/protected/application.php
@@ -5,7 +5,7 @@ return array(
'mode' => 'Debug',
),
'paths' => array(
- 'using'=>array('Application.common.*'),
+ 'using'=>array('Application.Common.*'),
),
'modules' => array(
),
diff --git a/demos/quickstart/protected/pages/ActiveControls/DragDrop.page b/demos/quickstart/protected/pages/ActiveControls/DragDrop.page
new file mode 100755
index 00000000..0969ddd0
--- /dev/null
+++ b/demos/quickstart/protected/pages/ActiveControls/DragDrop.page
@@ -0,0 +1,26 @@
+
+
+
\ 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 5cf4ab17..49855980 100644
--- a/demos/quickstart/protected/pages/ActiveControls/Home.page
+++ b/demos/quickstart/protected/pages/ActiveControls/Home.page
@@ -160,6 +160,12 @@ TActiveButton control. See also the later part of the TValueTriggeredCallback
monitors (using a timer) an attribute of an HTML element and triggers a callback request
when the attribute value changes.
+
+
+
+ TDropContainer & TDraggable represents drag and drop containers.
+ The former will make its child controls "draggable" while the latter will raise a callback when a draggable
+ control is dropped on it.
@@ -310,7 +316,21 @@ if Javascript was disabled on the client's browser.
TValueTriggeredCallback
Yes No
-
+
+
+
+ TDropContainer
+
+ Yes No
+
+ TDraggable
+
+ No No
+
+
+
+
+
+ Your shopping cart is empty, please add some items !
+
+
+ Data['ProductCount'] > 1)%>
+ >
+ Data['ProductImageUrl']%>/>
+ Data['ProductTitle']%>/>
+
+
+
+
+
diff --git a/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/Home.php b/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/Home.php
new file mode 100755
index 00000000..276ee6a4
--- /dev/null
+++ b/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/Home.php
@@ -0,0 +1,112 @@
+getIsPostBack() && !$this->getIsCallBack())
+ {
+
+ $this->populateProductList();
+ $this->populateShoppingList();
+ }
+ }
+
+ private function getProductData ()
+ {
+ return array (
+ array (
+ 'ProductId' => 'Product1',
+ 'ProductImageUrl' => $this->publishAsset('assets/product1.png'),
+ 'ProductTitle' => 'Cup'
+ ),
+ array (
+ 'ProductId' => 'Product2',
+ 'ProductImageUrl' => $this->publishAsset('assets/product2.png'),
+ 'ProductTitle' => 'T-Shirt'
+ )
+ );
+ }
+
+ private function getProduct ($key)
+ {
+ foreach ($this->getProductData() as $product)
+ if ($product['ProductId']==$key) return $product;
+ return null;
+ }
+
+ protected function populateProductList ()
+ {
+ $this->ProductList->DataSource=$this->getProductData();
+ $this->ProductList->Databind();
+ }
+
+ protected function populateShoppingList ()
+ {
+ $this->ShoppingList->DataSource=$this->getShoppingListData();
+ $this->ShoppingList->Databind();
+
+ }
+
+
+ public function getShoppingListData ()
+ {
+ return $this->getViewState('ShoppingList', array ());
+ }
+
+ public function setShoppingListData ($value)
+ {
+ $this->setViewState('ShoppingList', TPropertyValue::ensureArray($value), array ());
+ }
+
+ public function addItemToCart ($sender, $param)
+ {
+ $control=$param->getDroppedControl();
+ // Get the Key from the repeater item
+ $item=$control->getNamingContainer();
+ $key=$this->ProductList->getDataKeys()->itemAt($item->getItemIndex());
+ $product=$this->getProduct($key);
+ $shoppingList=$this->getShoppingListData();
+ if (isset ($shoppingList[$key]))
+ {
+ // Already an item of this type, increment counter
+ $shoppingList[$key]['ProductCount']++;
+ }
+ else
+ {
+ // Add an item to the shopping list
+ $shoppingList[$key]=$product;
+ $shoppingList[$key]['ProductCount']=1;
+ }
+ $this->setShoppingListData($shoppingList);
+
+ }
+
+ public function removeItemFromCart ($sender, $param)
+ {
+ $control=$param->getDroppedControl();
+ $item=$control->getNamingContainer();
+ $key=$this->ShoppingList->getDataKeys()->itemAt($item->getItemIndex());
+ $shoppingList=$this->getShoppingListData();
+ if (isset($shoppingList[$key]))
+ {
+ if ($shoppingList[$key]['ProductCount'] > 1)
+ $shoppingList[$key]['ProductCount'] --;
+ else
+ unset($shoppingList[$key]);
+ }
+ $this->setShoppingListData($shoppingList);
+
+ }
+
+ public function redrawCart ($sender, $param)
+ {
+ $this->populateShoppingList();
+ $this->cart->render($param->NewWriter);
+
+ }
+}
+?>
\ No newline at end of file
diff --git a/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/assets/product1.png b/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/assets/product1.png
new file mode 100755
index 00000000..ae03d551
Binary files /dev/null and b/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/assets/product1.png differ
diff --git a/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/assets/product2.png b/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/assets/product2.png
new file mode 100755
index 00000000..25e81ad7
Binary files /dev/null and b/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/assets/product2.png differ
diff --git a/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/assets/trash.png b/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/assets/trash.png
new file mode 100755
index 00000000..184f7628
Binary files /dev/null and b/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/assets/trash.png differ
diff --git a/demos/quickstart/protected/pages/Configurations/Templates2.page b/demos/quickstart/protected/pages/Configurations/Templates2.page
index e8442f1f..8a17c72c 100644
--- a/demos/quickstart/protected/pages/Configurations/Templates2.page
+++ b/demos/quickstart/protected/pages/Configurations/Templates2.page
@@ -96,4 +96,18 @@ Localization tags represent localized texts. They are in the following format,
where string will be translated to different languages according to the end-user's language preference. Localization tags are in fact shortcuts to the function call Prado::localize(string).
+
+
+
+<%/ image.jpg %>
+
+
+
\ No newline at end of file
diff --git a/demos/quickstart/protected/pages/Configurations/UrlMapping.page b/demos/quickstart/protected/pages/Configurations/UrlMapping.page
index 0837d50d..ec393012 100644
--- a/demos/quickstart/protected/pages/Configurations/UrlMapping.page
+++ b/demos/quickstart/protected/pages/Configurations/UrlMapping.page
@@ -124,4 +124,7 @@ A matching pattern is one whose ServiceID and ServiceParameter
By default, TUrlMapping will construct URLs prefixed with the currently requesting PHP script path, such as /path/to/index.php/article/3. Users may change this behavior by explicitly specifying the URL prefix through its UrlPrefix property. For example, if the Web server configuration treats index.php as the default script, we can set UrlPrefix as /path/to and the constructed URL will look like /path/to/article/3.
-
+TDropContainer
+TDropContainer represent an area where +TDraggable controls can be dropped. +When a TDraggable is dropped, a +callback request is initiated. The OnCallback event is raised +during a callback request and it is raised after +the OnDropk event. +
+ + +TDraggable
+TDraggable will make its child controls 'draggable'. +When a TDraggable is dropped, a +callback request is initiated. The OnCallback event is raised +during a callback request and it is raised after +the OnDropk event. +
+$Id$
Active Control Infrastructure Classes
diff --git a/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/Home.page b/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/Home.page new file mode 100755 index 00000000..89d64110 --- /dev/null +++ b/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/Home.page @@ -0,0 +1,90 @@ +Drag & Drop demo !
+ +Product List :
+ +
+
+
+
+
+ Data['ProductImageUrl']%> />
+
+
+
+
+Your shopping cart :
+Remove Items from cart by dropping them here
+URL Tags
++URL tags are used to insert the relative web url path to the Prado application in the template. You can use it in the following format: +
++If your Prado application is deployed on http://localhost/pradoapp/, the tag above will produce "/pradoapp/image.jpg". This tag will help you to use the correct file path even with UrlFormat set to Path, or if you are using url mappings. +
+$Id$
$Id$
\ No newline at end of file
+Note: If you use constructUrl() with string parameters that contain slashes ("/") they will get encoded to %2F. By default most Apache installations give a "404 Not found" if a URL contains a %2F. You can add AllowEncodedSlashes On to your VirtualHost configuration to resolve this. (Available since Apache 2.0.46).
+
+
+$Id$
diff --git a/demos/quickstart/protected/pages/Database/ActiveRecord.page b/demos/quickstart/protected/pages/Database/ActiveRecord.page
index 70998587..bc0df529 100644
--- a/demos/quickstart/protected/pages/Database/ActiveRecord.page
+++ b/demos/quickstart/protected/pages/Database/ActiveRecord.page
@@ -129,6 +129,19 @@ class UserRecord extends TActiveRecord
You may specify qualified table names. E.g. for MySQL, TABLE = "`database1`.`table1`".
Note:
+Since version 3.1.3 you can also use a method table() to define the table name.
+This allows you to dynamically specify which table should be used by the ActiveRecord.
+
+class TeamRecord extends TActiveRecord
+{
+ public function table() {
+ return 'Teams';
+ }
+}
+
+
+
Since TActiveRecord extends TComponent, setter and getter methods can be defined to allow control over how variables @@ -1183,4 +1196,4 @@ instead of $userRecord->first_name. This helps separation of logic and -
$Id$
\ No newline at end of file
+$Id$
diff --git a/demos/quickstart/protected/pages/GettingStarted/NewFeatures.page b/demos/quickstart/protected/pages/GettingStarted/NewFeatures.page
index 66e3111d..51dbb981 100644
--- a/demos/quickstart/protected/pages/GettingStarted/NewFeatures.page
+++ b/demos/quickstart/protected/pages/GettingStarted/NewFeatures.page
@@ -4,7 +4,13 @@
This page summarizes the main new features that are introduced in each PRADO release. -
+ + +Version 3.1.3
+-
+
- Added Drag and drop controls +
- Added TActiveDatePicker control +
Version 3.1.2
-
diff --git a/framework/3rdParty/TinyMCE/tiny_mce.md5 b/framework/3rdParty/TinyMCE/tiny_mce.md5
index a5b8fc8e..bf138c10 100644
--- a/framework/3rdParty/TinyMCE/tiny_mce.md5
+++ b/framework/3rdParty/TinyMCE/tiny_mce.md5
@@ -1 +1 @@
-6f0b8991531854895cb4461d218023bd tiny_mce.tar
+cf8b1ec3fc54577b1d834772ddecfc2e tiny_mce.tar
diff --git a/framework/3rdParty/TinyMCE/tiny_mce.tar b/framework/3rdParty/TinyMCE/tiny_mce.tar
index b4e9060d..beb06fb9 100644
Binary files a/framework/3rdParty/TinyMCE/tiny_mce.tar and b/framework/3rdParty/TinyMCE/tiny_mce.tar differ
diff --git a/framework/Caching/TAPCCache.php b/framework/Caching/TAPCCache.php
index 057d7585..5935e732 100644
--- a/framework/Caching/TAPCCache.php
+++ b/framework/Caching/TAPCCache.php
@@ -131,4 +131,3 @@ class TAPCCache extends TCache
}
}
-?>
diff --git a/framework/Caching/TCache.php b/framework/Caching/TCache.php
index 27618e84..02a4ae3b 100644
--- a/framework/Caching/TCache.php
+++ b/framework/Caching/TCache.php
@@ -4,7 +4,7 @@
*
* @author Qiang Xue
- framework - contains the core code of PRADO. This is the only directory that you will need in order to deploy with your PRADO application. It does NOT need to reside in a Web-accessible directory. -
- demos - contains PRADO demo applications. -
- docs - contains tutorials and documentation about PRADO. -
- editors - contains editor plugins for PRADO. -
- requirements - contains a requirement checker script that can check if your system can run PRADO applications. -
- tests - contains test tools that can be used to do unit test and functionality test about Web applications. -
- Hello World -
- PRADO Blog Tutorial (a good start point for new PRADO users) -
- PRADO QuickStart Tutorial (a definitive PRADO guidance. It contains many small examples.) -
- PRADO Blog (requires php_sqlite extension) -
- Time Tracker (requires php_pdo and php_pdo_mysql extensions) -
- PRADO Component Writer -
- Chat (requires php_pdo and php_pdo_sqlite extensions) -
- Currency Converter -
- SOAP (requires php_soap extension) -
- Personal Website -
- Flex Addressbook (requires php_soap, php_pdo and php_pdo_sqlite extensions) - -
- Northwind database (requires php_pdo and php_pdo_sqlite extensions) -
- Integrated manual (CHM), including quickstart, API, class docs and wiki -
- Quickstart tutorial (PDF) -
- API documentation (HTML) -
- SQLMap PHP DataMapper Tutorial (PDF) -
- Qiang Xue -
- Xiang Wei Zhuo -
- Jason Ragsdale -
- Marcus Nyeholt -
- Carl Mathisen -
- Alban Hanry -
- Knut Urdalen -
- Christophe Boulain -
- Michael Härtl -
- Indonesian: Zaenal Mutaqin -
- French: Eric Marchetti -
- Japanese: Yoshinari Ueyama, Shinya Kawamura, Tsuchimoto Hiroki -
- Stever for providing an Apple G3 notebook for testing safari browser issues. -
- Stanislav Yordanov - the script of generating Dreameweaver extension for PRADO -
- Andres Adolfo Testi - original concept and naming for Active Controls. -
- Jack Slocum - inspiration for the quickstart commenting system. -
- Cesar Ramos - Active Record driver for IBM DB2. -
- Sergey Morkovkin - TKeyboard control -
- Tomasz Wolny - TTabPanel control -
- All PRADO users - great suggestions, feedback and support -
- ASP.NET 2.0 for its great inspiration and reference -
- All third-party work used in PRADO -
- Redistributions of source code must retain the above copyright notice, this -list of conditions and the following disclaimer. -
- Redistributions in binary form must reproduce the above copyright notice, -this list of conditions and the following disclaimer in the documentation and/or -other materials provided with the distribution. -
- Neither the name of the PRADO Group nor the names of its contributors may be -used to endorse or promote products derived from this software without specific -prior written permission. -
- framework - contains the core code of PRADO. This is the only directory that you will need in order to deploy with your PRADO application. It does NOT need to reside in a Web-accessible directory. +
- demos - contains PRADO demo applications. +
- docs - contains tutorials and documentation about PRADO. +
- editors - contains editor plugins for PRADO. +
- requirements - contains a requirement checker script that can check if your system can run PRADO applications. +
- tests - contains test tools that can be used to do unit test and functionality test about Web applications. +
- Hello World +
- PRADO Blog Tutorial (a good start point for new PRADO users) +
- PRADO QuickStart Tutorial (a definitive PRADO guidance. It contains many small examples.) +
- PRADO Blog (requires php_sqlite extension) +
- Time Tracker (requires php_pdo and php_pdo_mysql extensions) +
- PRADO Component Writer +
- Chat (requires php_pdo and php_pdo_sqlite extensions) +
- Currency Converter +
- SOAP (requires php_soap extension) +
- Personal Website +
- Flex Addressbook (requires php_soap, php_pdo and php_pdo_sqlite extensions) + +
- Northwind database (requires php_pdo and php_pdo_sqlite extensions) +
- Integrated manual (CHM), including quickstart, API, class docs and wiki +
- Quickstart tutorial (PDF) +
- API documentation (HTML) +
- SQLMap PHP DataMapper Tutorial (PDF) +
- Qiang Xue +
- Xiang Wei Zhuo +
- Jason Ragsdale +
- Marcus Nyeholt +
- Carl Mathisen +
- Alban Hanry +
- Knut Urdalen +
- Christophe Boulain +
- Michael Härtl +
- Indonesian: Zaenal Mutaqin +
- French: Eric Marchetti +
- Japanese: Yoshinari Ueyama, Shinya Kawamura, Tsuchimoto Hiroki +
- Stever for providing an Apple G3 notebook for testing safari browser issues. +
- Stanislav Yordanov - the script of generating Dreameweaver extension for PRADO +
- Andres Adolfo Testi - original concept and naming for Active Controls. +
- Jack Slocum - inspiration for the quickstart commenting system. +
- Cesar Ramos - Active Record driver for IBM DB2. +
- Sergey Morkovkin - TKeyboard control +
- Tomasz Wolny - TTabPanel control +
- All PRADO users - great suggestions, feedback and support +
- ASP.NET 2.0 for its great inspiration and reference +
- All third-party work used in PRADO +
- Redistributions of source code must retain the above copyright notice, this +list of conditions and the following disclaimer. +
- Redistributions in binary form must reproduce the above copyright notice, +this list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. +
- Neither the name of the PRADO Group nor the names of its contributors may be +used to endorse or promote products derived from this software without specific +prior written permission. +
+ * class UserRecord extends TActiveRecord
+ * {
+ * public function table()
+ * {
+ * return 'users';
+ * }
+ *
+ * }
+ *
+ *
* @author Wei Zhuo Gets or sets the default text. If Value is not set, DefaultText will be + * shown instead of todays date and time. * * @author Xiang Wei Zhuo
Gets or sets the custom number formatting pattern. + * - DefaultText, string, + *
Gets or sets the default text. If Value is not set, DefaultText will be + * shown instead of the default currency Value/Pattern. * * @author Xiang Wei Zhuo
", first : "", pre : "", post : "
", last : ""}; case "SingleParagraph": return { header : " ", first : "", pre : "", post : " ", last : "
"}; @@ -1668,6 +1668,7 @@ Prado.WebUI.TRegularExpressionValidator = Class.extend(Prado.WebUI.TBaseValidato * @constructor initialize * @param {object} options - Additional constructor option: * @... {string} ValidationExpression - Regular expression to match against. + * @... {string} PatternModifiers - Pattern modifiers: combinations of g, i, and m */ /** @@ -1678,12 +1679,12 @@ Prado.WebUI.TRegularExpressionValidator = Class.extend(Prado.WebUI.TBaseValidato evaluateIsValid : function() { var value = this.getValidationValue(); - if (value.length <= 0) + if (value.length <= 0) return true; - var rx = new RegExp(this.options.ValidationExpression); - var matches = rx.exec(value); - return (matches != null && value == matches[0]); + var rx = new RegExp(this.options.ValidationExpression,this.options.PatternModifiers); + var matches = rx.exec(value); + return (matches != null && value == matches[0]); } }); @@ -1847,6 +1848,8 @@ Prado.WebUI.TCaptchaValidator = Class.extend(Prado.WebUI.TBaseValidator, { var a = this.getValidationValue(); var h = 0; + if (this.options.CaseSensitive==false) + a = a.toUpperCase(); for(var i = a.length-1; i >= 0; --i) h += a.charCodeAt(i); return h == this.options.TokenHash; diff --git a/framework/Web/Javascripts/source/scriptaculous-1.8.1/dragdrop.js b/framework/Web/Javascripts/source/scriptaculous-1.8.1/dragdrop.js index bf429c26..14f9546e 100644 --- a/framework/Web/Javascripts/source/scriptaculous-1.8.1/dragdrop.js +++ b/framework/Web/Javascripts/source/scriptaculous-1.8.1/dragdrop.js @@ -407,7 +407,7 @@ var Draggable = Class.create({ if(this.options.ghosting) { if (!this.element._originallyAbsolute) Position.relativize(this.element); - delete this.element._originallyAbsolute; + this.element._originallyAbsolute=null; Element.remove(this._clone); this._clone = null; } diff --git a/framework/Web/Services/TFeedService.php b/framework/Web/Services/TFeedService.php index fea39290..7ecd10a7 100644 --- a/framework/Web/Services/TFeedService.php +++ b/framework/Web/Services/TFeedService.php @@ -143,4 +143,3 @@ interface IFeedContentProvider public function getContentType(); } -?> diff --git a/framework/Web/Services/TJsonService.php b/framework/Web/Services/TJsonService.php index 93ad10d2..e3ed9a7f 100644 --- a/framework/Web/Services/TJsonService.php +++ b/framework/Web/Services/TJsonService.php @@ -92,7 +92,7 @@ class TJsonService extends TService throw new TConfigurationException('jsonservice_class_required',$id); } else - throw new THttpException(404,'jsonservice_feed_unknown',$id); + throw new THttpException(404,'jsonservice_provider_unknown',$id); } /** diff --git a/framework/Web/Services/TSoapService.php b/framework/Web/Services/TSoapService.php index 259fa5f8..f5962647 100644 --- a/framework/Web/Services/TSoapService.php +++ b/framework/Web/Services/TSoapService.php @@ -612,4 +612,3 @@ class TSoapServer extends TApplicationComponent } } -?> diff --git a/framework/Web/TAssetManager.php b/framework/Web/TAssetManager.php index d8028d93..7925d209 100644 --- a/framework/Web/TAssetManager.php +++ b/framework/Web/TAssetManager.php @@ -4,7 +4,7 @@ * * @author Qiang Xue
PRADO Framework for PHP 5
-Version 3.1.3, To Be Released
-Copyright© 2004-2008 by Prado Software
-All Rights Reserved.
-
-PRADO is a component-based and event-driven framework for Web application development in PHP 5. -
--PRADO is best suitable for creating Web applications that are highly user-interactive. It can be used to develop systems as simple as a blog system to those as complex as a content management system (CMS) or a complete e-commerce solution. Because PRADO promotes object-oriented programming (OOP) through its component-based methodology, it fits extremely well for team work and enterprise development. Its event-driven programming pattern helps developers gain better focus on business logic rather than distracted by various tedious and repetitive low-level coding handling. -
--PRADO comes with many features that can cut down development time signficantly. In particular, it provides a rich set of pluggable Web controls, complete database support including both active record and complex object mapper, seamless AJAX support, theme and skin, internationalization and localization, various caching solutions, security measures, and many other features that are seldom found in other programming frameworks. -
--Developers who have sufficient OOP experience will find PRADO is easy to learn and understand. In fact, PRADO shares many similarities with ASP.NET and other RAD kits for Windows GUI development, such as Borland Delphi and Microsoft Visual Basic. -
- -Requirements
--The sole requirement for PRADO is PHP 5.1.0 or higher. Please run requirement checker to obtain more detailed requirement information. -
--PRADO has been tested with Apache 2.0 on both Windows XP and RedHat Linux. -
- -Installation
--After downloading the latest PRADO release file, unpack it to a Web-accessible directory. The installation is done! You will see the following subdirectories: -
--
-
Included Demos
--
-
Editor Support
--A Macromedia Dreamweaver extension can be found under editors/Dreamweaver. -This extension contains a tag library that enables Dreamweaver to auto-complete -PRADO component tags when you use it to edit PRADO templates. -
- -Documentation
--
-
Credits
- -Prado v3 Developer Team
--
-
Translations
--
-
Prado v2 Maintenance Team
- - -Past Team Members
- - -Special Credits To
--
-
License
--The PRADO framework and the included demos are free software. They are released under -the terms of the following BSD License. -
-
-Copyright 2004-2008 by The PRADO Group (http://www.pradosoft.com)
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, -are permitted provided that the following conditions are met: -
--
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, -OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY -OF SUCH DAMAGE. -
- - + + + +PRADO Framework for PHP 5
+Version 3.2, To be released
+Copyright© 2004-2008 by Prado Software
+All Rights Reserved.
+
+PRADO is a component-based and event-driven framework for Web application development in PHP 5. +
++PRADO is best suitable for creating Web applications that are highly user-interactive. It can be used to develop systems as simple as a blog system to those as complex as a content management system (CMS) or a complete e-commerce solution. Because PRADO promotes object-oriented programming (OOP) through its component-based methodology, it fits extremely well for team work and enterprise development. Its event-driven programming pattern helps developers gain better focus on business logic rather than distracted by various tedious and repetitive low-level coding handling. +
++PRADO comes with many features that can cut down development time signficantly. In particular, it provides a rich set of pluggable Web controls, complete database support including both active record and complex object mapper, seamless AJAX support, theme and skin, internationalization and localization, various caching solutions, security measures, and many other features that are seldom found in other programming frameworks. +
++Developers who have sufficient OOP experience will find PRADO is easy to learn and understand. In fact, PRADO shares many similarities with ASP.NET and other RAD kits for Windows GUI development, such as Borland Delphi and Microsoft Visual Basic. +
+ +Requirements
++The sole requirement for PRADO is PHP 5.1.0 or higher. Please run requirement checker to obtain more detailed requirement information. +
++PRADO has been tested with Apache 2.0 on both Windows XP and RedHat Linux. +
+ +Installation
++After downloading the latest PRADO release file, unpack it to a Web-accessible directory. The installation is done! You will see the following subdirectories: +
+-
+
Included Demos
+-
+
Editor Support
++A Macromedia Dreamweaver extension can be found under editors/Dreamweaver. +This extension contains a tag library that enables Dreamweaver to auto-complete +PRADO component tags when you use it to edit PRADO templates. +
+ +Documentation
+-
+
Credits
+ +Prado v3 Developer Team
+-
+
Translations
+-
+
Prado v2 Maintenance Team
+ + +Past Team Members
+ + +Special Credits To
+-
+
License
++The PRADO framework and the included demos are free software. They are released under +the terms of the following BSD License. +
+
+Copyright 2004-2008 by The PRADO Group (http://www.pradosoft.com)
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: +
+-
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, +INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, +OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY +OF SUCH DAMAGE. +
+ + diff --git a/tests/FunctionalTests/active-controls/protected/pages/ActiveDatePicker.page b/tests/FunctionalTests/active-controls/protected/pages/ActiveDatePicker.page new file mode 100755 index 00000000..ed35293e --- /dev/null +++ b/tests/FunctionalTests/active-controls/protected/pages/ActiveDatePicker.page @@ -0,0 +1,17 @@ + +TActiveDatePicker test
+
+
+
TActiveRatingList AllowInput Test Case
+TActiveRatingList AutoPostBack Test Case
++
TActiveRatingList Check Boxes Test Case
+TActiveRatingList Enabled Test Case
++
TActiveRatingList Hover Caption Test Case
+TActiveRatingList Rating Test Case
++
TActiveRatingList ReadOnly Test Case
++
TActiveRatingList SelectedIndex Test Case
++
+ +
Problem with TUrlMapping and urlencoding
+ +Enter a string with spaces that will be used as URL parameter ++Decoded String: +
+ Timer 2 :
+