reverted r3032, please look ticket #362

3 files changed, 15 insertions, 34 deletions

diff --git a/HISTORY b/HISTORY
index 73e48530..857dbbbf 100644
--- a/HISTORY
+++ b/HISTORY
@@ -12,7 +12,6 @@ CHG: Remove TReflectionClass and all references since equals ReflectionClass (Yv
 CHG: Modifiy TTemplate::parseAttributes to allow definition of "HTML5 Custom Data Attributes (data-*)" e.g Attributes.data-custom-value="foobar" (Yves)
 EHN: Modify TActiveRecordConfig & TActiveRecordManager to allow custom subclassing of System.Data.ActiveRecord.TActiveRecordManager & System.Data.ActiveRecord.TActiveRecordGateway (Yves)
 EHN: Add methods quoteTableName, quoteColumnName, quoteColumnAlias to TDbMetaData & TDbConnection and add TDbConnection:getDbMetaData [TODO: customize TOracleMetaData] (Yves)
-EHN: Modify TThemeManager to allow custom subclassing of TTheme (Yves)
 EHN: Add method getHeaders to THttpRequest & THttpResponse (Yves)
 
 Version 3.1.9 June 3, 2011
diff --git a/demos/quickstart/protected/pages/Controls/Samples/TDatePicker/Home.page b/demos/quickstart/protected/pages/Controls/Samples/TDatePicker/Home.page
index 2eb0a5d2..1429c126 100644
--- a/demos/quickstart/protected/pages/Controls/Samples/TDatePicker/Home.page
+++ b/demos/quickstart/protected/pages/Controls/Samples/TDatePicker/Home.page
@@ -12,6 +12,13 @@
 </tr>

 

 <tr>

+	<td class="samplenote">Clickable mode</td>

+	<td class="sampleaction">

+		<com:TDatePicker Mode="Clickable"/>

+	</td>

+</tr>

+

+<tr>

 	<td class="samplenote">Button Mode, <br />pre-selected date 20-10-2005</td>

 	<td class="sampleaction">

 		<com:TDatePicker Mode="Button" Date="20-10-2005"/>

diff --git a/framework/Web/UI/TThemeManager.php b/framework/Web/UI/TThemeManager.php
index ca6f5d91..ba4fa81d 100644
--- a/framework/Web/UI/TThemeManager.php
+++ b/framework/Web/UI/TThemeManager.php
@@ -80,7 +80,8 @@ class TThemeManager extends TModule
 	{

 		$themePath=$this->getBasePath().DIRECTORY_SEPARATOR.$name;

 		$themeUrl=rtrim($this->getBaseUrl(),'/').'/'.$name;

-		return Prado::createComponent($this->getThemeClass(), $themePath, $themeUrl);

+		return new TTheme($themePath,$themeUrl);

+

 	}

 

 	/**

@@ -195,17 +196,6 @@ class TTheme extends TApplicationComponent implements ITheme
 	 * Extension name of skin files

 	 */

 	const SKIN_FILE_EXT='.skin';

-

-	/**

-	 * default theme class

-	 */

-	const DEFAULT_THEMECLASS = 'TTheme';

-

-	/**

-	 * @var string

-	 */

-	private $_themeClass=self::DEFAULT_THEMECLASS;

-

 	/**

 	 * @var string theme path

 	 */

@@ -338,7 +328,7 @@ class TTheme extends TApplicationComponent implements ITheme
 		return $this->_name;

 	}

 

-	/**

+ 	/**

 	 * @param string theme name

 	 */

 	protected function setName($value)

@@ -354,7 +344,7 @@ class TTheme extends TApplicationComponent implements ITheme
 		return $this->_themeUrl;

 	}

 

-	/**

+ 	/**

 	 * @param string the URL to the theme folder

 	 */

 	protected function setBaseUrl($value)

@@ -370,29 +360,14 @@ class TTheme extends TApplicationComponent implements ITheme
 		return $this->_themePath;

 	}

 

-	/**

+ 	/**

 	 * @param string tthe file path to the theme folder

 	 */

 	protected function setBasePath($value)

 	{

 		$this->_themePath=$value;

 	}

-

-	/**

-	 * @param string|null $class Theme class name in namespace format

-	 */

-	public function setThemeClass($class) {

-		$this->_themeClass = $class===null ? self::DEFAULT_THEMECLASS : (string)$class;

-

-	}

-

-	/**

-	 * @return string Theme class name in namespace format. Defaults to {@link TThemeManager::DEFAULT_THEMECLASS DEFAULT_THEMECLASS}.

-	 */

-	public function getThemeClass() {

-		return $this->_themeClass;

-	}

-

+	

 	/**

 	 * @return array list of skins for the theme

 	 */

@@ -401,7 +376,7 @@ class TTheme extends TApplicationComponent implements ITheme
 		return $this->_skins;

 	}

 

-	/**

+ 	/**

 	 * @param array list of skins for the theme

 	 */

 	protected function setSkins($value)

@@ -490,7 +465,7 @@ class TTheme extends TApplicationComponent implements ITheme
 		return $this->_cssFiles;

 	}

 

-	/**

+ 	/**

 	 * @param array list of CSS files (URL) in the theme

 	 */

 	protected function setStyleSheetFiles($value)