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

Merge pull request #708 from lucianobaraglia/master

Browse Source 
Minor doc and messages fixes [skip ci]
This commit is contained in:
Alexander Makarov
2013-08-03 09:59:48 -07:00
parent b31b02a55d 8760407cc9
commit 58eb23d3e8
7 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -55,7 +55,7 @@ class Carousel extends Widget
* // required, slide content (HTML), such as an image tag * // required, slide content (HTML), such as an image tag
* 'content' => '<img src="http://twitter.github.io/bootstrap/assets/img/bootstrap-mdo-sfmoma-01.jpg"/>', * 'content' => '<img src="http://twitter.github.io/bootstrap/assets/img/bootstrap-mdo-sfmoma-01.jpg"/>',
* // optional, the caption (HTML) of the slide * // optional, the caption (HTML) of the slide
* '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>',
* // optional the HTML attributes of the slide container * // optional the HTML attributes of the slide container
* 'options' => array(), * 'options' => array(),
* ) * )

6
framework/yii/bootstrap/Collapse.php
View File

@@ -23,7 +23,7 @@ use yii\helpers\Html;
* 'Collapsible Group Item #1' => array( * 'Collapsible Group Item #1' => array(
* 'content' => 'Anim pariatur cliche...', * 'content' => 'Anim pariatur cliche...',
* // open its content by default * // open its content by default
* 'contentOptions' => array('class'=>'in') * 'contentOptions' => array('class' => 'in')
* ), * ),
* // another group item * // another group item
* 'Collapsible Group Item #2' => array( * 'Collapsible Group Item #2' => array(
@@ -51,9 +51,9 @@ class Collapse extends Widget
* // required, the content (HTML) of the group * // required, the content (HTML) of the group
* 'content' => 'Anim pariatur cliche...', * 'content' => 'Anim pariatur cliche...',
* // optional the HTML attributes of the content group * // optional the HTML attributes of the content group
* 'contentOptions'=> array(), * 'contentOptions' => array(),
* // optional the HTML attributes of the group * // optional the HTML attributes of the group
* 'options'=> array(), * 'options' => array(),
* ) * )
* ``` * ```
*/ */

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

@@ -136,7 +136,7 @@ class Nav extends Widget
if (is_array($items)) { if (is_array($items)) {
$items = Dropdown::widget(array( $items = Dropdown::widget(array(
'items' => $items, 'items' => $items,
'encodeLabels'=>$this->encodeLabels, 'encodeLabels' => $this->encodeLabels,
'clientOptions' => false, 'clientOptions' => false,
)); ));
} }

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

@@ -87,7 +87,7 @@ class NavBar extends Widget
* // optional, the menu item class type of the widget to render. Defaults to "Nav" widget. * // optional, the menu item class type of the widget to render. Defaults to "Nav" widget.
* 'class' => 'Menu item class type', * 'class' => 'Menu item class type',
* // required, the configuration options of the widget. * // required, the configuration options of the widget.
* 'options'=> array(...), * 'options' => array(...),
* ), * ),
* // optionally, you can pass a string * // optionally, you can pass a string
* '<form class="navbar-search pull-left" action="">' . * '<form class="navbar-search pull-left" action="">' .

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

@@ -47,7 +47,7 @@ use yii\helpers\Html;
* echo Progress::widget(array( * echo Progress::widget(array(
* 'bars' => array( * 'bars' => array(
* array('percent' => 30, 'options' => array('class' => 'bar-danger')), * array('percent' => 30, 'options' => array('class' => 'bar-danger')),
* array('percent' => 30, 'label'=>'test', 'options' => array('class' => 'bar-success')), * array('percent' => 30, 'label' => 'test', 'options' => array('class' => 'bar-success')),
* array('percent' => 35, 'options' => array('class' => 'bar-warning')) * array('percent' => 35, 'options' => array('class' => 'bar-warning'))
* ) * )
* )); * ));

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

@@ -28,7 +28,7 @@ use yii\helpers\Html;
* 'label' => 'Two', * 'label' => 'Two',
* 'content' => 'Anim pariatur cliche...', * 'content' => 'Anim pariatur cliche...',
* 'headerOptions' => array(...), * 'headerOptions' => array(...),
* 'options' => array('id'=>'myveryownID'), * 'options' => array('id' => 'myveryownID'),
* ), * ),
* array( * array(
* 'label' => 'Dropdown', * 'label' => 'Dropdown',

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

@@ -21,7 +21,7 @@ use yii\helpers\Inflector;
* DetailView displays the detail of a single data [[model]]. * DetailView displays the detail of a single data [[model]].
* *
* DetailView is best used for displaying a model in a regular format (e.g. each model attribute * DetailView is best used for displaying a model in a regular format (e.g. each model attribute
* is displayed as a row in a table.) The model can be either an instance of [[Model]] or * is displayed as a row in a table.) The model can be either an instance of [[Model]]
* or an associative array. * or an associative array.
* *
* DetailView uses the [[attributes]] property to determines which model attributes * DetailView uses the [[attributes]] property to determines which model attributes
@@ -105,7 +105,7 @@ class DetailView extends Widget
public function init() public function init()
{ {
if ($this->model === null) { if ($this->model === null) {
throw new InvalidConfigException('Please specify the "data" property.'); throw new InvalidConfigException('Please specify the "model" property.');
} }
if ($this->formatter == null) { if ($this->formatter == null) {
$this->formatter = Yii::$app->getFormatter(); $this->formatter = Yii::$app->getFormatter();
@@ -166,7 +166,7 @@ class DetailView extends Widget
} elseif (is_array($this->model)) { } elseif (is_array($this->model)) {
$this->attributes = array_keys($this->model); $this->attributes = array_keys($this->model);
} else { } else {
throw new InvalidConfigException('The "data" property must be either an array or an object.'); throw new InvalidConfigException('The "model" property must be either an array or an object.');
} }
sort($this->attributes); sort($this->attributes);
} }