From 534eb8b4214888bb0b06b31c6516cba71bc4c18e Mon Sep 17 00:00:00 2001 From: Tobias Munk Date: Fri, 21 Mar 2014 00:19:17 +0100 Subject: [PATCH 1/5] added path when script is run from yii2-dev/extensions --- extensions/apidoc/apidoc | 1 + 1 file changed, 1 insertion(+) diff --git a/extensions/apidoc/apidoc b/extensions/apidoc/apidoc index 706dd1b171..258060f81a 100755 --- a/extensions/apidoc/apidoc +++ b/extensions/apidoc/apidoc @@ -13,6 +13,7 @@ defined('YII_DEBUG') or define('YII_DEBUG', false); $composerAutoload = [ __DIR__ . '/vendor/autoload.php', // standalone with "composer install" run __DIR__ . '/../../autoload.php', // script is installed as a composer binary + __DIR__ . '/../../../../autoload.php', // script is run from yii2-dev/extensions ]; $vendorPath = null; foreach ($composerAutoload as $autoload) { From 7499c198786c2cc7d0e531bcf17ef16d5597dcac Mon Sep 17 00:00:00 2001 From: Tobias Munk Date: Fri, 21 Mar 2014 11:49:22 +0100 Subject: [PATCH 2/5] use all 12 columns, left sidebar is now span-3 --- extensions/apidoc/templates/bootstrap/layouts/api.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/apidoc/templates/bootstrap/layouts/api.php b/extensions/apidoc/templates/bootstrap/layouts/api.php index 7cc38b182d..b76d4ab069 100644 --- a/extensions/apidoc/templates/bootstrap/layouts/api.php +++ b/extensions/apidoc/templates/bootstrap/layouts/api.php @@ -15,7 +15,7 @@ $renderer = $this->context; $this->beginContent('@yii/apidoc/templates/bootstrap/layouts/main.php'); ?>
-
+
getNavTypes(isset($type) ? $type : null, $types); ksort($types); From ac3ea60be8147b4450a8936b086c9be7fe54a747 Mon Sep 17 00:00:00 2001 From: Tobias Munk Date: Fri, 21 Mar 2014 11:55:12 +0100 Subject: [PATCH 3/5] tabs to spaces --- extensions/apidoc/apidoc | 47 ++++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/extensions/apidoc/apidoc b/extensions/apidoc/apidoc index 258060f81a..cd201f1bbd 100755 --- a/extensions/apidoc/apidoc +++ b/extensions/apidoc/apidoc @@ -2,53 +2,52 @@ 'yii2-apidoc', - 'basePath' => __DIR__, - 'enableCoreCommands' => false, - 'controllerNamespace' => 'yii\\apidoc\\commands', + 'id' => 'yii2-apidoc', + 'basePath' => __DIR__, + 'enableCoreCommands' => false, + 'controllerNamespace' => 'yii\\apidoc\\commands', ]); if ($vendorPath !== null) { - $application->setVendorPath($vendorPath); + $application->setVendorPath($vendorPath); } $exitCode = $application->run(); exit($exitCode); From ca00c9406262b078b7db3008b211188d63fafbb5 Mon Sep 17 00:00:00 2001 From: Tobias Munk Date: Fri, 21 Mar 2014 13:44:35 +0100 Subject: [PATCH 4/5] fixed docblock indent --- extensions/apidoc/apidoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extensions/apidoc/apidoc b/extensions/apidoc/apidoc index cd201f1bbd..90c8b857bd 100755 --- a/extensions/apidoc/apidoc +++ b/extensions/apidoc/apidoc @@ -2,9 +2,9 @@ Date: Fri, 21 Mar 2014 13:45:50 +0100 Subject: [PATCH 5/5] fixed docblock --- extensions/apidoc/apidoc | 1 + 1 file changed, 1 insertion(+) diff --git a/extensions/apidoc/apidoc b/extensions/apidoc/apidoc index 90c8b857bd..0dd7d372e8 100755 --- a/extensions/apidoc/apidoc +++ b/extensions/apidoc/apidoc @@ -2,6 +2,7 @@