Skip to content

T
test-project
Commit 470b0c23 by jomon
Options

code review changes

parent 9ee19cd3
Showing with 458 additions and 455 deletions
backend/mail/layouts/html.php
......@@ -9,13 +9,13 @@ use yii\helpers\Html;
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=<?php echo Yii::$app->charset ?>" />
<title><?php echo Html::encode($this->title) ?></title>
<meta http-equiv="Content-Type" content="text/html; charset=<?= Yii::$app->charset ?>" />
<title><?= Html::encode($this->title) ?></title>
<?php $this->head() ?>
</head>
<body>
<?php $this->beginBody() ?>
<?php echo $content ?>
<?= $content ?>
<?php $this->endBody() ?>
</body>
</html>
......
backend/modules/i18n/views/i18n-message/_form.php
......@@ -12,19 +12,19 @@ use yii\bootstrap\ActiveForm;
<?php $form = ActiveForm::begin(); ?>
<?php echo $form->field($model, 'id')->textInput(['disabled'=>!$model->isNewRecord]) ?>
<?= $form->field($model, 'id')->textInput(['disabled'=>!$model->isNewRecord]) ?>
<?php if (!$model->isNewRecord): ?>
<?php echo $form->field($model, 'category')->textInput(['disabled'=>true]) ?>
<?php echo $form->field($model, 'sourceMessage')->textInput(['disabled'=>true]) ?>
<?= $form->field($model, 'category')->textInput(['disabled'=>true]) ?>
<?= $form->field($model, 'sourceMessage')->textInput(['disabled'=>true]) ?>
<?php endif; ?>
<?php echo $form->field($model, 'language')->textInput(['maxlength' => 16]) ?>
<?= $form->field($model, 'language')->textInput(['maxlength' => 16]) ?>
<?php echo $form->field($model, 'translation')->textarea(['rows' => 6]) ?>
<?= $form->field($model, 'translation')->textarea(['rows' => 6]) ?>
<div class="form-group">
<?php echo Html::submitButton($model->isNewRecord ? Yii::t('backend', 'Create') : Yii::t('backend', 'Update'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
<?= Html::submitButton($model->isNewRecord ? Yii::t('backend', 'Create') : Yii::t('backend', 'Update'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
</div>
<?php ActiveForm::end(); ?>
......
backend/modules/i18n/views/i18n-message/_search.php
......@@ -15,15 +15,15 @@ use yii\bootstrap\ActiveForm;
'method' => 'get',
]); ?>
<?php echo $form->field($model, 'id') ?>
<?= $form->field($model, 'id') ?>
<?php echo $form->field($model, 'language') ?>
<?= $form->field($model, 'language') ?>
<?php echo $form->field($model, 'translation') ?>
<?= $form->field($model, 'translation') ?>
<div class="form-group">
<?php echo Html::submitButton(Yii::t('backend', 'Search'), ['class' => 'btn btn-primary']) ?>
<?php echo Html::resetButton(Yii::t('backend', 'Reset'), ['class' => 'btn btn-default']) ?>
<?= Html::submitButton(Yii::t('backend', 'Search'), ['class' => 'btn btn-primary']) ?>
<?= Html::resetButton(Yii::t('backend', 'Reset'), ['class' => 'btn btn-default']) ?>
</div>
<?php ActiveForm::end(); ?>
......
backend/modules/i18n/views/i18n-message/create.php
......@@ -10,7 +10,7 @@ $this->params['breadcrumbs'][] = $this->title;
?>
<div class="i18n-message-create">
<?php echo $this->render('_form', [
<?= $this->render('_form', [
'model' => $model
]) ?>
......
backend/modules/i18n/views/i18n-message/index.php
......@@ -15,12 +15,12 @@ $this->params['breadcrumbs'][] = $this->title;
<?php //echo $this->render('_search', ['model' => $searchModel]); ?>
<p>
<?php echo Html::a(Yii::t('backend', 'Create {modelClass}', [
<?= Html::a(Yii::t('backend', 'Create {modelClass}', [
'modelClass' => 'I18n Message',
]), ['create'], ['class' => 'btn btn-success']) ?>
</p>
<?php echo GridView::widget([
<?= GridView::widget([
'dataProvider' => $dataProvider,
'filterModel' => $searchModel,
'options' => [
......
backend/modules/i18n/views/i18n-message/update.php
......@@ -14,7 +14,7 @@ $this->params['breadcrumbs'][] = Yii::t('backend', 'Update');
?>
<div class="i18n-message-update">
<?php echo $this->render('_form', [
<?= $this->render('_form', [
'model' => $model,
]) ?>
......
backend/modules/i18n/views/i18n-source-message/_form.php
......@@ -12,12 +12,12 @@ use yii\bootstrap\ActiveForm;
<?php $form = ActiveForm::begin(); ?>
<?php echo $form->field($model, 'category')->textInput(['maxlength' => 32]) ?>
<?= $form->field($model, 'category')->textInput(['maxlength' => 32]) ?>
<?php echo $form->field($model, 'message')->textarea(['rows' => 6]) ?>
<?= $form->field($model, 'message')->textarea(['rows' => 6]) ?>
<div class="form-group">
<?php echo Html::submitButton($model->isNewRecord ? Yii::t('backend', 'Create') : Yii::t('backend', 'Update'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
<?= Html::submitButton($model->isNewRecord ? Yii::t('backend', 'Create') : Yii::t('backend', 'Update'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
</div>
<?php ActiveForm::end(); ?>
......
backend/modules/i18n/views/i18n-source-message/_search.php
......@@ -15,15 +15,15 @@ use yii\bootstrap\ActiveForm;
'method' => 'get',
]); ?>
<?php echo $form->field($model, 'id') ?>
<?= $form->field($model, 'id') ?>
<?php echo $form->field($model, 'category') ?>
<?= $form->field($model, 'category') ?>
<?php echo $form->field($model, 'message') ?>
<?= $form->field($model, 'message') ?>
<div class="form-group">
<?php echo Html::submitButton(Yii::t('backend', 'Search'), ['class' => 'btn btn-primary']) ?>
<?php echo Html::resetButton(Yii::t('backend', 'Reset'), ['class' => 'btn btn-default']) ?>
<?= Html::submitButton(Yii::t('backend', 'Search'), ['class' => 'btn btn-primary']) ?>
<?= Html::resetButton(Yii::t('backend', 'Reset'), ['class' => 'btn btn-default']) ?>
</div>
<?php ActiveForm::end(); ?>
......
backend/modules/i18n/views/i18n-source-message/create.php
......@@ -10,7 +10,7 @@ $this->params['breadcrumbs'][] = $this->title;
?>
<div class="i18n-source-message-create">
<?php echo $this->render('_form', [
<?= $this->render('_form', [
'model' => $model
]) ?>
......
backend/modules/i18n/views/i18n-source-message/index.php
......@@ -15,12 +15,12 @@ $this->params['breadcrumbs'][] = $this->title;
<?php // echo $this->render('_search', ['model' => $searchModel]); ?>
<p>
<?php echo Html::a(Yii::t('backend', 'Create {modelClass}', [
<?= Html::a(Yii::t('backend', 'Create {modelClass}', [
'modelClass' => 'I18n Source Message',
]), ['create'], ['class' => 'btn btn-success']) ?>
</p>
<?php echo GridView::widget([
<?= GridView::widget([
'dataProvider' => $dataProvider,
'filterModel' => $searchModel,
'options' => [
......
backend/modules/i18n/views/i18n-source-message/update.php
......@@ -14,7 +14,7 @@ $this->params['breadcrumbs'][] = Yii::t('backend', 'Update');
?>
<div class="i18n-source-message-update">
<?php echo $this->render('_form', [
<?= $this->render('_form', [
'model' => $model,
]) ?>
......
backend/modules/i18n/views/i18n-source-message/view.php
......@@ -12,11 +12,11 @@ $this->params['breadcrumbs'][] = $this->title;
?>
<div class="i18n-source-message-view">
<h1><?php echo Html::encode($this->title) ?></h1>
<h1><?= Html::encode($this->title) ?></h1>
<p>
<?php echo Html::a(Yii::t('backend', 'Update'), ['update', 'id' => $model->id], ['class' => 'btn btn-primary']) ?>
<?php echo Html::a(Yii::t('backend', 'Delete'), ['delete', 'id' => $model->id], [
<?= Html::a(Yii::t('backend', 'Update'), ['update', 'id' => $model->id], ['class' => 'btn btn-primary']) ?>
<?= Html::a(Yii::t('backend', 'Delete'), ['delete', 'id' => $model->id], [
'class' => 'btn btn-danger',
'data' => [
'confirm' => Yii::t('backend', 'Are you sure you want to delete this item?'),
......@@ -25,7 +25,7 @@ $this->params['breadcrumbs'][] = $this->title;
]) ?>
</p>
<?php echo DetailView::widget([
<?= DetailView::widget([
'model' => $model,
'attributes' => [
'id',
......
backend/modules/theme/views/category/_form.php
......@@ -13,23 +13,23 @@ use trntv\filekit\widget\Upload;
<?php $form = ActiveForm::begin(); ?>
<?php echo $form->errorSummary($model); ?>
<?= $form->errorSummary($model); ?>
<div class="row">
<div class="col-md-3">
<?php echo $form->field($model, 'name')->textInput(['maxlength' => true]) ?>
<?= $form->field($model, 'name')->textInput(['maxlength' => true]) ?>
</div>
</div>
<div class="row">
<div class="col-md-3">
<?php echo $form->field($model, 'slug')->textInput(['maxlength' => true]) ?>
<?= $form->field($model, 'slug')->textInput(['maxlength' => true]) ?>
</div>
</div>
<div class="row">
<div class="col-md-3">
<?php echo $form->field($model, 'description')->textarea(['maxlength' => true]) ?>
<?= $form->field($model, 'description')->textarea(['maxlength' => true]) ?>
</div>
</div>
......@@ -52,7 +52,7 @@ use trntv\filekit\widget\Upload;
</div>
<div class="form-group">
<?php echo Html::submitButton($model->isNewRecord ? Yii::t('backend', 'Create') : Yii::t('backend', 'Update'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
<?= Html::submitButton($model->isNewRecord ? Yii::t('backend', 'Create') : Yii::t('backend', 'Update'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
</div>
<?php ActiveForm::end(); ?>
......
backend/modules/theme/views/category/_search.php
......@@ -15,15 +15,15 @@ use yii\bootstrap\ActiveForm;
'method' => 'get',
]); ?>
<?php echo $form->field($model, 'id') ?>
<?= $form->field($model, 'id') ?>
<?php echo $form->field($model, 'name') ?>
<?= $form->field($model, 'name') ?>
<?php echo $form->field($model, 'slug') ?>
<?= $form->field($model, 'slug') ?>
<?php echo $form->field($model, 'description') ?>
<?= $form->field($model, 'description') ?>
<?php echo $form->field($model, 'image_url') ?>
<?= $form->field($model, 'image_url') ?>
<?php // echo $form->field($model, 'image_path') ?>
......@@ -34,8 +34,8 @@ use yii\bootstrap\ActiveForm;
<?php // echo $form->field($model, 'updated_at') ?>
<div class="form-group">
<?php echo Html::submitButton(Yii::t('backend', 'Search'), ['class' => 'btn btn-primary']) ?>
<?php echo Html::resetButton(Yii::t('backend', 'Reset'), ['class' => 'btn btn-default']) ?>
<?= Html::submitButton(Yii::t('backend', 'Search'), ['class' => 'btn btn-primary']) ?>
<?= Html::resetButton(Yii::t('backend', 'Reset'), ['class' => 'btn btn-default']) ?>
</div>
<?php ActiveForm::end(); ?>
......
backend/modules/theme/views/category/create.php
......@@ -14,7 +14,7 @@ $this->params['breadcrumbs'][] = $this->title;
?>
<div class="category-create">
<?php echo $this->render('_form', [
<?= $this->render('_form', [
'model' => $model,
]) ?>
......
backend/modules/theme/views/category/index.php
......@@ -17,32 +17,32 @@ $this->params['breadcrumbs'][] = $this->title;
<?php // echo $this->render('_search', ['model' => $searchModel]); ?>
<p>
<?php echo Html::a(Yii::t('backend', 'Create {modelClass}', [
<?= Html::a(Yii::t('backend', 'Create {modelClass}', [
'modelClass' => 'Category',
]), ['create'], ['class' => 'btn btn-success']) ?>
]), ['create'], ['class' => 'btn btn-success']) ?>
</p>
<?php echo GridView::widget([
<?= GridView::widget([
'dataProvider' => $dataProvider,
'filterModel' => $searchModel,
'columns' => [
['class' => 'yii\grid\SerialColumn'],
//'id',
// 'id',
'name',
// 'slug',
// 'slug',
'description',
// 'image_url:url',
// 'image_path',
// 'image_url:url',
// 'image_path',
[
'class' => EnumColumn::className(),
'attribute' => 'status',
'enum' => Category::statuses(),
'filter' => Category::statuses()
],
// 'status',
// 'created_at',
// 'updated_at',
'status',
'created_at',
// 'updated_at',
['class' => 'yii\grid\ActionColumn'],
],
......
backend/modules/theme/views/category/update.php
......@@ -14,7 +14,7 @@ $this->params['breadcrumbs'][] = Yii::t('backend', 'Update');
?>
<div class="category-update">
<?php echo $this->render('_form', [
<?= $this->render('_form', [
'model' => $model,
]) ?>
......
backend/modules/theme/views/category/view.php
......@@ -13,8 +13,8 @@ $this->params['breadcrumbs'][] = $this->title;
<div class="category-view">
<p>
<?php echo Html::a(Yii::t('backend', 'Update'), ['update', 'id' => $model->id], ['class' => 'btn btn-primary']) ?>
<?php echo Html::a(Yii::t('backend', 'Delete'), ['delete', 'id' => $model->id], [
<?= Html::a(Yii::t('backend', 'Update'), ['update', 'id' => $model->id], ['class' => 'btn btn-primary']) ?>
<?= Html::a(Yii::t('backend', 'Delete'), ['delete', 'id' => $model->id], [
'class' => 'btn btn-danger',
'data' => [
'confirm' => Yii::t('backend', 'Are you sure you want to delete this item?'),
......@@ -23,7 +23,7 @@ $this->params['breadcrumbs'][] = $this->title;
]) ?>
</p>
<?php echo DetailView::widget([
<?= DetailView::widget([
'model' => $model,
'attributes' => [
'id',
......
backend/views/_gii/templates/controller.php
......@@ -27,23 +27,23 @@ $actionParamComments = $generator->generateActionParamComments();
echo "<?php\n";
?>
namespace <?php echo StringHelper::dirname(ltrim($generator->controllerClass, '\\')) ?>;
namespace <?= StringHelper::dirname(ltrim($generator->controllerClass, '\\')) ?>;
use Yii;
use <?php echo ltrim($generator->modelClass, '\\') ?>;
use <?= ltrim($generator->modelClass, '\\') ?>;
<?php if (!empty($generator->searchModelClass)): ?>
use <?php echo ltrim($generator->searchModelClass, '\\') . (isset($searchModelAlias) ? " as $searchModelAlias" : "") ?>;
use <?= ltrim($generator->searchModelClass, '\\') . (isset($searchModelAlias) ? " as $searchModelAlias" : "") ?>;
<?php else: ?>
use yii\data\ActiveDataProvider;
<?php endif; ?>
use <?php echo ltrim($generator->baseControllerClass, '\\') ?>;
use <?= ltrim($generator->baseControllerClass, '\\') ?>;
use yii\web\NotFoundHttpException;
use yii\filters\VerbFilter;
/**
* <?php echo $controllerClass ?> implements the CRUD actions for <?php echo $modelClass ?> model.
* <?= $controllerClass ?> implements the CRUD actions for <?= $modelClass ?> model.
*/
class <?php echo $controllerClass ?> extends <?php echo StringHelper::basename($generator->baseControllerClass) . "\n" ?>
class <?= $controllerClass ?> extends <?= StringHelper::basename($generator->baseControllerClass) . "\n" ?>
{
public function behaviors()
{
......@@ -58,13 +58,13 @@ class <?php echo $controllerClass ?> extends <?php echo StringHelper::basename($
}
/**
* Lists all <?php echo $modelClass ?> models.
* Lists all <?= $modelClass ?> models.
* @return mixed
*/
public function actionIndex()
{
<?php if (!empty($generator->searchModelClass)): ?>
$searchModel = new <?php echo isset($searchModelAlias) ? $searchModelAlias : $searchModelClass ?>();
$searchModel = new <?= isset($searchModelAlias) ? $searchModelAlias : $searchModelClass ?>();
$dataProvider = $searchModel->search(Yii::$app->request->queryParams);
return $this->render('index', [
......@@ -73,7 +73,7 @@ class <?php echo $controllerClass ?> extends <?php echo StringHelper::basename($
]);
<?php else: ?>
$dataProvider = new ActiveDataProvider([
'query' => <?php echo $modelClass ?>::find(),
'query' => <?= $modelClass ?>::find(),
]);
return $this->render('index', [
......@@ -83,28 +83,28 @@ class <?php echo $controllerClass ?> extends <?php echo StringHelper::basename($
}
/**
* Displays a single <?php echo $modelClass ?> model.
* <?php echo implode("\n * ", $actionParamComments) . "\n" ?>
* Displays a single <?= $modelClass ?> model.
* <?= implode("\n * ", $actionParamComments) . "\n" ?>
* @return mixed
*/
public function actionView(<?php echo $actionParams ?>)
public function actionView(<?= $actionParams ?>)
{
return $this->render('view', [
'model' => $this->findModel(<?php echo $actionParams ?>),
'model' => $this->findModel(<?= $actionParams ?>),
]);
}
/**
* Creates a new <?php echo $modelClass ?> model.
* Creates a new <?= $modelClass ?> model.
* If creation is successful, the browser will be redirected to the 'view' page.
* @return mixed
*/
public function actionCreate()
{
$model = new <?php echo $modelClass ?>();
$model = new <?= $modelClass ?>();
if ($model->load(Yii::$app->request->post()) && $model->save()) {
return $this->redirect(['view', <?php echo $urlParams ?>]);
return $this->redirect(['view', <?= $urlParams ?>]);
} else {
return $this->render('create', [
'model' => $model,
......@@ -113,17 +113,17 @@ class <?php echo $controllerClass ?> extends <?php echo StringHelper::basename($
}
/**
* Updates an existing <?php echo $modelClass ?> model.
* Updates an existing <?= $modelClass ?> model.
* If update is successful, the browser will be redirected to the 'view' page.
* <?php echo implode("\n * ", $actionParamComments) . "\n" ?>
* <?= implode("\n * ", $actionParamComments) . "\n" ?>
* @return mixed
*/
public function actionUpdate(<?php echo $actionParams ?>)
public function actionUpdate(<?= $actionParams ?>)
{
$model = $this->findModel(<?php echo $actionParams ?>);
$model = $this->findModel(<?= $actionParams ?>);
if ($model->load(Yii::$app->request->post()) && $model->save()) {
return $this->redirect(['view', <?php echo $urlParams ?>]);
return $this->redirect(['view', <?= $urlParams ?>]);
} else {
return $this->render('update', [
'model' => $model,
......@@ -132,26 +132,26 @@ class <?php echo $controllerClass ?> extends <?php echo StringHelper::basename($
}
/**
* Deletes an existing <?php echo $modelClass ?> model.
* Deletes an existing <?= $modelClass ?> model.
* If deletion is successful, the browser will be redirected to the 'index' page.
* <?php echo implode("\n * ", $actionParamComments) . "\n" ?>
* <?= implode("\n * ", $actionParamComments) . "\n" ?>
* @return mixed
*/
public function actionDelete(<?php echo $actionParams ?>)
public function actionDelete(<?= $actionParams ?>)
{
$this->findModel(<?php echo $actionParams ?>)->delete();
$this->findModel(<?= $actionParams ?>)->delete();
return $this->redirect(['index']);
}
/**
* Finds the <?php echo $modelClass ?> model based on its primary key value.
* Finds the <?= $modelClass ?> model based on its primary key value.
* If the model is not found, a 404 HTTP exception will be thrown.
* <?php echo implode("\n * ", $actionParamComments) . "\n" ?>
* @return <?php echo $modelClass ?> the loaded model
* <?= implode("\n * ", $actionParamComments) . "\n" ?>
* @return <?= $modelClass ?> the loaded model
* @throws NotFoundHttpException if the model cannot be found
*/
protected function findModel(<?php echo $actionParams ?>)
protected function findModel(<?= $actionParams ?>)
{
<?php
if (count($pks) === 1) {
......@@ -164,7 +164,7 @@ if (count($pks) === 1) {
$condition = '[' . implode(', ', $condition) . ']';
}
?>
if (($model = <?php echo $modelClass ?>::findOne(<?php echo $condition ?>)) !== null) {
if (($model = <?= $modelClass ?>::findOne(<?= $condition ?>)) !== null) {
return $model;
} else {
throw new NotFoundHttpException('The requested page does not exist.');
......
backend/views/_gii/templates/search.php
......@@ -22,17 +22,17 @@ $searchConditions = $generator->generateSearchConditions();
echo "<?php\n";
?>
namespace <?php echo StringHelper::dirname(ltrim($generator->searchModelClass, '\\')) ?>;
namespace <?= StringHelper::dirname(ltrim($generator->searchModelClass, '\\')) ?>;
use Yii;
use yii\base\Model;
use yii\data\ActiveDataProvider;
use <?php echo ltrim($generator->modelClass, '\\') . (isset($modelAlias) ? " as $modelAlias" : "") ?>;
use <?= ltrim($generator->modelClass, '\\') . (isset($modelAlias) ? " as $modelAlias" : "") ?>;
/**
* <?php echo $searchModelClass ?> represents the model behind the search form about `<?php echo $generator->modelClass ?>`.
* <?= $searchModelClass ?> represents the model behind the search form about `<?= $generator->modelClass ?>`.
*/
class <?php echo $searchModelClass ?> extends <?php echo isset($modelAlias) ? $modelAlias : $modelClass ?>
class <?= $searchModelClass ?> extends <?= isset($modelAlias) ? $modelAlias : $modelClass ?>
{
/**
......@@ -41,7 +41,7 @@ class <?php echo $searchModelClass ?> extends <?php echo isset($modelAlias) ? $m
public function rules()
{
return [
<?php echo implode(",\n ", $rules) ?>,
<?= implode(",\n ", $rules) ?>,
];
}
......@@ -63,7 +63,7 @@ class <?php echo $searchModelClass ?> extends <?php echo isset($modelAlias) ? $m
*/
public function search($params)
{
$query = <?php echo isset($modelAlias) ? $modelAlias : $modelClass ?>::find();
$query = <?= isset($modelAlias) ? $modelAlias : $modelClass ?>::find();
$dataProvider = new ActiveDataProvider([
'query' => $query,
......@@ -73,7 +73,7 @@ class <?php echo $searchModelClass ?> extends <?php echo isset($modelAlias) ? $m
return $dataProvider;
}
<?php echo implode("\n ", $searchConditions) ?>
<?= implode("\n ", $searchConditions) ?>
return $dataProvider;
}
......
backend/views/_gii/templates/views/_form.php
......@@ -20,25 +20,25 @@ use yii\helpers\Html;
use yii\bootstrap\ActiveForm;
/* @var $this yii\web\View */
/* @var $model <?php echo ltrim($generator->modelClass, '\\') ?> */
/* @var $model <?= ltrim($generator->modelClass, '\\') ?> */
/* @var $form yii\bootstrap\ActiveForm */
?>
<div class="<?php echo Inflector::camel2id(StringHelper::basename($generator->modelClass)) ?>-form">
<div class="<?= Inflector::camel2id(StringHelper::basename($generator->modelClass)) ?>-form">
<?php echo "<?php " ?>$form = ActiveForm::begin(); ?>
<?= "<?php " ?>$form = ActiveForm::begin(); ?>
<?php echo "<?php echo " ?>$form->errorSummary($model); ?>
<?= "<?= " ?>$form->errorSummary($model); ?>
<?php foreach ($generator->getColumnNames() as $attribute) {
if (in_array($attribute, $safeAttributes)) {
echo " <?php echo " . $generator->generateActiveField($attribute) . " ?>\n\n";
echo " <?= " . $generator->generateActiveField($attribute) . " ?>\n\n";
}
} ?>
<div class="form-group">
<?php echo "<?php echo " ?>Html::submitButton($model->isNewRecord ? <?php echo $generator->generateString('Create') ?> : <?php echo $generator->generateString('Update') ?>, ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
<?= "<?= " ?>Html::submitButton($model->isNewRecord ? <?= $generator->generateString('Create') ?> : <?= $generator->generateString('Update') ?>, ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
</div>
<?php echo "<?php " ?>ActiveForm::end(); ?>
<?= "<?php " ?>ActiveForm::end(); ?>
</div>
backend/views/_gii/templates/views/_search.php
......@@ -13,13 +13,13 @@ use yii\helpers\Html;
use yii\bootstrap\ActiveForm;
/* @var $this yii\web\View */
/* @var $model <?php echo ltrim($generator->searchModelClass, '\\') ?> */
/* @var $model <?= ltrim($generator->searchModelClass, '\\') ?> */
/* @var $form yii\bootstrap\ActiveForm */
?>
<div class="<?php echo Inflector::camel2id(StringHelper::basename($generator->modelClass)) ?>-search">
<div class="<?= Inflector::camel2id(StringHelper::basename($generator->modelClass)) ?>-search">
<?php echo "<?php " ?>$form = ActiveForm::begin([
<?= "<?php " ?>$form = ActiveForm::begin([
'action' => ['index'],
'method' => 'get',
]); ?>
......@@ -28,17 +28,17 @@ use yii\bootstrap\ActiveForm;
$count = 0;
foreach ($generator->getColumnNames() as $attribute) {
if (++$count < 6) {
echo " <?php echo " . $generator->generateActiveSearchField($attribute) . " ?>\n\n";
echo " <?= " . $generator->generateActiveSearchField($attribute) . " ?>\n\n";
} else {
echo " <?php // echo " . $generator->generateActiveSearchField($attribute) . " ?>\n\n";
}
}
?>
<div class="form-group">
<?php echo "<?php echo " ?>Html::submitButton(<?php echo $generator->generateString('Search') ?>, ['class' => 'btn btn-primary']) ?>
<?php echo "<?php echo " ?>Html::resetButton(<?php echo $generator->generateString('Reset') ?>, ['class' => 'btn btn-default']) ?>
<?= "<?= " ?>Html::submitButton(<?= $generator->generateString('Search') ?>, ['class' => 'btn btn-primary']) ?>
<?= "<?= " ?>Html::resetButton(<?= $generator->generateString('Reset') ?>, ['class' => 'btn btn-default']) ?>
</div>
<?php echo "<?php " ?>ActiveForm::end(); ?>
<?= "<?php " ?>ActiveForm::end(); ?>
</div>
backend/views/_gii/templates/views/create.php
......@@ -13,15 +13,15 @@ use yii\helpers\Html;
/* @var $this yii\web\View */
/* @var $model <?php echo ltrim($generator->modelClass, '\\') ?> */
/* @var $model <?= ltrim($generator->modelClass, '\\') ?> */
$this->title = <?php echo $generator->generateString('Create {modelClass}', ['modelClass' => Inflector::camel2words(StringHelper::basename($generator->modelClass))]) ?>;
$this->params['breadcrumbs'][] = ['label' => <?php echo $generator->generateString(Inflector::pluralize(Inflector::camel2words(StringHelper::basename($generator->modelClass)))) ?>, 'url' => ['index']];
$this->title = <?= $generator->generateString('Create {modelClass}', ['modelClass' => Inflector::camel2words(StringHelper::basename($generator->modelClass))]) ?>;
$this->params['breadcrumbs'][] = ['label' => <?= $generator->generateString(Inflector::pluralize(Inflector::camel2words(StringHelper::basename($generator->modelClass)))) ?>, 'url' => ['index']];
$this->params['breadcrumbs'][] = $this->title;
?>
<div class="<?php echo Inflector::camel2id(StringHelper::basename($generator->modelClass)) ?>-create">
<div class="<?= Inflector::camel2id(StringHelper::basename($generator->modelClass)) ?>-create">
<?php echo "<?php echo " ?>$this->render('_form', [
<?= "<?= " ?>$this->render('_form', [
'model' => $model,
]) ?>
......
backend/views/_gii/templates/views/index.php
......@@ -13,29 +13,29 @@ echo "<?php\n";
?>
use yii\helpers\Html;
use <?php echo $generator->indexWidgetType === 'grid' ? "yii\\grid\\GridView" : "yii\\widgets\\ListView" ?>;
use <?= $generator->indexWidgetType === 'grid' ? "yii\\grid\\GridView" : "yii\\widgets\\ListView" ?>;
/* @var $this yii\web\View */
<?php echo !empty($generator->searchModelClass) ? "/* @var \$searchModel " . ltrim($generator->searchModelClass, '\\') . " */\n" : '' ?>
<?= !empty($generator->searchModelClass) ? "/* @var \$searchModel " . ltrim($generator->searchModelClass, '\\') . " */\n" : '' ?>
/* @var $dataProvider yii\data\ActiveDataProvider */
$this->title = <?php echo $generator->generateString(Inflector::pluralize(Inflector::camel2words(StringHelper::basename($generator->modelClass)))) ?>;
$this->title = <?= $generator->generateString(Inflector::pluralize(Inflector::camel2words(StringHelper::basename($generator->modelClass)))) ?>;
$this->params['breadcrumbs'][] = $this->title;
?>
<div class="<?php echo Inflector::camel2id(StringHelper::basename($generator->modelClass)) ?>-index">
<div class="<?= Inflector::camel2id(StringHelper::basename($generator->modelClass)) ?>-index">
<?php if(!empty($generator->searchModelClass)): ?>
<?php echo " <?php " . ($generator->indexWidgetType === 'grid' ? "// " : "") ?>echo $this->render('_search', ['model' => $searchModel]); ?>
<?= " <?php " . ($generator->indexWidgetType === 'grid' ? "// " : "") ?>echo $this->render('_search', ['model' => $searchModel]); ?>
<?php endif; ?>
<p>
<?php echo "<?php echo " ?>Html::a(<?php echo $generator->generateString('Create {modelClass}', ['modelClass' => Inflector::camel2words(StringHelper::basename($generator->modelClass))]) ?>, ['create'], ['class' => 'btn btn-success']) ?>
<?= "<?= " ?>Html::a(<?= $generator->generateString('Create {modelClass}', ['modelClass' => Inflector::camel2words(StringHelper::basename($generator->modelClass))]) ?>, ['create'], ['class' => 'btn btn-success']) ?>
</p>
<?php if ($generator->indexWidgetType === 'grid'): ?>
<?php echo "<?php echo " ?>GridView::widget([
<?= "<?= " ?>GridView::widget([
'dataProvider' => $dataProvider,
<?php echo !empty($generator->searchModelClass) ? "'filterModel' => \$searchModel,\n 'columns' => [\n" : "'columns' => [\n"; ?>
<?= !empty($generator->searchModelClass) ? "'filterModel' => \$searchModel,\n 'columns' => [\n" : "'columns' => [\n"; ?>
['class' => 'yii\grid\SerialColumn'],
<?php
......@@ -64,11 +64,11 @@ if (($tableSchema = $generator->getTableSchema()) === false) {
],
]); ?>
<?php else: ?>
<?php echo "<?php echo " ?>ListView::widget([
<?= "<?= " ?>ListView::widget([
'dataProvider' => $dataProvider,
'itemOptions' => ['class' => 'item'],
'itemView' => function ($model, $key, $index, $widget) {
return Html::a(Html::encode($model-><?php echo $nameAttribute ?>), ['view', <?php echo $urlParams ?>]);
return Html::a(Html::encode($model-><?= $nameAttribute ?>), ['view', <?= $urlParams ?>]);
},
]) ?>
<?php endif; ?>
......
backend/views/_gii/templates/views/update.php
......@@ -14,16 +14,16 @@ echo "<?php\n";
use yii\helpers\Html;
/* @var $this yii\web\View */
/* @var $model <?php echo ltrim($generator->modelClass, '\\') ?> */
/* @var $model <?= ltrim($generator->modelClass, '\\') ?> */
$this->title = <?php echo $generator->generateString('Update {modelClass}: ', ['modelClass' => Inflector::camel2words(StringHelper::basename($generator->modelClass))]) ?> . ' ' . $model-><?php echo $generator->getNameAttribute() ?>;
$this->params['breadcrumbs'][] = ['label' => <?php echo $generator->generateString(Inflector::pluralize(Inflector::camel2words(StringHelper::basename($generator->modelClass)))) ?>, 'url' => ['index']];
$this->params['breadcrumbs'][] = ['label' => $model-><?php echo $generator->getNameAttribute() ?>, 'url' => ['view', <?php echo $urlParams ?>]];
$this->params['breadcrumbs'][] = <?php echo $generator->generateString('Update') ?>;
$this->title = <?= $generator->generateString('Update {modelClass}: ', ['modelClass' => Inflector::camel2words(StringHelper::basename($generator->modelClass))]) ?> . ' ' . $model-><?= $generator->getNameAttribute() ?>;
$this->params['breadcrumbs'][] = ['label' => <?= $generator->generateString(Inflector::pluralize(Inflector::camel2words(StringHelper::basename($generator->modelClass)))) ?>, 'url' => ['index']];
$this->params['breadcrumbs'][] = ['label' => $model-><?= $generator->getNameAttribute() ?>, 'url' => ['view', <?= $urlParams ?>]];
$this->params['breadcrumbs'][] = <?= $generator->generateString('Update') ?>;
?>
<div class="<?php echo Inflector::camel2id(StringHelper::basename($generator->modelClass)) ?>-update">
<div class="<?= Inflector::camel2id(StringHelper::basename($generator->modelClass)) ?>-update">
<?php echo "<?php echo " ?>$this->render('_form', [
<?= "<?= " ?>$this->render('_form', [
'model' => $model,
]) ?>
......
backend/views/_gii/templates/views/view.php
......@@ -15,26 +15,26 @@ use yii\helpers\Html;
use yii\widgets\DetailView;
/* @var $this yii\web\View */
/* @var $model <?php echo ltrim($generator->modelClass, '\\') ?> */
/* @var $model <?= ltrim($generator->modelClass, '\\') ?> */
$this->title = $model-><?php echo $generator->getNameAttribute() ?>;
$this->params['breadcrumbs'][] = ['label' => <?php echo $generator->generateString(Inflector::pluralize(Inflector::camel2words(StringHelper::basename($generator->modelClass)))) ?>, 'url' => ['index']];
$this->title = $model-><?= $generator->getNameAttribute() ?>;
$this->params['breadcrumbs'][] = ['label' => <?= $generator->generateString(Inflector::pluralize(Inflector::camel2words(StringHelper::basename($generator->modelClass)))) ?>, 'url' => ['index']];
$this->params['breadcrumbs'][] = $this->title;
?>
<div class="<?php echo Inflector::camel2id(StringHelper::basename($generator->modelClass)) ?>-view">
<div class="<?= Inflector::camel2id(StringHelper::basename($generator->modelClass)) ?>-view">
<p>
<?php echo "<?php echo " ?>Html::a(<?php echo $generator->generateString('Update') ?>, ['update', <?php echo $urlParams ?>], ['class' => 'btn btn-primary']) ?>
<?php echo "<?php echo " ?>Html::a(<?php echo $generator->generateString('Delete') ?>, ['delete', <?php echo $urlParams ?>], [
<?= "<?= " ?>Html::a(<?= $generator->generateString('Update') ?>, ['update', <?= $urlParams ?>], ['class' => 'btn btn-primary']) ?>
<?= "<?= " ?>Html::a(<?= $generator->generateString('Delete') ?>, ['delete', <?= $urlParams ?>], [
'class' => 'btn btn-danger',
'data' => [
'confirm' => <?php echo $generator->generateString('Are you sure you want to delete this item?') ?>,
'confirm' => <?= $generator->generateString('Are you sure you want to delete this item?') ?>,
'method' => 'post',
],
]) ?>
</p>
<?php echo "<?php echo " ?>DetailView::widget([
<?= "<?= " ?>DetailView::widget([
'model' => $model,
'attributes' => [
<?php
......
backend/views/article-category/_form.php
......@@ -13,18 +13,18 @@ use yii\bootstrap\ActiveForm;
<?php $form = ActiveForm::begin(); ?>
<?php echo $form->field($model, 'title')->textInput(['maxlength' => 512]) ?>
<?= $form->field($model, 'title')->textInput(['maxlength' => 512]) ?>
<?php echo $form->field($model, 'slug')
<?= $form->field($model, 'slug')
->hint(Yii::t('backend', 'If you\'ll leave this field empty, slug will be generated automatically'))
->textInput(['maxlength' => 1024]) ?>
<?php echo $form->field($model, 'parent_id')->dropDownList($categories, ['prompt'=>'']) ?>
<?= $form->field($model, 'parent_id')->dropDownList($categories, ['prompt'=>'']) ?>
<?php echo $form->field($model, 'status')->checkbox() ?>
<?= $form->field($model, 'status')->checkbox() ?>
<div class="form-group">
<?php echo Html::submitButton($model->isNewRecord ? Yii::t('backend', 'Create') : Yii::t('backend', 'Update'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
<?= Html::submitButton($model->isNewRecord ? Yii::t('backend', 'Create') : Yii::t('backend', 'Update'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
</div>
<?php ActiveForm::end(); ?>
......
backend/views/article-category/_search.php
......@@ -15,17 +15,17 @@ use yii\bootstrap\ActiveForm;
'method' => 'get',
]); ?>
<?php echo $form->field($model, 'id') ?>
<?= $form->field($model, 'id') ?>
<?php echo $form->field($model, 'slug') ?>
<?= $form->field($model, 'slug') ?>
<?php echo $form->field($model, 'title') ?>
<?= $form->field($model, 'title') ?>
<?php echo $form->field($model, 'status') ?>
<?= $form->field($model, 'status') ?>
<div class="form-group">
<?php echo Html::submitButton(Yii::t('backend', 'Search'), ['class' => 'btn btn-primary']) ?>
<?php echo Html::resetButton(Yii::t('backend', 'Reset'), ['class' => 'btn btn-default']) ?>
<?= Html::submitButton(Yii::t('backend', 'Search'), ['class' => 'btn btn-primary']) ?>
<?= Html::resetButton(Yii::t('backend', 'Reset'), ['class' => 'btn btn-default']) ?>
</div>
<?php ActiveForm::end(); ?>
......
backend/views/article-category/create.php
......@@ -11,7 +11,7 @@ $this->params['breadcrumbs'][] = $this->title;
?>
<div class="article-category-create">
<?php echo $this->render('_form', [
<?= $this->render('_form', [
'model' => $model,
'categories' => $categories
]) ?>
......
backend/views/article-category/index.php
......@@ -15,12 +15,12 @@ $this->params['breadcrumbs'][] = $this->title;
<?php // echo $this->render('_search', ['model' => $searchModel]); ?>
<p>
<?php echo Html::a(Yii::t('backend', 'Create {modelClass}', [
<?= Html::a(Yii::t('backend', 'Create {modelClass}', [
'modelClass' => 'Article Category',
]), ['create'], ['class' => 'btn btn-success']) ?>
</p>
<?php echo GridView::widget([
<?= GridView::widget([
'dataProvider' => $dataProvider,
'filterModel' => $searchModel,
'options' => [
......
backend/views/article-category/update.php
......@@ -14,7 +14,7 @@ $this->params['breadcrumbs'][] = Yii::t('backend', 'Update');
?>
<div class="article-category-update">
<?php echo $this->render('_form', [
<?= $this->render('_form', [
'model' => $model,
'categories' => $categories,
]) ?>
......
backend/views/article-category/view.php
......@@ -13,8 +13,8 @@ $this->params['breadcrumbs'][] = $this->title;
<div class="article-category-view">
<p>
<?php echo Html::a(Yii::t('backend', 'Update'), ['update', 'id' => $model->id], ['class' => 'btn btn-primary']) ?>
<?php echo Html::a(Yii::t('backend', 'Delete'), ['delete', 'id' => $model->id], [
<?= Html::a(Yii::t('backend', 'Update'), ['update', 'id' => $model->id], ['class' => 'btn btn-primary']) ?>
<?= Html::a(Yii::t('backend', 'Delete'), ['delete', 'id' => $model->id], [
'class' => 'btn btn-danger',
'data' => [
'confirm' => Yii::t('backend', 'Are you sure you want to delete this item?'),
......@@ -23,7 +23,7 @@ $this->params['breadcrumbs'][] = $this->title;
]) ?>
</p>
<?php echo DetailView::widget([
<?= DetailView::widget([
'model' => $model,
'attributes' => [
'id',
......
backend/views/article/_form.php
......@@ -15,19 +15,19 @@ use yii\bootstrap\ActiveForm;
<?php $form = ActiveForm::begin(); ?>
<?php echo $form->field($model, 'title')->textInput(['maxlength' => true]) ?>
<?= $form->field($model, 'title')->textInput(['maxlength' => true]) ?>
<?php echo $form->field($model, 'slug')
<?= $form->field($model, 'slug')
->hint(Yii::t('backend', 'If you\'ll leave this field empty, slug will be generated automatically'))
->textInput(['maxlength' => true]) ?>
<?php echo $form->field($model, 'category_id')->dropDownList(\yii\helpers\ArrayHelper::map(
<?= $form->field($model, 'category_id')->dropDownList(\yii\helpers\ArrayHelper::map(
$categories,
'id',
'title'
), ['prompt'=>'']) ?>
<?php echo $form->field($model, 'body')->widget(
<?= $form->field($model, 'body')->widget(
\yii\imperavi\Widget::className(),
[
'plugins' => ['fullscreen', 'fontcolor', 'video'],
......@@ -42,7 +42,7 @@ use yii\bootstrap\ActiveForm;
]
) ?>
<?php echo $form->field($model, 'thumbnail')->widget(
<?= $form->field($model, 'thumbnail')->widget(
Upload::className(),
[
'url' => ['/file-storage/upload'],
......@@ -50,7 +50,7 @@ use yii\bootstrap\ActiveForm;
]);
?>
<?php echo $form->field($model, 'attachments')->widget(
<?= $form->field($model, 'attachments')->widget(
Upload::className(),
[
'url' => ['/file-storage/upload'],
......@@ -60,11 +60,11 @@ use yii\bootstrap\ActiveForm;
]);
?>
<?php echo $form->field($model, 'view')->textInput(['maxlength' => true]) ?>
<?= $form->field($model, 'view')->textInput(['maxlength' => true]) ?>
<?php echo $form->field($model, 'status')->checkbox() ?>
<?= $form->field($model, 'status')->checkbox() ?>
<?php echo $form->field($model, 'published_at')->widget(
<?= $form->field($model, 'published_at')->widget(
DateTimeWidget::className(),
[
'phpDatetimeFormat' => 'yyyy-MM-dd\'T\'HH:mm:ssZZZZZ'
......@@ -72,7 +72,7 @@ use yii\bootstrap\ActiveForm;
) ?>
<div class="form-group">
<?php echo Html::submitButton(
<?= Html::submitButton(
$model->isNewRecord ? Yii::t('backend', 'Create') : Yii::t('backend', 'Update'),
['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
</div>
......
backend/views/article/_search.php
......@@ -15,15 +15,15 @@ use yii\bootstrap\ActiveForm;
'method' => 'get',
]); ?>
<?php echo $form->field($model, 'id') ?>
<?= $form->field($model, 'id') ?>
<?php echo $form->field($model, 'slug') ?>
<?= $form->field($model, 'slug') ?>
<?php echo $form->field($model, 'title') ?>
<?= $form->field($model, 'title') ?>
<?php echo $form->field($model, 'body') ?>
<?= $form->field($model, 'body') ?>
<?php echo $form->field($model, 'user_id') ?>
<?= $form->field($model, 'user_id') ?>
<?php // echo $form->field($model, 'status') ?>
......@@ -34,8 +34,8 @@ use yii\bootstrap\ActiveForm;
<?php // echo $form->field($model, 'updated_at') ?>
<div class="form-group">
<?php echo Html::submitButton(Yii::t('backend', 'Search'), ['class' => 'btn btn-primary']) ?>
<?php echo Html::resetButton(Yii::t('backend', 'Reset'), ['class' => 'btn btn-default']) ?>
<?= Html::submitButton(Yii::t('backend', 'Search'), ['class' => 'btn btn-primary']) ?>
<?= Html::resetButton(Yii::t('backend', 'Reset'), ['class' => 'btn btn-default']) ?>
</div>
<?php ActiveForm::end(); ?>
......
backend/views/article/create.php
......@@ -11,7 +11,7 @@ $this->params['breadcrumbs'][] = $this->title;
?>
<div class="article-create">
<?php echo $this->render('_form', [
<?= $this->render('_form', [
'model' => $model,
'categories' => $categories
]) ?>
......
backend/views/article/update.php
......@@ -13,7 +13,7 @@ $this->params['breadcrumbs'][] = Yii::t('backend', 'Update');
?>
<div class="article-update">
<?php echo $this->render('_form', [
<?= $this->render('_form', [
'model' => $model,
'categories' => $categories,
]) ?>
......
backend/views/cache/index.php
......@@ -11,7 +11,7 @@ $this->params['breadcrumbs'][] = $this->title;
?>
<div class="article-index">
<?php echo GridView::widget([
<?= GridView::widget([
'dataProvider' => $dataProvider,
'columns' => [
'name',
......@@ -33,32 +33,32 @@ $this->params['breadcrumbs'][] = $this->title;
<div class="row">
<div class="col-xs-6">
<h4><?php echo Yii::t('backend', 'Delete a value with the specified key from cache') ?></h4>
<h4><?= Yii::t('backend', 'Delete a value with the specified key from cache') ?></h4>
<?php \yii\bootstrap\ActiveForm::begin([
'action'=>\yii\helpers\Url::to('flush-cache-key'),
'method'=>'get',
'layout'=>'inline',
]) ?>
<?php echo Html::dropDownList(
<?= Html::dropDownList(
'id', null, \yii\helpers\ArrayHelper::map($dataProvider->allModels, 'name', 'name'),
['class'=>'form-control', 'prompt'=> Yii::t('backend', 'Select cache')])
?>
<?php echo Html::input('string', 'key', null, ['class'=>'form-control', 'placeholder' => Yii::t('backend', 'Key')]) ?>
<?php echo Html::submitButton(Yii::t('backend', 'Flush'), ['class'=>'btn btn-danger']) ?>
<?= Html::input('string', 'key', null, ['class'=>'form-control', 'placeholder' => Yii::t('backend', 'Key')]) ?>
<?= Html::submitButton(Yii::t('backend', 'Flush'), ['class'=>'btn btn-danger']) ?>
<?php \yii\bootstrap\ActiveForm::end() ?>
</div>
<div class="col-xs-6">
<h4><?php echo Yii::t('backend', 'Invalidate tag') ?></h4>
<h4><?= Yii::t('backend', 'Invalidate tag') ?></h4>
<?php \yii\bootstrap\ActiveForm::begin([
'action'=>\yii\helpers\Url::to('flush-cache-tag'),
'method'=>'get',
'layout'=>'inline'
]) ?>
<?php echo Html::dropDownList(
<?= Html::dropDownList(
'id', null, \yii\helpers\ArrayHelper::map($dataProvider->allModels, 'name', 'name'),
['class'=>'form-control', 'prompt'=> Yii::t('backend', 'Select cache')]) ?>
<?php echo Html::input('string', 'tag', null, ['class'=>'form-control', 'placeholder' => Yii::t('backend', 'Tag')]) ?>
<?php echo Html::submitButton(Yii::t('backend', 'Flush'), ['class'=>'btn btn-danger']) ?>
<?= Html::input('string', 'tag', null, ['class'=>'form-control', 'placeholder' => Yii::t('backend', 'Tag')]) ?>
<?= Html::submitButton(Yii::t('backend', 'Flush'), ['class'=>'btn btn-danger']) ?>
<?php \yii\bootstrap\ActiveForm::end() ?>
</div>
</div>
......
backend/views/file-manager/index.php
......@@ -5,7 +5,7 @@ $this->title = Yii::t('backend', 'File Manager')
<div class="row">
<div class="col-xs-12">
<?php echo \mihaildev\elfinder\ElFinder::widget([
<?= \mihaildev\elfinder\ElFinder::widget([
'controller' => 'file-manager-elfinder',
'frameOptions' => ['style'=>'min-height: 500px; width: 100%; border: 0'],
]);
......
backend/views/file-storage/_search.php
......@@ -15,15 +15,15 @@ use yii\bootstrap\ActiveForm;
'method' => 'get',
]); ?>
<?php echo $form->field($model, 'id') ?>
<?= $form->field($model, 'id') ?>
<?php echo $form->field($model, 'component') ?>
<?= $form->field($model, 'component') ?>
<?php echo $form->field($model, 'base_url') ?>
<?= $form->field($model, 'base_url') ?>
<?php echo $form->field($model, 'path') ?>
<?= $form->field($model, 'path') ?>
<?php echo $form->field($model, 'type') ?>
<?= $form->field($model, 'type') ?>
<?php // echo $form->field($model, 'size') ?>
......@@ -34,8 +34,8 @@ use yii\bootstrap\ActiveForm;
<?php // echo $form->field($model, 'created_at') ?>
<div class="form-group">
<?php echo Html::submitButton(Yii::t('backend', 'Search'), ['class' => 'btn btn-primary']) ?>
<?php echo Html::resetButton(Yii::t('backend', 'Reset'), ['class' => 'btn btn-default']) ?>
<?= Html::submitButton(Yii::t('backend', 'Search'), ['class' => 'btn btn-primary']) ?>
<?= Html::resetButton(Yii::t('backend', 'Reset'), ['class' => 'btn btn-default']) ?>
</div>
<?php ActiveForm::end(); ?>
......
backend/views/file-storage/index.php
......@@ -20,10 +20,10 @@ $this->params['breadcrumbs'][] = $this->title;
<div class="col-xs-12">
<dl>
<dt>
<?php echo Yii::t('backend', 'Used size') ?>:
<?= Yii::t('backend', 'Used size') ?>:
</dt>
<dd>
<?php echo Yii::$app->formatter->asSize($totalSize); ?>
<?= Yii::$app->formatter->asSize($totalSize); ?>
</dd>
</dl>
</div>
......@@ -33,10 +33,10 @@ $this->params['breadcrumbs'][] = $this->title;
<div class="col-xs-12">
<dl>
<dt>
<?php echo Yii::t('backend', 'Count') ?>:
<?= Yii::t('backend', 'Count') ?>:
</dt>
<dd>
<?php echo $dataProvider->totalCount ?>
<?= $dataProvider->totalCount ?>
</dd>
</dl>
</div>
......@@ -44,7 +44,7 @@ $this->params['breadcrumbs'][] = $this->title;
</div>
</div>
<?php echo GridView::widget([
<?= GridView::widget([
'dataProvider' => $dataProvider,
'filterModel' => $searchModel,
'options' => [
......
backend/views/file-storage/view.php
......@@ -13,8 +13,8 @@ $this->params['breadcrumbs'][] = $this->title;
<div class="file-storage-item-view">
<p>
<?php echo Html::a(Yii::t('backend', 'Update'), ['update', 'id' => $model->id], ['class' => 'btn btn-primary']) ?>
<?php echo Html::a(Yii::t('backend', 'Delete'), ['delete', 'id' => $model->id], [
<?= Html::a(Yii::t('backend', 'Update'), ['update', 'id' => $model->id], ['class' => 'btn btn-primary']) ?>
<?= Html::a(Yii::t('backend', 'Delete'), ['delete', 'id' => $model->id], [
'class' => 'btn btn-danger',
'data' => [
'confirm' => Yii::t('backend', 'Are you sure you want to delete this item?'),
......@@ -23,7 +23,7 @@ $this->params['breadcrumbs'][] = $this->title;
]) ?>
</p>
<?php echo DetailView::widget([
<?= DetailView::widget([
'model' => $model,
'attributes' => [
'id',
......
backend/views/key-storage/_form.php
......@@ -12,14 +12,14 @@ use yii\bootstrap\ActiveForm;
<?php $form = ActiveForm::begin(); ?>
<?php echo $form->field($model, 'key')->textInput() ?>
<?= $form->field($model, 'key')->textInput() ?>
<?php echo $form->field($model, 'value')->textInput() ?>
<?= $form->field($model, 'value')->textInput() ?>
<?php echo $form->field($model, 'comment')->textarea() ?>
<?= $form->field($model, 'comment')->textarea() ?>
<div class="form-group">
<?php echo Html::submitButton($model->isNewRecord ? Yii::t('backend', 'Create') : Yii::t('backend', 'Update'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
<?= Html::submitButton($model->isNewRecord ? Yii::t('backend', 'Create') : Yii::t('backend', 'Update'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
</div>
<?php ActiveForm::end(); ?>
......
backend/views/key-storage/create.php
......@@ -10,7 +10,7 @@ $this->params['breadcrumbs'][] = $this->title;
?>
<div class="key-storage-item-create">
<?php echo $this->render('_form', [
<?= $this->render('_form', [
'model' => $model
]) ?>
......
backend/views/key-storage/index.php
......@@ -15,12 +15,12 @@ $this->params['breadcrumbs'][] = $this->title;
<?php // echo $this->render('_search', ['model' => $searchModel]); ?>
<p>
<?php echo Html::a(Yii::t('backend', 'Create {modelClass}', [
<?= Html::a(Yii::t('backend', 'Create {modelClass}', [
'modelClass' => 'Key Storage Item',
]), ['create'], ['class' => 'btn btn-success']) ?>
</p>
<?php echo GridView::widget([
<?= GridView::widget([
'dataProvider' => $dataProvider,
'filterModel' => $searchModel,
'options' => [
......
backend/views/key-storage/update.php
......@@ -13,7 +13,7 @@ $this->params['breadcrumbs'][] = Yii::t('backend', 'Update');
?>
<div class="key-storage-item-update">
<?php echo $this->render('_form', [
<?= $this->render('_form', [
'model' => $model,
]) ?>
......
backend/views/layouts/base.php
......@@ -15,17 +15,17 @@ $this->params['body-class'] = array_key_exists('body-class', $this->params) ?
<?php $this->beginPage() ?>
<!DOCTYPE html>
<html lang="<?php echo Yii::$app->language ?>">
<html lang="<?= Yii::$app->language ?>">
<head>
<meta charset="<?php echo Yii::$app->charset ?>">
<meta charset="<?= Yii::$app->charset ?>">
<meta content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no' name='viewport'>
<?php echo Html::csrfMetaTags() ?>
<title><?php echo Html::encode($this->title) ?></title>
<?= Html::csrfMetaTags() ?>
<title><?= Html::encode($this->title) ?></title>
<?php $this->head() ?>
</head>
<?php echo Html::beginTag('body', [
<?= Html::beginTag('body', [
'class' => implode(' ', [
ArrayHelper::getValue($this->params, 'body-class'),
Yii::$app->keyStorage->get('backend.theme-skin', 'skin-blue'),
......@@ -35,8 +35,8 @@ $this->params['body-class'] = array_key_exists('body-class', $this->params) ?
])
])?>
<?php $this->beginBody() ?>
<?php echo $content ?>
<?= $content ?>
<?php $this->endBody() ?>
<?php echo Html::endTag('body') ?>
<?= Html::endTag('body') ?>
</html>
<?php $this->endPage() ?>
\ No newline at end of file
backend/views/layouts/common.php
......@@ -16,15 +16,15 @@ $bundle = BackendAsset::register($this);
<div class="wrapper">
<!-- header logo: style can be found in header.less -->
<header class="main-header">
<a href="<?php echo Yii::getAlias('@frontendUrl') ?>" class="logo">
<a href="<?= Yii::getAlias('@frontendUrl') ?>" class="logo">
<!-- Add the class icon to your logo image or logo icon to add the margining -->
<?php echo Yii::$app->name ?>
<?= Yii::$app->name ?>
</a>
<!-- Header Navbar: style can be found in header.less -->
<nav class="navbar navbar-static-top" role="navigation">
<!-- Sidebar toggle button-->
<a href="#" class="sidebar-toggle" data-toggle="offcanvas" role="button">
<span class="sr-only"><?php echo Yii::t('backend', 'Toggle navigation') ?></span>
<span class="sr-only"><?= Yii::t('backend', 'Toggle navigation') ?></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
......@@ -32,10 +32,10 @@ $bundle = BackendAsset::register($this);
<div class="navbar-custom-menu">
<ul class="nav navbar-nav">
<li id="timeline-notifications" class="notifications-menu">
<a href="<?php echo Url::to(['/timeline-event/index']) ?>">
<a href="<?= Url::to(['/timeline-event/index']) ?>">
<i class="fa fa-bell"></i>
<span class="label label-success">
<?php echo TimelineEvent::find()->today()->count() ?>
<?= TimelineEvent::find()->today()->count() ?>
</span>
</a>
</li>
......@@ -44,61 +44,61 @@ $bundle = BackendAsset::register($this);
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
<i class="fa fa-warning"></i>
<span class="label label-danger">
<?php echo \backend\models\SystemLog::find()->count() ?>
<?= \backend\models\SystemLog::find()->count() ?>
</span>
</a>
<ul class="dropdown-menu">
<li class="header"><?php echo Yii::t('backend', 'You have {num} log items', ['num'=>\backend\models\SystemLog::find()->count()]) ?></li>
<li class="header"><?= Yii::t('backend', 'You have {num} log items', ['num'=>\backend\models\SystemLog::find()->count()]) ?></li>
<li>
<!-- inner menu: contains the actual data -->
<ul class="menu">
<?php foreach(\backend\models\SystemLog::find()->orderBy(['log_time'=>SORT_DESC])->limit(5)->all() as $logEntry): ?>
<li>
<a href="<?php echo Yii::$app->urlManager->createUrl(['/log/view', 'id'=>$logEntry->id]) ?>">
<i class="fa fa-warning <?php echo $logEntry->level == \yii\log\Logger::LEVEL_ERROR ? 'text-red' : 'text-yellow' ?>"></i>
<?php echo $logEntry->category ?>
<a href="<?= Yii::$app->urlManager->createUrl(['/log/view', 'id'=>$logEntry->id]) ?>">
<i class="fa fa-warning <?= $logEntry->level == \yii\log\Logger::LEVEL_ERROR ? 'text-red' : 'text-yellow' ?>"></i>
<?= $logEntry->category ?>
</a>
</li>
<?php endforeach; ?>
</ul>
</li>
<li class="footer">
<?php echo Html::a(Yii::t('backend', 'View all'), ['/log/index']) ?>
<?= Html::a(Yii::t('backend', 'View all'), ['/log/index']) ?>
</li>
</ul>
</li>
<!-- User Account: style can be found in dropdown.less -->
<li class="dropdown user user-menu">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
<img src="<?php echo Yii::$app->user->identity->userProfile->getAvatar($this->assetManager->getAssetUrl($bundle, 'img/anonymous.jpg')) ?>" class="user-image">
<span><?php echo Yii::$app->user->identity->username ?> <i class="caret"></i></span>
<img src="<?= Yii::$app->user->identity->userProfile->getAvatar($this->assetManager->getAssetUrl($bundle, 'img/anonymous.jpg')) ?>" class="user-image">
<span><?= Yii::$app->user->identity->username ?> <i class="caret"></i></span>
</a>
<ul class="dropdown-menu">
<!-- User image -->
<li class="user-header light-blue">
<img src="<?php echo Yii::$app->user->identity->userProfile->getAvatar($this->assetManager->getAssetUrl($bundle, 'img/anonymous.jpg')) ?>" class="img-circle" alt="User Image" />
<img src="<?= Yii::$app->user->identity->userProfile->getAvatar($this->assetManager->getAssetUrl($bundle, 'img/anonymous.jpg')) ?>" class="img-circle" alt="User Image" />
<p>
<?php echo Yii::$app->user->identity->username ?>
<?= Yii::$app->user->identity->username ?>
<small>
<?php echo Yii::t('backend', 'Member since {0, date, short}', Yii::$app->user->identity->created_at) ?>
<?= Yii::t('backend', 'Member since {0, date, short}', Yii::$app->user->identity->created_at) ?>
</small>
</li>
<!-- Menu Footer-->
<li class="user-footer">
<div class="pull-left">
<?php echo Html::a(Yii::t('backend', 'Profile'), ['/sign-in/profile'], ['class'=>'btn btn-default btn-flat']) ?>
<?= Html::a(Yii::t('backend', 'Profile'), ['/sign-in/profile'], ['class'=>'btn btn-default btn-flat']) ?>
</div>
<div class="pull-left">
<?php echo Html::a(Yii::t('backend', 'Account'), ['/sign-in/account'], ['class'=>'btn btn-default btn-flat']) ?>
<?= Html::a(Yii::t('backend', 'Account'), ['/sign-in/account'], ['class'=>'btn btn-default btn-flat']) ?>
</div>
<div class="pull-right">
<?php echo Html::a(Yii::t('backend', 'Logout'), ['/sign-in/logout'], ['class'=>'btn btn-default btn-flat', 'data-method' => 'post']) ?>
<?= Html::a(Yii::t('backend', 'Logout'), ['/sign-in/logout'], ['class'=>'btn btn-default btn-flat', 'data-method' => 'post']) ?>
</div>
</li>
</ul>
</li>
<li>
<?php echo Html::a('<i class="fa fa-cogs"></i>', ['/site/settings'])?>
<?= Html::a('<i class="fa fa-cogs"></i>', ['/site/settings'])?>
</li>
</ul>
</div>
......@@ -111,18 +111,18 @@ $bundle = BackendAsset::register($this);
<!-- Sidebar user panel -->
<div class="user-panel">
<div class="pull-left image">
<img src="<?php echo Yii::$app->user->identity->userProfile->getAvatar($this->assetManager->getAssetUrl($bundle, 'img/anonymous.jpg')) ?>" class="img-circle" />
<img src="<?= Yii::$app->user->identity->userProfile->getAvatar($this->assetManager->getAssetUrl($bundle, 'img/anonymous.jpg')) ?>" class="img-circle" />
</div>
<div class="pull-left info">
<p><?php echo Yii::t('backend', 'Hello, {username}', ['username'=>Yii::$app->user->identity->getPublicIdentity()]) ?></p>
<a href="<?php echo Url::to(['/sign-in/profile']) ?>">
<p><?= Yii::t('backend', 'Hello, {username}', ['username'=>Yii::$app->user->identity->getPublicIdentity()]) ?></p>
<a href="<?= Url::to(['/sign-in/profile']) ?>">
<i class="fa fa-circle text-success"></i>
<?php echo Yii::$app->formatter->asDatetime(time()) ?>
<?= Yii::$app->formatter->asDatetime(time()) ?>
</a>
</div>
</div>
<!-- sidebar menu: : style can be found in sidebar.less -->
<?php echo Menu::widget([
<?= Menu::widget([
'options'=>['class'=>'sidebar-menu'],
'linkTemplate' => '<a href="{url}">{icon}<span>{label}</span>{right-icon}{badge}</a>',
'submenuTemplate'=>"\n<ul class=\"treeview-menu\">\n{items}\n</ul>\n",
......@@ -214,13 +214,13 @@ $bundle = BackendAsset::register($this);
<!-- Content Header (Page header) -->
<section class="content-header">
<h1>
<?php echo $this->title ?>
<?= $this->title ?>
<?php if (isset($this->params['subtitle'])): ?>
<small><?php echo $this->params['subtitle'] ?></small>
<small><?= $this->params['subtitle'] ?></small>
<?php endif; ?>
</h1>
<?php echo Breadcrumbs::widget([
<?= Breadcrumbs::widget([
'tag'=>'ol',
'links' => isset($this->params['breadcrumbs']) ? $this->params['breadcrumbs'] : [],
]) ?>
......@@ -229,12 +229,12 @@ $bundle = BackendAsset::register($this);
<!-- Main content -->
<section class="content">
<?php if (Yii::$app->session->hasFlash('alert')):?>
<?php echo \yii\bootstrap\Alert::widget([
<?= \yii\bootstrap\Alert::widget([
'body'=>ArrayHelper::getValue(Yii::$app->session->getFlash('alert'), 'body'),
'options'=>ArrayHelper::getValue(Yii::$app->session->getFlash('alert'), 'options'),
])?>
<?php endif; ?>
<?php echo $content ?>
<?= $content ?>
</section><!-- /.content -->
</aside><!-- /.right-side -->
</div><!-- ./wrapper -->
......
backend/views/layouts/main.php
......@@ -6,7 +6,7 @@
<?php $this->beginContent('@backend/views/layouts/common.php'); ?>
<div class="box">
<div class="box-body">
<?php echo $content ?>
<?= $content ?>
</div>
</div>
<?php $this->endContent(); ?>
\ No newline at end of file
backend/views/log/_search.php
......@@ -15,21 +15,21 @@ use yii\bootstrap\ActiveForm;
'method' => 'get',
]); ?>
<?php echo $form->field($model, 'id') ?>
<?= $form->field($model, 'id') ?>
<?php echo $form->field($model, 'level') ?>
<?= $form->field($model, 'level') ?>
<?php echo $form->field($model, 'category') ?>
<?= $form->field($model, 'category') ?>
<?php echo $form->field($model, 'log_time') ?>
<?= $form->field($model, 'log_time') ?>
<?php echo $form->field($model, 'prefix') ?>
<?= $form->field($model, 'prefix') ?>
<?php echo $form->field($model, 'message') ?>
<?= $form->field($model, 'message') ?>
<div class="form-group">
<?php echo Html::submitButton(Yii::t('backend', 'Search'), ['class' => 'btn btn-primary']) ?>
<?php echo Html::resetButton(Yii::t('backend', 'Reset'), ['class' => 'btn btn-default']) ?>
<?= Html::submitButton(Yii::t('backend', 'Search'), ['class' => 'btn btn-primary']) ?>
<?= Html::resetButton(Yii::t('backend', 'Reset'), ['class' => 'btn btn-default']) ?>
</div>
<?php ActiveForm::end(); ?>
......
backend/views/log/index.php
......@@ -13,12 +13,12 @@ $this->params['breadcrumbs'][] = $this->title;
<div class="system-log-index">
<p>
<?php echo Html::a(Yii::t('backend', 'Clear'), false, ['class' => 'btn btn-danger', 'data-method'=>'delete']) ?>
<?= Html::a(Yii::t('backend', 'Clear'), false, ['class' => 'btn btn-danger', 'data-method'=>'delete']) ?>
</p>
<?php // echo $this->render('_search', ['model' => $searchModel]); ?>
<?php echo GridView::widget([
<?= GridView::widget([
'dataProvider' => $dataProvider,
'filterModel' => $searchModel,
'options' => [
......
backend/views/log/view.php
......@@ -13,10 +13,10 @@ $this->params['breadcrumbs'][] = $this->title;
<div class="system-log-view">
<p>
<?php echo Html::a(Yii::t('backend', 'Delete'), ['delete', 'id'=>$model->id], ['class' => 'btn btn-danger', 'data'=>['method'=>'post']]) ?>
<?= Html::a(Yii::t('backend', 'Delete'), ['delete', 'id'=>$model->id], ['class' => 'btn btn-danger', 'data'=>['method'=>'post']]) ?>
</p>
<?php echo DetailView::widget([
<?= DetailView::widget([
'model' => $model,
'attributes' => [
'id',
......
backend/views/page/_form.php
......@@ -12,11 +12,11 @@ use yii\bootstrap\ActiveForm;
<?php $form = ActiveForm::begin(); ?>
<?php echo $form->field($model, 'title')->textInput(['maxlength' => true]) ?>
<?= $form->field($model, 'title')->textInput(['maxlength' => true]) ?>
<?php echo $form->field($model, 'slug')->textInput(['maxlength' => true]) ?>
<?= $form->field($model, 'slug')->textInput(['maxlength' => true]) ?>
<?php echo $form->field($model, 'body')->widget(
<?= $form->field($model, 'body')->widget(
\yii\imperavi\Widget::className(),
[
'plugins' => ['fullscreen', 'fontcolor', 'video'],
......@@ -29,12 +29,12 @@ use yii\bootstrap\ActiveForm;
]
) ?>
<?php echo $form->field($model, 'view')->textInput(['maxlength' => true]) ?>
<?= $form->field($model, 'view')->textInput(['maxlength' => true]) ?>
<?php echo $form->field($model, 'status')->checkbox() ?>
<?= $form->field($model, 'status')->checkbox() ?>
<div class="form-group">
<?php echo Html::submitButton($model->isNewRecord ? Yii::t('backend', 'Create') : Yii::t('backend', 'Update'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
<?= Html::submitButton($model->isNewRecord ? Yii::t('backend', 'Create') : Yii::t('backend', 'Update'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
</div>
<?php ActiveForm::end(); ?>
......
backend/views/page/_search.php
......@@ -15,19 +15,19 @@ use yii\bootstrap\ActiveForm;
'method' => 'get',
]); ?>
<?php echo $form->field($model, 'id') ?>
<?= $form->field($model, 'id') ?>
<?php echo $form->field($model, 'slug') ?>
<?= $form->field($model, 'slug') ?>
<?php echo $form->field($model, 'title') ?>
<?= $form->field($model, 'title') ?>
<?php echo $form->field($model, 'body') ?>
<?= $form->field($model, 'body') ?>
<?php echo $form->field($model, 'status') ?>
<?= $form->field($model, 'status') ?>
<div class="form-group">
<?php echo Html::submitButton(Yii::t('backend', 'Search'), ['class' => 'btn btn-primary']) ?>
<?php echo Html::resetButton(Yii::t('backend', 'Reset'), ['class' => 'btn btn-default']) ?>
<?= Html::submitButton(Yii::t('backend', 'Search'), ['class' => 'btn btn-primary']) ?>
<?= Html::resetButton(Yii::t('backend', 'Reset'), ['class' => 'btn btn-default']) ?>
</div>
<?php ActiveForm::end(); ?>
......
backend/views/page/create.php
......@@ -10,7 +10,7 @@ $this->params['breadcrumbs'][] = $this->title;
?>
<div class="page-create">
<?php echo $this->render('_form', [
<?= $this->render('_form', [
'model' => $model
]) ?>
......
backend/views/page/index.php
......@@ -15,12 +15,12 @@ $this->params['breadcrumbs'][] = $this->title;
<?php // echo $this->render('_search', ['model' => $searchModel]); ?>
<p>
<?php echo Html::a(Yii::t('backend', 'Create {modelClass}', [
<?= Html::a(Yii::t('backend', 'Create {modelClass}', [
'modelClass' => 'Page',
]), ['create'], ['class' => 'btn btn-success']) ?>
</p>
<?php echo GridView::widget([
<?= GridView::widget([
'dataProvider' => $dataProvider,
'filterModel' => $searchModel,
'options' => [
......
backend/views/page/update.php
......@@ -13,7 +13,7 @@ $this->params['breadcrumbs'][] = Yii::t('backend', 'Update');
?>
<div class="page-update">
<?php echo $this->render('_form', [
<?= $this->render('_form', [
'model' => $model,
]) ?>
......
backend/views/sign-in/account.php
......@@ -13,16 +13,16 @@ $this->title = Yii::t('backend', 'Edit account')
<?php $form = ActiveForm::begin(); ?>
<?php echo $form->field($model, 'username') ?>
<?= $form->field($model, 'username') ?>
<?php echo $form->field($model, 'email') ?>
<?= $form->field($model, 'email') ?>
<?php echo $form->field($model, 'password')->passwordInput() ?>
<?= $form->field($model, 'password')->passwordInput() ?>
<?php echo $form->field($model, 'password_confirm')->passwordInput() ?>
<?= $form->field($model, 'password_confirm')->passwordInput() ?>
<div class="form-group">
<?php echo Html::submitButton(Yii::t('backend', 'Update'), ['class' => 'btn btn-primary']) ?>
<?= Html::submitButton(Yii::t('backend', 'Update'), ['class' => 'btn btn-primary']) ?>
</div>
<?php ActiveForm::end(); ?>
......
backend/views/sign-in/login.php
......@@ -12,18 +12,18 @@ $this->params['body-class'] = 'login-page';
?>
<div class="login-box">
<div class="login-logo">
<?php echo Html::encode($this->title) ?>
<?= Html::encode($this->title) ?>
</div><!-- /.login-logo -->
<div class="header"></div>
<div class="login-box-body">
<?php $form = ActiveForm::begin(['id' => 'login-form']); ?>
<div class="body">
<?php echo $form->field($model, 'username') ?>
<?php echo $form->field($model, 'password')->passwordInput() ?>
<?php echo $form->field($model, 'rememberMe')->checkbox(['class'=>'simple']) ?>
<?= $form->field($model, 'username') ?>
<?= $form->field($model, 'password')->passwordInput() ?>
<?= $form->field($model, 'rememberMe')->checkbox(['class'=>'simple']) ?>
</div>
<div class="footer">
<?php echo Html::submitButton(Yii::t('backend', 'Sign me in'), [
<?= Html::submitButton(Yii::t('backend', 'Sign me in'), [
'class' => 'btn btn-primary btn-flat btn-block',
'name' => 'login-button'
]) ?>
......
backend/views/sign-in/profile.php
......@@ -15,25 +15,25 @@ $this->title = Yii::t('backend', 'Edit profile')
<?php $form = ActiveForm::begin(); ?>
<?php echo $form->field($model, 'picture')->widget(\trntv\filekit\widget\Upload::classname(), [
<?= $form->field($model, 'picture')->widget(\trntv\filekit\widget\Upload::classname(), [
'url'=>['avatar-upload']
]) ?>
<?php echo $form->field($model, 'firstname')->textInput(['maxlength' => 255]) ?>
<?= $form->field($model, 'firstname')->textInput(['maxlength' => 255]) ?>
<?php echo $form->field($model, 'middlename')->textInput(['maxlength' => 255]) ?>
<?= $form->field($model, 'middlename')->textInput(['maxlength' => 255]) ?>
<?php echo $form->field($model, 'lastname')->textInput(['maxlength' => 255]) ?>
<?= $form->field($model, 'lastname')->textInput(['maxlength' => 255]) ?>
<?php echo $form->field($model, 'locale')->dropDownlist(Yii::$app->params['availableLocales']) ?>
<?= $form->field($model, 'locale')->dropDownlist(Yii::$app->params['availableLocales']) ?>
<?php echo $form->field($model, 'gender')->dropDownlist([
<?= $form->field($model, 'gender')->dropDownlist([
UserProfile::GENDER_FEMALE => Yii::t('backend', 'Female'),
UserProfile::GENDER_MALE => Yii::t('backend', 'Male')
]) ?>
<div class="form-group">
<?php echo Html::submitButton(Yii::t('backend', 'Update'), ['class' => 'btn btn-primary']) ?>
<?= Html::submitButton(Yii::t('backend', 'Update'), ['class' => 'btn btn-primary']) ?>
</div>
<?php ActiveForm::end(); ?>
......
backend/views/site/error.php
......@@ -15,7 +15,7 @@ $this->title = $name;
<div class="error-content text-center">
<h3 class="headline">
<i class="fa fa-warning text-yellow"></i>
<?php echo Yii::t(
<?= Yii::t(
'backend',
'Error {code}',
[
......@@ -24,7 +24,7 @@ $this->title = $name;
?>
</h3>
<p>
<?php echo nl2br(Html::encode($message)) ?>
<?= nl2br(Html::encode($message)) ?>
</p>
</div>
</div>
......
backend/views/site/settings.php
......@@ -6,7 +6,7 @@ $this->title = Yii::t('backend', 'Application settings');
?>
<div class="box">
<div class="box-body">
<?php echo \common\components\keyStorage\FormWidget::widget([
<?= \common\components\keyStorage\FormWidget::widget([
'model' => $model,
'formClass' => '\yii\bootstrap\ActiveForm',
'submitText' => Yii::t('backend', 'Save'),
......
backend/views/system-information/fail.php
......@@ -6,7 +6,7 @@ use yii\helpers\Html;
$this->title = Yii::t('backend', 'System Information');
?>
<?php echo Yii::t(
<?= Yii::t(
'backend',
'Sorry, application failed to collect information about your system. See {link}.',
['link' => Html::a('trntv/probe', 'https://github.com/trntv/probe#user-content-supported-os')]
......
backend/views/system-information/index.php
......@@ -19,18 +19,18 @@ $this->registerJsFile(
<div class="box box-primary">
<div class="box-header">
<i class="fa fa-hdd-o"></i>
<h3 class="box-title"><?php echo Yii::t('backend', 'Processor') ?></h3>
<h3 class="box-title"><?= Yii::t('backend', 'Processor') ?></h3>
</div><!-- /.box-header -->
<div class="box-body">
<dl class="dl-horizontal">
<dt><?php echo Yii::t('backend', 'Processor') ?></dt>
<dd><?php echo $provider->getCpuModel() ?></dd>
<dt><?= Yii::t('backend', 'Processor') ?></dt>
<dd><?= $provider->getCpuModel() ?></dd>
<dt><?php echo Yii::t('backend', 'Processor Architecture') ?></dt>
<dd><?php echo $provider->getArchitecture() ?></dd>
<dt><?= Yii::t('backend', 'Processor Architecture') ?></dt>
<dd><?= $provider->getArchitecture() ?></dd>
<dt><?php echo Yii::t('backend', 'Number of cores') ?></dt>
<dd><?php echo $provider->getCpuCores() ?></dd>
<dt><?= Yii::t('backend', 'Number of cores') ?></dt>
<dd><?= $provider->getCpuCores() ?></dd>
</dl>
</div><!-- /.box-body -->
</div>
......@@ -39,18 +39,18 @@ $this->registerJsFile(
<div class="box box-primary">
<div class="box-header">
<i class="fa fa-hdd-o"></i>
<h3 class="box-title"><?php echo Yii::t('backend', 'Operating System') ?></h3>
<h3 class="box-title"><?= Yii::t('backend', 'Operating System') ?></h3>
</div><!-- /.box-header -->
<div class="box-body">
<dl class="dl-horizontal">
<dt><?php echo Yii::t('backend', 'OS') ?></dt>
<dd><?php echo $provider->getOsType() ?></dd>
<dt><?= Yii::t('backend', 'OS') ?></dt>
<dd><?= $provider->getOsType() ?></dd>
<dt><?php echo Yii::t('backend', 'OS Release') ?></dt>
<dd><?php echo $provider->getOsRelease() ?></dd>
<dt><?= Yii::t('backend', 'OS Release') ?></dt>
<dd><?= $provider->getOsRelease() ?></dd>
<dt><?php echo Yii::t('backend', 'Kernel version') ?></dt>
<dd><?php echo $provider->getOsKernelVersion() ?></dd>
<dt><?= Yii::t('backend', 'Kernel version') ?></dt>
<dd><?= $provider->getOsKernelVersion() ?></dd>
</dl>
</div><!-- /.box-body -->
</div>
......@@ -59,18 +59,18 @@ $this->registerJsFile(
<div class="box box-primary">
<div class="box-header">
<i class="fa fa-hdd-o"></i>
<h3 class="box-title"><?php echo Yii::t('backend', 'Time') ?></h3>
<h3 class="box-title"><?= Yii::t('backend', 'Time') ?></h3>
</div><!-- /.box-header -->
<div class="box-body">
<dl class="dl-horizontal">
<dt><?php echo Yii::t('backend', 'System Date') ?></dt>
<dd><?php echo Yii::$app->formatter->asDate(time()) ?></dd>
<dt><?= Yii::t('backend', 'System Date') ?></dt>
<dd><?= Yii::$app->formatter->asDate(time()) ?></dd>
<dt><?php echo Yii::t('backend', 'System Time') ?></dt>
<dd><?php echo Yii::$app->formatter->asTime(time()) ?></dd>
<dt><?= Yii::t('backend', 'System Time') ?></dt>
<dd><?= Yii::$app->formatter->asTime(time()) ?></dd>
<dt><?php echo Yii::t('backend', 'Timezone') ?></dt>
<dd><?php echo date_default_timezone_get() ?></dd>
<dt><?= Yii::t('backend', 'Timezone') ?></dt>
<dd><?= date_default_timezone_get() ?></dd>
</dl>
</div><!-- /.box-body -->
</div>
......@@ -79,21 +79,21 @@ $this->registerJsFile(
<div class="box box-primary">
<div class="box-header">
<i class="fa fa-hdd-o"></i>
<h3 class="box-title"><?php echo Yii::t('backend', 'Network') ?></h3>
<h3 class="box-title"><?= Yii::t('backend', 'Network') ?></h3>
</div><!-- /.box-header -->
<div class="box-body">
<dl class="dl-horizontal">
<dt><?php echo Yii::t('backend', 'Hostname') ?></dt>
<dd><?php echo $provider->getHostname() ?></dd>
<dt><?= Yii::t('backend', 'Hostname') ?></dt>
<dd><?= $provider->getHostname() ?></dd>
<dt><?php echo Yii::t('backend', 'Internal IP') ?></dt>
<dd><?php echo $provider->getServerIP() ?></dd>
<dt><?= Yii::t('backend', 'Internal IP') ?></dt>
<dd><?= $provider->getServerIP() ?></dd>
<dt><?php echo Yii::t('backend', 'External IP') ?></dt>
<dd><?php echo $provider->getExternalIP() ?></dd>
<dt><?= Yii::t('backend', 'External IP') ?></dt>
<dd><?= $provider->getExternalIP() ?></dd>
<dt><?php echo Yii::t('backend', 'Port') ?></dt>
<dd><?php echo $provider->getServerVariable('SERVER_PORT') ?></dd>
<dt><?= Yii::t('backend', 'Port') ?></dt>
<dd><?= $provider->getServerVariable('SERVER_PORT') ?></dd>
</dl>
</div><!-- /.box-body -->
</div>
......@@ -102,21 +102,21 @@ $this->registerJsFile(
<div class="box box-primary">
<div class="box-header">
<i class="fa fa-hdd-o"></i>
<h3 class="box-title"><?php echo Yii::t('backend', 'Software') ?></h3>
<h3 class="box-title"><?= Yii::t('backend', 'Software') ?></h3>
</div><!-- /.box-header -->
<div class="box-body">
<dl class="dl-horizontal">
<dt><?php echo Yii::t('backend', 'Web Server') ?></dt>
<dd><?php echo $provider->getServerSoftware() ?></dd>
<dt><?= Yii::t('backend', 'Web Server') ?></dt>
<dd><?= $provider->getServerSoftware() ?></dd>
<dt><?php echo Yii::t('backend', 'PHP Version') ?></dt>
<dd><?php echo $provider->getPhpVersion() ?></dd>
<dt><?= Yii::t('backend', 'PHP Version') ?></dt>
<dd><?= $provider->getPhpVersion() ?></dd>
<dt><?php echo Yii::t('backend', 'DB Type') ?></dt>
<dd><?php echo $provider->getDbType(Yii::$app->db->pdo) ?></dd>
<dt><?= Yii::t('backend', 'DB Type') ?></dt>
<dd><?= $provider->getDbType(Yii::$app->db->pdo) ?></dd>
<dt><?php echo Yii::t('backend', 'DB Version') ?></dt>
<dd><?php echo $provider->getDbVersion(Yii::$app->db->pdo) ?></dd>
<dt><?= Yii::t('backend', 'DB Version') ?></dt>
<dd><?= $provider->getDbVersion(Yii::$app->db->pdo) ?></dd>
</dl>
</div><!-- /.box-body -->
</div>
......@@ -125,21 +125,21 @@ $this->registerJsFile(
<div class="box box-primary">
<div class="box-header">
<i class="fa fa-hdd-o"></i>
<h3 class="box-title"><?php echo Yii::t('backend', 'Memory') ?></h3>
<h3 class="box-title"><?= Yii::t('backend', 'Memory') ?></h3>
</div><!-- /.box-header -->
<div class="box-body">
<dl class="dl-horizontal">
<dt><?php echo Yii::t('backend', 'Total memory') ?></dt>
<dd><?php echo Yii::$app->formatter->asSize($provider->getTotalMem()) ?></dd>
<dt><?= Yii::t('backend', 'Total memory') ?></dt>
<dd><?= Yii::$app->formatter->asSize($provider->getTotalMem()) ?></dd>
<dt><?php echo Yii::t('backend', 'Free memory') ?></dt>
<dd><?php echo Yii::$app->formatter->asSize($provider->getFreeMem()) ?></dd>
<dt><?= Yii::t('backend', 'Free memory') ?></dt>
<dd><?= Yii::$app->formatter->asSize($provider->getFreeMem()) ?></dd>
<dt><?php echo Yii::t('backend', 'Total Swap') ?></dt>
<dd><?php echo Yii::$app->formatter->asSize($provider->getTotalSwap()) ?></dd>
<dt><?= Yii::t('backend', 'Total Swap') ?></dt>
<dd><?= Yii::$app->formatter->asSize($provider->getTotalSwap()) ?></dd>
<dt><?php echo Yii::t('backend', 'Free Swap') ?></dt>
<dd><?php echo Yii::$app->formatter->asSize($provider->getFreeSwap()) ?></dd>
<dt><?= Yii::t('backend', 'Free Swap') ?></dt>
<dd><?= Yii::$app->formatter->asSize($provider->getFreeSwap()) ?></dd>
</dl>
</div><!-- /.box-body -->
</div>
......@@ -151,10 +151,10 @@ $this->registerJsFile(
<div class="small-box bg-green">
<div class="inner">
<h3>
<?php echo gmdate('H:i:s', $provider->getUptime()) ?>
<?= gmdate('H:i:s', $provider->getUptime()) ?>
</h3>
<p>
<?php echo Yii::t('backend', 'Uptime') ?>
<?= Yii::t('backend', 'Uptime') ?>
</p>
</div>
<div class="icon">
......@@ -170,10 +170,10 @@ $this->registerJsFile(
<div class="small-box bg-aqua">
<div class="inner">
<h3>
<?php echo $provider->getLoadAverage() ?>
<?= $provider->getLoadAverage() ?>
</h3>
<p>
<?php echo Yii::t('backend', 'Load average') ?>
<?= Yii::t('backend', 'Load average') ?>
</p>
</div>
<div class="icon">
......@@ -190,17 +190,17 @@ $this->registerJsFile(
<div class="small-box bg-yellow">
<div class="inner">
<h3>
<?php echo User::find()->count() ?>
<?= User::find()->count() ?>
</h3>
<p>
<?php echo Yii::t('backend', 'User Registrations') ?>
<?= Yii::t('backend', 'User Registrations') ?>
</p>
</div>
<div class="icon">
<i class="ion ion-person-add"></i>
</div>
<a href="<?php echo Yii::$app->urlManager->createUrl(['/user/index']) ?>" class="small-box-footer">
<?php echo Yii::t('backend', 'More info') ?> <i class="fa fa-arrow-circle-right"></i>
<a href="<?= Yii::$app->urlManager->createUrl(['/user/index']) ?>" class="small-box-footer">
<?= Yii::t('backend', 'More info') ?> <i class="fa fa-arrow-circle-right"></i>
</a>
</div>
</div><!-- ./col -->
......@@ -209,17 +209,17 @@ $this->registerJsFile(
<div class="small-box bg-red">
<div class="inner">
<h3>
<?php echo FileStorageItem::find()->count() ?>
<?= FileStorageItem::find()->count() ?>
</h3>
<p>
<?php echo Yii::t('backend', 'Files in storage') ?>
<?= Yii::t('backend', 'Files in storage') ?>
</p>
</div>
<div class="icon">
<i class="ion ion-pie-graph"></i>
</div>
<a href="<?php echo Yii::$app->urlManager->createUrl(['/file-storage/index']) ?>" class="small-box-footer">
<?php echo Yii::t('backend', 'More info') ?> <i class="fa fa-arrow-circle-right"></i>
<a href="<?= Yii::$app->urlManager->createUrl(['/file-storage/index']) ?>" class="small-box-footer">
<?= Yii::t('backend', 'More info') ?> <i class="fa fa-arrow-circle-right"></i>
</a>
</div>
</div><!-- ./col -->
......@@ -229,16 +229,16 @@ $this->registerJsFile(
<div id="cpu-usage" class="box box-primary">
<div class="box-header">
<h3 class="box-title">
<?php echo Yii::t('backend', 'CPU Usage') ?>
<?= Yii::t('backend', 'CPU Usage') ?>
</h3>
<div class="box-tools pull-right">
<?php echo Yii::t('backend', 'Real time') ?>
<?= Yii::t('backend', 'Real time') ?>
<div class="realtime btn-group" data-toggle="btn-toggle">
<button type="button" class="btn btn-default btn-xs active" data-toggle="on">
<?php echo Yii::t('backend', 'On') ?>
<?= Yii::t('backend', 'On') ?>
</button>
<button type="button" class="btn btn-default btn-xs" data-toggle="off">
<?php echo Yii::t('backend', 'Off') ?>
<?= Yii::t('backend', 'Off') ?>
</button>
</div>
</div>
......@@ -255,16 +255,16 @@ $this->registerJsFile(
<div id="memory-usage" class="box box-primary">
<div class="box-header">
<h3 class="box-title">
<?php echo Yii::t('backend', 'Memory Usage') ?>
<?= Yii::t('backend', 'Memory Usage') ?>
</h3>
<div class="box-tools pull-right">
<?php echo Yii::t('backend', 'Real time') ?>
<?= Yii::t('backend', 'Real time') ?>
<div class="btn-group realtime" data-toggle="btn-toggle">
<button type="button" class="btn btn-default btn-xs active" data-toggle="on">
<?php echo Yii::t('backend', 'On') ?>
<?= Yii::t('backend', 'On') ?>
</button>
<button type="button" class="btn btn-default btn-xs" data-toggle="off">
<?php echo Yii::t('backend', 'Off') ?>
<?= Yii::t('backend', 'Off') ?>
</button>
</div>
</div>
......
backend/views/timeline-event/_item.php
......@@ -7,25 +7,25 @@
<div class="timeline-item">
<span class="time">
<i class="fa fa-clock-o"></i>
<?php echo Yii::$app->formatter->asRelativeTime($model->created_at) ?>
<?= Yii::$app->formatter->asRelativeTime($model->created_at) ?>
</span>
<h3 class="timeline-header">
<?php echo Yii::t('backend', 'You have new event') ?>
<?= Yii::t('backend', 'You have new event') ?>
</h3>
<div class="timeline-body">
<dl>
<dt><?php echo Yii::t('backend', 'Application') ?>:</dt>
<dd><?php echo $model->application ?></dd>
<dt><?= Yii::t('backend', 'Application') ?>:</dt>
<dd><?= $model->application ?></dd>
<dt><?php echo Yii::t('backend', 'Category') ?>:</dt>
<dd><?php echo $model->category ?></dd>
<dt><?= Yii::t('backend', 'Category') ?>:</dt>
<dd><?= $model->category ?></dd>
<dt><?php echo Yii::t('backend', 'Event') ?>:</dt>
<dd><?php echo $model->event ?></dd>
<dt><?= Yii::t('backend', 'Event') ?>:</dt>
<dd><?= $model->event ?></dd>
<dt><?php echo Yii::t('backend', 'Date') ?>:</dt>
<dd><?php echo Yii::$app->formatter->asDatetime($model->created_at) ?></dd>
<dt><?= Yii::t('backend', 'Date') ?>:</dt>
<dd><?= Yii::$app->formatter->asDatetime($model->created_at) ?></dd>
</dl>
</div>
</div>
\ No newline at end of file
backend/views/timeline-event/_search.php
......@@ -15,15 +15,15 @@ use yii\bootstrap\ActiveForm;
'method' => 'get',
]); ?>
<?php echo $form->field($model, 'id') ?>
<?= $form->field($model, 'id') ?>
<?php echo $form->field($model, 'application') ?>
<?= $form->field($model, 'application') ?>
<?php echo $form->field($model, 'event') ?>
<?= $form->field($model, 'event') ?>
<div class="form-group">
<?php echo Html::submitButton(Yii::t('backend', 'Search'), ['class' => 'btn btn-primary']) ?>
<?php echo Html::resetButton(Yii::t('backend', 'Reset'), ['class' => 'btn btn-default']) ?>
<?= Html::submitButton(Yii::t('backend', 'Search'), ['class' => 'btn btn-primary']) ?>
<?= Html::resetButton(Yii::t('backend', 'Reset'), ['class' => 'btn btn-default']) ?>
</div>
<?php ActiveForm::end(); ?>
......
backend/views/timeline-event/index.php
......@@ -20,7 +20,7 @@ $icons = [
<!-- timeline time label -->
<li class="time-label">
<span class="bg-blue">
<?php echo Yii::$app->formatter->asDate($model->created_at) ?>
<?= Yii::$app->formatter->asDate($model->created_at) ?>
</span>
</li>
<?php $date = Yii::$app->formatter->asDate($model->created_at) ?>
......@@ -42,11 +42,11 @@ $icons = [
</li>
</ul>
<?php else: ?>
<?php echo Yii::t('backend', 'No events found') ?>
<?= Yii::t('backend', 'No events found') ?>
<?php endif; ?>
</div>
<div class="col-md-12 text-center">
<?php echo \yii\widgets\LinkPager::widget([
<?= \yii\widgets\LinkPager::widget([
'pagination'=>$dataProvider->pagination,
'options' => ['class' => 'pagination']
]) ?>
......
backend/views/timeline-event/user/signup.php
......@@ -7,22 +7,22 @@
<div class="timeline-item">
<span class="time">
<i class="fa fa-clock-o"></i>
<?php echo Yii::$app->formatter->asRelativeTime($model->created_at) ?>
<?= Yii::$app->formatter->asRelativeTime($model->created_at) ?>
</span>
<h3 class="timeline-header">
<?php echo Yii::t('backend', 'You have new user!') ?>
<?= Yii::t('backend', 'You have new user!') ?>
</h3>
<div class="timeline-body">
<?php echo Yii::t('backend', 'New user ({identity}) was registered at {created_at}', [
<?= Yii::t('backend', 'New user ({identity}) was registered at {created_at}', [
'identity' => $model->data['public_identity'],
'created_at' => Yii::$app->formatter->asDatetime($model->data['created_at'])
]) ?>
</div>
<div class="timeline-footer">
<?php echo \yii\helpers\Html::a(
<?= \yii\helpers\Html::a(
Yii::t('backend', 'View user'),
['/user/view', 'id' => $model->data['user_id']],
['class' => 'btn btn-success btn-sm']
......
backend/views/user/_form.php
......@@ -14,13 +14,13 @@ use yii\bootstrap\ActiveForm;
<div class="user-form">
<?php $form = ActiveForm::begin(); ?>
<?php echo $form->field($model, 'username') ?>
<?php echo $form->field($model, 'email') ?>
<?php echo $form->field($model, 'password')->passwordInput() ?>
<?php echo $form->field($model, 'status')->dropDownList(User::statuses()) ?>
<?php echo $form->field($model, 'roles')->checkboxList($roles) ?>
<?= $form->field($model, 'username') ?>
<?= $form->field($model, 'email') ?>
<?= $form->field($model, 'password')->passwordInput() ?>
<?= $form->field($model, 'status')->dropDownList(User::statuses()) ?>
<?= $form->field($model, 'roles')->checkboxList($roles) ?>
<div class="form-group">
<?php echo Html::submitButton(Yii::t('backend', 'Save'), ['class' => 'btn btn-primary', 'name' => 'signup-button']) ?>
<?= Html::submitButton(Yii::t('backend', 'Save'), ['class' => 'btn btn-primary', 'name' => 'signup-button']) ?>
</div>
<?php ActiveForm::end(); ?>
......
backend/views/user/_search.php
......@@ -15,25 +15,25 @@ use yii\bootstrap\ActiveForm;
'method' => 'get',
]); ?>
<?php echo $form->field($model, 'id') ?>
<?= $form->field($model, 'id') ?>
<?php echo $form->field($model, 'username') ?>
<?= $form->field($model, 'username') ?>
<?php echo $form->field($model, 'auth_key') ?>
<?= $form->field($model, 'auth_key') ?>
<?php echo $form->field($model, 'email') ?>
<?= $form->field($model, 'email') ?>
<?php echo $form->field($model, 'role') ?>
<?= $form->field($model, 'role') ?>
<?php echo $form->field($model, 'status') ?>
<?= $form->field($model, 'status') ?>
<?php echo $form->field($model, 'created_at') ?>
<?= $form->field($model, 'created_at') ?>
<?php echo $form->field($model, 'updated_at') ?>
<?= $form->field($model, 'updated_at') ?>
<div class="form-group">
<?php echo Html::submitButton(Yii::t('backend', 'Search'), ['class' => 'btn btn-primary']) ?>
<?php echo Html::resetButton(Yii::t('backend', 'Reset'), ['class' => 'btn btn-default']) ?>
<?= Html::submitButton(Yii::t('backend', 'Search'), ['class' => 'btn btn-primary']) ?>
<?= Html::resetButton(Yii::t('backend', 'Reset'), ['class' => 'btn btn-default']) ?>
</div>
<?php ActiveForm::end(); ?>
......
backend/views/user/create.php
......@@ -10,7 +10,7 @@ $this->params['breadcrumbs'][] = $this->title;
?>
<div class="user-create">
<?php echo $this->render('_form', [
<?= $this->render('_form', [
'model' => $model,
'roles' => $roles
]) ?>
......
backend/views/user/index.php
......@@ -17,12 +17,12 @@ $this->params['breadcrumbs'][] = $this->title;
<?php // echo $this->render('_search', ['model' => $searchModel]); ?>
<p>
<?php echo Html::a(Yii::t('backend', 'Create {modelClass}', [
<?= Html::a(Yii::t('backend', 'Create {modelClass}', [
'modelClass' => 'User',
]), ['create'], ['class' => 'btn btn-success']) ?>
</p>
<?php echo GridView::widget([
<?= GridView::widget([
'dataProvider' => $dataProvider,
'filterModel' => $searchModel,
'options' => [
......
backend/views/user/update.php
......@@ -13,7 +13,7 @@ $this->params['breadcrumbs'][] = ['label'=>Yii::t('backend', 'Update')];
?>
<div class="user-update">
<?php echo $this->render('_form', [
<?= $this->render('_form', [
'model' => $model,
'roles' => $roles
]) ?>
......
backend/views/user/view.php
......@@ -13,8 +13,8 @@ $this->params['breadcrumbs'][] = $this->title;
<div class="user-view">
<p>
<?php echo Html::a(Yii::t('backend', 'Update'), ['update', 'id' => $model->id], ['class' => 'btn btn-primary']) ?>
<?php echo Html::a(Yii::t('backend', 'Delete'), ['delete', 'id' => $model->id], [
<?= Html::a(Yii::t('backend', 'Update'), ['update', 'id' => $model->id], ['class' => 'btn btn-primary']) ?>
<?= Html::a(Yii::t('backend', 'Delete'), ['delete', 'id' => $model->id], [
'class' => 'btn btn-danger',
'data' => [
'confirm' => Yii::t('backend', 'Are you sure you want to delete this item?'),
......@@ -23,7 +23,7 @@ $this->params['breadcrumbs'][] = $this->title;
]) ?>
</p>
<?php echo DetailView::widget([
<?= DetailView::widget([
'model' => $model,
'attributes' => [
'id',
......
backend/views/widget-carousel/_form.php
......@@ -12,12 +12,12 @@ use yii\bootstrap\ActiveForm;
<?php $form = ActiveForm::begin(); ?>
<?php echo $form->field($model, 'key')->textInput(['maxlength' => 1024]) ?>
<?= $form->field($model, 'key')->textInput(['maxlength' => 1024]) ?>
<?php echo $form->field($model, 'status')->checkbox() ?>
<?= $form->field($model, 'status')->checkbox() ?>
<div class="form-group">
<?php echo Html::submitButton($model->isNewRecord ? Yii::t('backend', 'Create') : Yii::t('backend', 'Update'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
<?= Html::submitButton($model->isNewRecord ? Yii::t('backend', 'Create') : Yii::t('backend', 'Update'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
</div>
<?php ActiveForm::end(); ?>
......
backend/views/widget-carousel/create.php
......@@ -10,7 +10,7 @@ $this->params['breadcrumbs'][] = $this->title;
?>
<div class="widget-carousel-create">
<?php echo $this->render('_form', [
<?= $this->render('_form', [
'model' => $model
]) ?>
......
backend/views/widget-carousel/index.php
......@@ -13,12 +13,12 @@ $this->params['breadcrumbs'][] = $this->title;
<div class="widget-carousel-index">
<p>
<?php echo Html::a(Yii::t('backend', 'Create {modelClass}', [
<?= Html::a(Yii::t('backend', 'Create {modelClass}', [
'modelClass' => 'Widget Carousel',
]), ['create'], ['class' => 'btn btn-success']) ?>
</p>
<?php echo GridView::widget([
<?= GridView::widget([
'dataProvider' => $dataProvider,
'filterModel' => $searchModel,
'options' => [
......
backend/views/widget-carousel/item/_form.php
......@@ -12,20 +12,20 @@ use yii\helpers\Html;
<?php $form = ActiveForm::begin(); ?>
<?php echo $form->errorSummary($model) ?>
<?= $form->errorSummary($model) ?>
<?php echo $form->field($model, 'image')->widget(
<?= $form->field($model, 'image')->widget(
\trntv\filekit\widget\Upload::className(),
[
'url'=>['/file-storage/upload'],
]
) ?>
<?php echo $form->field($model, 'order')->textInput() ?>
<?= $form->field($model, 'order')->textInput() ?>
<?php echo $form->field($model, 'url')->textInput(['maxlength' => 1024]) ?>
<?= $form->field($model, 'url')->textInput(['maxlength' => 1024]) ?>
<?php echo $form->field($model, 'caption')->widget(
<?= $form->field($model, 'caption')->widget(
\yii\imperavi\Widget::className(),
[
'plugins' => ['fullscreen', 'fontcolor', 'video'],
......@@ -38,10 +38,10 @@ use yii\helpers\Html;
]
]) ?>
<?php echo $form->field($model, 'status')->checkbox() ?>
<?= $form->field($model, 'status')->checkbox() ?>
<div class="form-group">
<?php echo Html::submitButton($model->isNewRecord ? Yii::t('backend', 'Create') : Yii::t('backend', 'Update'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
<?= Html::submitButton($model->isNewRecord ? Yii::t('backend', 'Create') : Yii::t('backend', 'Update'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
</div>
<?php ActiveForm::end(); ?>
......
backend/views/widget-carousel/item/create.php
......@@ -13,7 +13,7 @@ $this->params['breadcrumbs'][] = Yii::t('backend', 'Create');
?>
<div class="widget-carousel-item-create">
<?php echo $this->render('_form', [
<?= $this->render('_form', [
'model' => $model
]) ?>
......
backend/views/widget-carousel/item/update.php
......@@ -14,7 +14,7 @@ $this->params['breadcrumbs'][] = Yii::t('backend', 'Update');
?>
<div class="widget-carousel-item-update">
<?php echo $this->render('_form', [
<?= $this->render('_form', [
'model' => $model,
]) ?>
......
backend/views/widget-carousel/update.php
......@@ -14,17 +14,17 @@ $this->params['breadcrumbs'][] = Yii::t('backend', 'Update');
?>
<div class="widget-carousel-update">
<?php echo $this->render('_form', [
<?= $this->render('_form', [
'model' => $model,
]) ?>
<p>
<?php echo Html::a(Yii::t('backend', 'Create {modelClass}', [
<?= Html::a(Yii::t('backend', 'Create {modelClass}', [
'modelClass' => 'Widget Carousel Item',
]), ['/widget-carousel-item/create', 'carousel_id'=>$model->id], ['class' => 'btn btn-success']) ?>
</p>
<?php echo GridView::widget([
<?= GridView::widget([
'dataProvider' => $carouselItemsProvider,
'options' => [
'class' => 'grid-view table-responsive'
......
backend/views/widget-menu/_form.php
......@@ -12,23 +12,23 @@ use yii\bootstrap\ActiveForm;
<?php $form = ActiveForm::begin(); ?>
<?php echo $form->errorSummary($model) ?>
<?= $form->errorSummary($model) ?>
<?php echo $form->field($model, 'key')->textInput(['maxlength' => 1024]) ?>
<?= $form->field($model, 'key')->textInput(['maxlength' => 1024]) ?>
<?php echo $form->field($model, 'title')->textInput(['maxlength' => 512]) ?>
<?= $form->field($model, 'title')->textInput(['maxlength' => 512]) ?>
<?php echo $form->field($model, 'items')->widget(
<?= $form->field($model, 'items')->widget(
trntv\aceeditor\AceEditor::className(),
[
'mode' => 'json'
]
) ?>
<?php echo $form->field($model, 'status')->checkbox() ?>
<?= $form->field($model, 'status')->checkbox() ?>
<div class="form-group">
<?php echo Html::submitButton($model->isNewRecord ? Yii::t('backend', 'Create') : Yii::t('backend', 'Update'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
<?= Html::submitButton($model->isNewRecord ? Yii::t('backend', 'Create') : Yii::t('backend', 'Update'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
</div>
<?php ActiveForm::end(); ?>
......
backend/views/widget-menu/create.php
......@@ -10,7 +10,7 @@ $this->params['breadcrumbs'][] = $this->title;
?>
<div class="widget-menu-create">
<?php echo $this->render('_form', [
<?= $this->render('_form', [
'model' => $model,
]) ?>
......
backend/views/widget-menu/update.php
......@@ -13,7 +13,7 @@ $this->params['breadcrumbs'][] = Yii::t('backend', 'Update');
?>
<div class="widget-menu-update">
<?php echo $this->render('_form', [
<?= $this->render('_form', [
'model' => $model,
]) ?>
......
backend/views/widget-text/_form.php
......@@ -12,21 +12,21 @@ use yii\bootstrap\ActiveForm;
<?php $form = ActiveForm::begin(); ?>
<?php echo $form->field($model, 'key')->textInput(['maxlength' => 1024]) ?>
<?= $form->field($model, 'key')->textInput(['maxlength' => 1024]) ?>
<?php echo $form->field($model, 'title')->textInput(['maxlength' => 512]) ?>
<?= $form->field($model, 'title')->textInput(['maxlength' => 512]) ?>
<?php echo $form->field($model, 'body')->widget(
<?= $form->field($model, 'body')->widget(
trntv\aceeditor\AceEditor::className(),
[
'mode' => 'html'
]
) ?>
<?php echo $form->field($model, 'status')->checkbox() ?>
<?= $form->field($model, 'status')->checkbox() ?>
<div class="form-group">
<?php echo Html::submitButton(
<?= Html::submitButton(
$model->isNewRecord ? Yii::t('backend', 'Create') : Yii::t('backend', 'Update'),
['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']
) ?>
......
backend/views/widget-text/_search.php
......@@ -14,19 +14,19 @@ use yii\bootstrap\ActiveForm;
'method' => 'get',
]); ?>
<?php echo $form->field($model, 'id') ?>
<?= $form->field($model, 'id') ?>
<?php echo $form->field($model, 'key') ?>
<?= $form->field($model, 'key') ?>
<?php echo $form->field($model, 'title') ?>
<?= $form->field($model, 'title') ?>
<?php echo $form->field($model, 'body') ?>
<?= $form->field($model, 'body') ?>
<?php echo $form->field($model, 'status') ?>
<?= $form->field($model, 'status') ?>
<div class="form-group">
<?php echo Html::submitButton(Yii::t('backend', 'Search'), ['class' => 'btn btn-primary']) ?>
<?php echo Html::resetButton(Yii::t('backend', 'Reset'), ['class' => 'btn btn-default']) ?>
<?= Html::submitButton(Yii::t('backend', 'Search'), ['class' => 'btn btn-primary']) ?>
<?= Html::resetButton(Yii::t('backend', 'Reset'), ['class' => 'btn btn-default']) ?>
</div>
<?php ActiveForm::end(); ?>
......
backend/views/widget-text/create.php
......@@ -10,7 +10,7 @@ $this->params['breadcrumbs'][] = $this->title;
?>
<div class="text-block-create">
<?php echo $this->render('_form', [
<?= $this->render('_form', [
'model' => $model
]) ?>
......
backend/views/widget-text/index.php
......@@ -15,12 +15,12 @@ $this->params['breadcrumbs'][] = $this->title;
<?php // echo $this->render('_search', ['model' => $searchModel]); ?>
<p>
<?php echo Html::a(Yii::t('backend', 'Create {modelClass}', [
<?= Html::a(Yii::t('backend', 'Create {modelClass}', [
'modelClass' => 'Text Block',
]), ['create'], ['class' => 'btn btn-success']) ?>
</p>
<?php echo GridView::widget([
<?= GridView::widget([
'dataProvider' => $dataProvider,
'filterModel' => $searchModel,
'columns' => [
......
backend/views/widget-text/update.php
......@@ -13,7 +13,7 @@ $this->params['breadcrumbs'][] = Yii::t('backend', 'Update');
?>
<div class="text-block-update">
<?php echo $this->render('_form', [
<?= $this->render('_form', [
'model' => $model,
]) ?>
......
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