fix admin views

lib/User/resources/views/admin/_account.php

@@ -1,27 +1,18 @@
 <?php
 
-/*
- * This file is part of the Dektrium project
- *
- * (c) Dektrium project <http://github.com/dektrium>
- *
- * For the full copyright and license information, please view the LICENSE.md
- * file that was distributed with this source code.
- */
-
 use yii\bootstrap\ActiveForm;
 use yii\helpers\Html;
 
-/*
+/**
  * @var yii\web\View $this
- * @var dektrium\user\models\User $user
+ * @var \Da\User\Model\User $user
  */
-
 ?>
 
-<?php $this->beginContent('@dektrium/user/views/admin/update.php', ['user' => $user]) ?>
+<?php $this->beginContent('@Da/User/resources/views/admin/update.php', ['user' => $user]) ?>
 
-<?php $form = ActiveForm::begin([
+<?php $form = ActiveForm::begin(
+    [
         'layout' => 'horizontal',
         'enableAjaxValidation' => true,
         'enableClientValidation' => false,
@@ -30,7 +21,8 @@ use yii\helpers\Html;
                 'wrapper' => 'col-sm-9',
             ],
         ],
-]); ?>
+    ]
+); ?>
 
 <?= $this->render('_user', ['form' => $form, 'user' => $user]) ?>
 

lib/User/resources/views/admin/_assignments.php

@@ -1,31 +1,24 @@
 <?php
 
-/*
- * This file is part of the Dektrium project
- *
- * (c) Dektrium project <http://github.com/dektrium>
- *
- * For the full copyright and license information, please view the LICENSE.md
- * file that was distributed with this source code.
- */
-
 use dektrium\rbac\widgets\Assignments;
 
 /**
  * @var yii\web\View $this
- * @var dektrium\user\models\User   $user
+ * @var \Da\User\Model\User $user
  */
 
 ?>
 
-<?php $this->beginContent('@dektrium/user/views/admin/update.php', ['user' => $user]) ?>
+<?php $this->beginContent('@Da/User/resources/views/admin/update.php', ['user' => $user]) ?>
 
-<?= yii\bootstrap\Alert::widget([
+<?= yii\bootstrap\Alert::widget(
+    [
         'options' => [
             'class' => 'alert-info alert-dismissible',
         ],
         'body' => Yii::t('user', 'You can assign multiple roles or permissions to user by using the form below'),
-]) ?>
+    ]
+) ?>
 
 <?= Assignments::widget(['userId' => $user->id]) ?>
 

lib/User/resources/views/admin/_info.php

@@ -1,21 +1,12 @@
 <?php
 
-/*
- * This file is part of the Dektrium project
- *
- * (c) Dektrium project <http://github.com/dektrium>
- *
- * For the full copyright and license information, please view the LICENSE.md
- * file that was distributed with this source code.
- */
-
 /**
- * @var yii\web\View
+ * @var yii\web\View $this
- * @var dektrium\user\models\User
+ * @var \Da\User\Model\User $user
  */
 ?>
 
-<?php $this->beginContent('@dektrium/user/views/admin/update.php', ['user' => $user]) ?>
+<?php $this->beginContent('@Da/User/resources/views/admin/update.php', ['user' => $user]) ?>
 
 <table class="table">
     <tr>

lib/User/resources/views/admin/_menu.php

@@ -1,19 +1,11 @@
 <?php
 
-/*
- * This file is part of the Dektrium project
- *
- * (c) Dektrium project <http://github.com/dektrium>
- *
- * For the full copyright and license information, please view the LICENSE.md
- * file that was distributed with this source code.
- */
-
 use yii\bootstrap\Nav;
 
 ?>
 
-<?= Nav::widget([
+<?= Nav::widget(
+    [
         'options' => [
             'class' => 'nav-tabs',
             'style' => 'margin-bottom: 15px',
@@ -53,4 +45,5 @@ use yii\bootstrap\Nav;
                 ],
             ],
         ],
-]) ?>
+    ]
+) ?>

lib/User/resources/views/admin/_profile.php

@@ -1,28 +1,20 @@
 <?php
 
-/*
- * This file is part of the Dektrium project
- *
- * (c) Dektrium project <http://github.com/dektrium>
- *
- * For the full copyright and license information, please view the LICENSE.md
- * file that was distributed with this source code.
- */
-
 use yii\bootstrap\ActiveForm;
 use yii\helpers\Html;
 
 /**
  * @var yii\web\View $this
- * @var dektrium\user\models\User       $user
+ * @var \Da\User\Model\User $user
- * @var dektrium\user\models\Profile    $profile
+ * @var \Da\User\Model\Profile $profile
  */
 
 ?>
 
-<?php $this->beginContent('@dektrium/user/views/admin/update.php', ['user' => $user]) ?>
+<?php $this->beginContent('@Da/User/resources/views/admin/update.php', ['user' => $user]) ?>
 
