Commit d829dbb2 by Qiang Xue

Merge branch 'master' of github.com:yiisoft/yii2

parents 13c6b998 8814955a
......@@ -93,14 +93,14 @@ This will create all the `<label>`, `<input>` and other tags according to the te
To add these tags yourself you can use the `Html` helper class. The following is equivalent to the code above:
```php
<?= Html::activeLabel($model, 'password'); ?>
<?= Html::activePasswordInput($model, 'password'); ?>
<?= Html::error($model, 'password'); ?>
<?= Html::activeLabel($model, 'password') ?>
<?= Html::activePasswordInput($model, 'password') ?>
<?= Html::error($model, 'password') ?>
or
<?= Html::activeLabel($model, 'username', ['label' => 'name']); ?>
<?= Html::activeTextInput($model, 'username'); ?>
<?= Html::error($model, 'username'); ?>
<?= Html::activeLabel($model, 'username', ['label' => 'name']) ?>
<?= Html::activeTextInput($model, 'username') ?>
<?= Html::error($model, 'username') ?>
<div class="hint-block">Please enter your name</div>
```
......@@ -254,24 +254,24 @@ basic one without any widgets or extra markup.
<?php
use yii\helpers\Html;
?>
<?php $this->beginPage(); ?>
<?php $this->beginPage() ?>
<!DOCTYPE html>
<html lang="<?= Yii::$app->language ?>">
<head>
<meta charset="<?= Yii::$app->charset ?>"/>
<title><?= Html::encode($this->title) ?></title>
<?php $this->head(); ?>
<?php $this->head() ?>
</head>
<body>
<?php $this->beginBody(); ?>
<?php $this->beginBody() ?>
<div class="container">
<?= $content ?>
</div>
<footer class="footer">© 2013 me :)</footer>
<?php $this->endBody(); ?>
<?php $this->endBody() ?>
</body>
</html>
<?php $this->endPage(); ?>
<?php $this->endPage() ?>
```
In the markup above there's some code. First of all, `$content` is a variable that will contain result of views rendered
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment