From c36417a83127c6f743d2feccb5b2567e069d563b Mon Sep 17 00:00:00 2001 From: Qiang Xue Date: Fri, 15 Aug 2014 21:18:37 -0400 Subject: [PATCH 1/2] Added bower.json for gii and debug extensions. --- extensions/debug/bower.json | 27 +++++++++++++++++ extensions/debug/composer.json | 52 ++++++++++++++++---------------- extensions/gii/bower.json | 28 ++++++++++++++++++ extensions/gii/composer.json | 54 ++++++++++++++++++---------------- 4 files changed, 110 insertions(+), 51 deletions(-) create mode 100644 extensions/debug/bower.json create mode 100644 extensions/gii/bower.json diff --git a/extensions/debug/bower.json b/extensions/debug/bower.json new file mode 100644 index 0000000000..c78d355a1e --- /dev/null +++ b/extensions/debug/bower.json @@ -0,0 +1,27 @@ +{ + "name": "yii2-debug", + "version": "2.0.0", + "homepage": "http://www.yiiframework.com/", + "authors": [ + "Qiang Xue " + ], + "description": "The debugger extension for the Yii framework", + "keywords": [ + "yii2", + "debug", + "debugger" + ], + "license": "BSD-3-Clause", + "main": [ + "assets/toolbar.js" + ], + "ignore": [ + "**/.*", + "**/*", + "!assets/" + ], + "dependencies": { + "yii2": ">=2.0.0", + "bootstrap": ">=3.0.0" + } +} diff --git a/extensions/debug/composer.json b/extensions/debug/composer.json index 3d095b1466..0ae32c1fa3 100644 --- a/extensions/debug/composer.json +++ b/extensions/debug/composer.json @@ -1,27 +1,29 @@ { - "name": "yiisoft/yii2-debug", - "description": "The debugger extension for the Yii framework", - "keywords": ["yii2", "debug", "debugger"], - "type": "yii2-extension", - "license": "BSD-3-Clause", - "support": { - "issues": "https://github.com/yiisoft/yii2/issues?labels=ext%3Adebug", - "forum": "http://www.yiiframework.com/forum/", - "wiki": "http://www.yiiframework.com/wiki/", - "irc": "irc://irc.freenode.net/yii", - "source": "https://github.com/yiisoft/yii2" - }, - "authors": [ - { - "name": "Qiang Xue", - "email": "qiang.xue@gmail.com" - } - ], - "require": { - "yiisoft/yii2": "*", - "yiisoft/yii2-bootstrap": "*" - }, - "autoload": { - "psr-4": { "yii\\debug\\": "" } - } + "name": "yiisoft/yii2-debug", + "description": "The debugger extension for the Yii framework", + "keywords": ["yii2", "debug", "debugger"], + "type": "yii2-extension", + "license": "BSD-3-Clause", + "support": { + "issues": "https://github.com/yiisoft/yii2/issues?labels=ext%3Adebug", + "forum": "http://www.yiiframework.com/forum/", + "wiki": "http://www.yiiframework.com/wiki/", + "irc": "irc://irc.freenode.net/yii", + "source": "https://github.com/yiisoft/yii2" + }, + "authors": [ + { + "name": "Qiang Xue", + "email": "qiang.xue@gmail.com" + } + ], + "require": { + "yiisoft/yii2": "*", + "yiisoft/yii2-bootstrap": "*" + }, + "autoload": { + "psr-4": { + "yii\\debug\\": "" + } + } } diff --git a/extensions/gii/bower.json b/extensions/gii/bower.json new file mode 100644 index 0000000000..3efea34e5a --- /dev/null +++ b/extensions/gii/bower.json @@ -0,0 +1,28 @@ +{ + "name": "yii2-gii", + "version": "2.0.0", + "homepage": "http://www.yiiframework.com/", + "authors": [ + "Qiang Xue " + ], + "description": "The Gii extension for the Yii framework", + "keywords": [ + "yii2", + "gii", + "code generator" + ], + "license": "BSD-3-Clause", + "main": [ + "assets/gii.js" + ], + "ignore": [ + "**/.*", + "**/*", + "!assets/" + ], + "dependencies": { + "yii2": ">=2.0.0", + "bootstrap": ">=3.0.0", + "typeahead.js": ">=0.10.0" + } +} diff --git a/extensions/gii/composer.json b/extensions/gii/composer.json index 11fa779d96..7787846ccf 100644 --- a/extensions/gii/composer.json +++ b/extensions/gii/composer.json @@ -1,28 +1,30 @@ { - "name": "yiisoft/yii2-gii", - "description": "The Gii extension for the Yii framework", - "keywords": ["yii2", "gii", "code generator"], - "type": "yii2-extension", - "license": "BSD-3-Clause", - "support": { - "issues": "https://github.com/yiisoft/yii2/issues?labels=ext%3Agii", - "forum": "http://www.yiiframework.com/forum/", - "wiki": "http://www.yiiframework.com/wiki/", - "irc": "irc://irc.freenode.net/yii", - "source": "https://github.com/yiisoft/yii2" - }, - "authors": [ - { - "name": "Qiang Xue", - "email": "qiang.xue@gmail.com" - } - ], - "require": { - "yiisoft/yii2": "*", - "yiisoft/yii2-bootstrap": "*", - "phpspec/php-diff": ">=1.0.2" - }, - "autoload": { - "psr-4": { "yii\\gii\\": "" } - } + "name": "yiisoft/yii2-gii", + "description": "The Gii extension for the Yii framework", + "keywords": ["yii2", "gii", "code generator"], + "type": "yii2-extension", + "license": "BSD-3-Clause", + "support": { + "issues": "https://github.com/yiisoft/yii2/issues?labels=ext%3Agii", + "forum": "http://www.yiiframework.com/forum/", + "wiki": "http://www.yiiframework.com/wiki/", + "irc": "irc://irc.freenode.net/yii", + "source": "https://github.com/yiisoft/yii2" + }, + "authors": [ + { + "name": "Qiang Xue", + "email": "qiang.xue@gmail.com" + } + ], + "require": { + "yiisoft/yii2": "*", + "yiisoft/yii2-bootstrap": "*", + "phpspec/php-diff": ">=1.0.2" + }, + "autoload": { + "psr-4": { + "yii\\gii\\": "" + } + } } From d8999f4fd394c933e653c267eaf3c902ba13c0a8 Mon Sep 17 00:00:00 2001 From: xskif Date: Sat, 16 Aug 2014 17:11:42 +0400 Subject: [PATCH 2/2] Update structure-widgets.md changed bootstrap namespace to jui --- docs/guide/structure-widgets.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/guide/structure-widgets.md b/docs/guide/structure-widgets.md index 87738593de..4d8f737f85 100644 --- a/docs/guide/structure-widgets.md +++ b/docs/guide/structure-widgets.md @@ -8,7 +8,7 @@ like the following: ```php 'date']) ?> ``` @@ -28,7 +28,7 @@ widget which is configured to use Russian language and keep the input in the `fr ```php $model,