-<?php $form = ActiveForm::begin([
+<?php $form = ActiveForm::begin(
+    [
         'layout' => 'horizontal',
         'enableAjaxValidation' => true,
         'enableClientValidation' => false,
@@ -31,7 +23,8 @@ use yii\helpers\Html;
                 'wrapper' => 'col-sm-9',
             ],
         ],
-]); ?>
+    ]
+); ?>
 
 <?= $form->field($profile, 'name') ?>
 <?= $form->field($profile, 'public_email') ?>

lib/User/resources/views/admin/_user.php

@@ -1,17 +1,7 @@
 <?php
-
-/*
- * This file is part of the Dektrium project.
- *
- * (c) Dektrium project <http://github.com/dektrium>
- *
- * For the full copyright and license information, please view the LICENSE.md
- * file that was distributed with this source code.
- */
-
 /**
  * @var yii\widgets\ActiveForm $form
- * @var dektrium\user\models\User   $user
+ * @var \Da\User\Model\User $user
  */
 ?>
 

lib/User/resources/views/admin/create.php

@@ -1,21 +1,12 @@
 <?php
 
-/*
- * This file is part of the Dektrium project.
- *
- * (c) Dektrium project <http://github.com/dektrium>
- *
- * For the full copyright and license information, please view the LICENSE.md
- * file that was distributed with this source code.
- */
-
 use yii\bootstrap\ActiveForm;
 use yii\bootstrap\Nav;
 use yii\helpers\Html;
 
 /**
  * @var yii\web\View $this
- * @var dektrium\user\models\User   $user
+ * @var \Da\User\Model\User $user
  */
 
 $this->title = Yii::t('user', 'Create a user account');
@@ -24,9 +15,12 @@ $this->params['breadcrumbs'][] = $this->title;
 
 ?>
 
-<?= $this->render('/_alert', [
+<?= $this->render(
+    '/_alert',
+    [
         'module' => Yii::$app->getModule('user'),
-]) ?>
+    ]
+) ?>
 
 <?= $this->render('_menu') ?>
 
@@ -34,22 +28,30 @@ $this->params['breadcrumbs'][] = $this->title;
     <div class="col-md-3">
         <div class="panel panel-default">
             <div class="panel-body">
-                <?= Nav::widget([
+                <?= Nav::widget(
+                    [
                         'options' => [
                             'class' => 'nav-pills nav-stacked',
                         ],
                         'items' => [
                             ['label' => Yii::t('user', 'Account details'), 'url' => ['/user/admin/create']],
-                        ['label' => Yii::t('user', 'Profile details'), 'options' => [
+                            [
+                                'label' => Yii::t('user', 'Profile details'),
+                                'options' => [
                                     'class' => 'disabled',
                                     'onclick' => 'return false;',
-                        ]],
+                                ]
-                        ['label' => Yii::t('user', 'Information'), 'options' => [
-                            'class' => 'disabled',
-                            'onclick' => 'return false;',
-                        ]],
                             ],
-                ]) ?>
+                            [
+                                'label' => Yii::t('user', 'Information'),
+                                'options' => [
+                                    'class' => 'disabled',
+                                    'onclick' => 'return false;',
+                                ]
+                            ],
+                        ],
+                    ]
+                ) ?>
             </div>
         </div>
     </div>
@@ -60,7 +62,8 @@ $this->params['breadcrumbs'][] = $this->title;
                     <?= Yii::t('user', 'Credentials will be sent to the user by email') ?>.
                     <?= Yii::t('user', 'A password will be generated automatically if not provided') ?>.
                 </div>
-                <?php $form = ActiveForm::begin([
+                <?php $form = ActiveForm::begin(
+                    [
                         'layout' => 'horizontal',
                         'enableAjaxValidation' => true,
                         'enableClientValidation' => false,
@@ -69,7 +72,8 @@ $this->params['breadcrumbs'][] = $this->title;
                                 'wrapper' => 'col-sm-9',
                             ],
                         ],
-                ]); ?>
+                    ]
+                ); ?>
 
                 <?= $this->render('_user', ['form' => $form, 'user' => $user]) ?>
 

lib/User/resources/views/admin/index.php

@@ -1,15 +1,6 @@
 <?php
 
-/*
+use Da\User\Search\UserSearch;
- * This file is part of the Dektrium project.
- *
- * (c) Dektrium project <http://github.com/dektrium>
- *
- * For the full copyright and license information, please view the LICENSE.md
- * file that was distributed with this source code.
- */
-
-use dektrium\user\models\UserSearch;
 use yii\data\ActiveDataProvider;
 use yii\grid\GridView;
 use yii\helpers\Html;
@@ -26,15 +17,19 @@ $this->title = Yii::t('user', 'Manage users');
 $this->params['breadcrumbs'][] = $this->title;
 ?>
 
-<?= $this->render('/_alert', [
+<?= $this->render(
+    '/_alert',
+    [
         'module' => Yii::$app->getModule('user'),
-]) ?>
+    ]
+) ?>
 
 <?= $this->render('/admin/_menu') ?>
 
 <?php Pjax::begin() ?>
 
-<?= GridView::widget([
+<?= GridView::widget(
+    [
         'dataProvider' => $dataProvider,
         'filterModel' => $searchModel,
         'layout' => "{items}\n{pager}",
@@ -68,11 +63,15 @@ $this->params['breadcrumbs'][] = $this->title;
                                 <span class="text-success">' . Yii::t('user', 'Confirmed') . '</span>
                             </div>';
                     } else {
-                    return Html::a(Yii::t('user', 'Confirm'), ['confirm', 'id' => $model->id], [
+                        return Html::a(
+                            Yii::t('user', 'Confirm'),
+                            ['confirm', 'id' => $model->id],
+                            [
                                 'class' => 'btn btn-xs btn-success btn-block',
                                 'data-method' => 'post',
                                 'data-confirm' => Yii::t('user', 'Are you sure you want to confirm this user?'),
-                    ]);
+                            ]
+                        );
                     }
                 },
                 'format' => 'raw',
@@ -82,17 +81,25 @@ $this->params['breadcrumbs'][] = $this->title;
                 'header' => Yii::t('user', 'Block status'),
                 'value' => function ($model) {
                     if ($model->isBlocked) {
-                    return Html::a(Yii::t('user', 'Unblock'), ['block', 'id' => $model->id], [
+                        return Html::a(
+                            Yii::t('user', 'Unblock'),
+                            ['block', 'id' => $model->id],
+                            [
                                 'class' => 'btn btn-xs btn-success btn-block',
                                 'data-method' => 'post',
                                 'data-confirm' => Yii::t('user', 'Are you sure you want to unblock this user?'),
-                    ]);
+                            ]
+                        );
                     } else {
-                    return Html::a(Yii::t('user', 'Block'), ['block', 'id' => $model->id], [
+                        return Html::a(
+                            Yii::t('user', 'Block'),
+                            ['block', 'id' => $model->id],
+                            [
                                 'class' => 'btn btn-xs btn-danger btn-block',
                                 'data-method' => 'post',
                                 'data-confirm' => Yii::t('user', 'Are you sure you want to block this user?'),
-                    ]);
+                            ]
+                        );
                     }
                 },
                 'format' => 'raw',
@@ -102,6 +109,7 @@ $this->params['breadcrumbs'][] = $this->title;
                 'template' => '{update} {delete}',
             ],
         ],
-]); ?>
+    ]
+); ?>
 
 <?php Pjax::end() ?>

lib/User/resources/views/admin/update.php

@@ -1,15 +1,6 @@
 <?php
 
-/*
+use Da\User\Model\User;
- * This file is part of the Dektrium project.
- *
- * (c) Dektrium project <http://github.com/dektrium>
- *
- * For the full copyright and license information, please view the LICENSE.md
- * file that was distributed with this source code.
- */
-
-use dektrium\user\models\User;
 use yii\bootstrap\Nav;
 use yii\web\View;
 
@@ -25,9 +16,12 @@ $this->params['breadcrumbs'][] = $this->title;
 
 ?>
 
-<?= $this->render('/_alert', [
+<?= $this->render(
+    '/_alert',
+    [
         'module' => Yii::$app->getModule('user'),
-]) ?>
+    ]
+) ?>
 
 <?= $this->render('_menu') ?>
 
@@ -35,7 +29,8 @@ $this->params['breadcrumbs'][] = $this->title;
     <div class="col-md-3">
         <div class="panel panel-default">
             <div class="panel-body">
-                <?= Nav::widget([
+                <?= Nav::widget(
+                    [
                         'options' => [
                             'class' => 'nav-pills nav-stacked',
                         ],
@@ -48,11 +43,13 @@ $this->params['breadcrumbs'][] = $this->title;
                                 'label' => Yii::t('user', 'Profile details'),
                                 'url' => ['/user/admin/update-profile', 'id' => $user->id]
                             ],
-                        ['label' => Yii::t('user', 'Information'), 'url' => ['/user/admin/info', 'id' => $user->id]],
+                            [
+                                'label' => Yii::t('user', 'Information'),
+                                'url' => ['/user/admin/info', 'id' => $user->id]
+                            ],
                             [
                                 'label' => Yii::t('user', 'Assignments'),
                                 'url' => ['/user/admin/assignments', 'id' => $user->id],
-                            'visible' => isset(Yii::$app->extensions['dektrium/yii2-rbac']),
                             ],
                             '<hr>',
                             [
@@ -95,7 +92,8 @@ $this->params['breadcrumbs'][] = $this->title;
                                 ],
                             ],
                         ],
-                ]) ?>
+                    ]
+                ) ?>
             </div>
         </div>
     </div>