Merge pull request #530 from pradosoft/prado-3.2.43.2.4prado-3.2

Backports for Prado 3.2.4

181 files changed, 591 insertions, 1042 deletions

diff --git a/framework/Web/Javascripts/TJavaScript.php b/framework/Web/Javascripts/TJavaScript.php
index 0f6fef1c..d7703bfd 100644
--- a/framework/Web/Javascripts/TJavaScript.php
+++ b/framework/Web/Javascripts/TJavaScript.php
@@ -4,9 +4,8 @@
  *
  * @author Wei Zhuo<weizhuo[at]gmail[dot]com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TJavaScript.php 3291 2013-05-09 17:44:58Z ctrlaltca $
  * @package System.Web.Javascripts
  */
 
@@ -17,7 +16,6 @@
  * functions.
  *
  * @author Wei Zhuo<weizhuo[at]gmail[dot]com>
- * @version $Id: TJavaScript.php 3291 2013-05-09 17:44:58Z ctrlaltca $
  * @package System.Web.Javascripts
  * @since 3.0
  */
@@ -206,7 +204,6 @@ class TJavaScript
 		else
 			return '';
 	}
-
 	/**
 	 * Encodes a PHP variable into javascript string.
 	 * This method invokes json_encode to perform the encoding.
@@ -215,16 +212,32 @@ class TJavaScript
 	 */
 	public static function jsonEncode($value, $options = 0)
 	{
-		if (is_string($value) &&
-			($g=Prado::getApplication()->getGlobalization(false))!==null &&
-			strtoupper($enc=$g->getCharset())!='UTF-8')
-			$value=iconv($enc, 'UTF-8', $value);
+		if (($g=Prado::getApplication()->getGlobalization(false))!==null &&
+			strtoupper($enc=$g->getCharset())!='UTF-8') {
+			self::convertToUtf8($value, $enc);
+		}
+
 		$s = @json_encode($value,$options);
 		self::checkJsonError();
 		return $s;
 	}
 
 	/**
+	 * Encodes an string or the content of an array to UTF8
+	 * @param string|array|mixed $value
+	 * @param string $sourceEncoding
+	 */
+	private static function convertToUtf8(&$value, $sourceEncoding) {
+		if(is_string($value))
+			$value=iconv($sourceEncoding, 'UTF-8', $value);
+		else if (is_array($value))
+		{
+			foreach($value as &$element)
+				self::convertToUtf8($element, $sourceEncoding);
+		}
+	}
+
+	/**
 	 * Decodes a javascript string into PHP variable.
 	 * This method invokes json_decode to perform the decoding.
 	 * @param string string to be decoded
@@ -238,7 +251,7 @@ class TJavaScript
 		self::checkJsonError();
 		return $s;
 	}
-	
+
 	private static function checkJsonError()
 	{
 		switch ($err = json_last_error())
@@ -271,7 +284,7 @@ class TJavaScript
 	/**
 	 * Minimize the size of a javascript script.
 	 * This method is based on Douglas Crockford's JSMin.
-	 * @param string code that you want to minimzie 
+	 * @param string code that you want to minimzie
 	 * @return minimized version of the code
 	 */
 	public static function JSMin($code)
diff --git a/framework/Web/Javascripts/source/prado/activecontrols/ajax3.js b/framework/Web/Javascripts/source/prado/activecontrols/ajax3.js
index e19f5d49..648f3e76 100644
--- a/framework/Web/Javascripts/source/prado/activecontrols/ajax3.js
+++ b/framework/Web/Javascripts/source/prado/activecontrols/ajax3.js
@@ -1154,7 +1154,13 @@ if (typeof(Prado.AssetManagerClass)=="undefined") {
 	createStyleSheetCode: function(code) {
    		var asset = document.createElement('style');
    		asset.setAttribute('type', 'text/css');
-		asset.innerText = code;
+		
+		if(asset.styleSheet) 
+			asset.styleSheet.cssText = code; // IE7+IE8
+		else {
+			var cssCodeNode = document.createTextNode(code);
+			asset.appendChild(cssCodeNode);
+		}
 
 		var head = document.getElementsByTagName('head')[0];
    		head.appendChild(asset);
diff --git a/framework/Web/Javascripts/source/prado/controls/slider.js b/framework/Web/Javascripts/source/prado/controls/slider.js
index 2e26ee51..ba65de3b 100644
--- a/framework/Web/Javascripts/source/prado/controls/slider.js
+++ b/framework/Web/Javascripts/source/prado/controls/slider.js
@@ -18,17 +18,9 @@ Prado.WebUI.TSlider = Class.extend(Prado.WebUI.PostBackControl,
 		this.maximum   = this.options.maximum || this.range.end;
 		this.minimum   = this.options.minimum || this.range.start;
 		this.hiddenField=$(this.options.ID+'_1');
+		this.trackInitialized=false;
 		
-		// Will be used to align the handle onto the track, if necessary
-		this.alignX = parseInt(this.options.alignX || - this.track.offsetLeft);
-		this.alignY = parseInt(this.options.alignY || - this.track.offsetTop);
-		
-		this.trackLength = this.maximumOffset() - this.minimumOffset();
-		this.handleLength = this.isVertical() ? 
-			(this.handle.offsetHeight != 0 ? 
-				this.handle.offsetHeight : this.handles.style.height.replace(/px$/,"")) : 
-				(this.handle.offsetWidth != 0 ? this.handle.offsetWidth : 
-					this.handle.style.width.replace(/px$/,""));
+		this.initializeTrack();
 	
 		this.active   = false;
 		this.dragging = false;
@@ -63,8 +55,26 @@ Prado.WebUI.TSlider = Class.extend(Prado.WebUI.PostBackControl,
 		
 		if(this.options['AutoPostBack']==true)
 			this.observe(this.hiddenField, "change", Prado.PostBack.bindEvent(this,options));
-    
 	},
+
+	initializeTrack : function()
+	{
+		if(this.trackInitialized || !$(this.track).is(":visible"))
+			return;
+
+		// Will be used to align the handle onto the track, if necessary
+		this.alignX = parseInt(this.options.alignX || - this.track.offsetLeft);
+		this.alignY = parseInt(this.options.alignY || - this.track.offsetTop);
+
+		this.trackLength = this.maximumOffset() - this.minimumOffset();
+		this.handleLength = this.isVertical() ?
+			(this.handle.offsetHeight != 0 ?
+				this.handle.offsetHeight : this.handles.style.height.replace(/px$/,"")) :
+				(this.handle.offsetWidth != 0 ? this.handle.offsetWidth :
+					this.handle.style.width.replace(/px$/,""));
+		this.trackInitialized=true;
+	},
+
   
 	setDisabled: function(){
 		this.disabled = true;
@@ -151,6 +161,7 @@ Prado.WebUI.TSlider = Class.extend(Prado.WebUI.PostBackControl,
 	
 	startDrag: function(event) {
 		if(Event.isLeftClick(event)) {
+			this.initializeTrack();
 			if(!this.disabled){
 				this.active = true;
 				var handle = Event.element(event);
@@ -223,4 +234,4 @@ Prado.WebUI.TSlider = Class.extend(Prado.WebUI.PostBackControl,
 		}
 	}
 
-});
\ No newline at end of file
+});
diff --git a/framework/Web/Javascripts/source/prado/prado.js b/framework/Web/Javascripts/source/prado/prado.js
index 05f11dcd..1b3bd7c8 100644
--- a/framework/Web/Javascripts/source/prado/prado.js
+++ b/framework/Web/Javascripts/source/prado/prado.js
@@ -8,7 +8,7 @@ var Prado =
 	 * Version of Prado clientscripts
 	 * @var Version
 	 */
-	Version: '3.2.3',
+	Version: '3.2.4',
 	
 	/**
 	 * Registry for Prado components
diff --git a/framework/Web/Javascripts/source/prado/validator/validation3.js b/framework/Web/Javascripts/source/prado/validator/validation3.js
index 0361389f..483c7ec2 100644
--- a/framework/Web/Javascripts/source/prado/validator/validation3.js
+++ b/framework/Web/Javascripts/source/prado/validator/validation3.js
@@ -979,7 +979,7 @@ Prado.WebUI.TBaseValidator = Class.create(Prado.WebUI.Control,
 		if(!this.control)
 			this.control = $(this.options.ControlToValidate);
 
-		if(!this.control || this.control.disabled)
+		if(!this.control || this.control.disabled || !this.control.descendantOf(document))
 		{
 			this.isValid = true;
 			return this.isValid;
diff --git a/framework/Web/Services/TFeedService.php b/framework/Web/Services/TFeedService.php
index a1518d4e..75775f49 100644
--- a/framework/Web/Services/TFeedService.php
+++ b/framework/Web/Services/TFeedService.php
@@ -5,7 +5,7 @@
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @author Knut Urdalen <knut.urdalen@gmail.com>
  * @link http://www.pradosoft.com
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
  * @version $Id$
  * @package System.Web.Services
@@ -132,7 +132,7 @@ class TFeedService extends TService
 				else
 					throw new TConfigurationException('feedservice_class_required',$id);
 			}
-			
+
 			// init feed properties
 			foreach($properties as $name=>$value)
 				$feed->setSubproperty($name,$value);
diff --git a/framework/Web/Services/TJsonService.php b/framework/Web/Services/TJsonService.php
index 15701a9a..e3b9b1cb 100644
--- a/framework/Web/Services/TJsonService.php
+++ b/framework/Web/Services/TJsonService.php
@@ -4,9 +4,8 @@
  *
  * @author Wei Zhuo <weizhuo[at]gamil[dot]com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TJsonService.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.Services
  */
 
@@ -47,7 +46,6 @@
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
  * @author Carl G. Mathisen <carlgmathisen@gmail.com>
- * @version $Id: TJsonService.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.Services
  * @since 3.1
  */
@@ -132,7 +130,7 @@ class TJsonService extends TService
 						throw new TConfigurationException('jsonservice_response_type_invalid',$id);
 				}
 				else
-					throw new TConfigurationException('jsonservice_class_required',$id);	
+					throw new TConfigurationException('jsonservice_class_required',$id);
 			}
 		}
 		else
@@ -172,7 +170,6 @@ class TJsonService extends TService
  * will be empty if the returned content is null.
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @version $Id: TJsonService.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.Services
  * @since 3.1
  */
diff --git a/framework/Web/Services/TPageService.php b/framework/Web/Services/TPageService.php
index 8e052693..f0dd8c1a 100644
--- a/framework/Web/Services/TPageService.php
+++ b/framework/Web/Services/TPageService.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TPageService.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.Services
  */
 
@@ -70,7 +69,6 @@ Prado::using('System.Web.UI.TThemeManager');
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @author Carl G. Mathisen <carlgmathisen@gmail.com>
- * @version $Id: TPageService.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.Services
  * @since 3.0
  */
@@ -547,7 +545,6 @@ class TPageService extends TService
  * Configurations along this path are merged together to be provided for the page.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TPageService.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.Services
  * @since 3.0
  */
@@ -657,14 +654,14 @@ class TPageConfiguration extends TComponent
 		Prado::trace("Loading page configuration file $fname",'System.Web.Services.TPageService');
 		if(empty($fname) || !is_file($fname))
 			return;
-		
+
 		if(Prado::getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP)
 		{
 			$fcontent = include $fname;
 			$this->loadFromPhp($fcontent,dirname($fname),$configPagePath);
 		}
 		else
-		{	
+		{
 			$dom=new TXmlDocument;
 			if($dom->loadFromFile($fname))
 				$this->loadFromXml($dom,dirname($fname),$configPagePath);
@@ -692,7 +689,7 @@ class TPageConfiguration extends TComponent
 		$this->loadApplicationConfigurationFromXml($dom,$configPath);
 		$this->loadPageConfigurationFromXml($dom,$configPath,$configPagePath);
 	}
-	
+
 	public function loadApplicationConfigurationFromPhp($config,$configPath)
 	{
 		$appConfig=new TApplicationConfiguration;
@@ -775,7 +772,7 @@ class TPageConfiguration extends TComponent
 				if(isset($page['properties']))
 				{
 					$properties=$page['properties'];
-					unset($page['properties']);	
+					unset($page['properties']);
 				}
 				$matching=false;
 				$id=($configPagePath==='')?$id:$configPagePath.'.'.$id;
@@ -787,7 +784,7 @@ class TPageConfiguration extends TComponent
 					$this->_properties=array_merge($this->_properties,$properties);
 			}
 		}
