Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
yii2
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Rotua Panjaitan
yii2
Commits
2ce09559
Commit
2ce09559
authored
Oct 24, 2013
by
Alexander Makarov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixes #1055
parent
0c1477c6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
11 additions
and
11 deletions
+11
-11
Carousel.php
framework/yii/bootstrap/Carousel.php
+2
-2
Nav.php
framework/yii/bootstrap/Nav.php
+1
-1
ArrayDataProvider.php
framework/yii/data/ArrayDataProvider.php
+1
-1
Logger.php
framework/yii/log/Logger.php
+1
-1
AccessControl.php
framework/yii/web/AccessControl.php
+3
-3
Menu.php
framework/yii/widgets/Menu.php
+3
-3
No files found.
framework/yii/bootstrap/Carousel.php
View file @
2ce09559
...
@@ -29,8 +29,8 @@ use yii\helpers\Html;
...
@@ -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
...
...
framework/yii/bootstrap/Nav.php
View file @
2ce09559
...
@@ -24,7 +24,7 @@ use yii\helpers\Html;
...
@@ -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' => [
...
...
framework/yii/data/ArrayDataProvider.php
View file @
2ce09559
...
@@ -33,7 +33,7 @@ use yii\helpers\ArrayHelper;
...
@@ -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,
* ],
* ],
...
...
framework/yii/log/Logger.php
View file @
2ce09559
...
@@ -39,7 +39,7 @@ use yii\base\InvalidConfigException;
...
@@ -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'],
...
...
framework/yii/web/AccessControl.php
View file @
2ce09559
...
@@ -42,9 +42,9 @@ use yii\base\ActionFilter;
...
@@ -42,9 +42,9 @@ use yii\base\ActionFilter;
* 'roles' => ['@'],
* 'roles' => ['@'],
* ],
* ],
* // everything else is denied
* // everything else is denied
*
)
,
*
]
,
*
)
,
*
]
,
*
)
;
*
]
;
* }
* }
* ~~~
* ~~~
*
*
...
...
framework/yii/widgets/Menu.php
View file @
2ce09559
...
@@ -33,13 +33,13 @@ use yii\helpers\Html;
...
@@ -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>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment