diff options
| -rw-r--r-- | .gitattributes | 4 | ||||
| -rw-r--r-- | framework/Web/UI/WebControls/TKeyboard.php | 2 | ||||
| -rw-r--r-- | framework/Web/UI/WebControls/TTabPanel.php | 2 | ||||
| -rw-r--r-- | framework/Web/UI/WebControls/assets/keyboard.css (renamed from framework/Web/UI/WebControls/keyboard.css) | 0 | ||||
| -rw-r--r-- | framework/Web/UI/WebControls/assets/tabpanel.css (renamed from framework/Web/UI/WebControls/TTabPanel.css) | 0 |
5 files changed, 4 insertions, 4 deletions
diff --git a/.gitattributes b/.gitattributes index e515edbd..42ef415c 100644 --- a/.gitattributes +++ b/.gitattributes @@ -2484,7 +2484,6 @@ framework/Web/UI/WebControls/TRequiredFieldValidator.php -text framework/Web/UI/WebControls/TSafeHtml.php -text framework/Web/UI/WebControls/TStatements.php -text framework/Web/UI/WebControls/TStyle.php -text -framework/Web/UI/WebControls/TTabPanel.css -text framework/Web/UI/WebControls/TTabPanel.php -text framework/Web/UI/WebControls/TTable.php -text framework/Web/UI/WebControls/TTableCell.php -text @@ -2502,7 +2501,8 @@ framework/Web/UI/WebControls/TWebControlAdapter.php -text framework/Web/UI/WebControls/TWizard.php -text framework/Web/UI/WebControls/TWizardNavigationButtonStyle.php -text framework/Web/UI/WebControls/TXmlTransform.php -text -framework/Web/UI/WebControls/keyboard.css -text +framework/Web/UI/WebControls/assets/keyboard.css -text +framework/Web/UI/WebControls/assets/tabpanel.css -text framework/Xml/TXmlDocument.php -text framework/interfaces.php -text framework/powered.gif -text diff --git a/framework/Web/UI/WebControls/TKeyboard.php b/framework/Web/UI/WebControls/TKeyboard.php index 58af07ce..301e6cf3 100644 --- a/framework/Web/UI/WebControls/TKeyboard.php +++ b/framework/Web/UI/WebControls/TKeyboard.php @@ -143,7 +143,7 @@ class TKeyboard extends TWebControl protected function registerStyleSheet()
{
if(($url=$this->getCssUrl())==='')
- $url=$this->publishAsset('keyboard.css',__CLASS__);
+ $url=$this->getApplication()->getAssetManager()->publishFilePath(dirname(__FILE__).DIRECTORY_SEPARATOR.'assets'.DIRECTORY_SEPARATOR.'keyboard.css');
$this->getPage()->getClientScript()->registerStyleSheetFile($url,$url);
}
diff --git a/framework/Web/UI/WebControls/TTabPanel.php b/framework/Web/UI/WebControls/TTabPanel.php index 394f7326..d4524534 100644 --- a/framework/Web/UI/WebControls/TTabPanel.php +++ b/framework/Web/UI/WebControls/TTabPanel.php @@ -384,7 +384,7 @@ class TTabPanel extends TWebControl implements IPostBackDataHandler protected function registerStyleSheet()
{
if(($url=$this->getCssUrl())==='')
- $url=$this->publishAsset('TTabPanel.css',__CLASS__);
+ $url=$this->getApplication()->getAssetManager()->publishFilePath(dirname(__FILE__).DIRECTORY_SEPARATOR.'assets'.DIRECTORY_SEPARATOR.'tabpanel.css');
$this->getPage()->getClientScript()->registerStyleSheetFile($url,$url);
}
diff --git a/framework/Web/UI/WebControls/keyboard.css b/framework/Web/UI/WebControls/assets/keyboard.css index ad88d76b..ad88d76b 100644 --- a/framework/Web/UI/WebControls/keyboard.css +++ b/framework/Web/UI/WebControls/assets/keyboard.css diff --git a/framework/Web/UI/WebControls/TTabPanel.css b/framework/Web/UI/WebControls/assets/tabpanel.css index 43a42c60..43a42c60 100644 --- a/framework/Web/UI/WebControls/TTabPanel.css +++ b/framework/Web/UI/WebControls/assets/tabpanel.css |