title); ?>
+title) ?>
-
+
diff --git a/apps/advanced/backend/views/site/login.php b/apps/advanced/backend/views/site/login.php index d52eaa1..65495bf 100644 --- a/apps/advanced/backend/views/site/login.php +++ b/apps/advanced/backend/views/site/login.php @@ -11,18 +11,18 @@ $this->title = 'Login'; $this->params['breadcrumbs'][] = $this->title; ?>
-
<?=Html::encode($this->title); ?>
+
+ <?= Html::encode($this->title) ?>
head(); ?>
@@ -53,13 +53,13 @@ AppAsset::register($this);
'links' => isset($this->params['breadcrumbs']) ? $this->params['breadcrumbs'] : [],
]); ?>
-
+
diff --git a/apps/advanced/frontend/views/site/about.php b/apps/advanced/frontend/views/site/about.php
index 2084648..32b84eb 100644
--- a/apps/advanced/frontend/views/site/about.php
+++ b/apps/advanced/frontend/views/site/about.php
@@ -8,9 +8,9 @@ $this->title = 'About';
$this->params['breadcrumbs'][] = $this->title;
?>
title); ?>
+title) ?>
Please fill out the following fields to login:
'login-form']); ?>
- field($model, 'username'); ?>
- field($model, 'password')->passwordInput(); ?>
- field($model, 'rememberMe')->checkbox(); ?>
+ field($model, 'username') ?>
+ field($model, 'password')->passwordInput() ?>
+ field($model, 'rememberMe')->checkbox() ?>
diff --git a/apps/advanced/frontend/views/layouts/main.php b/apps/advanced/frontend/views/layouts/main.php
index 0b36edc..4f1510e 100644
--- a/apps/advanced/frontend/views/layouts/main.php
+++ b/apps/advanced/frontend/views/layouts/main.php
@@ -16,8 +16,8 @@ AppAsset::register($this);
-
-
- 'btn btn-primary']); ?>
+ 'btn btn-primary']) ?>
-
diff --git a/apps/advanced/frontend/views/site/contact.php b/apps/advanced/frontend/views/site/contact.php
index 012c36d..97580ca 100644
--- a/apps/advanced/frontend/views/site/contact.php
+++ b/apps/advanced/frontend/views/site/contact.php
@@ -12,7 +12,7 @@ $this->title = 'Contact';
$this->params['breadcrumbs'][] = $this->title;
?>
title); ?>
+title) ?>
This is the About page. You may modify the following file to customize its content:
-
-
title); ?>
+title) ?>
If you have business inquiries or other questions, please fill out the following form to contact us. Thank you. @@ -21,16 +21,16 @@ $this->params['breadcrumbs'][] = $this->title;
'contact-form']); ?>
- field($model, 'name'); ?>
- field($model, 'email'); ?>
- field($model, 'subject'); ?>
- field($model, 'body')->textArea(['rows' => 6]); ?>
+ field($model, 'name') ?>
+ field($model, 'email') ?>
+ field($model, 'subject') ?>
+ field($model, 'body')->textArea(['rows' => 6]) ?>
field($model, 'verifyCode')->widget(Captcha::className(), [
'options' => ['class' => 'form-control'],
'template' => '',
]); ?>
diff --git a/apps/advanced/frontend/views/site/error.php b/apps/advanced/frontend/views/site/error.php
index eef87f6..15a8eee 100644
--- a/apps/advanced/frontend/views/site/error.php
+++ b/apps/advanced/frontend/views/site/error.php
@@ -13,10 +13,10 @@ $this->title = $name;
?>
{image}
{input}
- 'btn btn-primary']); ?>
+ 'btn btn-primary']) ?>
-
title); ?>
+title) ?>
-
+
diff --git a/apps/advanced/frontend/views/site/login.php b/apps/advanced/frontend/views/site/login.php index df758a8..3069f90 100644 --- a/apps/advanced/frontend/views/site/login.php +++ b/apps/advanced/frontend/views/site/login.php @@ -11,21 +11,21 @@ $this->title = 'Login'; $this->params['breadcrumbs'][] = $this->title; ?>
-
title); ?>
+title) ?>
Please fill out the following fields to login:
'login-form']); ?>
- field($model, 'username'); ?>
- field($model, 'password')->passwordInput(); ?>
- field($model, 'rememberMe')->checkbox(); ?>
+ field($model, 'username') ?>
+ field($model, 'password')->passwordInput() ?>
+ field($model, 'rememberMe')->checkbox() ?>
diff --git a/apps/advanced/frontend/views/site/requestPasswordResetToken.php b/apps/advanced/frontend/views/site/requestPasswordResetToken.php
index f906b72..88d23be 100644
--- a/apps/advanced/frontend/views/site/requestPasswordResetToken.php
+++ b/apps/advanced/frontend/views/site/requestPasswordResetToken.php
@@ -11,16 +11,16 @@ $this->title = 'Request password reset';
$this->params['breadcrumbs'][] = $this->title;
?>
If you forgot your password you can .
- 'btn btn-primary']); ?>
+ 'btn btn-primary']) ?>
-
title); ?>
+title) ?>
Please fill out your email. A link to reset password will be sent there.
'request-password-reset-form']); ?>
- field($model, 'email'); ?>
+ field($model, 'email') ?>
diff --git a/apps/advanced/frontend/views/site/resetPassword.php b/apps/advanced/frontend/views/site/resetPassword.php
index 40c1106..dc5beba 100644
--- a/apps/advanced/frontend/views/site/resetPassword.php
+++ b/apps/advanced/frontend/views/site/resetPassword.php
@@ -11,16 +11,16 @@ $this->title = 'Reset password';
$this->params['breadcrumbs'][] = $this->title;
?>
- 'btn btn-primary']); ?>
+ 'btn btn-primary']) ?>
-
diff --git a/framework/yii/debug/views/layouts/main.php b/framework/yii/debug/views/layouts/main.php
index f22842d..c16ac4f 100644
--- a/framework/yii/debug/views/layouts/main.php
+++ b/framework/yii/debug/views/layouts/main.php
@@ -11,12 +11,12 @@ yii\debug\DebugAsset::register($this);
beginPage(); ?>
- <?=Html::encode($this->title); ?>
+ <?= Html::encode($this->title) ?>
head(); ?>
beginBody(); ?>
-
+
endBody(); ?>
endPage(); ?>
diff --git a/framework/yii/gii/generators/controller/templates/controller.php b/framework/yii/gii/generators/controller/templates/controller.php
index 9101c57..9d0d92c 100644
--- a/framework/yii/gii/generators/controller/templates/controller.php
+++ b/framework/yii/gii/generators/controller/templates/controller.php
@@ -13,15 +13,15 @@ echo "
ns)): ?>
-namespace ns; ?>;
+namespace ns ?>;
-class getControllerClass(); ?> extends baseClass, '\\') . "\n"; ?>
+class getControllerClass() ?> extends baseClass, '\\') . "\n" ?>
{
getActionIDs() as $action): ?>
- public function action()
+ public function action()
{
- return $this->render('');
+ return $this->render('');
}
diff --git a/framework/yii/gii/generators/controller/templates/view.php b/framework/yii/gii/generators/controller/templates/view.php
index 6441ecc..8a46f75 100644
--- a/framework/yii/gii/generators/controller/templates/view.php
+++ b/framework/yii/gii/generators/controller/templates/view.php
@@ -12,11 +12,11 @@ echo ""; ?>
+" ?>
-
title); ?>
+title) ?>
Please choose your new password:
'reset-password-form']); ?>
- field($model, 'password')->passwordInput(); ?>
+ field($model, 'password')->passwordInput() ?>
diff --git a/apps/advanced/frontend/views/site/signup.php b/apps/advanced/frontend/views/site/signup.php
index 82bc78c..bfebceb 100644
--- a/apps/advanced/frontend/views/site/signup.php
+++ b/apps/advanced/frontend/views/site/signup.php
@@ -11,18 +11,18 @@ $this->title = 'Signup';
$this->params['breadcrumbs'][] = $this->title;
?>
- 'btn btn-primary']); ?>
+ 'btn btn-primary']) ?>
-
<?=Html::encode($this->title); ?>
+
+ <?= Html::encode($this->title) ?>
head(); ?>
@@ -48,13 +48,13 @@ app\config\AppAsset::register($this);
isset($this->params['breadcrumbs']) ? $this->params['breadcrumbs'] : [],
]); ?>
-
+
diff --git a/apps/basic/views/site/about.php b/apps/basic/views/site/about.php
index e4070a8..5010642 100644
--- a/apps/basic/views/site/about.php
+++ b/apps/basic/views/site/about.php
@@ -8,11 +8,11 @@ $this->title = 'About';
$this->params['breadcrumbs'][] = $this->title;
?>
title); ?>
+title) ?>
Please fill out the following fields to signup:
'form-signup']); ?>
- field($model, 'username'); ?>
- field($model, 'email'); ?>
- field($model, 'password')->passwordInput(); ?>
+ field($model, 'username') ?>
+ field($model, 'email') ?>
+ field($model, 'password')->passwordInput() ?>
diff --git a/apps/basic/views/layouts/main.php b/apps/basic/views/layouts/main.php
index 3ffbf0f..88066de 100644
--- a/apps/basic/views/layouts/main.php
+++ b/apps/basic/views/layouts/main.php
@@ -14,8 +14,8 @@ app\config\AppAsset::register($this);
-
-
- 'btn btn-primary']); ?>
+ 'btn btn-primary']) ?>
-
diff --git a/apps/basic/views/site/contact.php b/apps/basic/views/site/contact.php
index 450e06b..66711a5 100644
--- a/apps/basic/views/site/contact.php
+++ b/apps/basic/views/site/contact.php
@@ -12,7 +12,7 @@ $this->title = 'Contact';
$this->params['breadcrumbs'][] = $this->title;
?>
title); ?>
+title) ?>
This is the About page. You may modify the following file to customize its content:
-
-
- getDetail(); ?>
+ getDetail() ?>
title); ?>
+title) ?>
session->hasFlash('contactFormSubmitted')): ?> @@ -29,16 +29,16 @@ $this->params['breadcrumbs'][] = $this->title;
'contact-form']); ?>
- field($model, 'name'); ?>
- field($model, 'email'); ?>
- field($model, 'subject'); ?>
- field($model, 'body')->textArea(['rows' => 6]); ?>
+ field($model, 'name') ?>
+ field($model, 'email') ?>
+ field($model, 'subject') ?>
+ field($model, 'body')->textArea(['rows' => 6]) ?>
field($model, 'verifyCode')->widget(Captcha::className(), [
'options' => ['class' => 'form-control'],
'template' => '',
]); ?>
diff --git a/apps/basic/views/site/error.php b/apps/basic/views/site/error.php
index eef87f6..15a8eee 100644
--- a/apps/basic/views/site/error.php
+++ b/apps/basic/views/site/error.php
@@ -13,10 +13,10 @@ $this->title = $name;
?>
{image}
{input}
- 'btn btn-primary']); ?>
+ 'btn btn-primary']) ?>
-
@@ -71,7 +71,7 @@ $this->title = 'Yii Debugger';
echo ' at ' . date('Y-m-d h:i:s a', $summary['time']) . ' by ' . $summary['ip'];
?>
title); ?>
+title) ?>
-
+
diff --git a/apps/basic/views/site/login.php b/apps/basic/views/site/login.php index 34936af..62b4398 100644 --- a/apps/basic/views/site/login.php +++ b/apps/basic/views/site/login.php @@ -11,7 +11,7 @@ $this->title = 'Login'; $this->params['breadcrumbs'][] = $this->title; ?>
-
diff --git a/docs/guide/upgrade-from-v1.md b/docs/guide/upgrade-from-v1.md
index 713f967..f04e849 100644
--- a/docs/guide/upgrade-from-v1.md
+++ b/docs/guide/upgrade-from-v1.md
@@ -340,10 +340,10 @@ It is represented as an `ActiveField` object. Using fields, you can build a form
```php
- field($model, 'username'); ?>
- field($model, 'password')->passwordInput(); ?>
+ field($model, 'username') ?>
+ field($model, 'password')->passwordInput() ?>
<?=Html::encode($this->title); ?>
+
+ <?= Html::encode($this->title) ?>
head(); ?>
beginBody(); ?>
- $tag]); ?>
- $tag]) ?>
+
diff --git a/framework/yii/debug/views/default/toolbar.php b/framework/yii/debug/views/default/toolbar.php
index 40d33cf..bc76a67 100644
--- a/framework/yii/debug/views/default/toolbar.php
+++ b/framework/yii/debug/views/default/toolbar.php
@@ -26,13 +26,13 @@ $url = $panels['request']->getUrl();
?>
- getSummary(); ?>
+ getSummary() ?>
title); ?>
+title) ?>
Please fill out the following fields to login:
@@ -24,9 +24,9 @@ $this->params['breadcrumbs'][] = $this->title; ], ]); ?> - field($model, 'username'); ?> + field($model, 'username') ?> - field($model, 'password')->passwordInput(); ?> + field($model, 'password')->passwordInput() ?> field($model, 'rememberMe', [ 'template' => "{input}
\n{error}
",
@@ -34,7 +34,7 @@ $this->params['breadcrumbs'][] = $this->title;
- 'btn btn-primary']); ?>
+ 'btn btn-primary']) ?>
-
+
```
diff --git a/docs/guide/view.md b/docs/guide/view.md
index 27a90ae..98e0140 100644
--- a/docs/guide/view.md
+++ b/docs/guide/view.md
@@ -76,7 +76,7 @@ use yii\helpers\Html;
?>
- name); ?>
+ name) ?>
```
@@ -97,7 +97,7 @@ use yii\helpers\HtmlPurifier;
?>
- text); ?>
+ text) ?>
```
@@ -256,16 +256,16 @@ use yii\helpers\Html;
?>
beginPage(); ?>
-
+
-
-
-
+
endBody(); ?>
@@ -295,8 +295,8 @@ use yii\helpers\Html;
?>
-
-
+
+
```
diff --git a/framework/yii/debug/views/default/index.php b/framework/yii/debug/views/default/index.php
index 325267d..c01230c 100644
--- a/framework/yii/debug/views/default/index.php
+++ b/framework/yii/debug/views/default/index.php
@@ -32,11 +32,11 @@ $this->title = 'Yii Debugger';
$data): ?>
- getSummary(); ?>
+ getSummary() ?>
-
+
diff --git a/framework/yii/debug/views/default/view.php b/framework/yii/debug/views/default/view.php
index 8fe7199..338bef7 100644
--- a/framework/yii/debug/views/default/view.php
+++ b/framework/yii/debug/views/default/view.php
@@ -21,7 +21,7 @@ $this->title = 'Yii Debugger';
Yii Debugger
getControllerID() . '/' . $action; ?>
+getControllerID() . '/' . $action ?>
You may change the content of this page by modifying
- the file echo __FILE__; ?>.
+ the file echo __FILE__; ?>.
+
- $form = ActiveForm::begin(); ?>
+ $form = ActiveForm::begin(); ?>
generateActiveField($attribute) . " ?>\n\n";
} ?>
diff --git a/framework/yii/gii/generators/crud/templates/views/_search.php b/framework/yii/gii/generators/crud/templates/views/_search.php
index 14bd1af..be92360 100644
--- a/framework/yii/gii/generators/crud/templates/views/_search.php
+++ b/framework/yii/gii/generators/crud/templates/views/_search.php
@@ -16,14 +16,14 @@ use yii\widgets\ActiveForm;
/**
* @var yii\base\View $this
- * @var searchModelClass, '\\'); ?> $model
+ * @var searchModelClass, '\\') ?> $model
* @var yii\widgets\ActiveForm $form
*/
?>
-
- echo Html::submitButton($model->isNewRecord ? 'Create' : 'Update', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']); ?>
+ echo Html::submitButton($model->isNewRecord ? 'Create' : 'Update', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']); ?>
- ActiveForm::end(); ?>
+ ActiveForm::end(); ?>
+
- $form = ActiveForm::begin([
+ $form = ActiveForm::begin([
'action' => ['index'],
'method' => 'get',
]); ?>
@@ -39,10 +39,10 @@ foreach ($generator->getTableSchema()->getColumnNames() as $attribute) {
}
?>
diff --git a/framework/yii/gii/generators/crud/templates/views/create.php b/framework/yii/gii/generators/crud/templates/views/create.php
index 63a4eef..2cb4b91 100644
--- a/framework/yii/gii/generators/crud/templates/views/create.php
+++ b/framework/yii/gii/generators/crud/templates/views/create.php
@@ -15,18 +15,18 @@ use yii\helpers\Html;
/**
* @var yii\base\View $this
- * @var modelClass, '\\'); ?> $model
+ * @var modelClass, '\\') ?> $model
*/
-$this->title = 'Create modelClass)); ?>';
-$this->params['breadcrumbs'][] = ['label' => 'modelClass))); ?>', 'url' => ['index']];
+$this->title = 'Create modelClass)) ?>';
+$this->params['breadcrumbs'][] = ['label' => 'modelClass))) ?>', 'url' => ['index']];
$this->params['breadcrumbs'][] = $this->title;
?>
-
- echo Html::submitButton('Search', ['class' => 'btn btn-primary']); ?>
- echo Html::resetButton('Reset', ['class' => 'btn btn-default']); ?>
+ echo Html::submitButton('Search', ['class' => 'btn btn-primary']); ?>
+ echo Html::resetButton('Reset', ['class' => 'btn btn-default']); ?>
- ActiveForm::end(); ?>
+ ActiveForm::end(); ?>
+
-
echo Html::encode($this->title); ?>
+echo Html::encode($this->title); ?>
- echo $this->render('_form', [ + echo $this->render('_form', [ 'model' => $model, ]); ?> diff --git a/framework/yii/gii/generators/crud/templates/views/index.php b/framework/yii/gii/generators/crud/templates/views/index.php index c440e34..fe2e266 100644 --- a/framework/yii/gii/generators/crud/templates/views/index.php +++ b/framework/yii/gii/generators/crud/templates/views/index.php @@ -15,29 +15,29 @@ echo " use yii\helpers\Html; -use indexWidgetType === 'grid' ? 'yii\grid\GridView' : 'yii\widgets\ListView'; ?>; +use indexWidgetType === 'grid' ? 'yii\grid\GridView' : 'yii\widgets\ListView' ?>; /** * @var yii\base\View $this * @var yii\data\ActiveDataProvider $dataProvider - * @var searchModelClass, '\\'); ?> $searchModel + * @var searchModelClass, '\\') ?> $searchModel */ -$this->title = 'modelClass))); ?>'; +$this->title = 'modelClass))) ?>'; $this->params['breadcrumbs'][] = $this->title; ?> -
+
-
echo Html::encode($this->title); ?>
+echo Html::encode($this->title); ?>
- indexWidgetType === 'grid' ? ' //' : ''); ?> echo $this->render('_search', ['model' => $searchModel]); ?> + indexWidgetType === 'grid' ? ' //' : '') ?> echo $this->render('_search', ['model' => $searchModel]); ?>- echo Html::a('Create modelClass); ?>', ['create'], ['class' => 'btn btn-success']); ?> + echo Html::a('Create modelClass) ?>', ['create'], ['class' => 'btn btn-success']); ?>
indexWidgetType === 'grid'): ?> - echo GridView::widget([ + echo GridView::widget([ 'dataProvider' => $dataProvider, 'filterModel' => $searchModel, 'columns' => [ @@ -59,11 +59,11 @@ foreach ($generator->getTableSchema()->columns as $column) { ], ]); ?> - echo ListView::widget([ + echo ListView::widget([ 'dataProvider' => $dataProvider, 'itemOptions' => ['class' => 'item'], 'itemView' => function ($model, $key, $index, $widget) { - return Html::a(Html::encode($model->), ['view', ]); + return Html::a(Html::encode($model->), ['view', ]); }, ]); ?> diff --git a/framework/yii/gii/generators/crud/templates/views/update.php b/framework/yii/gii/generators/crud/templates/views/update.php index 0b881ec..32bab23 100644 --- a/framework/yii/gii/generators/crud/templates/views/update.php +++ b/framework/yii/gii/generators/crud/templates/views/update.php @@ -17,19 +17,19 @@ use yii\helpers\Html; /** * @var yii\base\View $this - * @var modelClass, '\\'); ?> $model + * @var modelClass, '\\') ?> $model */ -$this->title = 'Update modelClass)); ?>: ' . $model->getNameAttribute(); ?>; -$this->params['breadcrumbs'][] = ['label' => 'modelClass))); ?>', 'url' => ['index']]; -$this->params['breadcrumbs'][] = ['label' => $model->getNameAttribute(); ?>, 'url' => ['view', ]]; +$this->title = 'Update modelClass)) ?>: ' . $model->getNameAttribute() ?>; +$this->params['breadcrumbs'][] = ['label' => 'modelClass))) ?>', 'url' => ['index']]; +$this->params['breadcrumbs'][] = ['label' => $model->getNameAttribute() ?>, 'url' => ['view', ]]; $this->params['breadcrumbs'][] = 'Update'; ?> -
+
-
echo Html::encode($this->title); ?>
+echo Html::encode($this->title); ?>
- echo $this->render('_form', [ + echo $this->render('_form', [ 'model' => $model, ]); ?> diff --git a/framework/yii/gii/generators/crud/templates/views/view.php b/framework/yii/gii/generators/crud/templates/views/view.php index 9e8f28d..2832507 100644 --- a/framework/yii/gii/generators/crud/templates/views/view.php +++ b/framework/yii/gii/generators/crud/templates/views/view.php @@ -18,27 +18,27 @@ use yii\widgets\DetailView; /** * @var yii\base\View $this - * @var modelClass, '\\'); ?> $model + * @var modelClass, '\\') ?> $model */ -$this->title = $model->getNameAttribute(); ?>; -$this->params['breadcrumbs'][] = ['label' => 'modelClass))); ?>', 'url' => ['index']]; +$this->title = $model->getNameAttribute() ?>; +$this->params['breadcrumbs'][] = ['label' => 'modelClass))) ?>', 'url' => ['index']]; $this->params['breadcrumbs'][] = $this->title; ?> -
+
-
+
- getRelativePath()), ['preview', 'file' => $file->id], ['class' => 'preview-code', 'data-title' => $file->getRelativePath()]); ?>
+ getRelativePath()), ['preview', 'file' => $file->id], ['class' => 'preview-code', 'data-title' => $file->getRelativePath()]) ?>
operation === CodeFile::OP_OVERWRITE): ?>
- $file->id], ['class' => 'diff-code label label-warning', 'data-title' => $file->getRelativePath()]); ?>
+ $file->id], ['class' => 'diff-code label label-warning', 'data-title' => $file->getRelativePath()]) ?>
diff --git a/framework/yii/gii/views/default/view/results.php b/framework/yii/gii/views/default/view/results.php
index 5ecb4e1..b37543f 100644
--- a/framework/yii/gii/views/default/view/results.php
+++ b/framework/yii/gii/views/default/view/results.php
@@ -18,5 +18,5 @@ use yii\gii\CodeFile;
echo '<?=Html::encode($this->title); ?>
+ <?= Html::encode($this->title) ?>
head(); ?>
@@ -37,13 +37,13 @@ NavBar::end();
?>
echo Html::encode($this->title); ?>
+echo Html::encode($this->title); ?>
- echo Html::a('Update', ['update', ], ['class' => 'btn btn-primary']); ?> - echo Html::a('Delete', ['delete', ], [ + echo Html::a('Update', ['update', ], ['class' => 'btn btn-primary']); ?> + echo Html::a('Delete', ['delete', ], [ 'class' => 'btn btn-danger', 'data-confirm' => Yii::t('app', 'Are you sure to delete this item?'), 'data-method' => 'post', ]); ?>
- echo DetailView::widget([ + echo DetailView::widget([ 'model' => $model, 'attributes' => [ -public function actionviewName), '_')); ?>() +public function actionviewName), '_')) ?>() { - $model = new modelClass; ?>scenarioName) ? '' : "(['scenario' => '{$generator->scenarioName}'])"; ?>; + $model = new modelClass ?>scenarioName) ? '' : "(['scenario' => '{$generator->scenarioName}'])" ?>; if ($model->load($_POST)) { if($model->validate()) { @@ -22,7 +22,7 @@ public function actionviewName) return; } } - return $this->render('viewName; ?>', [ + return $this->render('viewName ?>', [ 'model' => $model, ]); } diff --git a/framework/yii/gii/generators/form/templates/form.php b/framework/yii/gii/generators/form/templates/form.php index f365ebc..a448687 100644 --- a/framework/yii/gii/generators/form/templates/form.php +++ b/framework/yii/gii/generators/form/templates/form.php @@ -14,22 +14,22 @@ use yii\widgets\ActiveForm; /** * @var yii\base\View $this - * @var modelClass; ?> $model + * @var modelClass ?> $model * @var ActiveForm $form */ -"; ?> +" ?> -
+
diff --git a/framework/yii/gii/generators/model/templates/model.php b/framework/yii/gii/generators/model/templates/model.php
index b5fc4ad..b445425 100644
--- a/framework/yii/gii/generators/model/templates/model.php
+++ b/framework/yii/gii/generators/model/templates/model.php
@@ -15,29 +15,29 @@
echo "
-namespace ns; ?>;
+namespace ns ?>;
/**
- * This is the model class for table "".
+ * This is the model class for table "".
*
columns as $column): ?>
- * @property phpType} \${$column->name}\n"; ?>
+ * @property phpType} \${$column->name}\n" ?>
*
$relation): ?>
- * @property
+ * @property
*/
-class extends baseClass, '\\') . "\n"; ?>
+class extends baseClass, '\\') . "\n" ?>
{
/**
* @inheritdoc
*/
public static function tableName()
{
- return '';
+ return '';
}
/**
@@ -45,7 +45,7 @@ class extends baseClass, '\\') . "
*/
public function rules()
{
- return [];
+ return [];
}
/**
@@ -55,7 +55,7 @@ class extends baseClass, '\\') . "
{
return [
$label): ?>
- '" . addslashes($label) . "',\n"; ?>
+ '" . addslashes($label) . "',\n" ?>
];
}
@@ -64,9 +64,9 @@ class extends baseClass, '\\') . "
/**
* @return \yii\db\ActiveRelation
*/
- public function get()
+ public function get()
{
-
+
}
}
diff --git a/framework/yii/gii/generators/module/templates/controller.php b/framework/yii/gii/generators/module/templates/controller.php
index d5e92d6..2b24e0e 100644
--- a/framework/yii/gii/generators/module/templates/controller.php
+++ b/framework/yii/gii/generators/module/templates/controller.php
@@ -8,7 +8,7 @@
echo "
-namespace getControllerNamespace(); ?>;
+namespace getControllerNamespace() ?>;
use yii\web\Controller;
diff --git a/framework/yii/gii/generators/module/templates/module.php b/framework/yii/gii/generators/module/templates/module.php
index b22469c..ef0c55a 100644
--- a/framework/yii/gii/generators/module/templates/module.php
+++ b/framework/yii/gii/generators/module/templates/module.php
@@ -13,12 +13,12 @@ $className = substr($className, $pos + 1);
echo "
-namespace ;
+namespace ;
-class extends \yii\base\Module
+class extends \yii\base\Module
{
- public $controllerNamespace = 'getControllerNamespace(); ?>';
+ public $controllerNamespace = 'getControllerNamespace() ?>';
public function init()
{
diff --git a/framework/yii/gii/generators/module/templates/view.php b/framework/yii/gii/generators/module/templates/view.php
index 9ca15c1..311134d 100644
--- a/framework/yii/gii/generators/module/templates/view.php
+++ b/framework/yii/gii/generators/module/templates/view.php
@@ -4,15 +4,15 @@
* @var yii\gii\generators\module\Generator $generator
*/
?>
-
- $form = ActiveForm::begin(); ?>
+ $form = ActiveForm::begin(); ?>
getModelAttributes() as $attribute): ?>
- echo $form->field($model, ''); ?>
+ echo $form->field($model, ''); ?>
+
- echo Html::submitButton('Submit', ['class' => 'btn btn-primary']); ?>
+ echo Html::submitButton('Submit', ['class' => 'btn btn-primary']); ?>
- ActiveForm::end(); ?>
+ ActiveForm::end(); ?>
-
-
diff --git a/framework/yii/gii/views/default/index.php b/framework/yii/gii/views/default/index.php
index 26ba583..011a44b 100644
--- a/framework/yii/gii/views/default/index.php
+++ b/framework/yii/gii/views/default/index.php
@@ -21,9 +21,9 @@ $this->title = 'Welcome to Gii';
echo $this->context->action->uniqueId; ?>
+
+
diff --git a/framework/yii/gii/views/default/diff.php b/framework/yii/gii/views/default/diff.php
index d01d0f2..6766528 100644
--- a/framework/yii/gii/views/default/diff.php
+++ b/framework/yii/gii/views/default/diff.php
@@ -10,6 +10,6 @@
echo $this->context->action->uniqueId; ?>
- This is the view content for action " echo $this->context->action->id; ?>". - The action belongs to the controller " echo get_class($this->context); ?>" - in the " echo $this->context->module->id; ?>" module. + This is the view content for action " echo $this->context->action->id; ?>". + The action belongs to the controller " echo get_class($this->context); ?>" + in the " echo $this->context->module->id; ?>" module.
You may customize this page by editing the following file:
- echo __FILE__; ?>
+ echo __FILE__; ?>
Identical.
-
+
$generator): ?>
diff --git a/framework/yii/gii/views/default/view.php b/framework/yii/gii/views/default/view.php
index 7899275..1ef5c77 100644
--- a/framework/yii/gii/views/default/view.php
+++ b/framework/yii/gii/views/default/view.php
@@ -24,9 +24,9 @@ foreach ($generator->templates as $name => $path) {
}
?>
-
getName()); ?>
-getDescription(); ?>
-$id], ['class' => 'btn btn-default']); ?>
+getName()) ?>
+getDescription() ?>
+$id], ['class' => 'btn btn-default']) ?>
-
diff --git a/framework/yii/gii/views/default/view/files.php b/framework/yii/gii/views/default/view/files.php
index dae0274..0cc12dd 100644
--- a/framework/yii/gii/views/default/view/files.php
+++ b/framework/yii/gii/views/default/view/files.php
@@ -33,11 +33,11 @@ use yii\gii\CodeFile;
- title); ?>
+title) ?>
-getDescription(); ?>
+getDescription() ?>
"$id-generator", @@ -45,10 +45,10 @@ foreach ($generator->templates as $name => $path) { Please select which set of the templates should be used to generated the code. '); ?>
- 'preview', 'class' => 'btn btn-primary']); ?>
+ 'preview', 'class' => 'btn btn-primary']) ?>
- 'generate', 'class' => 'btn btn-success']); ?>
+ 'generate', 'class' => 'btn btn-success']) ?>
' . $generator->successMessage() . '
';
}
?>
-
+
diff --git a/framework/yii/gii/views/layouts/generator.php b/framework/yii/gii/views/layouts/generator.php
index 7d51e65..bdc032e 100644
--- a/framework/yii/gii/views/layouts/generator.php
+++ b/framework/yii/gii/views/layouts/generator.php
@@ -25,7 +25,7 @@ $activeGenerator = Yii::$app->controller->generator;
-
+
endContent(); ?>
diff --git a/framework/yii/gii/views/layouts/main.php b/framework/yii/gii/views/layouts/main.php
index 1d6c2f4..f648999 100644
--- a/framework/yii/gii/views/layouts/main.php
+++ b/framework/yii/gii/views/layouts/main.php
@@ -14,7 +14,7 @@ $asset = yii\gii\GiiAsset::register($this);
-
-
+
diff --git a/framework/yii/requirements/views/web/index.php b/framework/yii/requirements/views/web/index.php
index a609705..82e3fdb 100644
--- a/framework/yii/requirements/views/web/index.php
+++ b/framework/yii/requirements/views/web/index.php
@@ -52,18 +52,18 @@
| Name | Result | Required By | Memo |
|---|---|---|---|
| - + | - + | - + | - + |