diff options
| -rw-r--r-- | .gitattributes | 1 | ||||
| -rw-r--r-- | HISTORY | 1 | ||||
| -rw-r--r-- | UPGRADE | 8 | ||||
| -rw-r--r-- | framework/Web/UI/WebControls/TCompositeControl.php | 49 | ||||
| -rw-r--r-- | framework/Web/UI/WebControls/THtmlArea.php | 8 | ||||
| -rw-r--r-- | tests/FunctionalTests/features/protected/controls/LabeledTextbox.php | 10 |
6 files changed, 17 insertions, 60 deletions
diff --git a/.gitattributes b/.gitattributes index 28d84081..0d7510b8 100644 --- a/.gitattributes +++ b/.gitattributes @@ -772,7 +772,6 @@ framework/Web/UI/WebControls/TCheckBoxList.php -text framework/Web/UI/WebControls/TClientScript.php -text framework/Web/UI/WebControls/TColorPicker.php -text framework/Web/UI/WebControls/TCompareValidator.php -text -framework/Web/UI/WebControls/TCompositeControl.php -text framework/Web/UI/WebControls/TContent.php -text framework/Web/UI/WebControls/TContentPlaceHolder.php -text framework/Web/UI/WebControls/TCustomValidator.php -text @@ -27,7 +27,6 @@ CHG: TDatePicker's date can be set using Date property, it value must be in same CHG: TSimpleDateFormatter::parse() now return an integer or null on parse error (Wei)
NEW: TListControlValidator (Wei)
NEW: TClientScript (Wei)
-NEW: TCompositeControl (Wei)
Version 3.0RC2 April 16, 2006
@@ -4,7 +4,7 @@ !!!IMPORTANT!!!
-After upgrading, remember to delete everything under
+After installing the framework, remember to delete everything under
your PRADO application's assets and runtime directories.
@@ -16,9 +16,9 @@ for both A and B. Upgrading from v3.0.0 RC2
-------------------------
-There should be no PHP compatibility issues. Javascript libraries
-were updated and client-side validators rewritten.
-
+There should be no PHP compatibility issues. Remember to clean up 'assets'
+directory of your PRADO application as Javascript libraries were updated
+and client-side validators rewritten.
Upgrading from v3.0.0 RC1
diff --git a/framework/Web/UI/WebControls/TCompositeControl.php b/framework/Web/UI/WebControls/TCompositeControl.php deleted file mode 100644 index 80f2259c..00000000 --- a/framework/Web/UI/WebControls/TCompositeControl.php +++ /dev/null @@ -1,49 +0,0 @@ -<?php
-/**
- * TCompositeControl class file.
- *
- * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @link http://www.pradosoft.com/
- * @copyright Copyright © 2005 PradoSoft
- * @license http://www.pradosoft.com/license/
- * @version $Revision: $ $Date: $
- * @package System.Web.UI
- */
-
-/**
- * The TCompositeControl class is an abstract class that provides naming
- * container and control designer functionality for custom controls that
- * encompass child controls in their entirety or use the functionality of other
- * controls. You cannot use this class directly.
- *
- * To create a custom composite control, derive from the CompositeControl class.
- * The functionality this class provides is built-in verification that child
- * controls have been created prior to being accessed
- *
- * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @version $Revision: $ $Date: $
- * @package System.Web.UI
- * @since 3.0
- */
-abstract class TCompositeControl extends TTemplateControl
-{
- /**
- * The constructor ensures the child controls are created.
- */
- public function __construct()
- {
- parent::__construct();
- $this->recreateChildControls();
- }
-
- /**
- * Recreates the child controls in a control derived from TCompositeControl.
- */
- protected function recreateChildControls()
- {
- $this->ensureChildControls();
- }
-
-}
-
-?>
diff --git a/framework/Web/UI/WebControls/THtmlArea.php b/framework/Web/UI/WebControls/THtmlArea.php index 254754ae..8b214b69 100644 --- a/framework/Web/UI/WebControls/THtmlArea.php +++ b/framework/Web/UI/WebControls/THtmlArea.php @@ -271,10 +271,12 @@ class THtmlArea extends TTextBox $options['elements'] = $this->getClientID();
$options['language'] = $this->getLanguageSuffix($this->getCulture());
$options['theme'] = 'advanced';
-
+
//make it basic advanced to fit into 1 line of buttons.
- $options['theme_advanced_buttons1'] = 'bold,italic,underline,strikethrough,separator,justifyleft,justifycenter,justifyright, justifyfull,separator,bullist,numlist,separator,undo,redo,separator,link,unlink,separator,charmap,separator,code,help';
- $options['theme_advanced_buttons2'] = ' ';
+ //$options['theme_advanced_buttons1'] = 'bold,italic,underline,strikethrough,separator,justifyleft,justifycenter,justifyright, justifyfull,separator,bullist,numlist,separator,undo,redo,separator,link,unlink,separator,charmap,separator,code,help';
+ //$options['theme_advanced_buttons2'] = ' ';
+ $options['theme_advanced_buttons1'] = 'formatselect,fontselect,fontsizeselect,separator,bold,italic,underline,strikethrough,sub,sup';
+ $options['theme_advanced_buttons2'] = 'justifyleft,justifycenter,justifyright,justifyfull,separator,bullist,numlist,separator,outdent,indent,separator,forecolor,backcolor,separator,hr,link,unlink,image,charmap,separator,removeformat,code,help';
$options['theme_advanced_buttons3'] = ' ';
$options['theme_advanced_toolbar_location'] = 'top';
diff --git a/tests/FunctionalTests/features/protected/controls/LabeledTextbox.php b/tests/FunctionalTests/features/protected/controls/LabeledTextbox.php index e190abd4..9a50d095 100644 --- a/tests/FunctionalTests/features/protected/controls/LabeledTextbox.php +++ b/tests/FunctionalTests/features/protected/controls/LabeledTextbox.php @@ -3,8 +3,14 @@ * Created on 28/04/2006
*/
-class LabeledTextBox extends TCompositeControl
+class LabeledTextBox extends TTemplateControl
{
+ public function __construct()
+ {
+ parent::__construct();
+ $this->ensureChildControls();
+ }
+
public function getTextBox()
{
return $this->getRegisteredObject('textbox');
@@ -12,7 +18,7 @@ class LabeledTextBox extends TCompositeControl public function getLabel()
{
- return $this->label;
+ return $this->getRegisteredObject('label');
}
}
|