From b9c1eff373a76f9c120c821fb11f63aeb8df8e25 Mon Sep 17 00:00:00 2001 From: Carsten Brandt Date: Mon, 6 Jan 2014 01:16:25 +0100 Subject: [PATCH] fixed javascript --- extensions/yii/apidoc/templates/html/Renderer.php | 2 +- .../yii/apidoc/templates/offline/Renderer.php | 18 ------------- .../templates/offline/assets/AssetBundle.php | 31 ++++++++++++++++++++++ .../yii/apidoc/templates/offline/views/offline.php | 26 +++++++++++------- framework/yii/helpers/BaseHtml.php | 2 +- 5 files changed, 49 insertions(+), 30 deletions(-) create mode 100644 extensions/yii/apidoc/templates/offline/assets/AssetBundle.php diff --git a/extensions/yii/apidoc/templates/html/Renderer.php b/extensions/yii/apidoc/templates/html/Renderer.php index bf730c7..4d5ae20 100644 --- a/extensions/yii/apidoc/templates/html/Renderer.php +++ b/extensions/yii/apidoc/templates/html/Renderer.php @@ -76,7 +76,7 @@ abstract class Renderer extends BaseRenderer implements ViewContextInterface } $this->_view->assetManager = new AssetManager([ 'basePath' => $assetPath, - 'baseUrl' => '/assets', + 'baseUrl' => './assets', ]); } return $this->_view; diff --git a/extensions/yii/apidoc/templates/offline/Renderer.php b/extensions/yii/apidoc/templates/offline/Renderer.php index 1e544b7..a618fc8 100644 --- a/extensions/yii/apidoc/templates/offline/Renderer.php +++ b/extensions/yii/apidoc/templates/offline/Renderer.php @@ -23,22 +23,4 @@ class Renderer extends \yii\apidoc\templates\html\Renderer public $indexView = '@yii/apidoc/templates/offline/views/index.php'; public $pageTitle = 'Yii Framework 2.0 API Documentation'; - - /** - * Renders a given [[Context]]. - * - * @param Context $context the api documentation context to render. - * @param Controller $controller the apidoc controller instance. Can be used to control output. - */ - public function render($context, $controller) - { - parent::render($context, $controller); - - $dir = Yii::getAlias($this->targetDir); - - $controller->stdout('Copying asset files... '); - FileHelper::copyDirectory(__DIR__ . '/assets/css', $dir . '/css'); - $controller->stdout('done.' . PHP_EOL, Console::FG_GREEN); - } - } \ No newline at end of file diff --git a/extensions/yii/apidoc/templates/offline/assets/AssetBundle.php b/extensions/yii/apidoc/templates/offline/assets/AssetBundle.php new file mode 100644 index 0000000..e8c7024 --- /dev/null +++ b/extensions/yii/apidoc/templates/offline/assets/AssetBundle.php @@ -0,0 +1,31 @@ + + * @since 2.0 + */ +class AssetBundle extends \yii\web\AssetBundle +{ + public $sourcePath = '@yii/apidoc/templates/offline/assets/css'; + public $css = [ + 'api.css', + 'style.css', + ]; + public $depends = [ + 'yii\web\JqueryAsset', + ]; + public $jsOptions = [ + 'position' => View::POS_HEAD, + ]; +} diff --git a/extensions/yii/apidoc/templates/offline/views/offline.php b/extensions/yii/apidoc/templates/offline/views/offline.php index 36b2487..b5565c5 100644 --- a/extensions/yii/apidoc/templates/offline/views/offline.php +++ b/extensions/yii/apidoc/templates/offline/views/offline.php @@ -4,6 +4,8 @@ * @var yii\web\View $this */ +\yii\apidoc\templates\offline\assets\AssetBundle::register($this); + $this->beginPage(); ?> @@ -11,9 +13,6 @@ $this->beginPage(); - - - head(); ?> <?php echo $this->context->pageTitle; ?> @@ -35,16 +34,22 @@ $this->beginPage(); All Rights Reserved.
- diff --git a/framework/yii/helpers/BaseHtml.php b/framework/yii/helpers/BaseHtml.php index b3a88c1..b25ffa4 100644 --- a/framework/yii/helpers/BaseHtml.php +++ b/framework/yii/helpers/BaseHtml.php @@ -1471,7 +1471,7 @@ class BaseHtml return Yii::$app->getRequest()->getUrl(); } else { $url = Yii::getAlias($url); - if ($url !== '' && ($url[0] === '/' || $url[0] === '#' || strpos($url, '://'))) { + if ($url !== '' && ($url[0] === '/' || $url[0] === '#' || strpos($url, '://') || !strncmp($url, './', 2))) { return $url; } else { return Yii::$app->getRequest()->getBaseUrl() . '/' . $url;