From c5d0cd2824e3c3bb2f6f3834177a71c1d7b78519 Mon Sep 17 00:00:00 2001
From: xue <>
Date: Tue, 27 Mar 2007 00:47:38 +0000
Subject: merge from 3.0 branch till 1779.

---
 framework/Web/UI/WebControls/TColorPicker.php | 4 ++--
 framework/Web/UI/WebControls/TDatePicker.php  | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'framework/Web/UI/WebControls')

diff --git a/framework/Web/UI/WebControls/TColorPicker.php b/framework/Web/UI/WebControls/TColorPicker.php
index a4ae7a19..64345dcd 100644
--- a/framework/Web/UI/WebControls/TColorPicker.php
+++ b/framework/Web/UI/WebControls/TColorPicker.php
@@ -143,7 +143,7 @@ class TColorPicker extends TTextBox
 	protected function publishColorPickerStyle()
 	{
 		$cs = $this->getPage()->getClientScript();
-		$style = 'System.Web.Javascripts.colorpicker.'.$this->getColorPickerStyle();
+		$style = 'System.Web.Javascripts.prado.colorpicker.'.$this->getColorPickerStyle();
 		if(($cssFile=Prado::getPathOfNamespace($style,'.css'))!==null)
 		{
 			$url = $this->publishFilePath($cssFile);
@@ -172,7 +172,7 @@ class TColorPicker extends TTextBox
 
 		foreach($images as $filename => $ext)
 		{
-			$image = 'System.Web.Javascripts.colorpicker.'.$filename;
+			$image = 'System.Web.Javascripts.prado.colorpicker.'.$filename;
 			if(($file =  Prado::getPathOfNamespace($image, $ext))!==null)
 				$list[$filename.$ext] = $this->publishFilePath($file);
 			else
diff --git a/framework/Web/UI/WebControls/TDatePicker.php b/framework/Web/UI/WebControls/TDatePicker.php
index 3442fb3e..9ee24b53 100644
--- a/framework/Web/UI/WebControls/TDatePicker.php
+++ b/framework/Web/UI/WebControls/TDatePicker.php
@@ -744,7 +744,7 @@ class TDatePicker extends TTextBox
 	 */
 	protected function publishDefaultButtonImage()
 	{
-		$image = 'System.Web.Javascripts.datepicker.calendar';
+		$image = 'System.Web.Javascripts.prado.datepicker.calendar';
 		if(($file =  Prado::getPathOfNamespace($image, '.png'))!==null)
 			return $this->publishFilePath($file);
 		else
@@ -758,7 +758,7 @@ class TDatePicker extends TTextBox
 	protected function publishCalendarStyle()
 	{
 		$cs = $this->getPage()->getClientScript();
-		$style = 'System.Web.Javascripts.datepicker.'.$this->getCalendarStyle();
+		$style = 'System.Web.Javascripts.prado.datepicker.'.$this->getCalendarStyle();
 		if(($cssFile=Prado::getPathOfNamespace($style,'.css'))!==null)
 		{
 			$url = $this->publishFilePath($cssFile);
@@ -777,7 +777,7 @@ class TDatePicker extends TTextBox
 	protected function publishIFrameSpacer()
 	{
 		$cs = $this->getPage()->getClientScript();
-		$spacer = 'System.Web.Javascripts.datepicker.spacer';
+		$spacer = 'System.Web.Javascripts.prado.datepicker.spacer';
 		if(($file = Prado::getPathOfNamespace($spacer,'.gif')) != null)
 			return $this->publishFilePath($file);
 	}
-- 
cgit v1.2.3