title); ?>
+title); ?>
-
+
diff --git a/apps/advanced/backend/views/site/login.php b/apps/advanced/backend/views/site/login.php index bcb673d1f6..d52eaa10ed 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; ?>
-
<?php echo Html::encode($this->title); ?>
+
+ <?=Html::encode($this->title); ?>
head(); ?>
@@ -49,17 +49,17 @@ AppAsset::register($this);
?>
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/emails/passwordResetToken.php b/apps/advanced/frontend/views/emails/passwordResetToken.php
index 134dc083fa..fd386bf967 100644
--- a/apps/advanced/frontend/views/emails/passwordResetToken.php
+++ b/apps/advanced/frontend/views/emails/passwordResetToken.php
@@ -9,8 +9,8 @@ use yii\helpers\Html;
$resetLink = Yii::$app->urlManager->createAbsoluteUrl('site/reset-password', ['token' => $user->password_reset_token]);
?>
-Hello username)?>,
+Hello username)?>,
Follow the link below to reset your password:
-
+
diff --git a/apps/advanced/frontend/views/layouts/main.php b/apps/advanced/frontend/views/layouts/main.php
index d3e05a7aea..0b36edcc75 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']); ?>
- 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 a372e69519..2084648b5d 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;
?>
-
diff --git a/apps/advanced/frontend/views/site/contact.php b/apps/advanced/frontend/views/site/contact.php
index 9b1b392774..012c36d3e0 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, 'verifyCode')->widget(Captcha::className(), [
+ 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 024e27d4da..eef87f6353 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 22b5db55fd..df758a8c07 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 0b0ace499d..f906b72456 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 .
+ 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 92a136363c..40c1106610 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']); ?>
-
<?php echo 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 3829d54801..9101c57483 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 4b75d7a4da..6441ecc78e 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 7f6c2ad2a2..82bc78c25d 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']); ?>
-
<?php echo Html::encode($this->title); ?>
+
+ <?=Html::encode($this->title); ?>
head(); ?>
@@ -45,16 +45,16 @@ app\config\AppAsset::register($this);
?>
diff --git a/framework/yii/debug/views/layouts/main.php b/framework/yii/debug/views/layouts/main.php
index 8875878f76..f22842d688 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(); ?>
- 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 30246b1eb8..3ffbf0f70c 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']); ?>
- isset($this->params['breadcrumbs']) ? $this->params['breadcrumbs'] : [],
]); ?>
-
+
diff --git a/apps/basic/views/site/about.php b/apps/basic/views/site/about.php
index 967b8fe6ee..e4070a83ed 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;
?>
-
diff --git a/apps/basic/views/site/contact.php b/apps/basic/views/site/contact.php
index 55113cc367..450e06b5ec 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, 'verifyCode')->widget(Captcha::className(), [
+ 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 024e27d4da..eef87f6353 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 7efb8b743b..34936af666 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 f1748646cc..bf6e562ce9 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(); ?>
<?php echo 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 ac238fa46b..40d33cfc1e 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,17 +24,17 @@ $this->params['breadcrumbs'][] = $this->title; ], ]); ?> - field($model, 'username'); ?> + field($model, 'username'); ?> - field($model, 'password')->passwordInput(); ?> + field($model, 'password')->passwordInput(); ?> - field($model, 'rememberMe', [ + field($model, 'rememberMe', [ 'template' => "{input}
\n{error}
",
])->checkbox(); ?>
- 'btn btn-primary']); ?>
+ 'btn btn-primary']); ?>
-
+
```
diff --git a/docs/guide/view.md b/docs/guide/view.md
index 6ca2368fe1..be64d22d83 100644
--- a/docs/guide/view.md
+++ b/docs/guide/view.md
@@ -30,7 +30,7 @@ as the corresponding key.
So the view for the action above should be in `views/site/index.php` and can be something like:
```php
-Hello, !
+Hello, !
``` Instead of just scalar values you can pass anything else such as arrays or objects. @@ -78,7 +78,7 @@ use yii\helpers\Html; ?>
- name); ?>
+ name); ?>
```
@@ -99,7 +99,7 @@ use yii\helpers\HtmlPurifier;
?>
- text); ?>
+ text); ?>
```
@@ -258,16 +258,16 @@ use yii\helpers\Html;
?>
beginPage(); ?>
-
+
-
-
-
+
endBody(); ?>
@@ -297,8 +297,8 @@ use yii\helpers\Html;
?>
-
-
+
+
```
diff --git a/framework/yii/debug/views/default/index.php b/framework/yii/debug/views/default/index.php
index 59d60b405a..5630e80705 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 190bbe2d3b..a455008ca5 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";
+ echo "\t\tgenerateActiveField($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 13e2b82f5b..263fbd0661 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', array('class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary')); ?>
+ echo Html::submitButton($model->isNewRecord ? 'Create' : 'Update', array('class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary')); ?>
- ActiveForm::end(); ?>
+ ActiveForm::end(); ?>
+
- $form = ActiveForm::begin(array(
+ $form = ActiveForm::begin(array(
'action' => array('index'),
'method' => 'get',
)); ?>
@@ -32,17 +32,17 @@ use yii\widgets\ActiveForm;
$count = 0;
foreach ($generator->getTableSchema()->getColumnNames() as $attribute) {
if (++$count < 6) {
- echo "\t\tgenerateActiveSearchField($attribute) . " ?>\n";
+ echo "\t\tgenerateActiveSearchField($attribute) . " ?>\n";
} else {
echo "\t\tgenerateActiveSearchField($attribute) . " ?>\n";
}
}
?>
diff --git a/framework/yii/gii/generators/crud/templates/views/create.php b/framework/yii/gii/generators/crud/templates/views/create.php
index 669b99accc..5f2887f785 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'][] = array('label' => 'modelClass))); ?>', 'url' => array('index'));
+$this->title = 'Create modelClass)); ?>';
+$this->params['breadcrumbs'][] = array('label' => 'modelClass))); ?>', 'url' => array('index'));
$this->params['breadcrumbs'][] = $this->title;
?>
-
- echo Html::submitButton('Search', array('class' => 'btn btn-primary')); ?>
- echo Html::resetButton('Reset', array('class' => 'btn btn-default')); ?>
+ echo Html::submitButton('Search', array('class' => 'btn btn-primary')); ?>
+ echo Html::resetButton('Reset', array('class' => 'btn btn-default')); ?>
- ActiveForm::end(); ?>
+ ActiveForm::end(); ?>
+
-
echo Html::encode($this->title); ?>
+echo Html::encode($this->title); ?>
- echo $this->render('_form', array( + echo $this->render('_form', array( '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 96f83905d2..5898790b1c 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', array('model' => $searchModel)); ?> + indexWidgetType === 'grid' ? ' //' : ''); ?> echo $this->render('_search', array('model' => $searchModel)); ?>- echo Html::a('Create modelClass); ?>', array('create'), array('class' => 'btn btn-success')); ?> + echo Html::a('Create modelClass); ?>', array('create'), array('class' => 'btn btn-success')); ?>
indexWidgetType === 'grid'): ?> - echo GridView::widget(array( + echo GridView::widget(array( 'dataProvider' => $dataProvider, 'filterModel' => $searchModel, 'columns' => array( @@ -59,13 +59,13 @@ foreach ($generator->getTableSchema()->columns as $column) { ), )); ?> - echo ListView::widget(array( + echo ListView::widget(array( 'dataProvider' => $dataProvider, 'itemOptions' => array( 'class' => 'item', ), 'itemView' => function ($model, $key, $index, $widget) { - return Html::a(Html::encode($model->), array('view', )); + return Html::a(Html::encode($model->), array('view', )); }, )); ?> diff --git a/framework/yii/gii/generators/crud/templates/views/update.php b/framework/yii/gii/generators/crud/templates/views/update.php index cb892c20a8..85184902f7 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'][] = array('label' => 'modelClass))); ?>', 'url' => array('index')); -$this->params['breadcrumbs'][] = array('label' => $model->getNameAttribute(); ?>, 'url' => array('view', )); +$this->title = 'Update modelClass)); ?>: ' . $model->getNameAttribute(); ?>; +$this->params['breadcrumbs'][] = array('label' => 'modelClass))); ?>', 'url' => array('index')); +$this->params['breadcrumbs'][] = array('label' => $model->getNameAttribute(); ?>, 'url' => array('view', )); $this->params['breadcrumbs'][] = 'Update'; ?> -
+
-
echo Html::encode($this->title); ?>
+echo Html::encode($this->title); ?>
- echo $this->render('_form', array( + echo $this->render('_form', array( '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 4f302eda4b..18821af284 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'][] = array('label' => 'modelClass))); ?>', 'url' => array('index')); +$this->title = $model->getNameAttribute(); ?>; +$this->params['breadcrumbs'][] = array('label' => 'modelClass))); ?>', 'url' => array('index')); $this->params['breadcrumbs'][] = $this->title; ?> -
+
-
echo Html::encode($this->title); ?>
+echo Html::encode($this->title); ?>
- echo Html::a('Update', array('update', ), array('class' => 'btn btn-primary')); ?> - echo Html::a('Delete', array('delete', ), array( + echo Html::a('Update', array('update', ), array('class' => 'btn btn-primary')); ?> + echo Html::a('Delete', array('delete', ), array( 'class' => 'btn btn-danger', 'data-confirm' => Yii::t('app', 'Are you sure to delete this item?'), 'data-method' => 'post', )); ?>
- echo DetailView::widget(array( + echo DetailView::widget(array( 'model' => $model, 'attributes' => array( -public function actionviewName), '_')); ?>() +public function actionviewName), '_')); ?>() { - $model = new modelClass; ?>scenarioName) ? '' : "(array('scenario' => '{$generator->scenarioName}'))"; ?>; + $model = new modelClass; ?>scenarioName) ? '' : "(array('scenario' => '{$generator->scenarioName}'))"; ?>; if ($model->load($_POST)) { if($model->validate()) { @@ -22,7 +22,7 @@ public function actionv return; } } - return $this->render('viewName; ?>', array( + return $this->render('viewName; ?>', array( 'model' => $model, )); } diff --git a/framework/yii/gii/generators/form/templates/form.php b/framework/yii/gii/generators/form/templates/form.php index ad52fe90f7..7569fc0638 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 b194294f49..d5f0a18930 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 base
*/
public function rules()
{
- return array();
+ return array();
}
/**
@@ -55,7 +55,7 @@ class extends base
{
return array(
$label): ?>
- '" . addslashes($label) . "',\n"; ?>
+ '" . addslashes($label) . "',\n"; ?>
);
}
@@ -64,9 +64,9 @@ class extends base
/**
* @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 4d3da93cd7..d5e92d6ced 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 40af635157..b22469c688 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 d0e1ce60f1..9ca15c13bf 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', array('class' => 'btn btn-primary')); ?>
+ echo Html::submitButton('Submit', array('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 7dd1fdd657..c727691b6b 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 bb4e455065..d01d0f2699 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 91c6bcb8e9..d26c97d542 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), array('class' => 'btn btn-default')); ?>
+getName()); ?>
+getDescription(); ?>
+$id), array('class' => 'btn btn-default')); ?>
-
+
- getRelativePath()), array('preview', 'file' => $file->id), array('class' => 'preview-code', 'data-title' => $file->getRelativePath())); ?>
+ getRelativePath()), array('preview', 'file' => $file->id), array('class' => 'preview-code', 'data-title' => $file->getRelativePath())); ?>
operation === CodeFile::OP_OVERWRITE): ?>
- $file->id), array('class' => 'diff-code label label-warning', 'data-title' => $file->getRelativePath())); ?>
+ $file->id), array('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 caca4044a7..5ecb4e1fc1 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 '<?php echo Html::encode($this->title); ?>
+ <?=Html::encode($this->title); ?>
head(); ?>
@@ -39,13 +39,13 @@ NavBar::end();
?>
title); ?>
+title); ?>
-getDescription(); ?>
+getDescription(); ?>
"$id-generator", @@ -35,20 +35,20 @@ foreach ($generator->templates as $name => $path) { )); ?>
- renderFile($generator->formView(), array(
+ renderFile($generator->formView(), array(
'generator' => $generator,
'form' => $form,
)); ?>
- field($generator, 'template')->sticky()
+ field($generator, 'template')->sticky()
->label('Code Template')
->dropDownList($templates)->hint('
Please select which set of the templates should be used to generated the code.
'); ?>
diff --git a/framework/yii/gii/views/default/view/files.php b/framework/yii/gii/views/default/view/files.php
index 5ba08e8a34..21794c3fde 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;
-
- '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 fcf9fbcadd..7ec690502c 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 5a70ac4bbe..406fefefa4 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 1887f8b7a4..a609705a7c 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 |
|---|---|---|---|
| - + | - + | - + | - + |