A few minor fixes.

2 files changed, 5 insertions, 52 deletions

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 &copy; 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';