php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-08-23 04:00:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixes #1055

Browse Source
This commit is contained in:
Alexander Makarov
2013-10-24 14:50:39 +04:00
parent 0c1477c602
commit 2ce09559a2
6 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
framework/yii/bootstrap/Carousel.php
View File

@ -29,8 +29,8 @@ use yii\helpers\Html;
* 'caption' => '<h4>This is title</h4><p>This is the caption text</p>', * 'caption' => '<h4>This is title</h4><p>This is the caption text</p>',
* 'options' => [...], * 'options' => [...],
* ], * ],
* ) * ]
* )); * ]);
* ``` * ```
* *
* @see http://twitter.github.io/bootstrap/javascript.html#carousel * @see http://twitter.github.io/bootstrap/javascript.html#carousel

2
framework/yii/bootstrap/Nav.php
View File

@ -24,7 +24,7 @@ use yii\helpers\Html;
* 'label' => 'Home', * 'label' => 'Home',
* 'url' => ['site/index'], * 'url' => ['site/index'],
* 'linkOptions' => [...], * 'linkOptions' => [...],
* ), * ],
* [ * [
* 'label' => 'Dropdown', * 'label' => 'Dropdown',
* 'items' => [ * 'items' => [

2
framework/yii/data/ArrayDataProvider.php
View File

@ -33,7 +33,7 @@ use yii\helpers\ArrayHelper;
* 'allModels' => $query->from('tbl_post')->all(), * 'allModels' => $query->from('tbl_post')->all(),
* 'sort' => [ * 'sort' => [
* 'attributes' => ['id', 'username', 'email'], * 'attributes' => ['id', 'username', 'email'],
* ), * ],
* 'pagination' => [ * 'pagination' => [
* 'pageSize' => 10, * 'pageSize' => 10,
* ], * ],

2
framework/yii/log/Logger.php
View File

@ -39,7 +39,7 @@ use yii\base\InvalidConfigException;
* 'class' => 'yii\log\FileTarget', * 'class' => 'yii\log\FileTarget',
* 'levels' => ['trace', 'info'], * 'levels' => ['trace', 'info'],
* 'categories' => ['yii\*'], * 'categories' => ['yii\*'],
* ), * ],
* 'email' => [ * 'email' => [
* 'class' => 'yii\log\EmailTarget', * 'class' => 'yii\log\EmailTarget',
* 'levels' => ['error', 'warning'], * 'levels' => ['error', 'warning'],

6
framework/yii/web/AccessControl.php
View File

@ -42,9 +42,9 @@ use yii\base\ActionFilter;
* 'roles' => ['@'], * 'roles' => ['@'],
* ], * ],
* // everything else is denied * // everything else is denied
* ), * ],
* ), * ],
* ); * ];
* } * }
* ~~~ * ~~~
* *

6
framework/yii/widgets/Menu.php
View File

@ -33,13 +33,13 @@ use yii\helpers\Html;
* // not just as 'controller' even if default action is used. * // not just as 'controller' even if default action is used.
* ['label' => 'Home', 'url' => ['site/index']], * ['label' => 'Home', 'url' => ['site/index']],
* // 'Products' menu item will be selected as long as the route is 'product/index' * // 'Products' menu item will be selected as long as the route is 'product/index'
* ['label' => 'Products', 'url' => ['product/index'), 'items' => [ * ['label' => 'Products', 'url' => ['product/index'], 'items' => [
* ['label' => 'New Arrivals', 'url' => ['product/index', 'tag' => 'new']], * ['label' => 'New Arrivals', 'url' => ['product/index', 'tag' => 'new']],
* ['label' => 'Most Popular', 'url' => ['product/index', 'tag' => 'popular']], * ['label' => 'Most Popular', 'url' => ['product/index', 'tag' => 'popular']],
* ]], * ]],
* ['label' => 'Login', 'url' => ['site/login'], 'visible' => Yii::$app->user->isGuest], * ['label' => 'Login', 'url' => ['site/login'], 'visible' => Yii::$app->user->isGuest],
* ), * ],
* )); * ]);
* ~~~ * ~~~
* *
* @author Qiang Xue <qiang.xue@gmail.com> * @author Qiang Xue <qiang.xue@gmail.com>