diff --git a/lib/User/resources/views/admin/_account.php b/lib/User/resources/views/admin/_account.php index af4dcef..a6a4178 100644 --- a/lib/User/resources/views/admin/_account.php +++ b/lib/User/resources/views/admin/_account.php @@ -1,36 +1,28 @@ - * - * 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 */ - ?> -beginContent('@dektrium/user/views/admin/update.php', ['user' => $user]) ?> +beginContent('@Da/User/resources/views/admin/update.php', ['user' => $user]) ?> - 'horizontal', - 'enableAjaxValidation' => true, - 'enableClientValidation' => false, - 'fieldConfig' => [ - 'horizontalCssClasses' => [ - 'wrapper' => 'col-sm-9', + 'horizontal', + 'enableAjaxValidation' => true, + 'enableClientValidation' => false, + 'fieldConfig' => [ + 'horizontalCssClasses' => [ + 'wrapper' => 'col-sm-9', + ], ], - ], -]); ?> + ] +); ?> = $this->render('_user', ['form' => $form, 'user' => $user]) ?> diff --git a/lib/User/resources/views/admin/_assignments.php b/lib/User/resources/views/admin/_assignments.php index 50f93ba..08b777d 100644 --- a/lib/User/resources/views/admin/_assignments.php +++ b/lib/User/resources/views/admin/_assignments.php @@ -1,31 +1,24 @@ - * - * 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 yii\web\View $this + * @var \Da\User\Model\User $user */ ?> -beginContent('@dektrium/user/views/admin/update.php', ['user' => $user]) ?> +beginContent('@Da/User/resources/views/admin/update.php', ['user' => $user]) ?> -= 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'), -]) ?> += 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]) ?> diff --git a/lib/User/resources/views/admin/_info.php b/lib/User/resources/views/admin/_info.php index 03345a6..c2a5e0d 100644 --- a/lib/User/resources/views/admin/_info.php +++ b/lib/User/resources/views/admin/_info.php @@ -1,21 +1,12 @@ - * - * 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 dektrium\user\models\User + * @var yii\web\View $this + * @var \Da\User\Model\User $user */ ?> -beginContent('@dektrium/user/views/admin/update.php', ['user' => $user]) ?> +beginContent('@Da/User/resources/views/admin/update.php', ['user' => $user]) ?>
| = Yii::t('user', 'Confirmation status') ?>: | isConfirmed): ?>= Yii::t( - 'user', - 'Confirmed at {0, date, MMMM dd, YYYY HH:mm}', - [$user->confirmed_at] - ) ?> | + 'user', + 'Confirmed at {0, date, MMMM dd, YYYY HH:mm}', + [$user->confirmed_at] + ) ?>= Yii::t('user', 'Unconfirmed') ?> | @@ -44,10 +35,10 @@= Yii::t('user', 'Block status') ?>: | isBlocked): ?>= Yii::t( - 'user', - 'Blocked at {0, date, MMMM dd, YYYY HH:mm}', - [$user->blocked_at] - ) ?> + 'user', + 'Blocked at {0, date, MMMM dd, YYYY HH:mm}', + [$user->blocked_at] + ) ?> | = Yii::t('user', 'Not blocked') ?> | diff --git a/lib/User/resources/views/admin/_menu.php b/lib/User/resources/views/admin/_menu.php index efe0bf0..d837955 100644 --- a/lib/User/resources/views/admin/_menu.php +++ b/lib/User/resources/views/admin/_menu.php @@ -1,56 +1,49 @@ - * - * 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([ - 'options' => [ - 'class' => 'nav-tabs', - 'style' => 'margin-bottom: 15px', - ], - 'items' => [ - [ - 'label' => Yii::t('user', 'Users'), - 'url' => ['/user/admin/index'], += Nav::widget( + [ + 'options' => [ + 'class' => 'nav-tabs', + 'style' => 'margin-bottom: 15px', ], - [ - 'label' => Yii::t('user', 'Roles'), - 'url' => ['/rbac/role/index'], - 'visible' => isset(Yii::$app->extensions['dektrium/yii2-rbac']), - ], - [ - 'label' => Yii::t('user', 'Permissions'), - 'url' => ['/rbac/permission/index'], - 'visible' => isset(Yii::$app->extensions['dektrium/yii2-rbac']), - ], - [ - 'label' => Yii::t('user', 'Create'), - 'items' => [ - [ - 'label' => Yii::t('user', 'New user'), - 'url' => ['/user/admin/create'], - ], - [ - 'label' => Yii::t('user', 'New role'), - 'url' => ['/rbac/role/create'], - 'visible' => isset(Yii::$app->extensions['dektrium/yii2-rbac']), - ], - [ - 'label' => Yii::t('user', 'New permission'), - 'url' => ['/rbac/permission/create'], - 'visible' => isset(Yii::$app->extensions['dektrium/yii2-rbac']), + 'items' => [ + [ + 'label' => Yii::t('user', 'Users'), + 'url' => ['/user/admin/index'], + ], + [ + 'label' => Yii::t('user', 'Roles'), + 'url' => ['/rbac/role/index'], + 'visible' => isset(Yii::$app->extensions['dektrium/yii2-rbac']), + ], + [ + 'label' => Yii::t('user', 'Permissions'), + 'url' => ['/rbac/permission/index'], + 'visible' => isset(Yii::$app->extensions['dektrium/yii2-rbac']), + ], + [ + 'label' => Yii::t('user', 'Create'), + 'items' => [ + [ + 'label' => Yii::t('user', 'New user'), + 'url' => ['/user/admin/create'], + ], + [ + 'label' => Yii::t('user', 'New role'), + 'url' => ['/rbac/role/create'], + 'visible' => isset(Yii::$app->extensions['dektrium/yii2-rbac']), + ], + [ + 'label' => Yii::t('user', 'New permission'), + 'url' => ['/rbac/permission/create'], + 'visible' => isset(Yii::$app->extensions['dektrium/yii2-rbac']), + ], ], ], ], - ], -]) ?> + ] +) ?> diff --git a/lib/User/resources/views/admin/_profile.php b/lib/User/resources/views/admin/_profile.php index b19012c..6faea30 100644 --- a/lib/User/resources/views/admin/_profile.php +++ b/lib/User/resources/views/admin/_profile.php @@ -1,37 +1,30 @@ - * - * 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 dektrium\user\models\Profile $profile + * @var yii\web\View $this + * @var \Da\User\Model\User $user + * @var \Da\User\Model\Profile $profile */ ?> -beginContent('@dektrium/user/views/admin/update.php', ['user' => $user]) ?> +beginContent('@Da/User/resources/views/admin/update.php', ['user' => $user]) ?> - 'horizontal', - 'enableAjaxValidation' => true, - 'enableClientValidation' => false, - 'fieldConfig' => [ - 'horizontalCssClasses' => [ - 'wrapper' => 'col-sm-9', + 'horizontal', + 'enableAjaxValidation' => true, + 'enableClientValidation' => false, + 'fieldConfig' => [ + 'horizontalCssClasses' => [ + 'wrapper' => 'col-sm-9', + ], ], - ], -]); ?> + ] +); ?> = $form->field($profile, 'name') ?> = $form->field($profile, 'public_email') ?> diff --git a/lib/User/resources/views/admin/_user.php b/lib/User/resources/views/admin/_user.php index 757b50b..fc52dc7 100644 --- a/lib/User/resources/views/admin/_user.php +++ b/lib/User/resources/views/admin/_user.php @@ -1,17 +1,7 @@ - * - * 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 yii\widgets\ActiveForm $form + * @var \Da\User\Model\User $user */ ?> diff --git a/lib/User/resources/views/admin/create.php b/lib/User/resources/views/admin/create.php index 57036d4..62ee260 100644 --- a/lib/User/resources/views/admin/create.php +++ b/lib/User/resources/views/admin/create.php @@ -1,21 +1,12 @@ - * - * 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 yii\web\View $this + * @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', [ - 'module' => Yii::$app->getModule('user'), -]) ?> += $this->render( + '/_alert', + [ + 'module' => Yii::$app->getModule('user'), + ] +) ?> = $this->render('_menu') ?> @@ -34,22 +28,30 @@ $this->params['breadcrumbs'][] = $this->title;