-		
+
 		// external configurations
 		if(isset($config['includes']) && is_array($config['includes']))
 		{
diff --git a/framework/Web/Services/TRpcService.php b/framework/Web/Services/TRpcService.php
index a2691af4..a4ed3d7c 100644
--- a/framework/Web/Services/TRpcService.php
+++ b/framework/Web/Services/TRpcService.php
@@ -480,7 +480,6 @@ class TJsonRpcProtocol extends TRpcProtocol
 			if(!is_array($parameters))
 				$parameters = array($parameters);
 
-			$ret = $this->callApiMethod($_request['method'], $parameters);
 			// a request without an id is a notification that doesn't need a response
 			if($this->_id !== null)
 			{
@@ -489,7 +488,7 @@ class TJsonRpcProtocol extends TRpcProtocol
 					return $this->encode(array(
 						'jsonrpc' => '2.0',
 						'id' => $this->_id,
-						'result' => $ret
+						'result' => $this->callApiMethod($_request['method'], $parameters),
 					));
 				} else {
 					return $this->encode(array(
diff --git a/framework/Web/Services/TSoapService.php b/framework/Web/Services/TSoapService.php
index 2d59f462..c928dc06 100644
--- a/framework/Web/Services/TSoapService.php
+++ b/framework/Web/Services/TSoapService.php
@@ -5,9 +5,8 @@
  * @author Knut Urdalen <knut.urdalen@gmail.com>
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TSoapService.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.Services
  */
 
@@ -156,7 +155,7 @@ class TSoapService extends TService
 	 * @throws TConfigurationException if soap server id is not specified or duplicated
 	 */
 	private function loadConfig($config)
-	{	
+	{
 		if($this->getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP)
 		{
 			if(is_array($config))
@@ -296,7 +295,6 @@ class TSoapService extends TService
  * It also manages the URI for the SOAP service and WSDL.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TSoapService.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.Services
  * @since 3.1
  */
diff --git a/framework/Web/TAssetManager.php b/framework/Web/TAssetManager.php
index f29b0707..272d4400 100644
--- a/framework/Web/TAssetManager.php
+++ b/framework/Web/TAssetManager.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TAssetManager.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web
  */
 
@@ -38,7 +37,6 @@
  * pointing to a valid directory writable by the Web server process.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TAssetManager.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web
  * @since 3.0
  */
diff --git a/framework/Web/TCacheHttpSession.php b/framework/Web/TCacheHttpSession.php
index d658c0f3..02e84e22 100644
--- a/framework/Web/TCacheHttpSession.php
+++ b/framework/Web/TCacheHttpSession.php
@@ -5,9 +5,8 @@
  * @author Carl G. Mathisen <carlgmathisen@gmail.com>
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TCacheHttpSession.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web
  * @since 3.1.1
  */
@@ -36,7 +35,6 @@
  *
  * @author Carl G. Mathisen <carlgmathisen@gmail.com>
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TCacheHttpSession.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web
  * @since 3.1.1
  */
diff --git a/framework/Web/THttpRequest.php b/framework/Web/THttpRequest.php
index f621d1eb..5d77ba60 100644
--- a/framework/Web/THttpRequest.php
+++ b/framework/Web/THttpRequest.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: THttpRequest.php 3273 2013-02-13 21:51:21Z ctrlaltca $
  * @package System.Web
  */
 
@@ -64,7 +63,6 @@ Prado::using('System.Web.TUrlManager');
  * request module. It can be accessed via {@link TApplication::getRequest()}.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: THttpRequest.php 3273 2013-02-13 21:51:21Z ctrlaltca $
  * @package System.Web
  * @since 3.0
  */
@@ -267,7 +265,7 @@ class THttpRequest extends TApplicationComponent implements IteratorAggregate,Ar
 		if($this->getEnableCache())
 		{
 			$cache = $this->getApplication()->getCache();
-			if($cache !== null) 
+			if($cache !== null)
 			{
 				$dependencies = null;
 				if($this->getApplication()->getMode() !== TApplicationMode::Performance)
@@ -969,7 +967,6 @@ class THttpRequest extends TApplicationComponent implements IteratorAggregate,Ar
  * </code>
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: THttpRequest.php 3273 2013-02-13 21:51:21Z ctrlaltca $
  * @package System.Web
  * @since 3.0
  */
@@ -1057,7 +1054,6 @@ class THttpCookieCollection extends TList
  * domain, path, expire, and secure.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: THttpRequest.php 3273 2013-02-13 21:51:21Z ctrlaltca $
  * @package System.Web
  * @since 3.0
  */
@@ -1232,7 +1228,6 @@ class THttpCookie extends TComponent
  * - fragment: anchor
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: THttpRequest.php 3273 2013-02-13 21:51:21Z ctrlaltca $
  * @package System.Web
  * @since 3.0
  */
@@ -1399,7 +1394,6 @@ class TUri extends TComponent
  * - HiddenPath: the URL format is like /path/to/name1,value1/name2,value2...
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: THttpRequest.php 3273 2013-02-13 21:51:21Z ctrlaltca $
  * @package System.Web
  * @since 3.0.4
  */
diff --git a/framework/Web/THttpResponse.php b/framework/Web/THttpResponse.php
index ebcb9cc7..75563ef9 100644
--- a/framework/Web/THttpResponse.php
+++ b/framework/Web/THttpResponse.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: THttpResponse.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web
  */
 
@@ -60,7 +59,6 @@ Prado::using('System.Web.THttpResponseAdapter');
  * will force the browser to ask for a username and a password.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: THttpResponse.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web
  * @since 3.0
  */
diff --git a/framework/Web/THttpResponseAdapter.php b/framework/Web/THttpResponseAdapter.php
index 635752ed..3411e71c 100644
--- a/framework/Web/THttpResponseAdapter.php
+++ b/framework/Web/THttpResponseAdapter.php
@@ -4,7 +4,7 @@
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
  * @version $Id$
  * @package System.Web
diff --git a/framework/Web/THttpSession.php b/framework/Web/THttpSession.php
index f32b7063..79c6e6df 100644
--- a/framework/Web/THttpSession.php
+++ b/framework/Web/THttpSession.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: THttpSession.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web
  */
 
@@ -57,7 +56,6 @@
  * and {@link getTimeout TimeOut} are configurable properties of THttpSession.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: THttpSession.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web
  * @since 3.0
  */
@@ -159,7 +157,7 @@ class THttpSession extends TApplicationComponent implements IteratorAggregate,Ar
 			$this->_started=false;
 		}
 	}
-	
+
 	/**
 	 * Update the current session id with a newly generated one
 	 *
@@ -628,7 +626,6 @@ class THttpSession extends TApplicationComponent implements IteratorAggregate,Ar
  * for traversing the session variables.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: THttpSession.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web
  * @since 3.0
  */
@@ -717,7 +714,6 @@ class TSessionIterator implements Iterator
  * - Only: using cookie only.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: THttpSession.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web
  * @since 3.0.4
  */
diff --git a/framework/Web/THttpUtility.php b/framework/Web/THttpUtility.php
index 128dee55..f41060f7 100644
--- a/framework/Web/THttpUtility.php
+++ b/framework/Web/THttpUtility.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: THttpUtility.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web
  */
 
@@ -14,7 +13,6 @@
  * THttpUtility class
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: THttpUtility.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web
  * @since 3.0
  */
diff --git a/framework/Web/TUrlManager.php b/framework/Web/TUrlManager.php
index 75abdcf1..2d3fa572 100644
--- a/framework/Web/TUrlManager.php
+++ b/framework/Web/TUrlManager.php
@@ -4,7 +4,7 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
  * @version $Id $
  * @package System.Web
@@ -50,7 +50,7 @@ class TUrlManager extends TModule
 	 * In order to use the 'HiddenPath' format you need proper url rewrite configuration;
 	 * here's an example for Apache's .htaccess:
 	 * <cdde>
-	 * Options +FollowSymLinks  
+	 * Options +FollowSymLinks
 	 * RewriteEngine On
 	 * RewriteCond %{REQUEST_FILENAME} !-d
 	 * RewriteCond %{REQUEST_FILENAME} !-f
diff --git a/framework/Web/TUrlMapping.php b/framework/Web/TUrlMapping.php
index 929a873e..4c93f004 100644
--- a/framework/Web/TUrlMapping.php
+++ b/framework/Web/TUrlMapping.php
@@ -4,9 +4,8 @@
  *
  * @author Wei Zhuo <weizhuo[at]gamil[dot]com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TUrlMapping.php 3290 2013-05-06 08:32:15Z ctrlaltca $
  * @package System.Web
  */
 
@@ -63,7 +62,6 @@ Prado::using('System.Collections.TAttributeCollection');
  * in the GET variables.
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @version $Id: TUrlMapping.php 3290 2013-05-06 08:32:15Z ctrlaltca $
  * @package System.Web
  * @since 3.0.5
  */
@@ -477,7 +475,7 @@ class TUrlMapping extends TUrlManager
  * Since 3.2.2 you can also add a list of "constants" parameters that can be used just
  * like the original "parameters" parameters, except that the supplied value will be treated
  * as a simple string constant instead of a regular expression. For example
- * 
+ *
  * <url ServiceParameter="MyPage" pattern="/mypage/mypath/list/detail/{pageidx}" parameters.pageidx="\d+" constants.listtype="detailed"/>
  * <url ServiceParameter="MyPage" pattern="/mypage/mypath/list/summary/{pageidx}" parameters.pageidx="\d+" constants.listtype="summarized"/>
  *
@@ -486,7 +484,6 @@ class TUrlMapping extends TUrlManager
  * The constants is practically a table-based validation and translation of specified, fixed-set parameter values.
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @version $Id: TUrlMapping.php 3290 2013-05-06 08:32:15Z ctrlaltca $
  * @package System.Web
  * @since 3.0.5
  */
@@ -1003,7 +1000,6 @@ class TUrlMappingPattern extends TComponent
  * URL prefix behavior that can be used by {@link TUrlMappingPattern::constructUrl()}.
  *
  * @author Yves Berkholz <godzilla80[at]gmx[dot]net>
- * @version $Id: TUrlMapping.php 3290 2013-05-06 08:32:15Z ctrlaltca $
  * @package System.Web
  * @since 3.2
  */
diff --git a/framework/Web/UI/ActiveControls/TActiveButton.php b/framework/Web/UI/ActiveControls/TActiveButton.php
index 16ba5339..697e96f1 100644
--- a/framework/Web/UI/ActiveControls/TActiveButton.php
+++ b/framework/Web/UI/ActiveControls/TActiveButton.php
@@ -4,9 +4,8 @@
  *
  * @author Wei Zhuo <weizhuo[at]gamil[dot]com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TActiveButton.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.ActiveControls
  */
 
@@ -29,7 +28,6 @@ Prado::using('System.Web.UI.ActiveControls.TActiveControlAdapter');
  * will update the button's caption upon callback response completion.
  *
  * @author Wei Zhuo <weizhuo[at]gamil[dot]com>
- * @version $Id: TActiveButton.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.ActiveControls
  * @since 3.1
  */
@@ -63,7 +61,7 @@ class TActiveButton extends TButton implements ICallbackEventHandler, IActiveCon
 	}
 
 	/**
-	 * Raises the callback event. This method is required by 
+	 * Raises the callback event. This method is required by
 	 * {@link ICallbackEventHandler} interface. If {@link getCausesValidation CausesValidation}
 	 * is true, it will invoke the page's {@link TPage::validate validate}
 	 * method first. It will raise {@link onClick OnClick} event first
diff --git a/framework/Web/UI/ActiveControls/TActiveCheckBox.php b/framework/Web/UI/ActiveControls/TActiveCheckBox.php
index 6221150d..b5d7393c 100644
--- a/framework/Web/UI/ActiveControls/TActiveCheckBox.php
+++ b/framework/Web/UI/ActiveControls/TActiveCheckBox.php
@@ -4,9 +4,8 @@
  *
  * @author Wei Zhuo <weizhuo[at]gamil[dot]com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TActiveCheckBox.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.ActiveControls
  */
 
@@ -26,7 +25,6 @@ Prado::using('System.Web.UI.ActiveControls.TActiveControlAdapter');
  * changed during a callback.
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @version $Id: TActiveCheckBox.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.ActiveControls
  * @since 3.1
  */
@@ -121,9 +119,9 @@ class TActiveCheckBox extends TCheckBox implements ICallbackEventHandler, IActiv
 	/**
 	 * Ensure that the ID attribute is rendered and registers the javascript code
 	 * for initializing the active control.
-	 * 
+	 *
 	 * Since 3.1.4, the javascript code is not rendered if {@link setAutoPostBack AutoPostBack} is false
-	 * 
+	 *
 	 * @param THtmlWriter the writer for the rendering purpose
 	 * @param string checkbox id
 	 * @param string onclick js
diff --git a/framework/Web/UI/ActiveControls/TActiveCheckBoxList.php b/framework/Web/UI/ActiveControls/TActiveCheckBoxList.php
index a42044fb..aa2d5f94 100644
--- a/framework/Web/UI/ActiveControls/TActiveCheckBoxList.php
+++ b/framework/Web/UI/ActiveControls/TActiveCheckBoxList.php
@@ -4,9 +4,8 @@
  *
  * @author Wei Zhuo <weizhuo[at]gamil[dot]com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TActiveCheckBoxList.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.ActiveControls
  */
 
@@ -30,7 +29,6 @@ Prado::using('System.Web.UI.ActiveControls.TActiveListControlAdapter');
  * List items can not be changed dynamically during a callback request.
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @version $Id: TActiveCheckBoxList.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.ActiveControls
  * @since 3.1
  */
diff --git a/framework/Web/UI/ActiveControls/TActiveClientScript.php b/framework/Web/UI/ActiveControls/TActiveClientScript.php
index 8fce726a..4443ea30 100755
--- a/framework/Web/UI/ActiveControls/TActiveClientScript.php
+++ b/framework/Web/UI/ActiveControls/TActiveClientScript.php
@@ -4,9 +4,8 @@
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TActiveClientScript.php 3144 2012-05-19 10:07:03Z ctrlaltca $
  * @package System.Web.UI.ActiveControls
  */
 
@@ -15,13 +14,13 @@
  *
  * This is the active counterpart of the {@link TClientScript} class.
  *
- * TActiveClientScript has the ability to render itself on ajax 
+ * TActiveClientScript has the ability to render itself on ajax
  * callbacks. This means that every variable or function declared in javascript
  * code will be available to the page.
  *
  * Beware that when rendered on normal (postback) or ajax callbacks, some
- * javascript code won't behave in the same way. 
- * When rendered as part of a normal/postback response, scripts will execute instantly 
+ * javascript code won't behave in the same way.
+ * When rendered as part of a normal/postback response, scripts will execute instantly
  * where they are in the page and in a synchronous fashion.
  * Instead, when they are rendered as part of a callback response,
  * they will be executed when all DOM modifications are complete and any dynamic
@@ -30,7 +29,6 @@
  * This can potentially hurt compatibility and graceful fallback.
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @version $Id: TActiveClientScript.php 3144 2012-05-19 10:07:03Z ctrlaltca $
  * @package System.Web.UI.ActiveControls
  * @since 3.2
  */
diff --git a/framework/Web/UI/ActiveControls/TActiveControlAdapter.php b/framework/Web/UI/ActiveControls/TActiveControlAdapter.php
index ab15f091..91c17f92 100644
--- a/framework/Web/UI/ActiveControls/TActiveControlAdapter.php
+++ b/framework/Web/UI/ActiveControls/TActiveControlAdapter.php
@@ -4,9 +4,8 @@
  *
  * @author Wei Zhuo <weizhuo[at]gamil[dot]com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TActiveControlAdapter.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.ActiveControls
  */
 
@@ -29,7 +28,6 @@ Prado::using('System.Web.UI.ActiveControls.TBaseActiveControl');
  * corresponding client-side properties.
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @version $Id: TActiveControlAdapter.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.ActiveControls
  * @since 3.1
  */
@@ -197,7 +195,6 @@ class TActiveControlAdapter extends TControlAdapter
  * Tracking changes to the page state during callback.
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @version $Id: TActiveControlAdapter.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.ActiveControls
  * @since 3.1
  */
@@ -387,7 +384,6 @@ class TCallbackPageStateTracker
  * Calculates the viewstate changes during the request.
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @version $Id: TActiveControlAdapter.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.ActiveControls
  * @since 3.1
  */
@@ -431,7 +427,6 @@ abstract class TViewStateDiff
  * Calculate the changes to a scalar value.
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @version $Id: TActiveControlAdapter.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.ActiveControls
  * @since 3.1
  */
@@ -456,7 +451,6 @@ class TScalarDiff extends TViewStateDiff
  * Calculates the changes to the Style properties.
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @version $Id: TActiveControlAdapter.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.ActiveControls
  * @since 3.1
  */
@@ -548,7 +542,6 @@ class TStyleDiff extends TViewStateDiff
  * Calculate the changes to attributes collection.
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @version $Id: TActiveControlAdapter.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.ActiveControls
  * @since 3.1
  */
diff --git a/framework/Web/UI/ActiveControls/TActiveCustomValidator.php b/framework/Web/UI/ActiveControls/TActiveCustomValidator.php
index cc2a54a1..f05704fc 100644
--- a/framework/Web/UI/ActiveControls/TActiveCustomValidator.php
+++ b/framework/Web/UI/ActiveControls/TActiveCustomValidator.php
@@ -4,9 +4,8 @@
  *
  * @author Wei Zhuo <weizhuo[at]gamil[dot]com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TActiveCustomValidator.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.ActiveControls
  */
 
@@ -28,7 +27,6 @@ Prado::using('System.Web.UI.ActiveControls.TCallbackClientSide');
  * will be true when validation is made during a callback request.
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @version $Id: TActiveCustomValidator.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.ActiveControls
  * @since 3.1
  */
@@ -186,7 +184,6 @@ class TActiveCustomValidator extends TCustomValidator
  * Custom Validator callback client side options class.
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @version $Id: TActiveCustomValidator.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.ActiveControls
  * @since 3.1
  */
diff --git a/framework/Web/UI/ActiveControls/TActiveDataGrid.php b/framework/Web/UI/ActiveControls/TActiveDataGrid.php
index 00c9cb49..d5084e2d 100644
--- a/framework/Web/UI/ActiveControls/TActiveDataGrid.php
+++ b/framework/Web/UI/ActiveControls/TActiveDataGrid.php
@@ -107,7 +107,7 @@ class TActiveDataGrid extends TDataGrid implements IActiveControl, ISurroundable
 	 * If it is enabled (clickable), its command name and parameter will also be set.
 	 * It overrides the datagrid's original method to create active controls instead, thus
 	 * the pager will do callbacks instead of the regular postbacks.
-	 * @param mixed the container pager instance of TActiveDatagridPager 
+	 * @param mixed the container pager instance of TActiveDatagridPager
 	 * @param string button type, either LinkButton or PushButton
 	 * @param boolean whether the button should be enabled
 	 * @param string caption of the button
@@ -786,7 +786,6 @@ class TActiveLiteralColumn extends TLiteralColumn {
  * TActiveDataGridPager represents a pager in an activedatagrid.
  *
  * @author Fabio Bas <ctrlaltca@gmail.com>
- * @version $Id: TDataGrid.php 3057 2011-11-09 12:35:57Z ctrlaltca@gmail.com $
  * @package System.Web.UI.ActiveControls
  * @since 3.2.1
  */
@@ -813,7 +812,6 @@ class TActiveDataGridPager extends TDataGridPager
  * The {@link getPager Pager} property indicates the datagrid pager related with the event.
  *
  * @author Fabio Bas <ctrlaltca@gmail.com>
- * @version $Id: TActiveDataGrid.php 3057 2011-11-09 12:35:57Z ctrlaltca@gmail.com $
  * @package System.Web.UI.ActiveControls
  * @since 3.2.1
  */
diff --git a/framework/Web/UI/ActiveControls/TActiveDataList.php b/framework/Web/UI/ActiveControls/TActiveDataList.php
index dbf70067..6b749b40 100644
--- a/framework/Web/UI/ActiveControls/TActiveDataList.php
+++ b/framework/Web/UI/ActiveControls/TActiveDataList.php
@@ -1,12 +1,11 @@
 <?php
 /**
  * TActiveDataList class file
- * 
+ *
  * @author Marcos Aurelio Nobre <marconobre@gmail.com>
  * @copyright Copyright &copy; 2008, PradoSoft
  * @license http://www.pradosoft.com/license
  * @package System.Web.UI.ActiveControls
- * @version $Id: TActiveDataList.php 2706 2009-09-24 14:42:30Z rojaro $
  */
 
 /**
@@ -14,7 +13,7 @@
  *
  * TActiveDataList represents a data bound and updatable grid control which is the
  * active counterpart to the original {@link 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.
@@ -25,10 +24,10 @@
  * @package System.Web.UI.ActiveControls
  */
 class TActiveDataList extends TDataList implements IActiveControl {
-  
+
   /**
    * Creates a new callback control, sets the adapter to
-   * TActiveControlAdapter. 
+   * TActiveControlAdapter.
    */
   public function __construct()
   {
@@ -43,7 +42,7 @@ class TActiveDataList extends TDataList implements IActiveControl {
   {
     return $this->getAdapter()->getBaseActiveControl();
   }
-  
+
   /**
    * Sets the data source object associated with the repeater control.
    * In addition, the render method of all connected pagers is called so they
@@ -59,7 +58,7 @@ class TActiveDataList extends TDataList implements IActiveControl {
       $this->getPage()->getAdapter()->registerControlToRender($this,$this->getResponse()->createHtmlWriter());
     }
   }
-  
+
   /**
    * Returns the id of the surrounding container (span).
    * @return string container id
@@ -68,7 +67,7 @@ class TActiveDataList extends TDataList implements IActiveControl {
   {
     return $this->ClientID.'_Container';
   }
-  
+
   /**
    * Renders the repeater.
    * If the repeater did not pass the prerender phase yet, it will register itself for rendering later.
@@ -85,10 +84,10 @@ class TActiveDataList extends TDataList implements IActiveControl {
       $this->getPage()->getAdapter()->registerControlToRender($this,$writer);
     }
   }
-  
+
   /**
    * Loops through all {@link TActivePager} on the page and registers the ones which are set to paginate
-   * the repeater for rendering. This is to ensure that the connected pagers are also rendered if the 
+   * the repeater for rendering. This is to ensure that the connected pagers are also rendered if the
    * data source changed.
    */
   private function renderPager()
@@ -102,7 +101,7 @@ class TActiveDataList extends TDataList implements IActiveControl {
       }
     }
   }
-  
+
   /**
    * Renders the repeater by writing a span tag with the container id obtained from {@link getContainerID()}
    * which will be called by the replacement method of the client script to update it's content.
diff --git a/framework/Web/UI/ActiveControls/TActiveDatePicker.php b/framework/Web/UI/ActiveControls/TActiveDatePicker.php
index 279739a8..ad363d9c 100755
--- a/framework/Web/UI/ActiveControls/TActiveDatePicker.php
+++ b/framework/Web/UI/ActiveControls/TActiveDatePicker.php
@@ -1,13 +1,12 @@
 <?php
 /**
  * TActiveDatePicker class file
- * 
+ *
  * @author Bradley Booms <Bradley.Booms@nsighttel.com>
  * @author Christophe Boulain <Christophe.Boulain@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TActiveDatePicker.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.ActiveControls
  */
 
@@ -18,20 +17,19 @@ Prado::using('System.Web.UI.ActiveControls.TActiveControlAdapter');
 
 /**
  * TActiveDatePicker class
- * 
+ *
  * The active control counter part to date picker control.
  * When the date selection is changed, the {@link onCallback OnCallback} event is
  * raised.
- * 
+ *
  * @author Bradley Booms <Bradley.Booms@nsighttel.com>
  * @author Christophe Boulain <Christophe.Boulain@gmail.com>
- * @version $Id: TActiveDatePicker.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.ActiveControls
  * @since 3.1.3
  */
 class TActiveDatePicker extends TDatePicker  implements ICallbackEventHandler, IActiveControl
 {
-	
+
 	/**
 	 * @return boolean a value indicating whether an automatic postback to the server
      * will occur whenever the user modifies the text in the TActiveDatePicker control and
@@ -67,7 +65,7 @@ class TActiveDatePicker extends TDatePicker  implements ICallbackEventHandler, I
 		$options['AutoPostBack'] = $this->getAutoPostBack();
 		return $options;
 	}
-	
+
 	/**
 	 * Creates a new callback control, sets the adapter to
 	 * TActiveControlAdapter. If you override this class, be sure to set the
@@ -78,7 +76,7 @@ class TActiveDatePicker extends TDatePicker  implements ICallbackEventHandler, I
 		parent::__construct();
 		$this->setAdapter(new TActiveControlAdapter($this));
 	}
-	
+
 	/**
 	 * @return TBaseActiveCallbackControl standard callback control options.
 	 */
@@ -103,21 +101,21 @@ class TActiveDatePicker extends TDatePicker  implements ICallbackEventHandler, I
 				$cb->select($id.TControl::CLIENT_ID_SEPARATOR.'day', 'Value', $date['mday'], 'select');
 				$cb->select($id.TControl::CLIENT_ID_SEPARATOR.'month', 'Value', $date['mon']-1, 'select');
 				$cb->select($id.TControl::CLIENT_ID_SEPARATOR.'year', 'Value', $date['year'], 'select');
-				
+
 			}
 		}
 	}
-	
+
 	/**
 	 * Raises the callback event. This method is required by {@link
-	 * ICallbackEventHandler} interface. 
+	 * ICallbackEventHandler} interface.
 	 * This method is mainly used by framework and control developers.
 	 * @param TCallbackEventParameter the event parameter
 	 */
  	public function raiseCallbackEvent($param){
 		$this->onCallback($param);
-	}	
-	
+	}
+
 	/**
 	 * This method is invoked when a callback is requested. The method raises
 	 * 'OnCallback' event to fire up the event handlers. If you override this
@@ -128,7 +126,7 @@ class TActiveDatePicker extends TDatePicker  implements ICallbackEventHandler, I
 	public function onCallback($param){
 		$this->raiseEvent('OnCallback', $this, $param);
 	}
-	
+
 	/**
 	 * Registers the javascript code to initialize the date picker.
 	 */
@@ -174,9 +172,8 @@ class TActiveDatePicker extends TDatePicker  implements ICallbackEventHandler, I
  * is changed.
  * The formatted date according to {@link TDatePicker::getDateFormat DateFormat} is sent
  * as parameter to this event
- * 
+ *
  * @author Fabio Bas <ctrlaltca[at]gmail[dot]com>
- * @version $Id: TActiveDatePicker.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.ActiveControls
  * @since 3.2.1
  */
diff --git a/framework/Web/UI/ActiveControls/TActiveDropDownList.php b/framework/Web/UI/ActiveControls/TActiveDropDownList.php
index f0f8bba2..0de95078 100644
--- a/framework/Web/UI/ActiveControls/TActiveDropDownList.php
+++ b/framework/Web/UI/ActiveControls/TActiveDropDownList.php
@@ -4,9 +4,8 @@
  *
  * @author Wei Zhuo <weizhuo[at]gamil[dot]com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TActiveDropDownList.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.ActiveControls
  */
 
@@ -31,7 +30,6 @@ Prado::using('System.Web.UI.ActiveControls.TActiveListControlAdapter');
  * List items can be changed dynamically during a callback request.
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @version $Id: TActiveDropDownList.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.ActiveControls
  * @since 3.1
  */
diff --git a/framework/Web/UI/ActiveControls/TActiveFileUpload.php b/framework/Web/UI/ActiveControls/TActiveFileUpload.php
index 10aa2ed3..b478e119 100755
--- a/framework/Web/UI/ActiveControls/TActiveFileUpload.php
+++ b/framework/Web/UI/ActiveControls/TActiveFileUpload.php
@@ -1,11 +1,10 @@
 <?php
 /**
  * TActiveFileUpload.php
- * 
+ *
  * @author Bradley Booms <Bradley.Booms@nsighttel.com>
  * @author Christophe Boulain <Christophe.Boulain@gmail.com>
  * @author Gabor Berczi <gabor.berczi@devworx.hu> (issue 349 remote vulnerability fix)
- * @version $Id: TActiveFileUpload.php 3232 2013-01-02 14:42:24Z ctrlaltca $
  * @package System.Web.UI.ActiveControls
  */
 
@@ -17,7 +16,7 @@ Prado::using('System.Web.UI.WebControls.TFileUpload');
 
 /**
  * TActiveFileUpload
- * 
+ *
  * TActiveFileUpload displays a file upload field on a page. Upon postback,
  * the text entered into the field will be treated as the name of the file
  * that will be uploaded to the server. The property {@link getHasFile HasFile}
@@ -31,22 +30,21 @@ Prado::using('System.Web.UI.WebControls.TFileUpload');
  *
  * TActiveFileUpload raises {@link onFileUpload OnFileUpload} event if a file is uploaded
  * (whether it succeeds or not).
- * 
+ *
  * TActiveFileUpload actually does a postback in a hidden IFrame, and then does a callback.
  * This callback then raises the {@link onFileUpload OnFileUpload} event. After the postback
  * a status icon is displayed; either a green checkmark if the upload is successful,
  * or a red x if there was an error.
- *  
+ *
  * @author Bradley Booms <Bradley.Booms@nsighttel.com>
  * @author Christophe Boulain <Christophe.Boulain@gmail.com>
- * @version $Id: TActiveFileUpload.php 3232 2013-01-02 14:42:24Z ctrlaltca $
  * @package System.Web.UI.ActiveControls
  */
-class TActiveFileUpload extends TFileUpload implements IActiveControl, ICallbackEventHandler, INamingContainer 
+class TActiveFileUpload extends TFileUpload implements IActiveControl, ICallbackEventHandler, INamingContainer
 {
-	
+
 	const SCRIPT_PATH = 'prado/activefileupload';
-	
+
 	/**
 	 * @var THiddenField a flag to tell which component is doing the callback.
 	 */
@@ -68,7 +66,7 @@ class TActiveFileUpload extends TFileUpload implements IActiveControl, ICallback
 	 */
 	private $_target;
 
-	
+
 	/**
 	 * Creates a new callback control, sets the adapter to
 	 * TActiveControlAdapter. If you override this class, be sure to set the
@@ -78,8 +76,8 @@ class TActiveFileUpload extends TFileUpload implements IActiveControl, ICallback
 		parent::__construct();
 		$this->setAdapter(new TActiveControlAdapter($this));
 	}
-	
-	
+
+
 	/**
 	 * @param string asset file in the self::SCRIPT_PATH directory.
 	 * @return string asset file url.
@@ -89,8 +87,8 @@ class TActiveFileUpload extends TFileUpload implements IActiveControl, ICallback
 		$base = $this->getPage()->getClientScript()->getPradoScriptAssetUrl();
 		return $base.'/'.self::SCRIPT_PATH.'/'.$file;
 	}
-	
-	
+
+
 	/**
 	 * This method is invoked when a file is uploaded.
 	 * If you override this method, be sure to call the parent implementation to ensure
@@ -103,10 +101,10 @@ class TActiveFileUpload extends TFileUpload implements IActiveControl, ICallback
 			// save the file so that it will persist past the end of this return.
 			$localName = str_replace('\\', '/', tempnam(Prado::getPathOfNamespace($this->getTempPath()),''));
 			parent::saveAs($localName);
-			
+
 			$filename=addslashes($this->getFileName());
-			
-			
+
+
 			$params = new TActiveFileUploadCallbackParams;
 			$params->localName = $localName;
 			$params->fileName = $filename;
@@ -128,11 +126,11 @@ class TActiveFileUpload extends TFileUpload implements IActiveControl, ICallback
 	parent.Prado.WebUI.TActiveFileUpload.onFileUpload(Options);
 </script>
 EOS;
-			
+
 			exit();
 		}
 	}
-	
+
 	/**
 	 * @return string the path where the uploaded file will be stored temporarily, in namespace format
 	 * default "Application.runtime.*"
@@ -140,7 +138,7 @@ EOS;
 	public function getTempPath(){
 		return $this->getViewState('TempPath', 'Application.runtime.*');
 	}
-	
+
 	/**
 	 * @param string the path where the uploaded file will be stored temporarily in namespace format
 	 * default "Application.runtime.*"
@@ -148,7 +146,7 @@ EOS;
 	public function setTempPath($value){
 		$this->setViewState('TempPath',$value,'Application.runtime.*');
 	}
-	
+
 	/**
 	 * @return boolean a value indicating whether an automatic callback to the server will occur whenever the user modifies the text in the TTextBox control and then tabs out of the component. Defaults to true.
 	 * Note: When set to false, you will need to trigger the callback yourself.
@@ -156,7 +154,7 @@ EOS;
 	public function getAutoPostBack(){
 		return $this->getViewState('AutoPostBack', true);
 	}
-	
+
 	/**
 	 * @param boolean a value indicating whether an automatic callback to the server will occur whenever the user modifies the text in the TTextBox control and then tabs out of the component. Defaults to true.
 	 * Note: When set to false, you will need to trigger the callback yourself.
@@ -164,49 +162,49 @@ EOS;
 	public function setAutoPostBack($value){
 		$this->setViewState('AutoPostBack',TPropertyValue::ensureBoolean($value),true);
 	}
-	
+
 	/**
 	 * @return string A chuck of javascript that will need to be called if {{@link getAutoPostBack AutoPostBack} is set to false}
-	 */	
+	 */
 	public function getCallbackJavascript(){
 		return "Prado.WebUI.TActiveFileUpload.fileChanged(\"{$this->getClientID()}\")";
 	}
-	
+
 	/**
 	 * @throws TInvalidDataValueException if the {@link getTempPath TempPath} is not writable.
 	 */
 	public function onInit($sender){
 		parent::onInit($sender);
-		
+
 		if (!Prado::getApplication()->getCache())
 		  if (!Prado::getApplication()->getSecurityManager())
 			throw new Exception('TActiveFileUpload needs either an application level cache or a security manager to work securely');
-		
+
 		if (!is_writable(Prado::getPathOfNamespace($this->getTempPath()))){
 			throw new TInvalidDataValueException("activefileupload_temppath_invalid", $this->getTempPath());
 		}
 	}
-	
+
 	/**
 	 * Raises <b>OnFileUpload</b> event.
-	 * 
-	 * This method is required by {@link ICallbackEventHandler} interface. 
+	 *
+	 * This method is required by {@link ICallbackEventHandler} interface.
 	 * This method is mainly used by framework and control developers.
 	 * @param TCallbackEventParameter the event parameter
 	 */
  	public function raiseCallbackEvent($param){
  		$cp = $param->getCallbackParameter();
 		if ($key = $cp->targetID == $this->_target->getUniqueID()){
-		
+
 			$params = $this->popParamsByToken($cp->callbackToken);
-		
+
 			$_FILES[$key]['name'] = $params->fileName;
 			$_FILES[$key]['size'] = intval($params->fileSize);
 			$_FILES[$key]['type'] = $params->fileType;
 			$_FILES[$key]['error'] = intval($params->errorCode);
 			$_FILES[$key]['tmp_name'] = $params->localName;
 			$this->loadPostData($key, null);
-			
+
 			$this->raiseEvent('OnFileUpload', $this, $param);
 		}
 	}
@@ -220,7 +218,7 @@ EOS;
 	{
 		$this->onFileUpload($this->getPage()->getRequest()->itemAt('TActiveFileUpload_TargetId'));
 	}
-	
+
 	protected function pushParamsAndGetToken(TActiveFileUploadCallbackParams $params)
 	{
 		if ($cache = Prado::getApplication()->getCache())
@@ -237,10 +235,10 @@ EOS;
 			}
 		else
 			throw new Exception('TActiveFileUpload needs either an application level cache or a security manager to work securely');
-			
+
 		return $token;
 	}
-	
+
 	protected function popParamsByToken($token)
 	{
 		if ($cache = Prado::getApplication()->getCache())
@@ -260,7 +258,7 @@ EOS;
 			throw new Exception('TActiveFileUpload needs either an application level cache or a security manager to work securely');
 
 		assert($params instanceof TActiveFileUploadCallbackParams);
-		
+
 		return $params;
 	}
 
@@ -277,14 +275,14 @@ EOS;
 			$this->_errorCode = UPLOAD_ERR_FORM_SIZE;
 			$localName = str_replace('\\', '/', tempnam(Prado::getPathOfNamespace($this->getTempPath()),''));
 			$fileName = addslashes($this->getFileName());
-			
+
 			$params = new TActiveFileUploadCallbackParams;
 			$params->localName = $localName;
 			$params->fileName = $fileName;
 			$params->fileSize = $this->getFileSize();
 			$params->fileType = $this->getFileType();
 			$params->errorCode = $this->getErrorCode();
-			
+
 			echo <<<EOS
 <script language="Javascript">
 	Options = new Object();
@@ -295,35 +293,35 @@ EOS;
 	Options.fileType = '{$params->fileType}';
 	Options.errorCode = '{$params->errorCode}';
 	Options.callbackToken = '{$this->pushParamsAndGetToken($params)}';
-	parent.Prado.WebUI.TactiveFileUpload.onFileUpload(Options);
+	parent.Prado.WebUI.TActiveFileUpload.onFileUpload(Options);
 </script>
 EOS;
 		}
 	}
-	
+
 	public function createChildControls(){
 		$this->_flag = Prado::createComponent('THiddenField');
 		$this->_flag->setID('Flag');
 		$this->getControls()->add($this->_flag);
-		
+
 		$this->_busy = Prado::createComponent('TImage');
 		$this->_busy->setID('Busy');
 		$this->_busy->setImageUrl($this->getAssetUrl('ActiveFileUploadIndicator.gif'));
 		$this->_busy->setStyle("display:none");
 		$this->getControls()->add($this->_busy);
-		
+
 		$this->_success = Prado::createComponent('TImage');
 		$this->_success->setID('Success');
 		$this->_success->setImageUrl($this->getAssetUrl('ActiveFileUploadComplete.png'));
 		$this->_success->setStyle("display:none");
 		$this->getControls()->add($this->_success);
-		
+
 		$this->_error = Prado::createComponent('TImage');
 		$this->_error->setID('Error');
 		$this->_error->setImageUrl($this->getAssetUrl('ActiveFileUploadError.png'));
 		$this->_error->setStyle("display:none");
 		$this->getControls()->add($this->_error);
-		
+
 		$this->_target = Prado::createComponent('TInlineFrame');
 		$this->_target->setID('Target');
 		$this->_target->setFrameUrl($this->getAssetUrl('ActiveFileUploadBlank.html'));
@@ -331,14 +329,14 @@ EOS;
 		$this->_target->setShowBorder(false);
 		$this->getControls()->add($this->_target);
 	}
-	
-	
+
+
 	/**
-	 * Removes localfile on ending of the callback.  
+	 * Removes localfile on ending of the callback.
 	 */
 	public function onUnload($param){
-		if ($this->getPage()->getIsCallback() && 
-			$this->getHasFile() && 
+		if ($this->getPage()->getIsCallback() &&
+			$this->getHasFile() &&
 			file_exists($this->getLocalName())){
 				unlink($this->getLocalName());
 		}
@@ -367,7 +365,7 @@ EOS;
 	public function addAttributesToRender($writer){
 		parent::addAttributesToRender($writer);
 		$writer->addAttribute('id',$this->getClientID());
-		
+
 		$this->getPage()->getClientScript()->registerPradoScript('activefileupload');
 		$this->getActiveControl()->registerCallbackClientScript($this->getClientClassName(),$this->getClientOptions());
 	}
@@ -392,7 +390,7 @@ EOS;
 	protected function getClientOptions(){
 		$options['ID'] = $this->getClientID();
 		$options['EventTarget'] = $this->getUniqueID();
-		
+
 		$options['inputID'] = $this->getClientID();
 		$options['flagID'] = $this->_flag->getClientID();
 		$options['targetID'] = $this->_target->getUniqueID();
@@ -422,25 +420,25 @@ EOS;
 	}
 
 	/**
-	 * @return TImage the image displayed when an upload 
+	 * @return TImage the image displayed when an upload
 	 * 		completes successfully.
 	 */
 	public function getSuccessImage(){
 		$this->ensureChildControls();
 		return $this->_success;
 	}
-	
+
 	/**
-	 * @return TImage the image displayed when an upload 
+	 * @return TImage the image displayed when an upload
 	 * 		does not complete successfully.
 	 */
 	public function getErrorImage(){
 		$this->ensureChildControls();
 		return $this->_error;
 	}
-	
+
 	/**
-	 * @return TImage the image displayed when an upload 
+	 * @return TImage the image displayed when an upload
 	 * 		is in progress.
 	 */
 	public function getBusyImage(){
@@ -451,10 +449,9 @@ EOS;
 
 /**
  * TActiveFileUploadCallbackParams is an internal class used by {@link TActiveFileUpload}.
- *  
+ *
  * @author Bradley Booms <Bradley.Booms@nsighttel.com>
  * @author Christophe Boulain <Christophe.Boulain@gmail.com>
- * @version $Id: TActiveFileUpload.php 3232 2013-01-02 14:42:24Z ctrlaltca $
  * @package System.Web.UI.ActiveControls
  */
 class TActiveFileUploadCallbackParams
diff --git a/framework/Web/UI/ActiveControls/TActiveHiddenField.php b/framework/Web/UI/ActiveControls/TActiveHiddenField.php
index 0d4b3737..28be574a 100644
--- a/framework/Web/UI/ActiveControls/TActiveHiddenField.php
+++ b/framework/Web/UI/ActiveControls/TActiveHiddenField.php
@@ -4,7 +4,7 @@
  *
  * @author Carl G. Mathisen <carlgmathisen@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
  * @version $Id$
  * @package System.Web.UI.ActiveControls
diff --git a/framework/Web/UI/ActiveControls/TActiveHyperLink.php b/framework/Web/UI/ActiveControls/TActiveHyperLink.php
index 6ba8a801..13161eec 100644
--- a/framework/Web/UI/ActiveControls/TActiveHyperLink.php
+++ b/framework/Web/UI/ActiveControls/TActiveHyperLink.php
@@ -4,9 +4,8 @@
  *
  * @author Wei Zhuo <weizhuo[at]gamil[dot]com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TActiveHyperLink.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.ActiveControls
  */
 
@@ -21,7 +20,6 @@
  * {@link setNavigateUrl NavigateUrl} and {@link setTarget Target}.
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @version $Id: TActiveHyperLink.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.ActiveControls
  * @since 3.1
  */
diff --git a/framework/Web/UI/ActiveControls/TActiveImage.php b/framework/Web/UI/ActiveControls/TActiveImage.php
index 752c7a04..27ec337e 100644
--- a/framework/Web/UI/ActiveControls/TActiveImage.php
+++ b/framework/Web/UI/ActiveControls/TActiveImage.php
@@ -4,9 +4,8 @@
  *
  * @author Wei Zhuo <weizhuo[at]gamil[dot]com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TActiveImage.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.ActiveControls
  */
 
@@ -19,7 +18,6 @@
  * a callback request.
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @version $Id: TActiveImage.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.ActiveControls
  * @since 3.1
  */
diff --git a/framework/Web/UI/ActiveControls/TActiveImageButton.php b/framework/Web/UI/ActiveControls/TActiveImageButton.php
index b2aa9960..e8f1d054 100644
--- a/framework/Web/UI/ActiveControls/TActiveImageButton.php
+++ b/framework/Web/UI/ActiveControls/TActiveImageButton.php
@@ -4,9 +4,8 @@
  *
  * @author Wei Zhuo <weizhuo[at]gamil[dot]com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TActiveImageButton.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.ActiveControls
  */
 
@@ -21,7 +20,6 @@
  * and it is raise <b>after</b> the {@link onClick OnClick} event.
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @version $Id: TActiveImageButton.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.ActiveControls
  * @since 3.1
  */
diff --git a/framework/Web/UI/ActiveControls/TActiveLabel.php b/framework/Web/UI/ActiveControls/TActiveLabel.php
index 4fd19a56..0a20e2b0 100644
--- a/framework/Web/UI/ActiveControls/TActiveLabel.php
+++ b/framework/Web/UI/ActiveControls/TActiveLabel.php
@@ -4,9 +4,8 @@
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TActiveLabel.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.ActiveControls
  */
 
@@ -26,7 +25,6 @@ Prado::using('System.Web.UI.ActiveControls.TActiveControlAdapter');
  * the client-side "for" attribute on the label.
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @version $Id: TActiveLabel.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.ActiveControls
  * @since 3.1
  */
diff --git a/framework/Web/UI/ActiveControls/TActiveLinkButton.php b/framework/Web/UI/ActiveControls/TActiveLinkButton.php
index d8a8ffcb..304d1cef 100644
--- a/framework/Web/UI/ActiveControls/TActiveLinkButton.php
+++ b/framework/Web/UI/ActiveControls/TActiveLinkButton.php
@@ -4,9 +4,8 @@
  *
  * @author Wei Zhuo <weizhuo[at]gamil[dot]com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TActiveLinkButton.php 3292 2013-05-31 08:51:42Z ctrlaltca $
  * @package System.Web.UI.ActiveControls
  */
 
@@ -29,7 +28,6 @@ Prado::using('System.Web.UI.ActiveControls.TActiveControlAdapter');
  * will update the link text upon callback response completion.
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @version $Id: TActiveLinkButton.php 3292 2013-05-31 08:51:42Z ctrlaltca $
  * @package System.Web.UI.ActiveControls
  * @since 3.1
  */
@@ -145,7 +143,7 @@ class TActiveLinkButton extends TLinkButton implements IActiveControl, ICallback
 					$this->getClientClassName(), $this->getPostBackOptions());
 
 			} else {
-				$this->getPage()->getCallbackClient()->setAttribute($this, 'href', false);				
+				$this->getPage()->getCallbackClient()->setAttribute($this, 'href', false);
 			}
 		}
 	}
diff --git a/framework/Web/UI/ActiveControls/TActiveListBox.php b/framework/Web/UI/ActiveControls/TActiveListBox.php
index dfb4bf6e..36335cf6 100644
--- a/framework/Web/UI/ActiveControls/TActiveListBox.php
+++ b/framework/Web/UI/ActiveControls/TActiveListBox.php
@@ -4,9 +4,8 @@
  *
  * @author Wei Zhuo <weizhuo[at]gamil[dot]com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TActiveListBox.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.ActiveControls
  */
 
@@ -21,7 +20,6 @@ Prado::using('System.Web.UI.ActiveControls.TActiveListControlAdapter');
  * List items can be added dynamically during a callback request.
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @version $Id: TActiveListBox.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.ActiveControls
  * @since 3.1
  */
diff --git a/framework/Web/UI/ActiveControls/TActiveListControlAdapter.php b/framework/Web/UI/ActiveControls/TActiveListControlAdapter.php
index e48b9364..ca88477d 100644
--- a/framework/Web/UI/ActiveControls/TActiveListControlAdapter.php
+++ b/framework/Web/UI/ActiveControls/TActiveListControlAdapter.php
@@ -4,9 +4,8 @@
  *
  * @author Wei Zhuo <weizhuo[at]gamil[dot]com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TActiveListControlAdapter.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.ActiveControls
  */
 
@@ -23,7 +22,6 @@ Prado::using('System.Web.UI.WebControls.TListControl');
  * during callback response.
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @version $Id: TActiveListControlAdapter.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.ActiveControls
  * @since 3.1
  */
@@ -170,7 +168,6 @@ class TActiveListControlAdapter extends TActiveControlAdapter implements IListCo
  * repopulate the client-side options.
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @version $Id: TActiveListControlAdapter.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.ActiveControls
  * @since 3.1
  */
diff --git a/framework/Web/UI/ActiveControls/TActivePageAdapter.php b/framework/Web/UI/ActiveControls/TActivePageAdapter.php
index 03fe2f16..cc32376a 100644
--- a/framework/Web/UI/ActiveControls/TActivePageAdapter.php
+++ b/framework/Web/UI/ActiveControls/TActivePageAdapter.php
@@ -5,9 +5,8 @@
  * @author Wei Zhuo <weizhuo[at]gamil[dot]com>
  * @author Gabor Berczi <gabor.berczi@devworx.hu> (lazyload additions & progressive rendering)
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TActivePageAdapter.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.ActiveControls
  */
 
@@ -25,7 +24,6 @@ Prado::using('System.Web.UI.ActiveControls.TCallbackEventParameter');
  *
  * @author Wei Zhuo <weizhuo[at]gamil[dot]com>
  * @author Gabor Berczi <gabor.berczi@devworx.hu> (lazyload additions & progressive rendering)
- * @version $Id: TActivePageAdapter.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.ActiveControls
  * @since 3.1
  */
@@ -150,7 +148,6 @@ class TActivePageAdapter extends TControlAdapter
 	{
 		Prado::trace("ActivePage redirect()",'System.Web.UI.ActiveControls.TActivePageAdapter');
 		$this->appendContentPart($this->getResponse(), self::CALLBACK_REDIRECT, $url);
-		//$this->getResponse()->appendHeader(self::CALLBACK_REDIRECT.': '.$url);
 	}
 
 	/**
@@ -176,7 +173,6 @@ class TActivePageAdapter extends TControlAdapter
 				$data = TJavaScript::jsonEncode($responseData);
 
 				$this->appendContentPart($response, self::CALLBACK_DATA_HEADER, $data);
-				//$response->appendHeader(self::CALLBACK_DATA_HEADER.': '.$data);
 			}
 		}
 
@@ -187,7 +183,6 @@ class TActivePageAdapter extends TControlAdapter
 			{
 				$pagestate = $this->getPage()->getClientState();
 				$this->appendContentPart($response, self::CALLBACK_PAGESTATE_HEADER, $pagestate);
-				//$response->appendHeader(self::CALLBACK_PAGESTATE_HEADER.': '.$pagestate);
 			}
 		}
 
@@ -206,7 +201,6 @@ class TActivePageAdapter extends TControlAdapter
 		$executeJavascript = $this->getCallbackClientHandler()->getClientFunctionsToExecute();
 		$actions = TJavaScript::jsonEncode($executeJavascript);
 		$this->appendContentPart($response, self::CALLBACK_ACTION_HEADER, $actions);
-		//$response->appendHeader(self::CALLBACK_ACTION_HEADER.': '.$actions);
 
 
 		$cs = $this->Page->getClientScript();
@@ -296,7 +290,7 @@ class TActivePageAdapter extends TControlAdapter
 	}
 
 	/**
-	 * Gets callback parameter. JSON encoding is assumed.
+	 * Gets callback parameter.
 	 * @return string postback event parameter
 	 */
 	public function getCallbackEventParameter()
@@ -304,8 +298,7 @@ class TActivePageAdapter extends TControlAdapter
 		if($this->_callbackEventParameter===null)
 		{
 			$param = $this->getRequest()->itemAt(TPage::FIELD_CALLBACK_PARAMETER);
-			if(strlen($param) > 0)
-				$this->_callbackEventParameter=TJavaScript::jsonDecode((string)$param);
+			$this->_callbackEventParameter=$param;
 		}
 		return $this->_callbackEventParameter;
 	}
@@ -340,7 +333,6 @@ class TActivePageAdapter extends TControlAdapter
  * the error stack trace.
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @version $Id: TActivePageAdapter.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.ActiveControls
  * @since 3.1
  */
@@ -357,14 +349,22 @@ class TCallbackErrorHandler extends TErrorHandler
 		{
 			$response = $this->getApplication()->getResponse();
 			$trace = $this->getExceptionStackTrace($exception);
+			// avoid error on non-utf8 strings
 			try {
 				$trace = TJavaScript::jsonEncode($trace);
 			} catch (Exception $e) {
 				// strip everythin not 7bit ascii
 				$trace = preg_replace('/[^(\x20-\x7F)]*/','', serialize($trace));
 			}
-			$response->setStatusCode(500, 'Internal Server Error');
-			$response->appendHeader(TActivePageAdapter::CALLBACK_ERROR_HEADER.': '.$trace);
+
+			// avoid exception loop if headers have already been sent
+			try {
+				$response->setStatusCode(500, 'Internal Server Error');
+			} catch (Exception $e) { }
+
+			$content = $response->createHtmlWriter();
+			$content->getWriter()->setBoundary(TActivePageAdapter::CALLBACK_ERROR_HEADER);
+			$content->write($trace);
 		}
 		else
 		{
@@ -406,7 +406,6 @@ class TCallbackErrorHandler extends TErrorHandler
  * TInvalidCallbackException class.
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @version $Id: TActivePageAdapter.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.ActiveControls
  * @since 3.1
  */
diff --git a/framework/Web/UI/ActiveControls/TActivePager.php b/framework/Web/UI/ActiveControls/TActivePager.php
index 7dcd3212..078bd5be 100644
--- a/framework/Web/UI/ActiveControls/TActivePager.php
+++ b/framework/Web/UI/ActiveControls/TActivePager.php
@@ -4,9 +4,8 @@
  *
  * @author "gevik" (forum contributor) and Christophe Boulain (Christophe.Boulain@gmail.com)
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TActivePager.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.ActiveControls
  */
 
@@ -17,15 +16,14 @@ Prado::using('System.Web.UI.ActiveControls.TActiveControlAdapter');
 
 /**
  * TActivePager is the active control counter part of TPager.
- * 
+ *
  * When a page change is requested, TActivePager raises a callback instead of the
  * traditional postback.
  *
  * The {@link onCallback OnCallback} event is raised during a callback request
  * and it is raise <b>after</b> the {@link onPageIndexChanged OnPageIndexChanged} event.
- * 
+ *
  * @author "gevik" (forum contributor) and Christophe Boulain (Christophe.Boulain@gmail.com)
- * @version $Id: TActivePager.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.ActiveControls
  * @since 3.1.2
  */
@@ -41,7 +39,7 @@ class TActivePager extends TPager implements IActiveControl, ICallbackEventHandl
 		parent::__construct();
 		$this->setAdapter(new TActiveControlAdapter($this));
 	}
-	
+
 	/**
 	 * @return TBaseActiveControl standard active control options.
 	 */
@@ -60,11 +58,11 @@ class TActivePager extends TPager implements IActiveControl, ICallbackEventHandl
 
 	/**
 	 * Raises the callback event. This method is required by {@link
-	 * ICallbackEventHandler} interface. 
+	 * ICallbackEventHandler} interface.
 	 * This method is mainly used by framework and control developers.
 	 * @param TCallbackEventParameter the event parameter
 	 */
-	 
+
  	public function raiseCallbackEvent($param)
 	{
 		$this->onCallback($param);
@@ -82,7 +80,7 @@ class TActivePager extends TPager implements IActiveControl, ICallbackEventHandl
 	{
 		$this->raiseEvent('OnCallback', $this, $param);
 	}
-	
+
 	/**
 	 * Builds a dropdown list pager
 	 * Override parent implementation to build Active dropdown lists.
@@ -90,25 +88,25 @@ class TActivePager extends TPager implements IActiveControl, ICallbackEventHandl
 	protected function buildListPager()
 	{
 		$list=new TActiveDropDownList;
-		
+
 		$list->getAdapter()->getBaseActiveControl()->setClientSide(
 			$this->getClientSide()
 		);
-		
+
 		$this->getControls()->add($list);
 		$list->setDataSource(range(1,$this->getPageCount()));
 		$list->dataBind();
 		$list->setSelectedIndex($this->getCurrentPageIndex());
 		$list->setAutoPostBack(true);
 		$list->attachEventHandler('OnSelectedIndexChanged',array($this,'listIndexChanged'));
-		$list->attachEventHandler('OnCallback', array($this, 'handleCallback'));				
-	}	
-		
+		$list->attachEventHandler('OnCallback', array($this, 'handleCallback'));
+	}
+
 	/**
 	 * Creates a pager button.
 	 * Override parent implementation to create, depending on the button type, a TActiveLinkButton,
 	 * a TActiveButton or a TActiveImageButton may be created.
-	 * 
+	 *
 	 * @param string button type, either LinkButton or PushButton
 	 * @param boolean whether the button should be enabled
 	 * @param string caption of the button
@@ -126,6 +124,7 @@ class TActivePager extends TPager implements IActiveControl, ICallbackEventHandl
 			{
 				$button=new TLabel;
 				$button->setText($text);
+				$button->setCssClass($this->getButtonCssClass());
 				return $button;
 			}
 		}
@@ -144,28 +143,29 @@ class TActivePager extends TPager implements IActiveControl, ICallbackEventHandl
 			if(!$enabled)
 				$button->setEnabled(false);
 		}
-		
+
 		if($buttonType===TPagerButtonType::ImageButton)
 		{
 			$button->ImageUrl = $text;
 		}
-		
+
 		$button->setText($text);
 		$button->setCommandName($commandName);
 		$button->setCommandParameter($commandParameter);
 		$button->setCausesValidation(false);
-		
-		$button->attachEventHandler('OnCallback', array($this, 'handleCallback'));		
+		$button->setCssClass($this->getButtonCssClass());
+
+		$button->attachEventHandler('OnCallback', array($this, 'handleCallback'));
 		$button->getAdapter()->getBaseActiveControl()->setClientSide(
 			$this->getClientSide()
 		);
-		
+
 		return $button;
 	}
-	
+
 	/**
 	 * Event handler to the OnCallback active buttons or active dropdownlist.
-	 * This handler will raise the {@link onCallback OnCallback} event 
+	 * This handler will raise the {@link onCallback OnCallback} event
 	 *
 	 * @param mixed $sender
 	 * @param TCallbackEventParameter $param
@@ -181,14 +181,14 @@ class TActivePager extends TPager implements IActiveControl, ICallbackEventHandl
 			{
 				$control->render($param->getNewWriter());
 				// FIXME : With some very fast machine, the getNewWriter() consecutive calls are in the same microsecond, resulting
-				// of getting the same boundaries in ajax response. Wait 1 microsecond to avoid this. 
+				// of getting the same boundaries in ajax response. Wait 1 microsecond to avoid this.
 				usleep(1);
 			}
 		}
 		// Raise callback event
 		$this->onCallback($param);
-	}	
-	
+	}
+
 	public function render ($writer)
 	{
 		if($this->getHasPreRendered())
diff --git a/framework/Web/UI/ActiveControls/TActivePanel.php b/framework/Web/UI/ActiveControls/TActivePanel.php
index 39636cad..4b00b013 100644
--- a/framework/Web/UI/ActiveControls/TActivePanel.php
+++ b/framework/Web/UI/ActiveControls/TActivePanel.php
@@ -4,9 +4,8 @@
  *
  * @author Wei Zhuo <weizhuo[at]gamil[dot]com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TActivePanel.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.ActiveControls
  */
 
@@ -32,7 +31,6 @@ Prado::using('System.Web.UI.ActiveControls.TActiveControlAdapter');
  * </code>
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @version $Id: TActivePanel.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.ActiveControls
  * @since 3.1
  */
@@ -87,7 +85,7 @@ class TActivePanel extends TPanel implements IActiveControl
 			if ($this->getHasControls())
 			{
 				// If we update a TActivePanel on callback,
-				// We shouldn't update all childs, because the whole content will be replaced by 
+				// We shouldn't update all childs, because the whole content will be replaced by
 				// the parent
 				foreach ($this->findControlsByType('IActiveControl', false) as $control)
 				{
diff --git a/framework/Web/UI/ActiveControls/TActiveRadioButton.php b/framework/Web/UI/ActiveControls/TActiveRadioButton.php
index d192536a..46dbbaf7 100644
--- a/framework/Web/UI/ActiveControls/TActiveRadioButton.php
+++ b/framework/Web/UI/ActiveControls/TActiveRadioButton.php
@@ -4,9 +4,8 @@
  *
  * @author Wei Zhuo <weizhuo[at]gamil[dot]com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TActiveRadioButton.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.ActiveControls
  */
 
@@ -25,7 +24,6 @@
  * and can not be changed using javascript.
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @version $Id: TActiveRadioButton.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.ActiveControls
  * @since 3.1
  */
@@ -121,7 +119,7 @@ class TActiveRadioButton extends TRadioButton implements IActiveControl, ICallba
 	 * Ensure that the ID attribute is rendered and registers the javascript code
 	 * for initializing the active control.
 	 * Since 3.1.4, the javascript code is not rendered if {@link setAutoPostBack AutoPostBack} is false
-	 * 
+	 *
 	 */
 	protected function renderInputTag($writer,$clientID,$onclick)
 	{
diff --git a/framework/Web/UI/ActiveControls/TActiveRadioButtonList.php b/framework/Web/UI/ActiveControls/TActiveRadioButtonList.php
index 3244ce11..5c76aed1 100644
--- a/framework/Web/UI/ActiveControls/TActiveRadioButtonList.php
+++ b/framework/Web/UI/ActiveControls/TActiveRadioButtonList.php
@@ -4,9 +4,8 @@
  *
  * @author Wei Zhuo <weizhuo[at]gamil[dot]com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TActiveRadioButtonList.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.ActiveControls
  */
 
@@ -31,7 +30,6 @@ Prado::using('System.Web.UI.ActiveControls.TActiveRadioButton');
  * List items can not be changed dynamically during a callback request.
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @version $Id: TActiveRadioButtonList.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.ActiveControls
  * @since 3.1
  */
diff --git a/framework/Web/UI/ActiveControls/TActiveRatingList.php b/framework/Web/UI/ActiveControls/TActiveRatingList.php
index 022efe65..2b1c764c 100644
--- a/framework/Web/UI/ActiveControls/TActiveRatingList.php
+++ b/framework/Web/UI/ActiveControls/TActiveRatingList.php
@@ -5,7 +5,7 @@
  * @author Wei Zhuo <weizhuo[at]gamil[dot]com>
  * @author Bradley Booms <bradley[dot]booms[at]gmail[dot]com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
  * @version $Id$
  * @package System.Web.UI.ActiveControls
@@ -116,7 +116,7 @@ class TActiveRatingList extends TRatingList implements IActiveControl, ICallback
 	public function setCaption($value)
 	{
 		parent::setCaption($value);
-		// if it's an active control, this should not be needed. 
+		// if it's an active control, this should not be needed.
 		$this->callClientFunction('setCaption',$value);
 	}
 
diff --git a/framework/Web/UI/ActiveControls/TActiveRepeater.php b/framework/Web/UI/ActiveControls/TActiveRepeater.php
index 08e6f93a..08aeefab 100644
--- a/framework/Web/UI/ActiveControls/TActiveRepeater.php
+++ b/framework/Web/UI/ActiveControls/TActiveRepeater.php
@@ -5,7 +5,6 @@
  * @author LANDWEHR Computer und Software GmbH <programmierung@landwehr-software.de>
  * @package System.Web.UI.ActiveControls
  * @since 3.1.9
- * @version $Id: TActiveRepeater.php 2707 2009-09-29 10:33:30Z Christophe.Boulain $
  */
 
 /**
diff --git a/framework/Web/UI/ActiveControls/TActiveTextBox.php b/framework/Web/UI/ActiveControls/TActiveTextBox.php
index 5f96ff29..1b8791fd 100644
--- a/framework/Web/UI/ActiveControls/TActiveTextBox.php
+++ b/framework/Web/UI/ActiveControls/TActiveTextBox.php
@@ -4,9 +4,8 @@
  *
  * @author Wei Zhuo <weizhuo[at]gamil[dot]com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TActiveTextBox.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.ActiveControls
  */
 
@@ -25,7 +24,6 @@ Prado::using('System.Web.UI.ActiveControls.TActiveControlAdapter');
  * event.
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @version $Id: TActiveTextBox.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.ActiveControls
  * @since 3.1
  */
diff --git a/framework/Web/UI/ActiveControls/TAutoComplete.php b/framework/Web/UI/ActiveControls/TAutoComplete.php
index 5e144040..88b98172 100644
--- a/framework/Web/UI/ActiveControls/TAutoComplete.php
+++ b/framework/Web/UI/ActiveControls/TAutoComplete.php
@@ -4,9 +4,8 @@
  *
  * @author Wei Zhuo <weizhuo[at]gamil[dot]com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TAutoComplete.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.ActiveControls
  */
 
@@ -77,7 +76,6 @@ Prado::using('System.Web.UI.ActiveControls.TCallbackEventParameter');
  * "informal" are ignored as text for suggestions.
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @version $Id: TAutoComplete.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.ActiveControls
  * @since 3.1
  */
@@ -375,7 +373,6 @@ class TAutoComplete extends TActiveTextBox implements INamingContainer
  * suggestion selected by the user, -1 if not suggestion is selected.
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @version $Id: TAutoComplete.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.ActiveControls
  * @since 3.1
  */
@@ -416,7 +413,6 @@ class TAutoCompleteEventParameter extends TCallbackEventParameter
  * item template.
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @version $Id: TAutoComplete.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.ActiveControls
  * @since 3.1
  */
diff --git a/framework/Web/UI/ActiveControls/TBaseActiveControl.php b/framework/Web/UI/ActiveControls/TBaseActiveControl.php
index 61230719..3c0a938e 100644
--- a/framework/Web/UI/ActiveControls/TBaseActiveControl.php
+++ b/framework/Web/UI/ActiveControls/TBaseActiveControl.php
@@ -4,9 +4,8 @@
  *
  * @author Wei Zhuo <weizhuo[at]gamil[dot]com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TBaseActiveControl.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.ActiveControls
  */
 
@@ -23,7 +22,6 @@ Prado::using('System.Web.UI.ActiveControls.TCallbackClientSide');
  * response returns.
  *
  * @author Wei Zhuo <weizhuo[at]gamil[dot]com>
- * @version $Id: TBaseActiveControl.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.ActiveControls
  * @since 3.1
  */
@@ -155,7 +153,6 @@ class TBaseActiveControl extends TComponent
  * </code>
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @version $Id: TBaseActiveControl.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.ActiveControls
  * @since 3.1
  */
diff --git a/framework/Web/UI/ActiveControls/TCallback.php b/framework/Web/UI/ActiveControls/TCallback.php
index 2c20567c..557001b2 100644
--- a/framework/Web/UI/ActiveControls/TCallback.php
+++ b/framework/Web/UI/ActiveControls/TCallback.php
@@ -4,9 +4,8 @@
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TCallback.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.ActiveControls
  */
 
@@ -37,7 +36,6 @@ Prado::using('System.Web.UI.ActiveControls.TActiveControlAdapter');
  * </code>
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @version $Id: TCallback.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.ActiveControls
  * @since 3.1
  */
diff --git a/framework/Web/UI/ActiveControls/TCallbackClientScript.php b/framework/Web/UI/ActiveControls/TCallbackClientScript.php
index 40051f76..5496470f 100644
--- a/framework/Web/UI/ActiveControls/TCallbackClientScript.php
+++ b/framework/Web/UI/ActiveControls/TCallbackClientScript.php
@@ -4,9 +4,8 @@
  *
  * @author Wei Zhuo <weizhuo[at]gamil[dot]com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TCallbackClientScript.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.ActiveControls
  */
 
@@ -28,7 +27,6 @@
  * </code>
  *
  * @author Wei Zhuo <weizhuo[at]gamil[dot]com>
- * @version $Id: TCallbackClientScript.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.ActiveControls
  * @since 3.1
  */
@@ -127,7 +125,7 @@ class TCallbackClientScript extends TApplicationComponent
 
 	/**
 	 * Client script to click on an element. <b>This client-side function is unpredictable.</b>
-	 * 
+	 *
 	 * @param TControl control element or element id
 	 */
 	public function click($control)
@@ -182,14 +180,14 @@ class TCallbackClientScript extends TApplicationComponent
 		{
 			$promptText		= $control->getPromptText();
 			$promptValue	= $control->getPromptValue();
-			
+
 			if($promptValue==='')
 				$promptValue = $promptText;
-	
+
 			if($promptValue!=='')
 				$options[] = array($promptText, $promptValue);
 		}
-		
+
 		foreach($items as $item)
 		{
 			if($item->getHasAttributes())
@@ -301,6 +299,7 @@ class TCallbackClientScript extends TApplicationComponent
 	/**
 	 * Scroll the top of the browser viewing area to the location of the
 	 * element.
+	 *
 	 * @param TControl control element or element id
 	 */
 	public function scrollTo($element)
@@ -449,7 +448,7 @@ class TCallbackClientScript extends TApplicationComponent
 		{
 			$boundary = $this->getResponseContentBoundary($content);
 		}
-		
+
 		$this->callClientFunction('Prado.Element.appendScriptBlock', array($boundary));
 	}
 
diff --git a/framework/Web/UI/ActiveControls/TCallbackClientSide.php b/framework/Web/UI/ActiveControls/TCallbackClientSide.php
index ec993c14..449bea80 100644
--- a/framework/Web/UI/ActiveControls/TCallbackClientSide.php
+++ b/framework/Web/UI/ActiveControls/TCallbackClientSide.php
@@ -4,9 +4,8 @@
  *
  * @author Wei Zhuo <weizhuo[at]gamil[dot]com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TCallbackClientSide.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.ActiveControls
  */
 
@@ -28,8 +27,8 @@
  *
  * * Note that theses 2 events are not fired correctly by Opera. To make
  *   them work in this browser, Prado will fire them just after onPreDispatch.
- * 
- * In a general way, onUninitialized, onLoading, onLoaded and onInteractive events 
+ *
+ * In a general way, onUninitialized, onLoading, onLoaded and onInteractive events
  * are not implemented consistently in all browsers.When cross browser compatibility is
  * needed, it is best to avoid use them
  *
@@ -46,7 +45,6 @@
  *   viewstate update. This will automatically set HasPriority to true when enabled.
  *
  * @author Wei Zhuo <weizhuo[at]gamil[dot]com>
- * @version $Id: TCallbackClientSide.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.ActiveControls
  * @since 3.1
  */
diff --git a/framework/Web/UI/ActiveControls/TCallbackEventParameter.php b/framework/Web/UI/ActiveControls/TCallbackEventParameter.php
index 728ebbba..2d4451a8 100644
--- a/framework/Web/UI/ActiveControls/TCallbackEventParameter.php
+++ b/framework/Web/UI/ActiveControls/TCallbackEventParameter.php
@@ -4,7 +4,7 @@
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
  * @version $Id$
  * @package System.Web.UI.ActiveControls
@@ -28,7 +28,6 @@
  * callback handler function) can be set using {@link setResponseData ResponseData} property.
  *
  * @author Wei Zhuo <weizhuo[at]gamil[dot]com>
- * @version $Id: TActivePageAdapter.php 1648 2007-01-24 05:52:22Z wei $
  * @package System.Web.UI.ActiveControls
  * @since 3.1
  */
diff --git a/framework/Web/UI/ActiveControls/TCallbackOptions.php b/framework/Web/UI/ActiveControls/TCallbackOptions.php
index 19d53aeb..0d929ed1 100644
--- a/framework/Web/UI/ActiveControls/TCallbackOptions.php
+++ b/framework/Web/UI/ActiveControls/TCallbackOptions.php
@@ -4,9 +4,8 @@
  *
  * @author Wei Zhuo <weizhuo[at]gamil[dot]com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TCallbackOptions.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.ActiveControls
  */
 
@@ -17,7 +16,6 @@
  * to be attached to other active controls.
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @version $Id: TCallbackOptions.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.ActiveControls
  * @since 3.1
  */
diff --git a/framework/Web/UI/ActiveControls/TCallbackResponseAdapter.php b/framework/Web/UI/ActiveControls/TCallbackResponseAdapter.php
index 47b5fae4..cad3c9ee 100755
--- a/framework/Web/UI/ActiveControls/TCallbackResponseAdapter.php
+++ b/framework/Web/UI/ActiveControls/TCallbackResponseAdapter.php
@@ -4,9 +4,8 @@
  *
  * @author Wei Zhuo <weizhuo[at]gamil[dot]com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TCallbackResponseAdapter.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.ActiveControls
  */
 
@@ -22,7 +21,6 @@
  * property.
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @version $Id: TCallbackResponseAdapter.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.ActiveControls
  * @since 3.1
  */
@@ -110,7 +108,6 @@ class TCallbackResponseAdapter extends THttpResponseAdapter
  * is generated using microtime.
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @version $Id: TCallbackResponseAdapter.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.ActiveControls
  * @since 3.1
  */
diff --git a/framework/Web/UI/ActiveControls/TDraggable.php b/framework/Web/UI/ActiveControls/TDraggable.php
index df92bec5..fe2ac4cc 100755
--- a/framework/Web/UI/ActiveControls/TDraggable.php
+++ b/framework/Web/UI/ActiveControls/TDraggable.php
@@ -1,17 +1,16 @@
 <?php
 /**
  * TDraggable class file
- * 
+ *
  * @author Christophe BOULAIN (Christophe.Boulain@gmail.com)
  * @copyright Copyright &copy; 2008, PradoSoft
  * @license http://www.pradosoft.com/license
  * @package System.Web.UI.ActiveControls
- * @version $Id: TDraggable.php 3285 2013-04-11 07:28:07Z ctrlaltca $
  */
 
 /**
  * TDraggable is a control which can be dragged
- * 
+ *
  * This control will make "draggable" control.
  * Properties :
  *
@@ -21,14 +20,13 @@
  * <b>{@link setRevert Revert}</b>: Set to True if you want your dragged element to revert to its initial position if not dropped on a valid area.
  * <b>{@link setConstraint Constraint}</b>: Set this to Horizontal or Vertical if you want to constraint your move in one direction.
  * <b>{@link setHandle Handle}</b>:
- * 
+ *
  * @author Christophe BOULAIN (Christophe.Boulain@gmail.com)
  * @copyright Copyright &copy; 2008, PradoSoft
  * @license http://www.pradosoft.com/license
  * @package System.Web.UI.ActiveControls
- * @version $Id: TDraggable.php 3285 2013-04-11 07:28:07Z ctrlaltca $
  */
-class TDraggable extends TPanel 
+class TDraggable extends TPanel
 {
 	/**
 	 * Set the handle id or css class
@@ -38,7 +36,7 @@ class TDraggable extends TPanel
 	{
 		$this->setViewState('DragHandle', TPropertyValue::ensureString($value), null);
 	}
-	
+
 	/**
 	 * Get the handle id or css class
 	 * @return string
@@ -47,7 +45,7 @@ class TDraggable extends TPanel
 	{
 		return $this->getViewState('DragHandle', null);
 	}
-	
+
 	/**
 	 * Determine if draggable element should revert to it orginal position
 	 * upon release in an non-droppable container.
@@ -61,7 +59,7 @@ class TDraggable extends TPanel
 	{
 		return $this->getViewState('Revert', TDraggableRevertOptions::Revert);
 	}
-	
+
 	/**
 	 * Sets whether the draggable element should revert to it orginal position
 	 * upon release in an non-droppable container.
@@ -79,7 +77,7 @@ class TDraggable extends TPanel
 			$value=TDraggableRevertOptions::None;
 		$this->setViewState('Revert', TPropertyValue::ensureEnum($value, 'TDraggableRevertOptions'), true);
 	}
-	
+
 	/**
 	 * Determine if the element should be cloned when dragged
 	 * If true, Clones the element and drags the clone, leaving the original in place until the clone is dropped.
@@ -96,7 +94,7 @@ class TDraggable extends TPanel
 	{
 		return $this->getViewState('Ghosting', TDraggableGhostingOptions::None);
 	}
-	
+
 	/**
 	 * Sets wether the element should be cloned when dragged
 	 * If true, Clones the element and drags the clone, leaving the original in place until the clone is dropped.
@@ -117,7 +115,7 @@ class TDraggable extends TPanel
 			$value=TDraggableGhostingOptions::None;
 		$this->setViewState('Ghosting', TPropertyValue::ensureEnum($value, 'TDraggableGhostingOptions'), TDraggableGhostingOptions::None);
 	}
-	
+
 	/**
 	 * Determine if the element should be constrainted in one direction or not
 	 * @return CDraggableConstraint
@@ -126,7 +124,7 @@ class TDraggable extends TPanel
 	{
 		return $this->getViewState('Constraint', TDraggableConstraint::None);
 	}
-	
+
 	/**
 	 * Set wether the element should be constrainted in one direction
 	 * @param CDraggableConstraint
@@ -135,7 +133,7 @@ class TDraggable extends TPanel
 	{
 		$this->setViewState('Constraint', TPropertyValue::ensureEnum($value, 'TDraggableConstraint'), TDraggableConstraint::None);
 	}
-	
+
 	/**
 	 * Registers clientscripts
 	 *
@@ -166,7 +164,7 @@ class TDraggable extends TPanel
 		$code="new {$class}('{$this->getClientId()}', {$options}) ";
 		$cs->registerEndScript(sprintf('%08X', crc32($code)), $code);
 	}
-		
+
 	/**
 	 * Gets the name of the javascript class responsible for performing postback for this control.
 	 * This method overrides the parent implementation.
@@ -176,7 +174,7 @@ class TDraggable extends TPanel
 	{
 		return 'Draggable';
 	}
-	
+
 	/**
 	 * Gets the post back options for this textbox.
 	 * @return array
@@ -193,7 +191,7 @@ class TDraggable extends TPanel
 		else
 			$options['revert']=strtolower($revert);
 		if (($constraint=$this->getConstraint())!==TDraggableConstraint::None) $options['constraint']=strtolower($constraint);
-		switch ($this->getGhosting()) 
+		switch ($this->getGhosting())
 		{
 			case TDraggableGhostingOptions::SuperGhosting:
 				$options['superghosting']=true;
@@ -205,7 +203,7 @@ class TDraggable extends TPanel
 
 		return $options;
 	}
-	
+
 }
 
 /**
@@ -213,7 +211,6 @@ class TDraggable extends TPanel
  * @copyright Copyright &copy; 2008, PradoSoft
  * @license http://www.pradosoft.com/license
  * @package System.Web.UI.ActiveControls
- * @version $Id: TDraggable.php 3285 2013-04-11 07:28:07Z ctrlaltca $
  */
 class TDraggableConstraint extends TEnumerable
 {
@@ -227,7 +224,6 @@ class TDraggableConstraint extends TEnumerable
  * @copyright Copyright &copy; 2008, PradoSoft
  * @license http://www.pradosoft.com/license
  * @package System.Web.UI.ActiveControls
- * @version $Id: TDraggable.php 3285 2013-04-11 07:28:07Z ctrlaltca $
  */
 class TDraggableGhostingOptions extends TEnumerable
 {
@@ -241,7 +237,6 @@ class TDraggableGhostingOptions extends TEnumerable
  * @copyright Copyright &copy; 2008, PradoSoft
  * @license http://www.pradosoft.com/license
  * @package System.Web.UI.ActiveControls
- * @version $Id: TDraggable.php 3285 2013-04-11 07:28:07Z ctrlaltca $
  */
 class TDraggableRevertOptions extends TEnumerable
 {
diff --git a/framework/Web/UI/ActiveControls/TDropContainer.php b/framework/Web/UI/ActiveControls/TDropContainer.php
index 43e8017c..00ebf461 100755
--- a/framework/Web/UI/ActiveControls/TDropContainer.php
+++ b/framework/Web/UI/ActiveControls/TDropContainer.php
@@ -5,9 +5,7 @@
  * @author Christophe BOULAIN (Christophe.Boulain@gmail.com)
  * @copyright Copyright &copy; 2008, PradoSoft
  * @license http://www.pradosoft.com/license
- * @version $Id: TDropContainer.php 3159 2012-2013 PradoSoft
  * @license http://www.pradosoft.com/license
- * @version $Id: TDropContainer.php 3285 2013-04-11 07:28:07Z ctrlaltca $
  * @package System.Web.UI.ActiveControls
  */
 
@@ -40,7 +38,6 @@ Prado::using('System.Web.UI.ActiveControls.TActivePanel');
  * @author Christophe BOULAIN (Christophe.Boulain@gmail.com)
  * @copyright Copyright &copy; 2008, PradoSoft
  * @license http://www.pradosoft.com/license
- * @version $Id: TDropContainer.php 3285 2013-04-11 07:28:07Z ctrlaltca $
  * @package System.Web.UI.ActiveControls
  */
 class TDropContainer extends TPanel implements IActiveControl, ICallbackEventHandler 
@@ -258,7 +255,6 @@ class TDropContainer extends TPanel implements IActiveControl, ICallbackEventHan
  * @author Christophe BOULAIN (Christophe.Boulain@ceram.fr)
  * @copyright Copyright &copy; 2008, PradoSoft
  * @license http://www.pradosoft.com/license
- * @version $Id: TDropContainer.php 3285 2013-04-11 07:28:07Z ctrlaltca $
  * @package System.Web.UI.ActiveControls
  */
 class TDropContainerEventParameter extends TEventParameter
diff --git a/framework/Web/UI/ActiveControls/TEventTriggeredCallback.php b/framework/Web/UI/ActiveControls/TEventTriggeredCallback.php
index 4f1dbbf8..53d6aead 100644
--- a/framework/Web/UI/ActiveControls/TEventTriggeredCallback.php
+++ b/framework/Web/UI/ActiveControls/TEventTriggeredCallback.php
@@ -4,9 +4,8 @@
  *
  * @author Wei Zhuo <weizhuo[at]gamil[dot]com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TEventTriggeredCallback.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.ActiveControls
  */
 
@@ -22,7 +21,6 @@ Prado::using('System.Web.UI.ActiveControls.TTriggeredCallback');
  * {@link setPreventDefaultAction PreventDefaultAction} is set to true.
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @version $Id: TEventTriggeredCallback.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.ActiveControls
  * @since 3.1
  */
diff --git a/framework/Web/UI/ActiveControls/TInPlaceTextBox.php b/framework/Web/UI/ActiveControls/TInPlaceTextBox.php
index 5309b7e8..012f2da3 100644
--- a/framework/Web/UI/ActiveControls/TInPlaceTextBox.php
+++ b/framework/Web/UI/ActiveControls/TInPlaceTextBox.php
@@ -4,9 +4,8 @@
  *
  * @author Wei Zhuo <weizhuo[at]gamil[dot]com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TInPlaceTextBox.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.ActiveControls
  */
 
@@ -38,9 +37,8 @@ Prado::using('System.Web.UI.ActiveControls.TActiveTextBox');
  *
  * Since 3.1.2, you can set the {@link setReadOnly ReadOnly} property to make
  * the control not editable. This property can be also changed on callback
- * 
+ *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @version $Id: TInPlaceTextBox.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.ActiveControls
  * @since 3.1
  */
@@ -145,7 +143,7 @@ class TInPlaceTextBox extends TActiveTextBox
 			$client->setValue($this, $value);
 		}
 	}
-	
+
 	/**
 	 * Update ClientSide Readonly property
 	 * @param boolean value
@@ -232,7 +230,7 @@ class TInPlaceTextBox extends TActiveTextBox
 
 		if($this->hasEventHandler('OnLoadingText'))
 			$options['LoadTextOnEdit'] = true;
-			
+
 		$options['ReadOnly']=$this->getReadOnly();
 		return $options;
 	}
diff --git a/framework/Web/UI/ActiveControls/TTimeTriggeredCallback.php b/framework/Web/UI/ActiveControls/TTimeTriggeredCallback.php
index 46df7a22..bc250521 100644
--- a/framework/Web/UI/ActiveControls/TTimeTriggeredCallback.php
+++ b/framework/Web/UI/ActiveControls/TTimeTriggeredCallback.php
@@ -4,9 +4,8 @@
  *
  * @author Wei Zhuo <weizhuo[at]gamil[dot]com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TTimeTriggeredCallback.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.ActiveControls
  */
 
@@ -26,7 +25,6 @@ Prado::using('System.Web.UI.ActiveControls.TCallback');
  * {@link setStartTimerOnLoad StartTimerOnLoad} is true.
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @version $Id: TTimeTriggeredCallback.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.ActiveControls
  * @since 3.1
  */
diff --git a/framework/Web/UI/ActiveControls/TTriggeredCallback.php b/framework/Web/UI/ActiveControls/TTriggeredCallback.php
index 2365326b..544707b0 100644
--- a/framework/Web/UI/ActiveControls/TTriggeredCallback.php
+++ b/framework/Web/UI/ActiveControls/TTriggeredCallback.php
@@ -4,9 +4,8 @@
  *
  * @author Wei Zhuo <weizhuo[at]gamil[dot]com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TTriggeredCallback.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.ActiveControls
  */
 
@@ -18,7 +17,6 @@ Prado::using('System.Web.UI.ActiveControls.TCallback');
  * property sets the control ID to observe the trigger.
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @version $Id: TTriggeredCallback.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.ActiveControls
  * @since 3.1
  */
diff --git a/framework/Web/UI/ActiveControls/TValueTriggeredCallback.php b/framework/Web/UI/ActiveControls/TValueTriggeredCallback.php
index e9db1bed..0b323066 100644
--- a/framework/Web/UI/ActiveControls/TValueTriggeredCallback.php
+++ b/framework/Web/UI/ActiveControls/TValueTriggeredCallback.php
@@ -4,9 +4,8 @@
  *
  * @author Wei Zhuo <weizhuo[at]gamil[dot]com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TValueTriggeredCallback.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.ActiveControls
  */
 
@@ -25,7 +24,6 @@ Prado::using('System.Web.UI.ActiveControls.TTriggeredCallback');
  * observed, the polling interval is reset to the original value.
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @version $Id: TValueTriggeredCallback.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.ActiveControls
  * @since 3.1
  */
diff --git a/framework/Web/UI/TCachePageStatePersister.php b/framework/Web/UI/TCachePageStatePersister.php
index 4f3d60cc..0914c650 100644
--- a/framework/Web/UI/TCachePageStatePersister.php
+++ b/framework/Web/UI/TCachePageStatePersister.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TCachePageStatePersister.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI
  */
 
@@ -54,7 +53,6 @@
  * </code>
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TCachePageStatePersister.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI
  * @since 3.1.1
  */
diff --git a/framework/Web/UI/TClientScriptManager.php b/framework/Web/UI/TClientScriptManager.php
index ea828187..cc59292a 100644
--- a/framework/Web/UI/TClientScriptManager.php
+++ b/framework/Web/UI/TClientScriptManager.php
@@ -5,9 +5,8 @@
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @author Gabor Berczi <gabor.berczi@devworx.hu> (lazyload additions & progressive rendering)
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TClientScriptManager.php 3280 2013-03-13 20:19:30Z ctrlaltca $
  * @package System.Web.UI
  */
 
@@ -18,7 +17,6 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @author Gabor Berczi <gabor.berczi@devworx.hu> (lazyload additions & progressive rendering)
- * @version $Id: TClientScriptManager.php 3280 2013-03-13 20:19:30Z ctrlaltca $
  * @package System.Web.UI
  * @since 3.0
  */
@@ -150,7 +148,7 @@ class TClientScriptManager extends TApplicationComponent
 				$this->_registeredPradoScripts[$name]=true;
 			else
 				throw new TInvalidOperationException('csmanager_pradoscript_invalid',$name);
-				
+
 			if(($packages=array_keys($this->_registeredPradoScripts))!==array())
 			{
 				$base = Prado::getFrameworkPath().DIRECTORY_SEPARATOR.self::SCRIPT_PATH;
@@ -347,7 +345,7 @@ class TClientScriptManager extends TApplicationComponent
 		if($target instanceof TControl)
 			$target=$target->getClientID();
 		$id = TJavaScript::quoteString($target);
-		$this->_endScripts['prado:focus'] = 'new Effect.ScrollTo('.$id.'); Prado.Element.focus('.$id.');';
+		$this->_endScripts['prado:focus'] = 'Prado.Element.focus('.$id.');';
 
 		$params=func_get_args();
 		$this->_page->registerCachingAction('Page.ClientScript','registerFocusControl',$params);
@@ -369,7 +367,6 @@ class TClientScriptManager extends TApplicationComponent
 	 *     $this->Page->ClientScript->registerStyleSheetFile($url, $url);
 	 *   }
 	 * }
-	 * ?>
 	 * </code>
 	 *
 	 * @param string a unique key identifying the file
@@ -466,7 +463,7 @@ class TClientScriptManager extends TApplicationComponent
 	public function registerScriptFile($key, $url)
 	{
 		$this->_scriptFiles[$key]=$url;
-		
+
 		$params=func_get_args();
 		$this->_page->registerCachingAction('Page.ClientScript','registerScriptFile',$params);
 	}
@@ -717,8 +714,11 @@ class TClientScriptManager extends TApplicationComponent
 	 */
 	public function flushScriptFiles($writer, $control=null)
 	{
-		$this->_page->ensureRenderInForm($control);
-		$this->renderAllPendingScriptFiles($writer);
+		if(!$this->_page->getIsCallback())
+		{
+			$this->_page->ensureRenderInForm($control);
+			$this->renderAllPendingScriptFiles($writer);
+		}
 	}
 
 	/**
@@ -747,7 +747,7 @@ class TClientScriptManager extends TApplicationComponent
 			$writer->write("<div style=\"visibility:hidden;\">\n".$str."</div>\n");
 	}
 
-	public function getHiddenFields()	
+	public function getHiddenFields()
 	{
 		return $this->_hiddenFields;
 	}
@@ -770,7 +770,6 @@ class TClientScriptManager extends TApplicationComponent
  * between ActiveControls and validators.
  *
  * @author <weizhuo[at]gmail[dot]com>
- * @version $Id: TClientScriptManager.php 3280 2013-03-13 20:19:30Z ctrlaltca $
  * @package System.Web.UI
  * @since 3.0
  */
diff --git a/framework/Web/UI/TCompositeControl.php b/framework/Web/UI/TCompositeControl.php
index 21e4c46f..5a54271d 100644
--- a/framework/Web/UI/TCompositeControl.php
+++ b/framework/Web/UI/TCompositeControl.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TCompositeControl.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI
  */
 
@@ -16,7 +15,6 @@
  * by other controls.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TCompositeControl.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI
  * @since 3.0
  */
diff --git a/framework/Web/UI/TControl.php b/framework/Web/UI/TControl.php
index 5ee20d61..3037a4d9 100644
--- a/framework/Web/UI/TControl.php
+++ b/framework/Web/UI/TControl.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TControl.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI
  */
 
@@ -64,7 +63,6 @@ Prado::using('System.Web.UI.TControlAdapter');
  * They work together with page lifecycles to process a page request.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TControl.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI
  * @since 3.0
  */
@@ -1771,7 +1769,6 @@ class TControl extends TApplicationComponent implements IRenderable, IBindable
  * controls to maintain a list of their child controls.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TControl.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI
  * @since 3.0
  */
@@ -1856,7 +1853,6 @@ class TControlCollection extends TList
  * controls to it. This is useful for controls that do not allow child controls.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TControl.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI
  * @since 3.0
  */
@@ -1889,7 +1885,6 @@ class TEmptyControlCollection extends TControlCollection
  * INamingContainer marks a control as a naming container.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TControl.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI
  * @since 3.0
  */
@@ -1903,7 +1898,6 @@ interface INamingContainer
  * If a control wants to respond to postback event, it must implement this interface.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TControl.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI
  * @since 3.0
  */
@@ -1924,7 +1918,6 @@ interface IPostBackEventHandler
  * If a control wants to load post data, it must implement this interface.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TControl.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI
  * @since 3.0
  */
@@ -1958,7 +1951,6 @@ interface IPostBackDataHandler
  * If a control wants to validate user input, it must implement this interface.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TControl.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI
  * @since 3.0
  */
@@ -1996,7 +1988,6 @@ interface IValidator
  * If a control wants to be validated by a validator, it must implement this interface.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TControl.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI
  * @since 3.0
  */
@@ -2022,7 +2013,6 @@ interface IValidatable
  * If a control wants to check broadcast event, it must implement this interface.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TControl.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI
  * @since 3.0
  */
@@ -2046,7 +2036,6 @@ interface IBroadcastEventReceiver
  * This interface must be implemented by theme.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TControl.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI
  * @since 3.0
  */
@@ -2066,7 +2055,6 @@ interface ITheme
  * parsed template structures.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TControl.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI
  * @since 3.0
  */
@@ -2089,7 +2077,6 @@ interface ITemplate
  * {@link TImageButton}.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TControl.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI
  * @since 3.0
  */
@@ -2194,7 +2181,6 @@ interface ISurroundable
  * {@link setParameter Parameter} property.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TControl.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI
  * @since 3.0
  */
@@ -2256,7 +2242,6 @@ class TBroadcastEventParameter extends TEventParameter
  * with the command via {@link getCommandParameter CommandParameter} property.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TControl.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI
  * @since 3.0
  */
@@ -2301,7 +2286,6 @@ class TCommandEventParameter extends TEventParameter
  * consecutive static strings, expressions and statements.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TControl.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI
  * @since 3.0
  */
diff --git a/framework/Web/UI/TControlAdapter.php b/framework/Web/UI/TControlAdapter.php
index 1ef2d1fb..2e89e5e7 100644
--- a/framework/Web/UI/TControlAdapter.php
+++ b/framework/Web/UI/TControlAdapter.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TControlAdapter.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI
  */
 
@@ -17,7 +16,6 @@
  * various behaviors for the control to which the adapter is attached.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TControlAdapter.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI
  * @since 3.0
  */
diff --git a/framework/Web/UI/TForm.php b/framework/Web/UI/TForm.php
index 9db8682c..c9280e9a 100644
--- a/framework/Web/UI/TForm.php
+++ b/framework/Web/UI/TForm.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TForm.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI
  */
 
@@ -23,7 +22,6 @@
  * URLs.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TForm.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI
  * @since 3.0
  */
@@ -87,7 +85,7 @@ class TForm extends TControl
  			$this->renderChildren($writer);
 			$cs->renderHiddenFieldsEnd($writer);
  			$page->endFormRender($writer);
- 
+
 			$cs->renderScriptFilesEnd($writer);
 			$cs->renderEndScripts($writer);
 		}
diff --git a/framework/Web/UI/THtmlWriter.php b/framework/Web/UI/THtmlWriter.php
index 9f070d5f..0339ac83 100644
--- a/framework/Web/UI/THtmlWriter.php
+++ b/framework/Web/UI/THtmlWriter.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: THtmlWriter.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI
  */
 
@@ -32,7 +31,6 @@
  * tags in HTML and XHTML.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: THtmlWriter.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI
  * @since 3.0
  */
@@ -87,7 +85,7 @@ class THtmlWriter extends TApplicationComponent implements ITextWriter
 	{
 		return $this->_writer;
 	}
-	
+
 	public function setWriter($writer)
 	{
 		$this->_writer = $writer;
diff --git a/framework/Web/UI/TPage.php b/framework/Web/UI/TPage.php
index 39656e13..412d14b6 100644
--- a/framework/Web/UI/TPage.php
+++ b/framework/Web/UI/TPage.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TPage.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI
  */
 
@@ -22,7 +21,6 @@ Prado::using('System.Web.UI.TClientScriptManager');
  * TPage class
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TPage.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI
  * @since 3.0
  */
@@ -297,7 +295,7 @@ class TPage extends TTemplateControl
 			return $data;
 		}
 	}
-	
+
 	/**
 	 * Sets Adapter to TActivePageAdapter and calls apter to process the
 	 * callback request.
@@ -308,6 +306,10 @@ class TPage extends TTemplateControl
 
 		$this->setAdapter(new TActivePageAdapter($this));
 
+        $callbackEventParameter = $this->getRequest()->itemAt(TPage::FIELD_CALLBACK_PARAMETER);
+        if(strlen($callbackEventParameter) > 0)
+            $this->_postData[TPage::FIELD_CALLBACK_PARAMETER]=TJavaScript::jsonDecode((string)$callbackEventParameter);
+
         // Decode Callback postData from UTF-8 to current Charset
         if (($g=$this->getApplication()->getGlobalization(false))!==null &&
             strtoupper($enc=$g->getCharset())!='UTF-8')
@@ -1245,7 +1247,6 @@ class TPage extends TTemplateControl
  * classes.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TPage.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI
  * @since 3.1
  */
diff --git a/framework/Web/UI/TPageStatePersister.php b/framework/Web/UI/TPageStatePersister.php
index 7d2330b7..bbb20098 100644
--- a/framework/Web/UI/TPageStatePersister.php
+++ b/framework/Web/UI/TPageStatePersister.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TPageStatePersister.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI
  */
 
@@ -22,7 +21,6 @@
  * traffic for transmitting bulky page state.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TPageStatePersister.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI
  * @since 3.0
  */
diff --git a/framework/Web/UI/TSessionPageStatePersister.php b/framework/Web/UI/TSessionPageStatePersister.php
index 5448fd22..a1a1f601 100644
--- a/framework/Web/UI/TSessionPageStatePersister.php
+++ b/framework/Web/UI/TSessionPageStatePersister.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TSessionPageStatePersister.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI
  */
 
@@ -39,7 +38,6 @@
  * </code>
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TSessionPageStatePersister.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI
  * @since 3.1
  */
diff --git a/framework/Web/UI/TTemplateControl.php b/framework/Web/UI/TTemplateControl.php
index f5780928..df6482c6 100644
--- a/framework/Web/UI/TTemplateControl.php
+++ b/framework/Web/UI/TTemplateControl.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TTemplateControl.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI
  */
 
@@ -23,7 +22,6 @@ Prado::using('System.Web.UI.TCompositeControl');
  * different extension name. For template file, the extension name is ".tpl".
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TTemplateControl.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI
  * @since 3.0
  */
diff --git a/framework/Web/UI/TTemplateManager.php b/framework/Web/UI/TTemplateManager.php
index 91630241..0ffb6bec 100644
--- a/framework/Web/UI/TTemplateManager.php
+++ b/framework/Web/UI/TTemplateManager.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TTemplateManager.php 3251 2013-01-15 18:37:04Z ctrlaltca $
  * @package System.Web.UI
  */
 
@@ -32,7 +31,6 @@ Prado::using('System.Web.UI.WebControls.TOutputCache');
  * template manager module that can be accessed via {@link TPageService::getTemplateManager()}.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TTemplateManager.php 3251 2013-01-15 18:37:04Z ctrlaltca $
  * @package System.Web.UI
  * @since 3.0
  */
@@ -162,7 +160,6 @@ class TTemplateManager extends TModule
  * set their parent as $control.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TTemplateManager.php 3251 2013-01-15 18:37:04Z ctrlaltca $
  * @package System.Web.UI
  * @since 3.0
  */
diff --git a/framework/Web/UI/TThemeManager.php b/framework/Web/UI/TThemeManager.php
index ba007dc0..f8c86bb7 100644
--- a/framework/Web/UI/TThemeManager.php
+++ b/framework/Web/UI/TThemeManager.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TThemeManager.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI
  */
 
@@ -34,7 +33,6 @@ Prado::using('System.Web.Services.TPageService');
  * and {@link getBufferOutput BufferOutput} are configurable properties of THttpResponse.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TThemeManager.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI
  * @since 3.0
  */
@@ -206,7 +204,6 @@ class TThemeManager extends TModule
  * To apply a theme to a particular control, call {@link applySkin}.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TThemeManager.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI
  * @since 3.0
  */
diff --git a/framework/Web/UI/WebControls/TAccordion.php b/framework/Web/UI/WebControls/TAccordion.php
index dbf761a2..fc794cd4 100644
--- a/framework/Web/UI/WebControls/TAccordion.php
+++ b/framework/Web/UI/WebControls/TAccordion.php
@@ -4,9 +4,8 @@
  *
  * @author Gabor Berczi, DevWorx Hungary <gabor.berczi@devworx.hu>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TAccordion.php 2915 2011-05-15 16:26:11Z ctrlaltca@gmail.com $
  * @package System.Web.UI.WebControls
  * @since 3.2
  */
@@ -59,7 +58,6 @@
  * </code>
  *
  * @author Gabor Berczi, DevWorx Hungary <gabor.berczi@devworx.hu>
- * @version $Id: TAccordion.php 2915 2011-05-15 16:26:11Z ctrlaltca@gmail.com $
  * @package System.Web.UI.WebControls
  * @since 3.2
  */
@@ -198,7 +196,7 @@ class TAccordion extends TWebControl implements IPostBackDataHandler
 	}
 
 	/**
-		* @return string CSS class for the whole accordion control div. 
+		* @return string CSS class for the whole accordion control div.
 	*/
 	public function getCssClass()
 	{
@@ -426,15 +424,15 @@ class TAccordion extends TWebControl implements IPostBackDataHandler
 	protected function registerStyleSheet()
 	{
 		$url = $this->getCssUrl();
-		
+
 		if($url === '') {
 			return;
 		}
-		
+
 		if($url === 'default') {
 			$url = $this->getApplication()->getAssetManager()->publishFilePath(dirname(__FILE__).DIRECTORY_SEPARATOR.'assets'.DIRECTORY_SEPARATOR.'accordion.css');
 		}
-		
+
 		if($url !== '') {
 			$this->getPage()->getClientScript()->registerStyleSheetFile($url, $url);
 		}
@@ -540,13 +538,12 @@ class TAccordion extends TWebControl implements IPostBackDataHandler
  * Class TAccordionView.
  *
  * TAccordionView represents a single view in a {@link TAccordion}.
- * 
+ *
  * TAccordionView is represented inside the {@link TAccordion} with an header label whose text is defined by
  * the {@link setCaption Caption} property; optionally the label can be an hyperlink: use the
  * {@link setNavigateUrl NavigateUrl} property to define the destination url.
  *
  * @author Gabor Berczi, DevWorx Hungary <gabor.berczi@devworx.hu>
- * @version $Id: TAccordion.php 2915 2011-05-15 16:26:11Z ctrlaltca@gmail.com $
  * @package System.Web.UI.WebControls
  * @since 3.2
  */
@@ -669,7 +666,7 @@ class TAccordionView extends TWebControl
 			$writer->addAttribute('id',$this->getClientID().'_0');
 
 			$style=$this->getActive()?$this->getParent()->getActiveHeaderStyle():$this->getParent()->getHeaderStyle();
-			
+
 			$style->addAttributesToRender($writer);
 
 			$writer->renderBeginTag($this->getTagName());
@@ -690,7 +687,7 @@ class TAccordionView extends TWebControl
 		$url = $this->getNavigateUrl();
 		if(($caption=$this->getCaption())==='')
 			$caption='&nbsp;';
-			
+
 		if ($url!='')
 			$writer->write("<a href=\"{$url}\">");
 		$writer->write("{$caption}");
@@ -703,9 +700,8 @@ class TAccordionView extends TWebControl
  * Class TAccordionViewCollection.
  *
  * TAccordionViewCollection is a collection of {@link TAccordionView} to be used inside a {@link TAccordion}.
- * 
+ *
  * @author Gabor Berczi, DevWorx Hungary <gabor.berczi@devworx.hu>
- * @version $Id: TAccordion.php 2915 2011-05-15 16:26:11Z ctrlaltca@gmail.com $
  * @package System.Web.UI.WebControls
  * @since 3.2
  */
diff --git a/framework/Web/UI/WebControls/TBaseDataList.php b/framework/Web/UI/WebControls/TBaseDataList.php
index 0ef22752..9ebe551e 100644
--- a/framework/Web/UI/WebControls/TBaseDataList.php
+++ b/framework/Web/UI/WebControls/TBaseDataList.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TBaseDataList.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  */
 
@@ -37,7 +36,6 @@ Prado::using('System.Util.TDataFieldAccessor');
  * content can be specified via {@link setHorizontalAlign HorizontalAlign}.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TBaseDataList.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
diff --git a/framework/Web/UI/WebControls/TBaseValidator.php b/framework/Web/UI/WebControls/TBaseValidator.php
index 074939c1..a23e2104 100644
--- a/framework/Web/UI/WebControls/TBaseValidator.php
+++ b/framework/Web/UI/WebControls/TBaseValidator.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TBaseValidator.php 3319 2013-09-08 20:59:44Z ctrlaltca $
  * @package System.Web.UI.WebControls
  */
 
@@ -70,7 +69,6 @@ Prado::using('System.Web.UI.WebControls.TLabel');
  * override the method {@link evaluateIsValid}.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TBaseValidator.php 3319 2013-09-08 20:59:44Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
@@ -513,7 +511,7 @@ abstract class TBaseValidator extends TLabel implements IValidator
 			$target=$this->getValidationTarget();
 			// if the target is not a disabled web control
 			if($target===null ||
-				($target!==null && 
+				($target!==null &&
 				!($target instanceof TWebControl && !$target->getEnabled(true))))
 			{
 				if($this->evaluateIsValid())
@@ -625,7 +623,6 @@ abstract class TBaseValidator extends TLabel implements IValidator
  * See the quickstart documentation for further details.
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @version $Id: TBaseValidator.php 3319 2013-09-08 20:59:44Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
@@ -715,7 +712,6 @@ class TValidatorClientSide extends TClientSideOptions
  * - Fixed: Similar to Dynamic except that the error message physically occupies the page layout (even though it may not be visible)
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TBaseValidator.php 3319 2013-09-08 20:59:44Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0.4
  */
@@ -738,7 +734,6 @@ class TValidatorDisplayStyle extends TEnumerable
  * - String
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TBaseValidator.php 3319 2013-09-08 20:59:44Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0.4
  */
diff --git a/framework/Web/UI/WebControls/TBoundColumn.php b/framework/Web/UI/WebControls/TBoundColumn.php
index 7534fcbc..d7ac7750 100644
--- a/framework/Web/UI/WebControls/TBoundColumn.php
+++ b/framework/Web/UI/WebControls/TBoundColumn.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TBoundColumn.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  */
 
@@ -42,7 +41,6 @@ Prado::using('System.Web.UI.WebControls.TDataGridColumn');
  * For more details, see {@link TRepeater} and {@link TDataList}.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TBoundColumn.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
diff --git a/framework/Web/UI/WebControls/TBulletedList.php b/framework/Web/UI/WebControls/TBulletedList.php
index e5c17b38..9cd3654e 100644
--- a/framework/Web/UI/WebControls/TBulletedList.php
+++ b/framework/Web/UI/WebControls/TBulletedList.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TBulletedList.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  */
 
@@ -33,7 +32,6 @@ Prado::using('System.Web.UI.WebControls.TListControl');
  * will be raised under such a circumstance.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TBulletedList.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
@@ -414,7 +412,6 @@ class TBulletedList extends TListControl implements IPostBackEventHandler
  * of the item that is currently being clicked.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TBulletedList.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
@@ -449,7 +446,6 @@ class TBulletedListEventParameter extends TEventParameter
  * for a {@link TBulletedList} control.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TBulletedList.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0.4
  */
@@ -479,7 +475,6 @@ class TBulletStyle extends TEnumerable
  * - LinkButton: the bulleted list items are displayed as link buttons that can cause postbacks
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TBulletedList.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0.4
  */
diff --git a/framework/Web/UI/WebControls/TButton.php b/framework/Web/UI/WebControls/TButton.php
index e7d0f5bf..f24985e6 100644
--- a/framework/Web/UI/WebControls/TButton.php
+++ b/framework/Web/UI/WebControls/TButton.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TButton.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  */
 
@@ -43,7 +42,6 @@
  * if the button does not cause a postback.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TButton.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
@@ -355,7 +353,6 @@ class TButton extends TWebControl implements IPostBackEventHandler, IButtonContr
  * - Button: a client button (normally does not perform form submission)
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TButton.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0.4
  */
diff --git a/framework/Web/UI/WebControls/TButtonColumn.php b/framework/Web/UI/WebControls/TButtonColumn.php
index 258fecf2..939fc721 100644
--- a/framework/Web/UI/WebControls/TButtonColumn.php
+++ b/framework/Web/UI/WebControls/TButtonColumn.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TButtonColumn.php 3287 2013-04-30 10:10:16Z ctrlaltca $
  * @package System.Web.UI.WebControls
  */
 
@@ -48,7 +47,6 @@ Prado::using('System.Web.UI.WebControls.TImageButton');
  * datagrid cell is the first child.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TButtonColumn.php 3287 2013-04-30 10:10:16Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
diff --git a/framework/Web/UI/WebControls/TCaptcha.php b/framework/Web/UI/WebControls/TCaptcha.php
index 79f402a5..4523ea40 100644
--- a/framework/Web/UI/WebControls/TCaptcha.php
+++ b/framework/Web/UI/WebControls/TCaptcha.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TCaptcha.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  */
 
@@ -57,7 +56,6 @@ Prado::using('System.Web.UI.WebControls.TImage');
  * </code>
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TCaptcha.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.1.1
  */
diff --git a/framework/Web/UI/WebControls/TCaptchaValidator.php b/framework/Web/UI/WebControls/TCaptchaValidator.php
index c8cc7aea..2758cac7 100644
--- a/framework/Web/UI/WebControls/TCaptchaValidator.php
+++ b/framework/Web/UI/WebControls/TCaptchaValidator.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TCaptchaValidator.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  */
 
@@ -31,7 +30,6 @@ Prado::using('System.Web.UI.WebControls.TCaptcha');
  * the CAPTCHA control that the user input should be compared with.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TCaptchaValidator.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.1.1
  */
diff --git a/framework/Web/UI/WebControls/TCheckBox.php b/framework/Web/UI/WebControls/TCheckBox.php
index e12946be..a28beac7 100644
--- a/framework/Web/UI/WebControls/TCheckBox.php
+++ b/framework/Web/UI/WebControls/TCheckBox.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TCheckBox.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  */
 
@@ -36,7 +35,6 @@
  * that may bring security vulnerabilities.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TCheckBox.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
@@ -127,7 +125,7 @@ class TCheckBox extends TWebControl implements IPostBackDataHandler, IValidatabl
 	}
 
 	/**
-	 * Returns true if this control validated successfully. 
+	 * Returns true if this control validated successfully.
 	 * Defaults to true.
 	 * @return bool wether this control validated successfully.
 	 */
@@ -412,7 +410,7 @@ class TCheckBox extends TWebControl implements IPostBackDataHandler, IValidatabl
 
     /**
      * Check if we need a span tag to surround this control. The span tag will be created if
-     * the Text property is set for this control. 
+     * the Text property is set for this control.
      *
      * @return bool wether this control needs a surrounding span tag
      */
@@ -519,7 +517,6 @@ class TCheckBox extends TWebControl implements IPostBackDataHandler, IValidatabl
  * - Right: right aligned
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TCheckBox.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0.4
  */
diff --git a/framework/Web/UI/WebControls/TCheckBoxColumn.php b/framework/Web/UI/WebControls/TCheckBoxColumn.php
index c0206676..8f67df55 100644
--- a/framework/Web/UI/WebControls/TCheckBoxColumn.php
+++ b/framework/Web/UI/WebControls/TCheckBoxColumn.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TCheckBoxColumn.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  */
 
@@ -38,7 +37,6 @@ Prado::using('System.Web.UI.WebControls.TCheckBox');
  * datagrid cell is the first child.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TCheckBoxColumn.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
diff --git a/framework/Web/UI/WebControls/TCheckBoxList.php b/framework/Web/UI/WebControls/TCheckBoxList.php
index 5122432c..af59545c 100644
--- a/framework/Web/UI/WebControls/TCheckBoxList.php
+++ b/framework/Web/UI/WebControls/TCheckBoxList.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TCheckBoxList.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  */
 
@@ -43,7 +42,6 @@ Prado::using('System.Web.UI.WebControls.TCheckBox');
  * The alignment of the text besides each checkbox can be specified via {@link setTextAlign TextAlign}.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TCheckBoxList.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
@@ -256,7 +254,7 @@ class TCheckBoxList extends TListControl implements IRepeatInfoUser, INamingCont
 	{
 		return false;
 	}
-	
+
 	/**
 	 * @param boolean whether the control is to be enabled.
 	 */
@@ -264,8 +262,8 @@ class TCheckBoxList extends TListControl implements IRepeatInfoUser, INamingCont
 	{
 		parent::setEnabled($value);
 		$value = !TPropertyValue::ensureBoolean($value);
-		// if this is an active control, 
-		// and it's a callback, 
+		// if this is an active control,
+		// and it's a callback,
 		// and we can update clientside,
 		// then update the 'disabled' attribute of the items.
 		if(($this instanceof IActiveControl) &&
@@ -389,14 +387,14 @@ class TCheckBoxList extends TListControl implements IRepeatInfoUser, INamingCont
 
 	/**
 	 * Wether the list should be rendered inside a span or not
-	 * 
+	 *
 	 *@return boolean true if we need a span
 	 */
 	protected function getSpanNeeded ()
 	{
 		return $this->getRepeatLayout()===TRepeatLayout::Raw;
 	}
-	
+
 	/**
 	 * Renders the checkbox list control.
 	 * This method overrides the parent implementation.
@@ -459,7 +457,7 @@ class TCheckBoxList extends TListControl implements IRepeatInfoUser, INamingCont
 	}
 
 	/**
-	 * Returns true if this control validated successfully. 
+	 * Returns true if this control validated successfully.
 	 * Defaults to true.
 	 * @return bool wether this control validated successfully.
 	 */
@@ -498,6 +496,6 @@ class TCheckBoxList extends TListControl implements IRepeatInfoUser, INamingCont
 		$options['ItemCount'] = $this->getItemCount();
 		return $options;
 	}
-	
+
 }
 
diff --git a/framework/Web/UI/WebControls/TClientScript.php b/framework/Web/UI/WebControls/TClientScript.php
index f28a507a..6fca14d3 100644
--- a/framework/Web/UI/WebControls/TClientScript.php
+++ b/framework/Web/UI/WebControls/TClientScript.php
@@ -4,9 +4,8 @@
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TClientScript.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  */
 
@@ -38,9 +37,8 @@
  * set the {@link setFlushScriptFiles FlushScriptFiles} property to false, so Prado
  * can postpone the loading of all the referenced script files further down the page
  * generation cycle.
- * 
+ *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @version $Id: TClientScript.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
diff --git a/framework/Web/UI/WebControls/TColorPicker.php b/framework/Web/UI/WebControls/TColorPicker.php
index fcb129b9..7b20318c 100644
--- a/framework/Web/UI/WebControls/TColorPicker.php
+++ b/framework/Web/UI/WebControls/TColorPicker.php
@@ -4,9 +4,8 @@
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TColorPicker.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  */
 
@@ -23,17 +22,16 @@
  *  # <b>Simple</b> - Grid with 12 simple colors.
  *  # <b>Basic</b> - Grid with the most common 70 colors. This is the default mode.
  *  # <b>Full</b> - Full-featured color picker.
- * 
+ *
  * The <b>CssClass</b> property can be used to override the CSS class name
  * for the color picker panel. The <b>ColorStyle</b> property sets the packages
  * styles available. E.g. <b>default</b>.
- * 
+ *
  * If the <b>Mode</b> property is set to <b>Full</b>, the color picker panel will
  * display an "Ok" and "Cancel" buttons. You can customize the button labels setting the <b>OKButtonText</b>
  * and <b>CancelButtonText</b> properties.
- * 
+ *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @version $Id: TColorPicker.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
@@ -248,7 +246,6 @@ class TColorPicker extends TTextBox
  * # Full - Full-featured color picker.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TColorPicker.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0.4
  */
@@ -265,7 +262,6 @@ class TColorPickerMode extends TEnumerable
  * Client-side javascript code options.
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @version $Id: TColorPicker.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.1
  */
diff --git a/framework/Web/UI/WebControls/TCompareValidator.php b/framework/Web/UI/WebControls/TCompareValidator.php
index eaaa8f51..b902b67b 100644
--- a/framework/Web/UI/WebControls/TCompareValidator.php
+++ b/framework/Web/UI/WebControls/TCompareValidator.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TCompareValidator.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  */
 
@@ -40,7 +39,6 @@ Prado::using('System.Web.UI.WebControls.TBaseValidator');
  * LessThan and LessThanEqual.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TCompareValidator.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
@@ -249,7 +247,6 @@ class TCompareValidator extends TBaseValidator
  * - LessThanEqual
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TCompareValidator.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0.4
  */
diff --git a/framework/Web/UI/WebControls/TConditional.php b/framework/Web/UI/WebControls/TConditional.php
index 054e1a76..61cc3988 100644
--- a/framework/Web/UI/WebControls/TConditional.php
+++ b/framework/Web/UI/WebControls/TConditional.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TConditional.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  */
 
@@ -39,7 +38,6 @@
  * or {@link getFalseTemplate FalseTemplate}, but never both. And the condition is evaluated only once.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TConditional.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.1.1
  */
diff --git a/framework/Web/UI/WebControls/TContent.php b/framework/Web/UI/WebControls/TContent.php
index f0a67674..a2f15e3d 100644
--- a/framework/Web/UI/WebControls/TContent.php
+++ b/framework/Web/UI/WebControls/TContent.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TContent.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  */
 
@@ -25,7 +24,6 @@
  * {@link TContent} and {@link TContentPlaceHolder} controls.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TContent.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
diff --git a/framework/Web/UI/WebControls/TContentPlaceHolder.php b/framework/Web/UI/WebControls/TContentPlaceHolder.php
index d9464fa3..8a4d7284 100644
--- a/framework/Web/UI/WebControls/TContentPlaceHolder.php
+++ b/framework/Web/UI/WebControls/TContentPlaceHolder.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TContentPlaceHolder.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  */
 
@@ -24,7 +23,6 @@
  * {@link TContent} and {@link TContentPlaceHolder} controls.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TContentPlaceHolder.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
diff --git a/framework/Web/UI/WebControls/TCustomValidator.php b/framework/Web/UI/WebControls/TCustomValidator.php
index b4987f06..6966a075 100644
--- a/framework/Web/UI/WebControls/TCustomValidator.php
+++ b/framework/Web/UI/WebControls/TCustomValidator.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TCustomValidator.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  */
 
@@ -48,7 +47,6 @@ Prado::using('System.Web.UI.WebControls.TBaseValidator');
  * with the TCustomValidator.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TCustomValidator.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
@@ -153,7 +151,6 @@ class TCustomValidator extends TBaseValidator
  * <b>OnServerValidate</b> event of TCustomValidator components.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TCustomValidator.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
diff --git a/framework/Web/UI/WebControls/TDataBoundControl.php b/framework/Web/UI/WebControls/TDataBoundControl.php
index 08d130c1..2a287aac 100644
--- a/framework/Web/UI/WebControls/TDataBoundControl.php
+++ b/framework/Web/UI/WebControls/TDataBoundControl.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TDataBoundControl.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  */
 
@@ -39,7 +38,6 @@ Prado::using('System.Collections.TPagedDataSource');
  * custom paging, set {@link setAllowCustomPaging AllowCustomPaging} to true.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TDataBoundControl.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
@@ -527,7 +525,6 @@ abstract class TDataBoundControl extends TWebControl
  * - Pager: pager
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TDataBoundControl.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0.4
  */
@@ -553,7 +550,6 @@ class TListItemType extends TEnumerable
  * {@link getItemType ItemType} property.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TDataBoundControl.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.1.0
  */
diff --git a/framework/Web/UI/WebControls/TDataGrid.php b/framework/Web/UI/WebControls/TDataGrid.php
index 249d8108..96e799aa 100644
--- a/framework/Web/UI/WebControls/TDataGrid.php
+++ b/framework/Web/UI/WebControls/TDataGrid.php
@@ -9,9 +9,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TDataGrid.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  */
 
@@ -145,7 +144,6 @@ Prado::using('System.Web.UI.WebControls.TDataGridPagerStyle');
  * - Save the data in viewstate and get it back during postbacks.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TDataGrid.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
@@ -1233,7 +1231,7 @@ class TDataGrid extends TBaseDataList implements INamingContainer
 	 * Depending on the button type, a TLinkButton or a TButton may be created.
 	 * If it is enabled (clickable), its command name and parameter will also be set.
 	 * Derived classes may override this method to create additional types of buttons, such as TImageButton.
-	 * @param mixed the container pager instance of TActiveDatagridPager 
+	 * @param mixed the container pager instance of TActiveDatagridPager
 	 * @param string button type, either LinkButton or PushButton
 	 * @param boolean whether the button should be enabled
 	 * @param string caption of the button
@@ -1680,7 +1678,6 @@ class TDataGrid extends TBaseDataList implements INamingContainer
  * The {@link getItem Item} property indicates the datagrid item related with the event.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TDataGrid.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
@@ -1718,7 +1715,6 @@ class TDataGridItemEventParameter extends TEventParameter
  * The {@link getPager Pager} property indicates the datagrid pager related with the event.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TDataGrid.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
@@ -1759,7 +1755,6 @@ class TDataGridPagerEventParameter extends TEventParameter
  * raises the Command event.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TDataGrid.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
@@ -1815,7 +1810,6 @@ class TDataGridCommandEventParameter extends TCommandEventParameter
  * gives the sort expression carried with the sort command.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TDataGrid.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
@@ -1869,7 +1863,6 @@ class TDataGridSortCommandEventParameter extends TEventParameter
  * returns the new page index carried with the page command.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TDataGrid.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
@@ -1923,7 +1916,6 @@ class TDataGridPageChangedEventParameter extends TEventParameter
  * gives the index of the item from the bound data source.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TDataGrid.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
@@ -2060,7 +2052,6 @@ class TDataGridItem extends TTableRow implements INamingContainer
  * TDataGridPager represents a datagrid pager.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TDataGrid.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
@@ -2119,7 +2110,6 @@ class TDataGridPager extends TPanel implements INamingContainer
  * TDataGridItemCollection represents a collection of data grid items.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TDataGrid.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
@@ -2147,7 +2137,6 @@ class TDataGridItemCollection extends TList
  * TDataGridColumnCollection represents a collection of data grid columns.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TDataGrid.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
@@ -2204,7 +2193,6 @@ class TDataGridColumnCollection extends TList
  * - Numeric: pager buttons are displayed as numeric page numbers
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TDataGrid.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0.4
  */
@@ -2224,7 +2212,6 @@ class TDataGridPagerMode extends TEnumerable
  * - PushButton: form submit buttons
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TDataGrid.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0.4
  */
@@ -2245,7 +2232,6 @@ class TDataGridPagerButtonType extends TEnumerable
  * - TopAndBottom: pager appears on both top and bottom of the data grid.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TDataGrid.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0.4
  */
diff --git a/framework/Web/UI/WebControls/TDataGridColumn.php b/framework/Web/UI/WebControls/TDataGridColumn.php
index ad3be81f..1c8831d2 100644
--- a/framework/Web/UI/WebControls/TDataGridColumn.php
+++ b/framework/Web/UI/WebControls/TDataGridColumn.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TDataGridColumn.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  */
 
@@ -58,7 +57,6 @@ Prado::using('System.Web.UI.WebControls.TDataGrid');
  * which is the major logic for managing the data and presentation of cells in the column.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TDataGridColumn.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
@@ -554,7 +552,6 @@ abstract class TDataGridColumn extends TApplicationComponent
  * - ImageButton: image buttons
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TDataGridColumn.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0.4
  */
diff --git a/framework/Web/UI/WebControls/TDataGridItemRenderer.php b/framework/Web/UI/WebControls/TDataGridItemRenderer.php
index 6e37a739..376eea17 100644
--- a/framework/Web/UI/WebControls/TDataGridItemRenderer.php
+++ b/framework/Web/UI/WebControls/TDataGridItemRenderer.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TDataGridItemRenderer.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  */
 
@@ -20,7 +19,6 @@ Prado::using('System.Web.UI.WebControls.TItemDataRenderer');
  * define an item renderer class specific for {@link TDataGrid}.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TDataGridItemRenderer.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.1.0
  */
diff --git a/framework/Web/UI/WebControls/TDataGridPagerStyle.php b/framework/Web/UI/WebControls/TDataGridPagerStyle.php
index 31c0380b..4e143e05 100644
--- a/framework/Web/UI/WebControls/TDataGridPagerStyle.php
+++ b/framework/Web/UI/WebControls/TDataGridPagerStyle.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TDataGridPagerStyle.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  */
 
@@ -18,7 +17,6 @@ Prado::using('System.Web.UI.WebControls.TDataGrid');
  * TDataGridPagerStyle specifies the styles available for a datagrid pager.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TDataGridPagerStyle.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
diff --git a/framework/Web/UI/WebControls/TDataList.php b/framework/Web/UI/WebControls/TDataList.php
index 6b3c4a73..021fdf6d 100644
--- a/framework/Web/UI/WebControls/TDataList.php
+++ b/framework/Web/UI/WebControls/TDataList.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TDataList.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  */
 
@@ -146,7 +145,6 @@ Prado::using('System.Web.UI.WebControls.TRepeatInfo');
  * complex data may also have serializing problem if saved in viewstate.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TDataList.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
@@ -1499,7 +1497,6 @@ class TDataList extends TBaseDataList implements INamingContainer, IRepeatInfoUs
  * The {@link getItem Item} property indicates the DataList item related with the event.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TDataList.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
@@ -1540,7 +1537,6 @@ class TDataListItemEventParameter extends TEventParameter
  * raises the Command event.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TDataList.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
@@ -1595,7 +1591,6 @@ class TDataListCommandEventParameter extends TCommandEventParameter
  * is given by {@link getItemType ItemType} property.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TDataList.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
@@ -1742,7 +1737,6 @@ class TDataListItem extends TWebControl implements INamingContainer, IItemDataRe
  * TDataListItemCollection represents a collection of data list items.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TDataList.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
diff --git a/framework/Web/UI/WebControls/TDataListItemRenderer.php b/framework/Web/UI/WebControls/TDataListItemRenderer.php
index df63c1f2..cf42c9a4 100644
--- a/framework/Web/UI/WebControls/TDataListItemRenderer.php
+++ b/framework/Web/UI/WebControls/TDataListItemRenderer.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TDataListItemRenderer.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  */
 
@@ -26,7 +25,6 @@ Prado::using('System.Web.UI.WebControls.TItemDataRenderer');
  * which allows TDataList to apply CSS styles to the renders.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TDataListItemRenderer.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.1.0
  */
diff --git a/framework/Web/UI/WebControls/TDataRenderer.php b/framework/Web/UI/WebControls/TDataRenderer.php
index 8bde0152..0e98a1b4 100644
--- a/framework/Web/UI/WebControls/TDataRenderer.php
+++ b/framework/Web/UI/WebControls/TDataRenderer.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TDataRenderer.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.1.2
  */
@@ -22,7 +21,6 @@
  * - {@link getData Data}: data associated with this renderer.
 
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TDataRenderer.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.1.2
  */
diff --git a/framework/Web/UI/WebControls/TDataSourceControl.php b/framework/Web/UI/WebControls/TDataSourceControl.php
index 93037c03..afe4de2d 100644
--- a/framework/Web/UI/WebControls/TDataSourceControl.php
+++ b/framework/Web/UI/WebControls/TDataSourceControl.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TDataSourceControl.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  */
 
@@ -14,7 +13,6 @@
  * IDataSource class
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TDataSourceControl.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
@@ -29,7 +27,6 @@ interface IDataSource
  * TDataSourceControl class
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TDataSourceControl.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
@@ -90,7 +87,6 @@ abstract class TDataSourceControl extends TControl implements IDataSource
  * TDataSourceControl class
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TDataSourceControl.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
diff --git a/framework/Web/UI/WebControls/TDataSourceView.php b/framework/Web/UI/WebControls/TDataSourceView.php
index 1e1ad7a9..b9a76a32 100644
--- a/framework/Web/UI/WebControls/TDataSourceView.php
+++ b/framework/Web/UI/WebControls/TDataSourceView.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TDataSourceView.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  */
 
@@ -14,7 +13,6 @@
  * TDataSourceSelectParameters class
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TDataSourceView.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
@@ -76,7 +74,6 @@ class TDataSourceSelectParameters extends TComponent
  * TDataSourceView class
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TDataSourceView.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
@@ -179,7 +176,6 @@ abstract class TDataSourceView extends TComponent
  * TReadOnlyDataSourceView class
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TDataSourceView.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
diff --git a/framework/Web/UI/WebControls/TDataTypeValidator.php b/framework/Web/UI/WebControls/TDataTypeValidator.php
index b9ddbf6c..3881bb84 100644
--- a/framework/Web/UI/WebControls/TDataTypeValidator.php
+++ b/framework/Web/UI/WebControls/TDataTypeValidator.php
@@ -4,9 +4,8 @@
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TDataTypeValidator.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  */
 
@@ -30,7 +29,6 @@ Prado::using('System.Web.UI.WebControls.TBaseValidator');
  * provided, the string will be assumed to be in GNU datetime format.
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @version $Id: TDataTypeValidator.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
diff --git a/framework/Web/UI/WebControls/TDatePicker.php b/framework/Web/UI/WebControls/TDatePicker.php
index 0e8d7bda..112b2f74 100644
--- a/framework/Web/UI/WebControls/TDatePicker.php
+++ b/framework/Web/UI/WebControls/TDatePicker.php
@@ -4,9 +4,8 @@
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TDatePicker.php 3318 2013-09-04 14:04:51Z ctrlaltca $
  * @package System.Web.UI.WebControls
  */
 
@@ -73,7 +72,6 @@ Prado::using('System.Web.UI.WebControls.TTextBox');
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
  * @author Carl G. Mathisen <carlgmathisen@gmail.com>
- * @version $Id: TDatePicker.php 3318 2013-09-04 14:04:51Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
@@ -276,7 +274,7 @@ class TDatePicker extends TTextBox
 	{
 		return $this->getViewState('UpToYear', intval(@date('Y'))+10);
 	}
-	
+
 	/**
 	 * @param TDatePickerPositionMode calendar UI position
 	 */
@@ -902,9 +900,8 @@ class TDatePicker extends TTextBox
  * is changed.
  * The formatted date according to {@link TDatePicker::getDateFormat DateFormat} is sent
  * as parameter to this event
- * 
+ *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @version $Id: TDatePicker.php 3318 2013-09-04 14:04:51Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0.4
  */
@@ -938,7 +935,6 @@ class TDatePickerClientScript extends TClientSideOptions
  * - DropDownList: dropdown lists are used to pick up date values
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TDatePicker.php 3318 2013-09-04 14:04:51Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0.4
  */
@@ -960,7 +956,6 @@ class TDatePickerInputMode extends TEnumerable
  * - ImageButton: Shows an image next to the text input, clicking on the image shows the date picker,
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TDatePicker.php 3318 2013-09-04 14:04:51Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0.4
  */
diff --git a/framework/Web/UI/WebControls/TDropDownList.php b/framework/Web/UI/WebControls/TDropDownList.php
index 8dda857b..ab56bc7a 100644
--- a/framework/Web/UI/WebControls/TDropDownList.php
+++ b/framework/Web/UI/WebControls/TDropDownList.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TDropDownList.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  */
 
@@ -39,7 +38,6 @@ Prado::using('System.Web.UI.WebControls.TListControl');
  * available item in the dropdown list will be selected.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TDropDownList.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
@@ -136,7 +134,7 @@ class TDropDownList extends TListControl implements IPostBackDataHandler, IValid
 	}
 
 	/**
-	 * Returns true if this control validated successfully. 
+	 * Returns true if this control validated successfully.
 	 * Defaults to true.
 	 * @return bool wether this control validated successfully.
 	 */
diff --git a/framework/Web/UI/WebControls/TDropDownListColumn.php b/framework/Web/UI/WebControls/TDropDownListColumn.php
index 40e07aef..13a47aa7 100644
--- a/framework/Web/UI/WebControls/TDropDownListColumn.php
+++ b/framework/Web/UI/WebControls/TDropDownListColumn.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TDropDownListColumn.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  */
 
@@ -54,7 +53,6 @@ Prado::using('System.Web.UI.WebControls.TDropDownList');
  * datagrid cell is the first child.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TDropDownListColumn.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0.4
  */
diff --git a/framework/Web/UI/WebControls/TEditCommandColumn.php b/framework/Web/UI/WebControls/TEditCommandColumn.php
index 2f69c001..d8db8059 100644
--- a/framework/Web/UI/WebControls/TEditCommandColumn.php
+++ b/framework/Web/UI/WebControls/TEditCommandColumn.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TEditCommandColumn.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  */
 
@@ -47,7 +46,6 @@ Prado::using('System.Web.UI.WebControls.TDataGridColumn');
  * datagrid cell is the first child.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TEditCommandColumn.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
diff --git a/framework/Web/UI/WebControls/TEmailAddressValidator.php b/framework/Web/UI/WebControls/TEmailAddressValidator.php
index dffe912e..b5ed78c6 100644
--- a/framework/Web/UI/WebControls/TEmailAddressValidator.php
+++ b/framework/Web/UI/WebControls/TEmailAddressValidator.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TEmailAddressValidator.php 3283 2013-03-24 10:19:08Z ctrlaltca $
  * @package System.Web.UI.WebControls
  */
 
@@ -24,7 +23,6 @@ Prado::using('System.Web.UI.WebControls.TRegularExpressionValidator');
  * checkdnsrr() is available in the installed PHP.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TEmailAddressValidator.php 3283 2013-03-24 10:19:08Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
diff --git a/framework/Web/UI/WebControls/TExpression.php b/framework/Web/UI/WebControls/TExpression.php
index 3cb1aa8c..f1fea77b 100644
--- a/framework/Web/UI/WebControls/TExpression.php
+++ b/framework/Web/UI/WebControls/TExpression.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TExpression.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  */
 
@@ -22,7 +21,6 @@
  * make sure {@link setExpression Expression} does not come directly from user input.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TExpression.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
diff --git a/framework/Web/UI/WebControls/TFileUpload.php b/framework/Web/UI/WebControls/TFileUpload.php
index c6dc595a..af2ad3f2 100644
--- a/framework/Web/UI/WebControls/TFileUpload.php
+++ b/framework/Web/UI/WebControls/TFileUpload.php
@@ -4,9 +4,8 @@
  *
  * @author Marcus Nyeholt <tanus@users.sourceforge.net>, Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TFileUpload.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  */
 
@@ -28,7 +27,6 @@
  * (whether it succeeds or not).
  *
  * @author Marcus Nyeholt <tanus@users.sourceforge.net>, Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TFileUpload.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
@@ -261,7 +259,7 @@ class TFileUpload extends TWebControl implements IPostBackDataHandler, IValidata
 	}
 
 	/**
-	 * Returns true if this control validated successfully. 
+	 * Returns true if this control validated successfully.
 	 * Defaults to true.
 	 * @return bool wether this control validated successfully.
 	 */
diff --git a/framework/Web/UI/WebControls/TFlushOutput.php b/framework/Web/UI/WebControls/TFlushOutput.php
index dba35c79..0dbe0692 100644
--- a/framework/Web/UI/WebControls/TFlushOutput.php
+++ b/framework/Web/UI/WebControls/TFlushOutput.php
@@ -5,7 +5,6 @@
  * @author Berczi Gabor <gabor.berczi@devworx.hu>
  * @link http://www.pradosoft.com/
  * @license http://www.pradosoft.com/license/
- * @version $Id: TFlushOutput.php $
  * @package System.Web.UI.WebControls
  */
 
@@ -23,17 +22,16 @@
  * <com:TFlushOutput />
  * </code>
  *
- * You can specify whether you want to keep buffering of the output 
+ * You can specify whether you want to keep buffering of the output
  * (if it was enabled) till the next occourence of a <com: TFlushOutput />
- * or the end of the page rendering, or stop buffering, by using the 
+ * or the end of the page rendering, or stop buffering, by using the
  * {@link setContinueBuffering ContinueBuffering}.
  *
  * @author Berczi Gabor <gabor.berczi@devworx.hu>
- * @version $Id: TFlushOutput.php  $
  * @package System.Web.UI.WebControls
  * @since 3.1
  */
-class TFlushOutput extends TControl 
+class TFlushOutput extends TControl
 {
 	/**
 	 * @var boolean whether to continue buffering of output
@@ -73,7 +71,7 @@ class TFlushOutput extends TControl
 	public function render($writer)
 	{
 //$writer->write('<!-- flush -->');
-		// ajax responses can't be parsed by the client side before loaded and returned completely, 
+		// ajax responses can't be parsed by the client side before loaded and returned completely,
 		// so don't bother with flushing output somewhere mid-page if refreshing in a callback
 		if (!$this->Page->IsCallback)
 		{
diff --git a/framework/Web/UI/WebControls/TFont.php b/framework/Web/UI/WebControls/TFont.php
index 12da993b..a07b8621 100644
--- a/framework/Web/UI/WebControls/TFont.php
+++ b/framework/Web/UI/WebControls/TFont.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TFont.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  */
 
@@ -16,7 +15,6 @@
  * TFont encapsulates the CSS style fields related with font settings.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TFont.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
diff --git a/framework/Web/UI/WebControls/THead.php b/framework/Web/UI/WebControls/THead.php
index 52ce3013..707bbfcc 100644
--- a/framework/Web/UI/WebControls/THead.php
+++ b/framework/Web/UI/WebControls/THead.php
@@ -4,9 +4,8 @@
  *
  * @author Marcus Nyeholt <tanus@users.sourceforge.net> and Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: THead.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI
  */
 
@@ -37,7 +36,6 @@
  * theme will not be rendered.
  *
  * @author Marcus Nyeholt <tanus@users.sourceforge.net> and Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: THead.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI
  * @since 3.0
  */
@@ -186,7 +184,6 @@ class THead extends TControl
  * attributes for a meta tag, respectively.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: THead.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
@@ -321,7 +318,6 @@ class TMetaTag extends TComponent
  * contained in a {@link THead} control.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: THead.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
diff --git a/framework/Web/UI/WebControls/THeader1.php b/framework/Web/UI/WebControls/THeader1.php
index db516679..8aa635b5 100644
--- a/framework/Web/UI/WebControls/THeader1.php
+++ b/framework/Web/UI/WebControls/THeader1.php
@@ -4,9 +4,8 @@
  *
  * @author Brad Anderson <javalizard@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: THeader1.php 2590 2008-12-10 11:34:24Z carlgmathisen $
  * @package System.Web.UI.WebControls
  */
 
@@ -18,13 +17,12 @@
  * This is also useful for the {@link TWebControlDecorator} (used by themes).
  *
  * @author Brad Anderson <javalizard@gmail.com>
- * @version $Id: THeader1.php 2541 2008-10-21 15:05:13Z javalizard $
  * @package System.Web.UI.WebControls
  * @since 3.2a
  */
- 
-class THeader1 extends THtmlElement {	
-	
+
+class THeader1 extends THtmlElement {
+
 	/**
 	 * @return string tag name
 	 */
@@ -32,5 +30,5 @@ class THeader1 extends THtmlElement {
 	{
 		return 'h1';
 	}
-	
+
 }
diff --git a/framework/Web/UI/WebControls/THeader2.php b/framework/Web/UI/WebControls/THeader2.php
index be1d76ae..16631312 100644
--- a/framework/Web/UI/WebControls/THeader2.php
+++ b/framework/Web/UI/WebControls/THeader2.php
@@ -4,9 +4,8 @@
  *
  * @author Brad Anderson <javalizard@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: THeader2.php 2590 2008-12-10 11:34:24Z carlgmathisen $
  * @package System.Web.UI.WebControls
  */
 
@@ -18,13 +17,12 @@
  * This is also useful for the {@link TWebControlDecorator} (used by themes).
  *
  * @author Brad Anderson <javalizard@gmail.com>
- * @version $Id: THeader2.php 2541 2008-10-21 15:05:13Z javalizard $
  * @package System.Web.UI.WebControls
  * @since 3.2a
  */
- 
-class THeader2 extends THtmlElement {	
-	
+
+class THeader2 extends THtmlElement {
+
 	/**
 	 * @return string tag name
 	 */
@@ -32,5 +30,5 @@ class THeader2 extends THtmlElement {
 	{
 		return 'h2';
 	}
-	
+
 }
diff --git a/framework/Web/UI/WebControls/THeader3.php b/framework/Web/UI/WebControls/THeader3.php
index ff96a190..64e48366 100644
--- a/framework/Web/UI/WebControls/THeader3.php
+++ b/framework/Web/UI/WebControls/THeader3.php
@@ -4,9 +4,8 @@
  *
  * @author Brad Anderson <javalizard@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: THeader3.php 2590 2008-12-10 11:34:24Z carlgmathisen $
  * @package System.Web.UI.WebControls
  */
 
@@ -18,13 +17,12 @@
  * This is also useful for the {@link TWebControlDecorator} (used by themes).
  *
  * @author Brad Anderson <javalizard@gmail.com>
- * @version $Id: THeader3.php 2541 2008-10-21 15:05:13Z javalizard $
  * @package System.Web.UI.WebControls
  * @since 3.2a
  */
- 
-class THeader3 extends THtmlElement {	
-	
+
+class THeader3 extends THtmlElement {
+
 	/**
 	 * @return string tag name
 	 */
@@ -32,5 +30,5 @@ class THeader3 extends THtmlElement {
 	{
 		return 'h3';
 	}
-	
+
 }
diff --git a/framework/Web/UI/WebControls/THeader4.php b/framework/Web/UI/WebControls/THeader4.php
index 1374c700..6622dd34 100644
--- a/framework/Web/UI/WebControls/THeader4.php
+++ b/framework/Web/UI/WebControls/THeader4.php
@@ -4,9 +4,8 @@
  *
  * @author Brad Anderson <javalizard@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: THeader4.php 2590 2008-12-10 11:34:24Z carlgmathisen $
  * @package System.Web.UI.WebControls
  */
 
@@ -18,13 +17,12 @@
  * This is also useful for the {@link TWebControlDecorator} (used by themes).
  *
  * @author Brad Anderson <javalizard@gmail.com>
- * @version $Id: THeader4.php 2541 2008-10-21 15:05:13Z javalizard $
  * @package System.Web.UI.WebControls
  * @since 3.2
  */
- 
-class THeader4 extends THtmlElement {	
-	
+
+class THeader4 extends THtmlElement {
+
 	/**
 	 * @return string tag name
 	 */
@@ -32,5 +30,5 @@ class THeader4 extends THtmlElement {
 	{
 		return 'h4';
 	}
-	
+
 }
diff --git a/framework/Web/UI/WebControls/THeader5.php b/framework/Web/UI/WebControls/THeader5.php
index 911e17ed..4d061943 100644
--- a/framework/Web/UI/WebControls/THeader5.php
+++ b/framework/Web/UI/WebControls/THeader5.php
@@ -4,9 +4,8 @@
  *
  * @author Brad Anderson <javalizard@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: THeader5.php 2590 2008-12-10 11:34:24Z carlgmathisen $
  * @package System.Web.UI.WebControls
  */
 
@@ -18,13 +17,12 @@
  * This is also useful for the {@link TWebControlDecorator} (used by themes).
  *
  * @author Brad Anderson <javalizard@gmail.com>
- * @version $Id: THeader5.php 2541 2008-10-21 15:05:13Z javalizard $
  * @package System.Web.UI.WebControls
  * @since 3.2
  */
- 
-class THeader5 extends THtmlElement {	
-	
+
+class THeader5 extends THtmlElement {
+
 	/**
 	 * @return string tag name
 	 */
@@ -32,5 +30,5 @@ class THeader5 extends THtmlElement {
 	{
 		return 'h5';
 	}
-	
+
 }
diff --git a/framework/Web/UI/WebControls/THeader6.php b/framework/Web/UI/WebControls/THeader6.php
index a2891c3f..164c391c 100644
--- a/framework/Web/UI/WebControls/THeader6.php
+++ b/framework/Web/UI/WebControls/THeader6.php
@@ -4,9 +4,8 @@
  *
  * @author Brad Anderson <javalizard@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: THeader6.php 2590 2008-12-10 11:34:24Z carlgmathisen $
  * @package System.Web.UI.WebControls
  */
 
@@ -18,13 +17,12 @@
  * This is also useful for the {@link TWebControlDecorator} (used by themes).
  *
  * @author Brad Anderson <javalizard@gmail.com>
- * @version $Id: THeader6.php 2541 2008-10-21 15:05:13Z javalizard $
  * @package System.Web.UI.WebControls
  * @since 3.2
  */
- 
-class THeader6 extends THtmlElement {	
-	
+
+class THeader6 extends THtmlElement {
+
 	/**
 	 * @return string tag name
 	 */
@@ -32,5 +30,5 @@ class THeader6 extends THtmlElement {
 	{
 		return 'h6';
 	}
-	
+
 }
diff --git a/framework/Web/UI/WebControls/THiddenField.php b/framework/Web/UI/WebControls/THiddenField.php
index 041acdb2..d887a5e6 100644
--- a/framework/Web/UI/WebControls/THiddenField.php
+++ b/framework/Web/UI/WebControls/THiddenField.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.xisc.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.opensource.org/licenses/bsd-license.php BSD License
- * @version $Id: THiddenField.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  */
 
@@ -19,7 +18,6 @@
  * event will be raised.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: THiddenField.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
@@ -113,7 +111,7 @@ class THiddenField extends TControl implements IPostBackDataHandler, IValidatabl
 	}
 
 	/**
-	 * Returns true if this control validated successfully. 
+	 * Returns true if this control validated successfully.
 	 * Defaults to true.
 	 * @return bool wether this control validated successfully.
 	 */
diff --git a/framework/Web/UI/WebControls/THtmlArea.php b/framework/Web/UI/WebControls/THtmlArea.php
index 9d9ff3fa..6c2985f8 100644
--- a/framework/Web/UI/WebControls/THtmlArea.php
+++ b/framework/Web/UI/WebControls/THtmlArea.php
@@ -4,9 +4,8 @@
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: THtmlArea.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  */
 
@@ -72,7 +71,6 @@ Prado::using('System.Web.UI.WebControls.TTextBox');
  * </code>
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @version $Id: THtmlArea.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
@@ -471,6 +469,8 @@ class THtmlArea extends TTextBox
 		$options['theme_advanced_toolbar_align'] = 'left';
 		$options['theme_advanced_path_location'] = 'bottom';
 		$options['extended_valid_elements'] = 'a[name|href|target|title|onclick],img[class|src|border=0|alt|title|hspace|vspace|width|height|align|onmouseover|onmouseout|name],hr[class|width|size|noshade],font[face|size|color|style],span[class|align|style]';
+		if($this->getReadOnly())
+			$options['readonly'] = true;
 
 		$options = array_merge($options, $this->parseEditorOptions($this->getOptions()));
 		return $options;
@@ -491,7 +491,7 @@ class THtmlArea extends TTextBox
 			if(count($option) == 2)
 			{
 				$value=trim(trim($option[1]),"'\"");
-				if (($s=strtolower($value))==='false') 
+				if (($s=strtolower($value))==='false')
 					$value=false;
 				elseif ($s==='true')
 					$value=true;
diff --git a/framework/Web/UI/WebControls/THtmlArea4.php b/framework/Web/UI/WebControls/THtmlArea4.php
index f98c2ddf..d5410eae 100644
--- a/framework/Web/UI/WebControls/THtmlArea4.php
+++ b/framework/Web/UI/WebControls/THtmlArea4.php
@@ -4,9 +4,8 @@
  *
  * @author Fabio Bas <ctrlaltca[at]gmail[dot]com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: THtmlArea4.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  */
 
@@ -20,7 +19,7 @@ Prado::using('System.Web.UI.WebControls.TTextBox');
  *
  * THtmlArea4 wraps the visual editing functionalities provided by the
  * version 4 of TinyMCE project {@link http://tinymce.com/}. It has been
- * developed as a plug'n'play substitute for {@link THtmlArea}, that is 
+ * developed as a plug'n'play substitute for {@link THtmlArea}, that is
  * based on the previous iteration (version 3) of the same project.
  * Please note that both components can't be used together in the same page.
  *
@@ -53,7 +52,6 @@ Prado::using('System.Web.UI.WebControls.TTextBox');
  * </code>
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @version $Id: THtmlArea.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
@@ -408,6 +406,13 @@ class THtmlArea4 extends TTextBox
 		$options['height'] = $this->getHeight();
 		$options['resize'] = 'both';
 		$options['menubar'] = false;
+		if($this->getReadOnly())
+		{
+			$options['readonly'] = true;
+			$options['toolbar'] = false;
+			$options['menubar'] = false;
+			$options['statusbar'] = false;
+		}
 
 		$options['extended_valid_elements'] = 'a[name|href|target|title|onclick],img[class|src|border=0|alt|title|hspace|vspace|width|height|align|onmouseover|onmouseout|name],hr[class|width|size|noshade],font[face|size|color|style],span[class|align|style]';
 
@@ -430,7 +435,7 @@ class THtmlArea4 extends TTextBox
 			if(count($option) == 2)
 			{
 				$value=trim(trim($option[1]),"'\"");
-				if (($s=strtolower($value))==='false') 
+				if (($s=strtolower($value))==='false')
 					$value=false;
 				elseif ($s==='true')
 					$value=true;
diff --git a/framework/Web/UI/WebControls/THtmlElement.php b/framework/Web/UI/WebControls/THtmlElement.php
index 5646a6ff..f5bee915 100644
--- a/framework/Web/UI/WebControls/THtmlElement.php
+++ b/framework/Web/UI/WebControls/THtmlElement.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: THtmlElement.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  */
 
@@ -23,7 +22,6 @@ Prado::using('System.Web.UI.WebControls.TWebControl');
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @author Brad Anderson <javalizard@gmail.com>
- * @version $Id: THtmlElement.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.1.2
  */
@@ -49,18 +47,18 @@ class THtmlElement extends TWebControl
 	{
 		$this->_tagName=TPropertyValue::ensureString($value);
 	}
-	
+
 	/**
 	 *	This is the default tag when no other is specified
-	 * @return string the default tag 
+	 * @return string the default tag
 	 */
 	public function getDefaultTagName() {
 		return 'span';
 	}
-	
+
 	/**
 	 * This tells you if this TagName has deviated from the original
-	 * @return boolean true if TagName has deviated from the default. 
+	 * @return boolean true if TagName has deviated from the default.
 	 */
 	public function getIsMutated() {
 		return $this->_tagName !== null && $this->_tagName != $this->getDefaultTagName();
diff --git a/framework/Web/UI/WebControls/THyperLink.php b/framework/Web/UI/WebControls/THyperLink.php
index 56aa5391..3cda0c48 100644
--- a/framework/Web/UI/WebControls/THyperLink.php
+++ b/framework/Web/UI/WebControls/THyperLink.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.xisc.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.opensource.org/licenses/bsd-license.php BSD License
- * @version $Id: THyperLink.php 3286 2013-04-18 06:09:19Z ctrlaltca $
  * @package System.Web.UI.WebControls
  */
 
@@ -20,13 +19,12 @@
  * the alignment of the image displayed is set by the
  * {@link setImageAlign ImageAlign} property and {@link getText Text} is
  * displayed as the alternate text of the image.
- * 
+ *
  * The link target is specified via the {@link setTarget Target} property.
  * If both {@link getImageUrl ImageUrl} and {@link getText Text} are empty,
  * the content enclosed within the control tag will be rendered.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: THyperLink.php 3286 2013-04-18 06:09:19Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
@@ -145,7 +143,7 @@ class THyperLink extends TWebControl implements IDataRenderer
 	{
 		return $this->getViewState('ImageHeight','');
 	}
-	
+
 	/**
 	 * Sets the height of the image in the THyperLink
 	 * @param string height of the image in the THyperLink
@@ -171,7 +169,7 @@ class THyperLink extends TWebControl implements IDataRenderer
 	{
 		$this->setViewState('ImageUrl',$value,'');
 	}
-	
+
 	/**
 	 * @return string width of the image in the THyperLink
 	 */
@@ -179,7 +177,7 @@ class THyperLink extends TWebControl implements IDataRenderer
 	{
 		return $this->getViewState('ImageWidth','');
 	}
-	
+
 	/**
 	 * Sets the width of the image in the THyperLink
 	 * @param string width of the image
diff --git a/framework/Web/UI/WebControls/THyperLinkColumn.php b/framework/Web/UI/WebControls/THyperLinkColumn.php
index 171accad..05060ea6 100644
--- a/framework/Web/UI/WebControls/THyperLinkColumn.php
+++ b/framework/Web/UI/WebControls/THyperLinkColumn.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: THyperLinkColumn.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  */
 
@@ -45,7 +44,6 @@ Prado::using('System.Web.UI.WebControls.THyperLink');
  * datagrid cell is the first child.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: THyperLinkColumn.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
@@ -107,7 +105,7 @@ class THyperLinkColumn extends TDataGridColumn
 	{
 		return $this->getViewState('ImageHeight','');
 	}
-	
+
 	/**
 	 * @param string height of the image in the THyperLink
 	 */
@@ -123,7 +121,7 @@ class THyperLinkColumn extends TDataGridColumn
 	{
 		return $this->getViewState('ImageUrl','');
 	}
-	
+
 	/**
 	 * @param string url of the image in the THyperLink
 	 */
@@ -131,7 +129,7 @@ class THyperLinkColumn extends TDataGridColumn
 	{
 		$this->setViewState('ImageUrl',$value,'');
 	}
-	
+
 	/**
 	 * @return string width of the image in the THyperLink
 	 */
@@ -139,7 +137,7 @@ class THyperLinkColumn extends TDataGridColumn
 	{
 		return $this->getViewState('ImageWidth','');
 	}
-	
+
 	/**
 	 * @param string width of the image in the THyperLink
 	 */
diff --git a/framework/Web/UI/WebControls/TImage.php b/framework/Web/UI/WebControls/TImage.php
index 04a6d116..6ebbca5d 100644
--- a/framework/Web/UI/WebControls/TImage.php
+++ b/framework/Web/UI/WebControls/TImage.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TImage.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  */
 
@@ -21,7 +20,6 @@
  * or {@link setDescriptionUrl DescriptionUrl} property, respectively.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TImage.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
diff --git a/framework/Web/UI/WebControls/TImageButton.php b/framework/Web/UI/WebControls/TImageButton.php
index 0ee52a94..ff876b07 100644
--- a/framework/Web/UI/WebControls/TImageButton.php
+++ b/framework/Web/UI/WebControls/TImageButton.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TImageButton.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  */
 
@@ -52,7 +51,6 @@ Prado::using('System.Web.UI.WebControls.TImage');
  * TImageButton displays the {@link setText Text} property as the hint text to the displayed image.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TImageButton.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
@@ -378,7 +376,6 @@ class TImageButton extends TImage implements IPostBackDataHandler, IPostBackEven
  * {@link TImageButton::onClick Click} event of {@link TImageButton} controls.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TImageButton.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
diff --git a/framework/Web/UI/WebControls/TImageMap.php b/framework/Web/UI/WebControls/TImageMap.php
index 340f5089..23409b1c 100644
--- a/framework/Web/UI/WebControls/TImageMap.php
+++ b/framework/Web/UI/WebControls/TImageMap.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TImageMap.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  */
 
@@ -33,7 +32,6 @@ Prado::using('System.Web.UI.WebControls.TImage');
  * </code>
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TImageMap.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
@@ -230,7 +228,6 @@ class TImageMap extends TImage implements IPostBackEventHandler
  * access {@link getPostBackValue PostBackValue}.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TImageMap.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
@@ -262,7 +259,6 @@ class TImageMapEventParameter extends TEventParameter
  * THotSpotCollection represents a collection of hotspots in an imagemap.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TImageMap.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
@@ -293,7 +289,6 @@ class THotSpotCollection extends TList
  * and {@link TRectangleHotSpot}.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TImageMap.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
@@ -604,7 +599,6 @@ abstract class THotSpot extends TComponent
  * control.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TImageMap.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
@@ -682,7 +676,6 @@ class TCircleHotSpot extends THotSpot
  * TImageMap} control.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TImageMap.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
@@ -776,7 +769,6 @@ class TRectangleHotSpot extends THotSpot
  * TImageMap} control.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TImageMap.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
@@ -823,7 +815,6 @@ class TPolygonHotSpot extends THotSpot
  * - Inactive: the hotspot is inactive (not clickable)
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TImageMap.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0.4
  */
diff --git a/framework/Web/UI/WebControls/TInlineFrame.php b/framework/Web/UI/WebControls/TInlineFrame.php
index 2c1371aa..09e82315 100644
--- a/framework/Web/UI/WebControls/TInlineFrame.php
+++ b/framework/Web/UI/WebControls/TInlineFrame.php
@@ -5,9 +5,8 @@
  * @author Jason Ragsdale <jrags@jasrags.net>
  * @author Harry Pottash <hpottash@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TInlineFrame.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  */
 
@@ -27,7 +26,6 @@
  * Original Prado v2 IFrame Author Information
  * @author Jason Ragsdale <jrags@jasrags.net>
  * @author Harry Pottash <hpottash@gmail.com>
- * @version $Id: TInlineFrame.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
@@ -239,7 +237,6 @@ class TInlineFrame extends TWebControl implements IDataRenderer
  * - Bottom: bottom aligned
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TInlineFrame.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0.4
  */
@@ -264,7 +261,6 @@ class TInlineFrameAlign extends TEnumerable
  * - Both: show both horizontal and vertical scroll bars all the time.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TInlineFrame.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0.4
  */
diff --git a/framework/Web/UI/WebControls/TItemDataRenderer.php b/framework/Web/UI/WebControls/TItemDataRenderer.php
index 2809e046..eb6fabef 100644
--- a/framework/Web/UI/WebControls/TItemDataRenderer.php
+++ b/framework/Web/UI/WebControls/TItemDataRenderer.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TItemDataRenderer.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.1.2
  */
@@ -28,7 +27,6 @@ Prado::using('System.Web.UI.WebControls.TDataRenderer');
  * - {@link getData Data}: data associated with this renderer
 
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TItemDataRenderer.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.1.2
  */
diff --git a/framework/Web/UI/WebControls/TJavascriptLogger.php b/framework/Web/UI/WebControls/TJavascriptLogger.php
index a2f1c1c2..f9f9a37d 100644
--- a/framework/Web/UI/WebControls/TJavascriptLogger.php
+++ b/framework/Web/UI/WebControls/TJavascriptLogger.php
@@ -4,9 +4,8 @@
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TJavascriptLogger.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  */
 
@@ -26,14 +25,13 @@
  * http://web.archive.org/web/20060512041505/gleepglop.com/javascripts/logger/
  *
  * @author Wei Zhuo<weizhuo[at]gmail[dot]com>
- * @version $Id: TJavascriptLogger.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
 class TJavascriptLogger extends TWebControl
 {
 	private static $_keyCodes = array(
-		'0'=>48, '1'=>49, '2'=>50, '3'=>51, '4'=>52, '5'=>53, '6'=>54, '7'=>55, '8'=>56, '9'=>57, 
+		'0'=>48, '1'=>49, '2'=>50, '3'=>51, '4'=>52, '5'=>53, '6'=>54, '7'=>55, '8'=>56, '9'=>57,
 		'a'=>65, 'b'=>66, 'c'=>67, 'd'=>68, 'e'=>69, 'f'=>70, 'g'=>71, 'h'=>72,
 		'i'=>73, 'j'=>74, 'k'=>75, 'l'=>76, 'm'=>77, 'n'=>78, 'o'=>79, 'p'=>80,
 		'q'=>81, 'r'=>82, 's'=>83, 't'=>84, 'u'=>85, 'v'=>86, 'w'=>87, 'x'=>88, 'y'=>89, 'z'=>90);
diff --git a/framework/Web/UI/WebControls/TKeyboard.php b/framework/Web/UI/WebControls/TKeyboard.php
index 1260c5af..d423107a 100644
--- a/framework/Web/UI/WebControls/TKeyboard.php
+++ b/framework/Web/UI/WebControls/TKeyboard.php
@@ -4,9 +4,8 @@
  *
  * @author Sergey Morkovkin <sergeymorkovkin@mail.ru> and Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TKeyboard.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.1.1
  */
@@ -33,7 +32,6 @@
  * also be changed by specifying {@link setKeyboardCssClass KeyboardCssClass}.
  *
  * @author Sergey Morkovkin <sergeymorkovkin@mail.ru> and Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TKeyboard.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.1.1
  */
diff --git a/framework/Web/UI/WebControls/TLabel.php b/framework/Web/UI/WebControls/TLabel.php
index 4552b1a5..6ffd025b 100644
--- a/framework/Web/UI/WebControls/TLabel.php
+++ b/framework/Web/UI/WebControls/TLabel.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TLabel.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  */
 
@@ -26,7 +25,6 @@
  * Make sure it does not contain dangerous characters that you want to avoid.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TLabel.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
diff --git a/framework/Web/UI/WebControls/TLinkButton.php b/framework/Web/UI/WebControls/TLinkButton.php
index a9e6f4cf..fe1ae33b 100644
--- a/framework/Web/UI/WebControls/TLinkButton.php
+++ b/framework/Web/UI/WebControls/TLinkButton.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TLinkButton.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  */
 
@@ -50,7 +49,6 @@
  * as an image button by enclosing an &lt;img&gt; tag as the body of TLinkButton.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TLinkButton.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
diff --git a/framework/Web/UI/WebControls/TListBox.php b/framework/Web/UI/WebControls/TListBox.php
index a616a2be..1d72f0c2 100644
--- a/framework/Web/UI/WebControls/TListBox.php
+++ b/framework/Web/UI/WebControls/TListBox.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TListBox.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  */
 
@@ -32,7 +31,6 @@ Prado::using('System.Web.UI.WebControls.TListControl');
  * </code>
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TListBox.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
@@ -223,7 +221,7 @@ class TListBox extends TListControl implements IPostBackDataHandler, IValidatabl
 	}
 
 	/**
-	 * Returns true if this control validated successfully. 
+	 * Returns true if this control validated successfully.
 	 * Defaults to true.
 	 * @return bool wether this control validated successfully.
 	 */
@@ -250,7 +248,6 @@ class TListBox extends TListControl implements IPostBackDataHandler, IValidatabl
  * - Multiple: allow multiple selection
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TListBox.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0.4
  */
diff --git a/framework/Web/UI/WebControls/TListControl.php b/framework/Web/UI/WebControls/TListControl.php
index f9fdd77f..f8655761 100644
--- a/framework/Web/UI/WebControls/TListControl.php
+++ b/framework/Web/UI/WebControls/TListControl.php
@@ -6,9 +6,8 @@
  * @author Robin J. Rogge <rojaro@gmail.com>
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TListControl.php 3288 2013-04-30 10:36:50Z ctrlaltca $
  * @package System.Web.UI.WebControls
  */
 
@@ -79,7 +78,6 @@ Prado::using('System.Util.TDataFieldAccessor');
  * be used to add a dummy list item that will be rendered first.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TListControl.php 3288 2013-04-30 10:36:50Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
@@ -794,7 +792,7 @@ abstract class TListControl extends TDataBoundControl implements IDataRenderer
 	public function renderContents($writer)
 	{
 		$this->renderPrompt($writer);
-		
+
 		if($this->_items)
 		{
 			$writer->writeLine();
diff --git a/framework/Web/UI/WebControls/TListControlValidator.php b/framework/Web/UI/WebControls/TListControlValidator.php
index 7d9801ef..04cc6ef6 100644
--- a/framework/Web/UI/WebControls/TListControlValidator.php
+++ b/framework/Web/UI/WebControls/TListControlValidator.php
@@ -4,9 +4,8 @@
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TListControlValidator.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  */
 
@@ -57,7 +56,6 @@ Prado::using('System.Web.UI.WebControls.TBaseValidator');
  * </code>
  *
  * @author Xiang Wei Zhuo <weizhuo[at]gmail.com>
- * @version $Id: TListControlValidator.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
diff --git a/framework/Web/UI/WebControls/TListItem.php b/framework/Web/UI/WebControls/TListItem.php
index e9bfa175..cf5e487a 100644
--- a/framework/Web/UI/WebControls/TListItem.php
+++ b/framework/Web/UI/WebControls/TListItem.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TListItem.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  */
 
@@ -21,7 +20,6 @@
  * if the list control supports so.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TListItem.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
diff --git a/framework/Web/UI/WebControls/TLiteral.php b/framework/Web/UI/WebControls/TLiteral.php
index da195f50..35d35e02 100644
--- a/framework/Web/UI/WebControls/TLiteral.php
+++ b/framework/Web/UI/WebControls/TLiteral.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TLiteral.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  */
 
@@ -27,7 +26,6 @@
  * does not contain unwanted characters that may bring security vulnerabilities.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TLiteral.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
diff --git a/framework/Web/UI/WebControls/TLiteralColumn.php b/framework/Web/UI/WebControls/TLiteralColumn.php
index f40f8f4e..4b2c39fc 100644
--- a/framework/Web/UI/WebControls/TLiteralColumn.php
+++ b/framework/Web/UI/WebControls/TLiteralColumn.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TLiteralColumn.php 1397 2006-09-07 07:55:53Z wei $
  * @package System.Web.UI.WebControls
  */
 
@@ -29,7 +28,6 @@ Prado::using('System.Web.UI.WebControls.TDataGridColumn');
  * If {@link setEncode Encode} is true, the static texts will be HTML-encoded.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TLiteralColumn.php 1397 2006-09-07 07:55:53Z wei $
  * @package System.Web.UI.WebControls
  * @since 3.0.5
  */
@@ -111,18 +109,13 @@ class TLiteralColumn extends TDataGridColumn
 		if($itemType===TListItemType::Item || $itemType===TListItemType::AlternatingItem || $itemType===TListItemType::EditItem || $itemType===TListItemType::SelectedItem)
 		{
 			if($this->getDataField()!=='')
-				$cell->attachEventHandler('OnDataBinding',array($this,'dataBindColumn'));
-			else
 			{
-				if(($dataField=$this->getDataField())!=='')
-					$control->attachEventHandler('OnDataBinding',array($this,'dataBindColumn'));
-				else
-				{
-					$text=$this->getText();
-					if($this->getEncode())
-						$text=THttpUtility::htmlEncode($text);
-					$cell->setText($text);
-				}
+				$cell->attachEventHandler('OnDataBinding',array($this,'dataBindColumn'));
+			} else {
+				$text=$this->getText();
+				if($this->getEncode())
+					$text=THttpUtility::htmlEncode($text);
+				$cell->setText($text);
 			}
 		}
 		else
diff --git a/framework/Web/UI/WebControls/TMarkdown.php b/framework/Web/UI/WebControls/TMarkdown.php
index 1a2855eb..75c8ec1b 100644
--- a/framework/Web/UI/WebControls/TMarkdown.php
+++ b/framework/Web/UI/WebControls/TMarkdown.php
@@ -4,9 +4,8 @@
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TMarkdown.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  */
 
@@ -14,7 +13,7 @@
  * Using TTextHighlighter and MarkdownParser classes
  */
 Prado::using('System.Web.UI.WebControls.TTextHighlighter');
-Prado::using('System.3rdParty.Markdown.MarkdownParser');
+Prado::using('System.3rdParty.Parsedown.Parsedown');
 
 /**
  * TMarkdown class
@@ -30,7 +29,7 @@ Prado::using('System.3rdParty.Markdown.MarkdownParser');
  * To use TMarkdown, simply enclose the content to be rendered within
  * the body of TMarkdown in a template.
  *
- * See http://www.pradosoft.com/demos/quickstart/?page=Markdown for
+ * See https://daringfireball.net/projects/markdown/basics for
  * details on the Markdown syntax usage.
  *
  * TMarkdown also performs syntax highlighting for code blocks whose language
@@ -39,7 +38,6 @@ Prado::using('System.3rdParty.Markdown.MarkdownParser');
  * and enclosed within a pair of square brackets (e.g. [php]).
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @version $Id: TMarkdown.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0.1
  */
@@ -53,10 +51,9 @@ class TMarkdown extends TTextHighlighter
 	 */
 	public function processText($text)
 	{
-		$renderer = new MarkdownParser;
-		$result = $renderer->parse($text);
+		$result = Parsedown::instance()->parse($text);
 		return preg_replace_callback(
-				'/<pre><code>\[\s*(\w+)\s*\]\n+((.|\n)*?)\s*<\\/code><\\/pre>/im',
+				'/<pre><code class="language-(\w+)">((.|\n)*?)<\\/code><\\/pre>/im',
 				array($this, 'highlightCode'), $result);
 	}
 
diff --git a/framework/Web/UI/WebControls/TMultiView.php b/framework/Web/UI/WebControls/TMultiView.php
index 286f4e95..05725ff7 100644
--- a/framework/Web/UI/WebControls/TMultiView.php
+++ b/framework/Web/UI/WebControls/TMultiView.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TMultiView.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  */
 
@@ -32,7 +31,6 @@
  * when its active view is changed during a postback.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TMultiView.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
@@ -272,7 +270,6 @@ class TMultiView extends TControl
  * TViewCollection represents a collection that only takes {@link TView} instances
  * as collection elements.
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TMultiView.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
@@ -307,7 +304,6 @@ class TViewCollection extends TControlCollection
  * and when a view is deactivated, it raises {@link onDeactivate OnDeactivate}.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TMultiView.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
diff --git a/framework/Web/UI/WebControls/TOutputCache.php b/framework/Web/UI/WebControls/TOutputCache.php
index 89c0c849..2a5ce734 100644
--- a/framework/Web/UI/WebControls/TOutputCache.php
+++ b/framework/Web/UI/WebControls/TOutputCache.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TOutputCache.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  */
 
@@ -63,7 +62,6 @@
  * to determine whether the content is cached or not.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TOutputCache.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.1
  */
@@ -481,7 +479,7 @@ class TOutputCache extends TControl implements INamingContainer
 			$textwriter = new TTextWriter();
 			$multiwriter = new TOutputCacheTextWriterMulti(array($writer->getWriter(),$textwriter));
 			$htmlWriter = Prado::createComponent($this->GetResponse()->getHtmlWriterType(), $multiwriter);
-			
+
 			$stack=$this->getPage()->getCachingStack();
 			$stack->push($this);
 			parent::render($htmlWriter);
@@ -503,7 +501,6 @@ class TOutputCache extends TControl implements INamingContainer
  * <b>OnCheckDependency</b> event of {@link TOutputCache} control.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TOutputCache.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
@@ -555,7 +552,6 @@ class TOutputCacheCheckDependencyEventParameter extends TEventParameter
  * <b>OnCalculateKey</b> event of {@link TOutputCache} control.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TOutputCache.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
@@ -591,7 +587,6 @@ class TOutputCacheCalculateKeyEventParameter extends TEventParameter
  *
  * @author Gabor Berczi, DevWorx Hungary <gabor.berczi@devworx.hu>
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TOutputCache.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.2
  */
@@ -604,7 +599,7 @@ class TOutputCacheTextWriterMulti extends TTextWriter
 		//parent::__construct();
 		$this->_writers = $writers;
 	}
-	
+
 	public function write($s)
 	{
 		foreach($this->_writers as $writer)
diff --git a/framework/Web/UI/WebControls/TPager.php b/framework/Web/UI/WebControls/TPager.php
index 6379fedd..b4b9c2b0 100644
--- a/framework/Web/UI/WebControls/TPager.php
+++ b/framework/Web/UI/WebControls/TPager.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TPager.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  */
 
@@ -34,7 +33,7 @@
  *
  * Since Prado 3.2.1, you can use the {@link setButtonCssClass ButtonCssClass} property to specify a css class
  * that will be applied to each button created by the pager in NextPrev or Numeric mode.
- * 
+ *
  * TPager raises an {@link onPageIndexChanged OnPageIndexChanged} event when
  * the end-user interacts with it and specifies a new page (e.g. clicking
  * on a page button that leads to a new page.) The new page index may be obtained
@@ -45,7 +44,6 @@
  * Multiple pagers can be associated with the same data-bound control.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TPager.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0.2
  */
@@ -727,7 +725,6 @@ class TPager extends TWebControl implements INamingContainer
  * returns the new page index carried with the page command.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TPager.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0.2
  */
@@ -781,7 +778,6 @@ class TPagerPageChangedEventParameter extends TEventParameter
  * - DropDownList: a dropdown list is used to select pages
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TPager.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0.4
  */
@@ -802,7 +798,6 @@ class TPagerMode extends TEnumerable
  * - PushButton: form submit buttons
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TPager.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0.4
  */
diff --git a/framework/Web/UI/WebControls/TPanel.php b/framework/Web/UI/WebControls/TPanel.php
index cf20a864..2bf1b40d 100644
--- a/framework/Web/UI/WebControls/TPanel.php
+++ b/framework/Web/UI/WebControls/TPanel.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TPanel.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  */
 
@@ -35,7 +34,6 @@ Prado::using('System.Web.UI.WebControls.TPanelStyle');
  * by setting the {@link setDefaultButton DefaultButton} property.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TPanel.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
@@ -231,12 +229,7 @@ class TPanel extends TWebControl
 
 		if(($butt=$this->getDefaultButton())!=='')
 		{
-			$buttons = $this->findControlsByID($butt);
-			if (count($buttons)>0)
-				$button = reset($buttons);
-			else
-				$button = null;
-			if($button===null)
+			if(($button=$this->findControl($butt))===null)
 				throw new TInvalidDataValueException('panel_defaultbutton_invalid',$butt);
 			else
 				$this->getPage()->getClientScript()->registerDefaultButton($this, $button);
diff --git a/framework/Web/UI/WebControls/TPanelStyle.php b/framework/Web/UI/WebControls/TPanelStyle.php
index cb49b715..d1dfe62e 100644
--- a/framework/Web/UI/WebControls/TPanelStyle.php
+++ b/framework/Web/UI/WebControls/TPanelStyle.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TPanelStyle.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  */
 
@@ -20,7 +19,6 @@ Prado::using('System.Web.UI.WebControls.TStyle');
  * TPanelStyle represents the CSS style specific for panel HTML tag.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TPanelStyle.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
@@ -239,7 +237,6 @@ class TPanelStyle extends TStyle
  * - RightToLeft: content in a panel is right to left
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TPanelStyle.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0.4
  */
@@ -263,7 +260,6 @@ class TContentDirection extends TEnumerable
  * - Vertical: vertical scroll bar only
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TPanelStyle.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0.4
  */
diff --git a/framework/Web/UI/WebControls/TPlaceHolder.php b/framework/Web/UI/WebControls/TPlaceHolder.php
index 020141cf..6809a402 100644
--- a/framework/Web/UI/WebControls/TPlaceHolder.php
+++ b/framework/Web/UI/WebControls/TPlaceHolder.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TPlaceHolder.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  */
 
@@ -18,7 +17,6 @@
  * by manipulating the {@link TControl::getControls Controls} property.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TPlaceHolder.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
diff --git a/framework/Web/UI/WebControls/TRadioButton.php b/framework/Web/UI/WebControls/TRadioButton.php
index 144704b4..bb12a2ff 100644
--- a/framework/Web/UI/WebControls/TRadioButton.php
+++ b/framework/Web/UI/WebControls/TRadioButton.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TRadioButton.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  */
 
@@ -14,10 +13,6 @@
  * Using TCheckBox parent class
  */
 Prado::using('System.Web.UI.WebControls.TCheckBox');
-/**
- * Using TRadioButtonList class
- */
-Prado::using('System.Web.UI.WebControls.TRadioButtonList');
 
 /**
  * TRadioButton class
@@ -49,7 +44,6 @@ Prado::using('System.Web.UI.WebControls.TRadioButtonList');
  * that may bring security vulnerabilities.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TRadioButton.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
@@ -182,7 +176,7 @@ class TRadioButton extends TCheckBox
 				{
 					if($groupName!=='')
 						$groupName=substr($uniqueID,0,$pos+1).$groupName;
-					else if($this->getNamingContainer() instanceof TRadioButtonList)
+					else if(is_a($this->getNamingContainer(), 'TRadioButtonList'))
 						$groupName=substr($uniqueID,0,$pos);
 				}
 				if($groupName==='')
diff --git a/framework/Web/UI/WebControls/TRadioButtonList.php b/framework/Web/UI/WebControls/TRadioButtonList.php
index d93caaa2..bead3582 100644
--- a/framework/Web/UI/WebControls/TRadioButtonList.php
+++ b/framework/Web/UI/WebControls/TRadioButtonList.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TRadioButtonList.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  */
 
@@ -29,7 +28,6 @@ Prado::using('System.Web.UI.WebControls.TCheckBoxList');
  * one radiobutton can be selected at a time.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TRadioButtonList.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
diff --git a/framework/Web/UI/WebControls/TRangeValidator.php b/framework/Web/UI/WebControls/TRangeValidator.php
index 8b7550c8..8a3c0e35 100644
--- a/framework/Web/UI/WebControls/TRangeValidator.php
+++ b/framework/Web/UI/WebControls/TRangeValidator.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TRangeValidator.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  */
 
@@ -46,7 +45,6 @@ Prado::using('System.Web.UI.WebControls.TBaseValidator');
  * defaulted as UTF-8.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TRangeValidator.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
@@ -350,7 +348,6 @@ class TRangeValidator extends TBaseValidator
  * - StringLength
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TRangeValidator.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0.4
  */
diff --git a/framework/Web/UI/WebControls/TRatingList.php b/framework/Web/UI/WebControls/TRatingList.php
index f4d4adcf..09d7fc6a 100644
--- a/framework/Web/UI/WebControls/TRatingList.php
+++ b/framework/Web/UI/WebControls/TRatingList.php
@@ -4,9 +4,8 @@
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TRatingList.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  */
 
@@ -22,7 +21,6 @@ Prado::using('System.Web.UI.WebControls.TRadioButtonList');
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
  * @author Bradley Booms <bradley[dot]booms[at]gmail[dot]com>
- * @version $Id: TRatingList.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
@@ -125,7 +123,7 @@ class TRatingList extends TRadioButtonList
 		$index = $this->getRatingIndex($value);
 		parent::setSelectedIndex($index);
 	}
-	
+
 	public function setSelectedIndex($value)
 	{
 		$this->setRating($value+1);
@@ -213,7 +211,7 @@ class TRatingList extends TRadioButtonList
  	{
 	   return $this->getViewState('RatingStyle', 'default');
  	}
- 
+
  	/**
 	 * @return string rating style css class name.
  	 */
diff --git a/framework/Web/UI/WebControls/TRegularExpressionValidator.php b/framework/Web/UI/WebControls/TRegularExpressionValidator.php
index 890fb56e..2c155e28 100644
--- a/framework/Web/UI/WebControls/TRegularExpressionValidator.php
+++ b/framework/Web/UI/WebControls/TRegularExpressionValidator.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TRegularExpressionValidator.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  */
 
@@ -43,7 +42,6 @@ Prado::using('System.Web.UI.WebControls.TBaseValidator');
  * Use a {@link TRequiredFieldValidator} to ensure the input is not empty.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TRegularExpressionValidator.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
diff --git a/framework/Web/UI/WebControls/TRepeatInfo.php b/framework/Web/UI/WebControls/TRepeatInfo.php
index 929d31e7..7b65b3b3 100644
--- a/framework/Web/UI/WebControls/TRepeatInfo.php
+++ b/framework/Web/UI/WebControls/TRepeatInfo.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TRepeatInfo.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  */
 
@@ -17,7 +16,6 @@ Prado::using('System.Web.UI.WebControls.TTable');
  * This interface must be implemented by classes who want to use {@link TRepeatInfo}.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TRepeatInfo.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
@@ -70,7 +68,6 @@ interface IRepeatInfoUser
  * the column and repeat direction settings.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TRepeatInfo.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
@@ -526,7 +523,6 @@ class TRepeatInfo extends TComponent
  * - Horizontal
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TRepeatInfo.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0.4
  */
@@ -547,7 +543,6 @@ class TRepeatDirection extends TEnumerable
  * - Raw: the repeated contents are stacked together without any additional decorations
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TRepeatInfo.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0.4
  */
diff --git a/framework/Web/UI/WebControls/TRepeater.php b/framework/Web/UI/WebControls/TRepeater.php
index c32636fd..a563a12d 100644
--- a/framework/Web/UI/WebControls/TRepeater.php
+++ b/framework/Web/UI/WebControls/TRepeater.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TRepeater.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  */
 
@@ -87,7 +86,6 @@ Prado::using('System.Util.TDataFieldAccessor');
  * complex data may also have serializing problem if saved in viewstate.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TRepeater.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
@@ -784,7 +782,6 @@ class TRepeater extends TDataBoundControl implements INamingContainer
  * The {@link getItem Item} property indicates the repeater item related with the event.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TRepeater.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
@@ -825,7 +822,6 @@ class TRepeaterItemEventParameter extends TEventParameter
  * raises the Command event.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TRepeater.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
@@ -880,7 +876,6 @@ class TRepeaterCommandEventParameter extends TCommandEventParameter
  * is given by {@link getItemType ItemType} property.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TRepeater.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
@@ -1001,7 +996,6 @@ class TRepeaterItem extends TControl implements INamingContainer, IItemDataRende
  * TRepeaterItemCollection represents a collection of repeater items.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TRepeater.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
diff --git a/framework/Web/UI/WebControls/TRepeaterItemRenderer.php b/framework/Web/UI/WebControls/TRepeaterItemRenderer.php
index 0e39e765..1c41e65f 100644
--- a/framework/Web/UI/WebControls/TRepeaterItemRenderer.php
+++ b/framework/Web/UI/WebControls/TRepeaterItemRenderer.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TRepeaterItemRenderer.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  */
 
@@ -23,7 +22,6 @@ Prado::using('System.Web.UI.WebControls.TItemDataRenderer');
  * the bubbling scheme for the OnCommand event of repeater items.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TRepeaterItemRenderer.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.1.0
  */
diff --git a/framework/Web/UI/WebControls/TRequiredFieldValidator.php b/framework/Web/UI/WebControls/TRequiredFieldValidator.php
index 7a0bad8c..3db2457d 100644
--- a/framework/Web/UI/WebControls/TRequiredFieldValidator.php
+++ b/framework/Web/UI/WebControls/TRequiredFieldValidator.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TRequiredFieldValidator.php 3288 2013-04-30 10:36:50Z ctrlaltca $
  * @package System.Web.UI.WebControls
  */
 
@@ -29,7 +28,6 @@ Prado::using('System.Web.UI.WebControls.TBaseValidator');
  * set, it will be automatically considered as the validator's {@link setInitialValue InitialValue}.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TRequiredFieldValidator.php 3288 2013-04-30 10:36:50Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
@@ -99,7 +97,7 @@ class TRequiredFieldValidator extends TBaseValidator
 		else
 			return $this->validateStandardControl($control);
 	}
-	
+
 	private function validateListControl($control)
 	{
 		$initial = trim($this->getInitialValue());
@@ -111,7 +109,7 @@ class TRequiredFieldValidator extends TBaseValidator
 		}
 		return $count > 0;
 	}
-	
+
 	private function validateRadioButtonGroup($control)
 	{
 		$initial = trim($this->getInitialValue());
@@ -127,7 +125,7 @@ class TRequiredFieldValidator extends TBaseValidator
 		}
 		return false;
 	}
-	
+
 	private function validateStandardControl($control)
 	{
 		$initial = trim($this->getInitialValue());
diff --git a/framework/Web/UI/WebControls/TSafeHtml.php b/framework/Web/UI/WebControls/TSafeHtml.php
index 775086b4..b7b14f79 100644
--- a/framework/Web/UI/WebControls/TSafeHtml.php
+++ b/framework/Web/UI/WebControls/TSafeHtml.php
@@ -4,9 +4,8 @@
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TSafeHtml.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  */
 
@@ -34,7 +33,6 @@
  * to ensure the contents gets parsed correctly.
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @version $Id: TSafeHtml.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
diff --git a/framework/Web/UI/WebControls/TSlider.php b/framework/Web/UI/WebControls/TSlider.php
index dcf34bfc..c0d76559 100644
--- a/framework/Web/UI/WebControls/TSlider.php
+++ b/framework/Web/UI/WebControls/TSlider.php
@@ -4,9 +4,8 @@
  *
  * @author Christophe Boulain <Christophe.Boulain@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TSlider.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.1.1
  */
@@ -26,10 +25,10 @@
  * You can also provide the allowed values by setting the {@link SetValues Values} array.
  *
  * A 'Progress Indicator' can be displayed within the track with the {@link SetProgressIndicator ProgressIndicator} property.
- * 
+ *
  * The TSlider control can be easily customized using CssClasses. You can provide your own css file, using the
  * {@link SetCssUrl CssUrl} property.
- * The css class for TSlider can be set by the {@link setCssClass CssClass} property. Default value is "Slider HorizontalSlider" 
+ * The css class for TSlider can be set by the {@link setCssClass CssClass} property. Default value is "Slider HorizontalSlider"
  * for an horizontal slider, and "Slider VerticalSlider" for a vertical one.
  *
  * If {@link SetAutoPostBack AutoPostBack} property is true, postback is sent as soon as the value changed.
@@ -42,7 +41,6 @@
  * - ClientSide.onChange is called when the slider value has changed (at the end of a move).
  *
  * @author Christophe Boulain <Christophe.Boulain@gmail.com>
- * @version $Id: TSlider.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.1.1
  */
@@ -145,7 +143,7 @@ class TSlider extends TWebControl implements IPostBackDataHandler, IDataRenderer
 	{
 		$this->setViewState('StepSize', $value, 1.0);
 	}
-	
+
 	/**
 	 * @return boolean wether to display a progress indicator or not. Defaults to true.
 	 */
@@ -219,7 +217,7 @@ class TSlider extends TWebControl implements IPostBackDataHandler, IDataRenderer
 	{
 		$this->setViewState('Values', TPropertyValue::ensureArray($value), array());
 	}
-	
+
 	/**
 	 * @return boolean a value indicating whether an automatic postback to the server
 	 * will occur whenever the user modifies the slider value. Defaults to false.
@@ -351,7 +349,7 @@ class TSlider extends TWebControl implements IPostBackDataHandler, IDataRenderer
 			$class=($this->getDirection()==TSliderDirection::Horizontal)?'HorizontalSlider':'VerticalSlider';
 			$writer->addAttribute('class', 'Slider '.$class);
 		}
-		
+
 	}
 
 	/**
@@ -387,9 +385,9 @@ class TSlider extends TWebControl implements IPostBackDataHandler, IDataRenderer
 		}
 		$writer->renderEndTag();
 		*/
-		
+
 		$writer->renderEndTag();
-		
+
 		// Render the 'Handle'
 		$writer->addAttribute('class', 'Handle');
 		$writer->addAttribute('id', $this->getClientID().'_handle');
@@ -508,7 +506,6 @@ class TSlider extends TWebControl implements IPostBackDataHandler, IDataRenderer
  * The <tt>OnChange</tt> event is raised when the slider value is changed (or at the end of a move)
  *
  * @author Christophe Boulain <Christophe.Boulain@gmail.com>
- * @version $Id: TSlider.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.1.1
  */
@@ -561,7 +558,6 @@ class TSliderClientScript extends TClientSideOptions
  * - Vertical : Vertical slider
  *
  * @author Christophe Boulain <Christophe.Boulain@gmail.com>
- * @version $Id: TSlider.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.1.1
  */
diff --git a/framework/Web/UI/WebControls/TStatements.php b/framework/Web/UI/WebControls/TStatements.php
index 32f98296..0602732b 100644
--- a/framework/Web/UI/WebControls/TStatements.php
+++ b/framework/Web/UI/WebControls/TStatements.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TStatements.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  */
 
@@ -23,7 +22,6 @@
  * make sure {@link setStatements Statements} does not come directly from user input.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TStatements.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
diff --git a/framework/Web/UI/WebControls/TStyle.php b/framework/Web/UI/WebControls/TStyle.php
index 4ba37d53..f30b3461 100644
--- a/framework/Web/UI/WebControls/TStyle.php
+++ b/framework/Web/UI/WebControls/TStyle.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TStyle.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  */
 
@@ -21,7 +20,6 @@ Prado::using('System.Web.UI.WebControls.TFont');
  * TStyle encapsulates the CSS style applied to a control.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TStyle.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
@@ -418,7 +416,6 @@ class TStyle extends TComponent
  * - Hidden: the control is not displayed and is included in the layout.
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @version $Id: TStyle.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.1
  */
@@ -435,7 +432,6 @@ class TDisplayStyle extends TEnumerable
  * TTableStyle represents the CSS style specific for HTML table.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TStyle.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
@@ -676,7 +672,6 @@ class TTableStyle extends TStyle
  * TTableItemStyle represents the CSS style specific for HTML table item.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TStyle.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
@@ -831,7 +826,6 @@ class TTableItemStyle extends TStyle
  * - Justify: the begin and end are justified
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TStyle.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0.4
  */
@@ -855,7 +849,6 @@ class THorizontalAlign extends TEnumerable
  * - Middle: middle aligned
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TStyle.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0.4
  */
@@ -879,7 +872,6 @@ class TVerticalAlign extends TEnumerable
  * - Both: both horizontal and vertical grid lines are shown
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TStyle.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0.4
  */
diff --git a/framework/Web/UI/WebControls/TStyleSheet.php b/framework/Web/UI/WebControls/TStyleSheet.php
index 5faf52f0..32c0faf1 100644
--- a/framework/Web/UI/WebControls/TStyleSheet.php
+++ b/framework/Web/UI/WebControls/TStyleSheet.php
@@ -4,9 +4,8 @@
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TStyleSheet.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  */
 
diff --git a/framework/Web/UI/WebControls/TTabPanel.php b/framework/Web/UI/WebControls/TTabPanel.php
index 0c6128f1..8f1564db 100644
--- a/framework/Web/UI/WebControls/TTabPanel.php
+++ b/framework/Web/UI/WebControls/TTabPanel.php
@@ -4,9 +4,8 @@
  *
  * @author Tomasz Wolny <tomasz.wolny@polecam.to.pl> and Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TTabPanel.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.1.1
  */
@@ -54,7 +53,6 @@
  * </code>
  *
  * @author Tomasz Wolny <tomasz.wolny@polecam.to.pl> and Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TTabPanel.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.1.1
  */
@@ -408,15 +406,15 @@ class TTabPanel extends TWebControl implements IPostBackDataHandler
 	protected function registerStyleSheet()
 	{
 		$url = $this->getCssUrl();
-		
+
 		if($url === '') {
 			return;
 		}
-		
+
 		if($url === 'default') {
 			$url = $this->getApplication()->getAssetManager()->publishFilePath(dirname(__FILE__).DIRECTORY_SEPARATOR.'assets'.DIRECTORY_SEPARATOR.'tabpanel.css');
 		}
-		
+
 		if($url !== '') {
 			$this->getPage()->getClientScript()->registerStyleSheetFile($url, $url);
 		}
@@ -540,7 +538,6 @@ class TTabPanel extends TWebControl implements IPostBackDataHandler
  * setting the {@link setActive Active} property.
  *
  * @author Tomasz Wolny <tomasz.wolny@polecam.to.pl> and Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TTabPanel.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.1.1
  */
@@ -694,7 +691,6 @@ class TTabView extends TWebControl
  * TTabViewCollection is used to maintain a list of views belong to a {@link TTabPanel}.
  *
  * @author Tomasz Wolny <tomasz.wolny@polecam.to.pl> and Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TTabPanel.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.1.1
  */
diff --git a/framework/Web/UI/WebControls/TTable.php b/framework/Web/UI/WebControls/TTable.php
index 5be68cbd..4102cd4b 100644
--- a/framework/Web/UI/WebControls/TTable.php
+++ b/framework/Web/UI/WebControls/TTable.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TTable.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  */
 
@@ -61,7 +60,6 @@ Prado::using('System.Web.UI.WebControls.TTableRow');
  * </code>
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TTable.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
@@ -358,7 +356,6 @@ class TTable extends TWebControl
  * TTableRowCollection is used to maintain a list of rows belong to a table.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TTable.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
@@ -395,7 +392,6 @@ class TTableRowCollection extends TControlCollection
  * - Right: right aligned
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TTable.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0.4
  */
diff --git a/framework/Web/UI/WebControls/TTableCell.php b/framework/Web/UI/WebControls/TTableCell.php
index 96254e62..d78aebbd 100644
--- a/framework/Web/UI/WebControls/TTableCell.php
+++ b/framework/Web/UI/WebControls/TTableCell.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TTableCell.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  */
 
@@ -28,7 +27,6 @@
  * indicates whether the contents in the cell should be wrapped.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TTableCell.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
diff --git a/framework/Web/UI/WebControls/TTableFooterRow.php b/framework/Web/UI/WebControls/TTableFooterRow.php
index 46d1a3be..32be1e12 100644
--- a/framework/Web/UI/WebControls/TTableFooterRow.php
+++ b/framework/Web/UI/WebControls/TTableFooterRow.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TTableFooterRow.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  */
 
@@ -21,7 +20,6 @@ Prado::using('System.Web.UI.WebControls.TTableRow');
  * TTableFooterRow displays a table footer row.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TTableFooterRow.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0.1
  */
diff --git a/framework/Web/UI/WebControls/TTableHeaderCell.php b/framework/Web/UI/WebControls/TTableHeaderCell.php
index 80036d41..43b21b45 100644
--- a/framework/Web/UI/WebControls/TTableHeaderCell.php
+++ b/framework/Web/UI/WebControls/TTableHeaderCell.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TTableHeaderCell.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  */
 
@@ -22,7 +21,6 @@ Prado::using('System.Web.UI.WebControls.TTableCell');
  * TTableHeaderCell displays a table header cell on a Web page.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TTableHeaderCell.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
@@ -111,7 +109,6 @@ class TTableHeaderCell extends TTableCell
  * - Column: the scope is column-wise
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TTableHeaderCell.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0.4
  */
diff --git a/framework/Web/UI/WebControls/TTableHeaderRow.php b/framework/Web/UI/WebControls/TTableHeaderRow.php
index 166a20e4..0e42a416 100644
--- a/framework/Web/UI/WebControls/TTableHeaderRow.php
+++ b/framework/Web/UI/WebControls/TTableHeaderRow.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TTableHeaderRow.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  */
 
@@ -21,7 +20,6 @@ Prado::using('System.Web.UI.WebControls.TTableRow');
  * TTableHeaderRow displays a table header row.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TTableHeaderRow.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0.1
  */
diff --git a/framework/Web/UI/WebControls/TTableRow.php b/framework/Web/UI/WebControls/TTableRow.php
index a998e6fb..d0bc6bfb 100644
--- a/framework/Web/UI/WebControls/TTableRow.php
+++ b/framework/Web/UI/WebControls/TTableRow.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TTableRow.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  */
 
@@ -24,7 +23,6 @@ Prado::using('System.Web.UI.WebControls.TTableCell');
  * {@link setVerticalAlign VerticalAlign} properties, respectively.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TTableRow.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
@@ -160,7 +158,6 @@ class TTableRow extends TWebControl
  * TTableCellCollection is used to maintain a list of cells belong to a table row.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TTableRow.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
@@ -195,7 +192,6 @@ class TTableCellCollection extends TControlCollection
  * - Footer: in table footer
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TTableRow.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0.4
  */
diff --git a/framework/Web/UI/WebControls/TTemplateColumn.php b/framework/Web/UI/WebControls/TTemplateColumn.php
index 173476f2..947f0c47 100644
--- a/framework/Web/UI/WebControls/TTemplateColumn.php
+++ b/framework/Web/UI/WebControls/TTemplateColumn.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TTemplateColumn.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  */
 
@@ -34,7 +33,6 @@ Prado::using('System.Web.UI.WebControls.TDataGridColumn');
  * takes precedence.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TTemplateColumn.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
diff --git a/framework/Web/UI/WebControls/TTextBox.php b/framework/Web/UI/WebControls/TTextBox.php
index 969d2969..0d14dd7c 100644
--- a/framework/Web/UI/WebControls/TTextBox.php
+++ b/framework/Web/UI/WebControls/TTextBox.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TTextBox.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  */
 
@@ -44,7 +43,6 @@
  * Currently, no alternatives are available.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TTextBox.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
@@ -593,7 +591,6 @@ class TTextBox extends TWebControl implements IPostBackDataHandler, IValidatable
  * - Password: the textbox will hide user input like a password input box
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TTextBox.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0.4
  */
@@ -610,7 +607,6 @@ class TTextBoxMode extends TEnumerable
  * by a {@link TTextBox} control.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TTextBox.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0.4
  */
diff --git a/framework/Web/UI/WebControls/TTextHighlighter.php b/framework/Web/UI/WebControls/TTextHighlighter.php
index 64878d49..a10171db 100644
--- a/framework/Web/UI/WebControls/TTextHighlighter.php
+++ b/framework/Web/UI/WebControls/TTextHighlighter.php
@@ -4,9 +4,8 @@
  *
  * @author Wei Zhuo<weizhuo[at]gmail[dot]com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TTextHighlighter.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  */
 
@@ -31,7 +30,6 @@ Prado::using('System.Web.UI.WebControls.TTextProcessor');
  * because it needs to insert some CSS styles.
  *
  * @author Wei Zhuo<weizhuo[at]gmail[dot]com>
- * @version $Id: TTextHighlighter.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
@@ -202,7 +200,6 @@ class TTextHighlighter extends TTextProcessor
 
 /**
  * @author Wei Zhuo<weizhuo[at]gmail[dot]com>
- * @version $Id: TTextHighlighter.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
diff --git a/framework/Web/UI/WebControls/TTextProcessor.php b/framework/Web/UI/WebControls/TTextProcessor.php
index e569e780..daba9b46 100644
--- a/framework/Web/UI/WebControls/TTextProcessor.php
+++ b/framework/Web/UI/WebControls/TTextProcessor.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TTextProcessor.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  */
 
@@ -23,7 +22,6 @@
  * Note, all child classes must implement {@link processText} method.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TTextProcessor.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI
  * @since 3.0.1
  */
diff --git a/framework/Web/UI/WebControls/TValidationSummary.php b/framework/Web/UI/WebControls/TValidationSummary.php
index 00c96c90..3d5b61ca 100644
--- a/framework/Web/UI/WebControls/TValidationSummary.php
+++ b/framework/Web/UI/WebControls/TValidationSummary.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TValidationSummary.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  */
 
@@ -30,7 +29,6 @@
  * {@link setEnableClientScript EnableClientScript} is true.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TValidationSummary.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
@@ -430,7 +428,6 @@ class TValidationSummary extends TWebControl
  * See the quickstart documentation for further details.
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @version $Id: TValidationSummary.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
@@ -499,7 +496,6 @@ class TClientSideValidationSummaryOptions extends TClientSideOptions
  * - HeaderOnly: only the HeaderText will be display.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TValidationSummary.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0.4
  */
@@ -523,7 +519,6 @@ class TValidationSummaryDisplayMode extends TEnumerable
  * - Fixed: Similar to Dynamic except that the error messages physically occupy the page layout (even though they may not be visible)
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TValidationSummary.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0.4
  */
diff --git a/framework/Web/UI/WebControls/TWebControl.php b/framework/Web/UI/WebControls/TWebControl.php
index 0da4d88c..e0bd6194 100644
--- a/framework/Web/UI/WebControls/TWebControl.php
+++ b/framework/Web/UI/WebControls/TWebControl.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TWebControl.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  */
 
@@ -35,7 +34,6 @@ Prado::using('System.Web.UI.WebControls.TWebControlDecorator');
  * the body contents enclosed within the HTML tag.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TWebControl.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
@@ -45,12 +43,12 @@ class TWebControl extends TControl implements IStyleable
 	 *	@var boolean ensures the inclusion the id in the tag rendering.
 	 */
 	private $_ensureid=false;
-	
+
 	/**
 	 *	@var TWebControlDecorator this render things before and after both the open and close tag
 	 */
 	protected $_decorator;
-	
+
 
 	/**
 	 * Subclasses can override getEnsureId or just set this property.  eg. If your subclass
@@ -80,7 +78,7 @@ class TWebControl extends TControl implements IStyleable
 			$this->_decorator = Prado::createComponent('TWebControlDecorator', $this);
 		return $this->_decorator;
 	}
-	
+
 	/**
 	 * Copies basic control attributes from another control.
 	 * Properties including AccessKey, ToolTip, TabIndex, Enabled
@@ -397,10 +395,10 @@ class TWebControl extends TControl implements IStyleable
 	{
 		$this->getStyle()->setWidth($value);
 	}
-	
+
 
 	/**
-	 * If your subclass overrides the onPreRender method be sure to call 
+	 * If your subclass overrides the onPreRender method be sure to call
 	 * this method through parent::onPreRender($param); so your sub-class can be decorated,
 	 * among other things.
 	 * @param TEventParameter event parameter to be passed to the event handlers
@@ -408,7 +406,7 @@ class TWebControl extends TControl implements IStyleable
 	public function onPreRender($param) {
 		if($decorator = $this->getDecorator(false))
 			$decorator->instantiate();
-		
+
 		parent::onPreRender($param);
 	}
 
@@ -494,7 +492,7 @@ class TWebControl extends TControl implements IStyleable
 			$decorator->renderPostContentsText($writer);
 			$writer->renderEndTag();
 			$decorator->renderPostTagText($writer);
-		} else 
+		} else
 			$writer->renderEndTag($writer);
 	}
 }
diff --git a/framework/Web/UI/WebControls/TWebControlAdapter.php b/framework/Web/UI/WebControls/TWebControlAdapter.php
index 5de15419..6b969456 100644
--- a/framework/Web/UI/WebControls/TWebControlAdapter.php
+++ b/framework/Web/UI/WebControls/TWebControlAdapter.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TWebControlAdapter.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  */
 
@@ -19,7 +18,6 @@
  * browsers.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TWebControlAdapter.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
diff --git a/framework/Web/UI/WebControls/TWebControlDecorator.php b/framework/Web/UI/WebControls/TWebControlDecorator.php
index 9b1c3652..d08d9c82 100644
--- a/framework/Web/UI/WebControls/TWebControlDecorator.php
+++ b/framework/Web/UI/WebControls/TWebControlDecorator.php
@@ -4,23 +4,22 @@
  *
  * @author Brad Anderson <javalizard@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TWebControlDecorator.php 2541 2008-10-21 15:05:13Z qiang.xue $
  * @package System.Web.UI.WebControls
  */
 
 
 /**
  * TWebControlDecorator class
- * 
+ *
  * A TWebControlDecorator can be applied to a {@link TWebControl} to customize its rendering.
- * TWebControlDecorator can add custom html code before and after both the open and close 
+ * TWebControlDecorator can add custom html code before and after both the open and close
  * tag of a {@link TWebControl}.
  * The html code can be an user-defined text or an external template file that will be
  * instantiated and rendered in place.
- * 
- * This is an easy way to have your look and feel depend upon the theme instead of writing 
+ *
+ * This is an easy way to have your look and feel depend upon the theme instead of writing
  * specific html in your templates to achieve your website desires.
  * Here is an example of how to code your theme skin:
  * <code>
@@ -51,40 +50,39 @@
  *
  *
  * @author Brad Anderson <javalizard@gmail.com>
- * @version $Id: TWebControlDecorator.php 2541 2008-10-21 15:05:13Z qiang.xue $
  * @package System.Web.UI.WebControls
  * @since 3.2
  */
 
 class TWebControlDecorator extends TComponent {
-	
+
 	/**
 	 * @var boolean tells if there should only be decoration around the inner content
 	 */
 	private $_internalonly;
-	
+
 	/**
 	 * @var boolean tells if the decoration uses state in its templates.  If there are no templates
-	 * in the instance of the decoration this variable is unused. 
+	 * in the instance of the decoration this variable is unused.
 	 */
 	private $_usestate = false;
-	
+
 	/**
 	 * @var TWebControl the control to decorate
 	 */
 	private $_control;
-	
+
 	/**
 	 * @var TControl to tell the decorator where to place the outer controls
 	 */
 	private $_outercontrol;
-	
+
 	/**
-	 * @var boolean This tells if the Templates have been 
+	 * @var boolean This tells if the Templates have been
 	 */
 	private $_addedTemplateDecoration=false;
-	
-	
+
+
 	/**
 	 * @var string the text that goes before the open tag
 	 */
@@ -101,9 +99,9 @@ class TWebControlDecorator extends TComponent {
 	 * @var string the text that goes after the close tag
 	 */
 	private $_posttagtext = '';
-	
-	
-	
+
+
+
 	/**
 	 * @var TTemplate the template that goes before the open tag
 	 */
@@ -120,7 +118,7 @@ class TWebControlDecorator extends TComponent {
 	 * @var TTemplate the template that goes after the close tag
 	 */
 	private $_posttagtemplate;
-	
+
 	/**
 	 * Constructor.
 	 * Initializes the control .
@@ -131,7 +129,7 @@ class TWebControlDecorator extends TComponent {
 		$this->_control = $control;
 		$this->_internalonly = $onlyinternal;
 	}
-	
+
 	/**
 	 * @return boolean if the templates in this decoration need state.  This defaults to false
 	 */
@@ -139,23 +137,23 @@ class TWebControlDecorator extends TComponent {
 	{
 		return $this->_usestate;
 	}
-	
+
 	/**
-	 * @param boolean $value true to tell the decoration that the templates need state and should be 
+	 * @param boolean $value true to tell the decoration that the templates need state and should be
 	 * placed in a control step before the state is saved.
 	 */
 	public function setUseState($value)
 	{
 		$this->_usestate = TPropertyValue::ensureBoolean($value);
 	}
-	
+
 	/**
 	 * @return string gets the text before the open tag in the TWebControl
 	 */
 	public function getPreTagText() {
 		return $this->_pretagtext;
 	}
-	
+
 	/**
 	 * @param string sets the text before the open tag in the TWebControl
 	 */
@@ -163,15 +161,15 @@ class TWebControlDecorator extends TComponent {
 		if(!$this->_internalonly && !$this->_control->getIsSkinApplied())
 			$this->_pretagtext = TPropertyValue::ensureString($value);
 	}
-	
-	
+
+
 	/**
 	 * @return string the text after the open tag in the TWebControl
 	 */
 	public function getPreContentsText() {
 		return $this->_precontentstext;
 	}
-	
+
 	/**
 	 * @param string sets the text after the open tag in the TWebControl
 	 */
@@ -179,15 +177,15 @@ class TWebControlDecorator extends TComponent {
 		if(!$this->_control->getIsSkinApplied())
 			$this->_precontentstext = TPropertyValue::ensureString($value);
 	}
-	
-	
+
+
 	/**
 	 * @return string the text before the close tag in the TWebControl
 	 */
 	public function getPostContentsText() {
 		return $this->_postcontentstext;
 	}
-	
+
 	/**
 	 * @param string sets the text before the close tag in the TWebControl
 	 */
@@ -195,15 +193,15 @@ class TWebControlDecorator extends TComponent {
 		if(!$this->_control->getIsSkinApplied())
 			$this->_postcontentstext = TPropertyValue::ensureString($value);
 	}
-	
-	
+
+
 	/**
 	 * @return string the text before the close tag in the TWebControl
 	 */
 	public function getPostTagText() {
 		return $this->_posttagtext;
 	}
-	
+
 	/**
 	 * @param string sets the text after the close tag in the TWebControl
 	 */
@@ -211,15 +209,15 @@ class TWebControlDecorator extends TComponent {
 		if(!$this->_internalonly && !$this->_control->getIsSkinApplied())
 			$this->_posttagtext = TPropertyValue::ensureString($value);
 	}
-	
-	
+
+
 	/**
 	 * @return TTemplate|null the template before the open tag in the TWebControl.  Defaults to null.
 	 */
 	public function getPreTagTemplate() {
 		return $this->_pretagtemplate;
 	}
-	
+
 	/**
 	 * @param TTemplate sets the template before the open tag in the TWebControl
 	 */
@@ -227,15 +225,15 @@ class TWebControlDecorator extends TComponent {
 		if(!$this->_internalonly && !$this->_control->getIsSkinApplied())
 			$this->_pretagtemplate = $value;
 	}
-	
-	
+
+
 	/**
 	 * @return TTemplate|null the template after the open tag in the TWebControl.  Defaults to null.
 	 */
 	public function getPreContentsTemplate() {
 		return $this->_precontentstemplate;
 	}
-	
+
 	/**
 	 * @param TTemplate sets the template after the open tag in the TWebControl
 	 */
@@ -243,15 +241,15 @@ class TWebControlDecorator extends TComponent {
 		if(!$this->_control->getIsSkinApplied())
 			$this->_precontentstemplate = $value;
 	}
-	
-	
+
+
 	/**
 	 * @return TTemplate|null the template before the close tag in the TWebControl.  Defaults to null.
 	 */
 	public function getPostContentsTemplate() {
 		return $this->_postcontentstemplate;
 	}
-	
+
 	/**
 	 * @param TTemplate sets the template before the close tag in the TWebControl
 	 */
@@ -259,15 +257,15 @@ class TWebControlDecorator extends TComponent {
 		if(!$this->_control->getIsSkinApplied())
 			$this->_postcontentstemplate = $value;
 	}
-	
-	
+
+
 	/**
 	 * @return TTemplate|null the template after the close tag in the TWebControl.  Defaults to null.
 	 */
 	public function getPostTagTemplate() {
 		return $this->_posttagtemplate;
 	}
-	
+
 	/**
 	 * @param TTemplate sets the template before the close tag in the TWebControl
 	 */
@@ -275,17 +273,17 @@ class TWebControlDecorator extends TComponent {
 		if(!$this->_internalonly && !$this->_control->getIsSkinApplied())
 			$this->_posttagtemplate = $value;
 	}
-	
+
 	/**
-	 *	this is a framework call.  The Text decoration can't 
+	 *	this is a framework call.  The Text decoration can't
 	 * influence the object hierarchy because they are rendered into into the writer directly.
-	 * This call attaches the ensureTemplateDecoration to the TPage onSaveStateComplete so 
+	 * This call attaches the ensureTemplateDecoration to the TPage onSaveStateComplete so
 	 * these controls don't have page states.  This is as close to not influencing the page as possible.
 	 */
 	public function instantiate($outercontrol = null) {
-		if($this->getPreTagTemplate() || $this->getPreContentsTemplate() || 
+		if($this->getPreTagTemplate() || $this->getPreContentsTemplate() ||
 			$this->getPostContentsTemplate() || $this->getPostTagTemplate()) {
-			
+
 			$this->_outercontrol = $outercontrol;
 			if($this->getUseState())
 				$this->ensureTemplateDecoration();
@@ -293,53 +291,53 @@ class TWebControlDecorator extends TComponent {
 				$this->_control->getPage()->onSaveStateComplete[] = array($this, 'ensureTemplateDecoration');
 		}
 	}
-	
-	
+
+
 	/**
 	 *	This method places the templates around the open and close tag.  This takes a parameter which is
 	 * to specify the control to get the outer template decoration.  If no outer control is specified
-	 * @param TComponent this indicates the component or control to get the outer tag elements, just in case it's 
+	 * @param TComponent this indicates the component or control to get the outer tag elements, just in case it's
 	 * different than attached TWebControl.  If none is provided, the outer templates default to the attached
 	 * control
 	 * @return boolean returns true if the template decorations have been added
 	 */
 	public function ensureTemplateDecoration($sender=null, $param=null) {
-	
+
 		$control = $this->_control;
 		$outercontrol = $this->_outercontrol;
 		if($outercontrol === null)
 			$outercontrol = $control;
-			
+
 		if($this->_addedTemplateDecoration)
 			return $this->_addedTemplateDecoration;
-		
+
 		$this->_addedTemplateDecoration = true;
-		
+
 		if($this->getPreContentsTemplate())
 		{
 			$precontents = Prado::createComponent('TCompositeControl');
 			$this->getPreContentsTemplate()->instantiateIn($precontents);
 			$control->getControls()->insertAt(0, $precontents);
 		}
-		
+
 		if($this->getPostContentsTemplate())
 		{
 			$postcontents = Prado::createComponent('TCompositeControl');
 			$this->getPostContentsTemplate()->instantiateIn($postcontents);
 			$control->getControls()->add($postcontents);
 		}
-		
+
 		if(!$outercontrol->getParent())
 			return $this->_addedTemplateDecoration;
-		
-		
+
+
 		if($this->getPreTagTemplate())
 		{
 			$pretag = Prado::createComponent('TCompositeControl');
 			$this->getPreTagTemplate()->instantiateIn($pretag);
 			$outercontrol->getParent()->getControls()->insertBefore($outercontrol, $pretag);
 		}
-		
+
 		if($this->getPostTagTemplate())
 		{
 			$posttag = Prado::createComponent('TCompositeControl');
@@ -348,8 +346,8 @@ class TWebControlDecorator extends TComponent {
 		}
 		return true;
 	}
-	
-	
+
+
 	/**
 	 * This method places the pre tag text into the {@link TTextWriter}
 	 * @param {@link TTextWriter} the writer to which the text is written
@@ -357,7 +355,7 @@ class TWebControlDecorator extends TComponent {
 	public function renderPreTagText($writer) {
 		$writer->write($this->getPreTagText());
 	}
-	
+
 	/**
 	 * This method places the pre contents text into the {@link TTextWriter}
 	 * @param {@link TTextWriter} the writer to which the text is written
@@ -365,7 +363,7 @@ class TWebControlDecorator extends TComponent {
 	public function renderPreContentsText($writer) {
 		$writer->write($this->getPreContentsText());
 	}
-	
+
 	/**
 	 * This method places the post contents text into the {@link TTextWriter}
 	 * @param {@link TTextWriter} the writer to which the text is written
@@ -373,7 +371,7 @@ class TWebControlDecorator extends TComponent {
 	public function renderPostContentsText($writer) {
 		$writer->write($this->getPostContentsText());
 	}
-	
+
 	/**
 	 * This method places the post tag text into the {@link TTextWriter}
 	 * @param {@link TTextWriter} the writer to which the text is written
diff --git a/framework/Web/UI/WebControls/TWizard.php b/framework/Web/UI/WebControls/TWizard.php
index 67cbc4e4..6b82a691 100644
--- a/framework/Web/UI/WebControls/TWizard.php
+++ b/framework/Web/UI/WebControls/TWizard.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TWizard.php 3274 2013-02-15 08:32:25Z ctrlaltca $
  * @package System.Web.UI.WebControls
  */
 
@@ -77,7 +76,6 @@ Prado::using('System.Web.UI.WebControls.TWizardNavigationButtonStyle');
  * - side bar: {@link getSideBarStyle SideBarStyle} and {@link getSideBarButtonStyle SideBarButtonStyle}.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TWizard.php 3274 2013-02-15 08:32:25Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
@@ -1449,7 +1447,6 @@ class TWizard extends TWebControl implements INamingContainer
  * set {@link setAllowReturn AllowReturn} to true.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TWizard.php 3274 2013-02-15 08:32:25Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
@@ -1539,7 +1536,6 @@ class TWizardStep extends TView
  * TCompleteWizardStep represents a wizard step of type TWizardStepType::Complete.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TWizard.php 3274 2013-02-15 08:32:25Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
@@ -1574,7 +1570,6 @@ class TCompleteWizardStep extends TWizardStep
  * if the navigation template is not specified, default navigation will be used.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TWizard.php 3274 2013-02-15 08:32:25Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
@@ -1676,7 +1671,6 @@ class TTemplatedWizardStep extends TWizardStep implements INamingContainer
  * by a {@link TWizard}.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TWizard.php 3274 2013-02-15 08:32:25Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
@@ -1740,7 +1734,6 @@ class TWizardStepCollection extends TList
  * {@link getCancelButton CancelButton}, {@link getCompleteButton CompleteButton}.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TWizard.php 3274 2013-02-15 08:32:25Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
@@ -1832,7 +1825,6 @@ class TWizardNavigationContainer extends TControl implements INamingContainer
  * to true.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TWizard.php 3274 2013-02-15 08:32:25Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
@@ -1897,7 +1889,6 @@ class TWizardNavigationEventParameter extends TEventParameter
  * TWizardSideBarTemplate class.
  * TWizardSideBarTemplate is the default template for wizard sidebar.
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TWizard.php 3274 2013-02-15 08:32:25Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
@@ -1922,7 +1913,6 @@ class TWizardSideBarTemplate extends TComponent implements ITemplate
  * TWizardSideBarListItemTemplate class.
  * TWizardSideBarListItemTemplate is the default template for each item in the sidebar datalist.
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TWizard.php 3274 2013-02-15 08:32:25Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
@@ -1945,7 +1935,6 @@ class TWizardSideBarListItemTemplate extends TComponent implements ITemplate
  * TWizardNavigationTemplate class.
  * TWizardNavigationTemplate is the base class for various navigation templates.
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TWizard.php 3274 2013-02-15 08:32:25Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
@@ -2017,7 +2006,6 @@ class TWizardNavigationTemplate extends TComponent implements ITemplate
  * TWizardStartNavigationTemplate is the template used as default wizard start navigation panel.
  * It consists of two buttons, Next and Cancel.
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TWizard.php 3274 2013-02-15 08:32:25Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
@@ -2047,7 +2035,6 @@ class TWizardStartNavigationTemplate extends TWizardNavigationTemplate
  * TWizardFinishNavigationTemplate is the template used as default wizard finish navigation panel.
  * It consists of three buttons, Previous, Complete and Cancel.
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TWizard.php 3274 2013-02-15 08:32:25Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
@@ -2081,7 +2068,6 @@ class TWizardFinishNavigationTemplate extends TWizardNavigationTemplate
  * TWizardStepNavigationTemplate is the template used as default wizard step navigation panel.
  * It consists of three buttons, Previous, Next and Cancel.
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TWizard.php 3274 2013-02-15 08:32:25Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
@@ -2122,7 +2108,6 @@ class TWizardStepNavigationTemplate extends TWizardNavigationTemplate
  * - Link: a hyperlink button
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TWizard.php 3274 2013-02-15 08:32:25Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0.4
  */
@@ -2146,7 +2131,6 @@ class TWizardNavigationButtonType extends TEnumerable
  * - Finish: the last step before the Complete step.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TWizard.php 3274 2013-02-15 08:32:25Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0.4
  */
diff --git a/framework/Web/UI/WebControls/TWizardNavigationButtonStyle.php b/framework/Web/UI/WebControls/TWizardNavigationButtonStyle.php
index f0873df8..c84f28a1 100644
--- a/framework/Web/UI/WebControls/TWizardNavigationButtonStyle.php
+++ b/framework/Web/UI/WebControls/TWizardNavigationButtonStyle.php
@@ -4,7 +4,7 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
  * @version $Id $
  * @package System.Web.UI.WebControls
@@ -25,7 +25,6 @@ Prado::using('System.Web.UI.WebControls.TStyle');
  * Otherwise, {@link setButtonText ButtonText} will be displayed as the button caption.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TWizardNavigationButtonStyle.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
diff --git a/framework/Web/UI/WebControls/TXmlTransform.php b/framework/Web/UI/WebControls/TXmlTransform.php
index 7b4d5cf7..c32ab440 100644
--- a/framework/Web/UI/WebControls/TXmlTransform.php
+++ b/framework/Web/UI/WebControls/TXmlTransform.php
@@ -5,7 +5,7 @@
  * @author Knut Urdalen <knut.urdalen@gmail.com>
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
  * @package System.Web.UI.WebControls
  */
diff --git a/framework/Web/UI/WebControls/assets/captcha.php b/framework/Web/UI/WebControls/assets/captcha.php
index ac71d696..1c35e6eb 100644
--- a/framework/Web/UI/WebControls/assets/captcha.php
+++ b/framework/Web/UI/WebControls/assets/captcha.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: captcha.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.UI.WebControls.assets
  */
 
@@ -116,7 +115,7 @@ function displayToken($token,$fontSize,$theme)
         	imagettftext($image,$size,$angle,$x+2,$y+2,$color,$font,$token[$i]);
         imagecolordeallocate($image,$color);
     }
-	
+
 	header('Content-Type: image/png');
 	imagepng($image);
 	imagedestroy($image);