fix admin views

This commit is contained in:
Antonio Ramirez
2016-12-10 21:42:16 +01:00
parent 0faf61f044
commit 005ab4f1b8
9 changed files with 294 additions and 332 deletions

View File

@ -1,36 +1,28 @@
<?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([
'layout' => 'horizontal',
'enableAjaxValidation' => true,
'enableClientValidation' => false,
'fieldConfig' => [
'horizontalCssClasses' => [
'wrapper' => 'col-sm-9',
<?php $form = ActiveForm::begin(
[
'layout' => 'horizontal',
'enableAjaxValidation' => true,
'enableClientValidation' => false,
'fieldConfig' => [
'horizontalCssClasses' => [
'wrapper' => 'col-sm-9',
],
],
],
]); ?>
]
); ?>
<?= $this->render('_user', ['form' => $form, 'user' => $user]) ?>

View File

@ -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 yii\web\View $this
* @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([
'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]) ?>

View File

@ -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 dektrium\user\models\User
* @var yii\web\View $this
* @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>
@ -32,10 +23,10 @@
<td><strong><?= Yii::t('user', 'Confirmation status') ?>:</strong></td>
<?php if ($user->isConfirmed): ?>
<td class="text-success"><?= Yii::t(
'user',
'Confirmed at {0, date, MMMM dd, YYYY HH:mm}',
[$user->confirmed_at]
) ?></td>
'user',
'Confirmed at {0, date, MMMM dd, YYYY HH:mm}',
[$user->confirmed_at]
) ?></td>
<?php else: ?>
<td class="text-danger"><?= Yii::t('user', 'Unconfirmed') ?></td>
<?php endif ?>
@ -44,10 +35,10 @@
<td><strong><?= Yii::t('user', 'Block status') ?>:</strong></td>
<?php if ($user->isBlocked): ?>
<td class="text-danger"><?= 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]
) ?>
</td>
<?php else: ?>
<td class="text-success"><?= Yii::t('user', 'Not blocked') ?></td>

View File

@ -1,56 +1,49 @@
<?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([
'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']),
],
],
],
],
],
]) ?>
]
) ?>

View File

@ -1,37 +1,30 @@
<?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 dektrium\user\models\Profile $profile
* @var yii\web\View $this
* @var \Da\User\Model\User $user
* @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([
'layout' => 'horizontal',
'enableAjaxValidation' => true,
'enableClientValidation' => false,
'fieldConfig' => [
'horizontalCssClasses' => [
'wrapper' => 'col-sm-9',
<?php $form = ActiveForm::begin(
[
'layout' => 'horizontal',
'enableAjaxValidation' => true,
'enableClientValidation' => false,
'fieldConfig' => [
'horizontalCssClasses' => [
'wrapper' => 'col-sm-9',
],
],
],
]); ?>
]
); ?>
<?= $form->field($profile, 'name') ?>
<?= $form->field($profile, 'public_email') ?>

View File

@ -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 yii\widgets\ActiveForm $form
* @var \Da\User\Model\User $user
*/
?>

View File

@ -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 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;
<div class="col-md-3">
<div class="panel panel-default">
<div class="panel-body">
<?= 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' => [
'class' => 'disabled',
'onclick' => 'return false;',
]],
['label' => Yii::t('user', 'Information'), 'options' => [
'class' => 'disabled',
'onclick' => 'return false;',
]],
],
]) ?>
<?= 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' => [
'class' => 'disabled',
'onclick' => 'return false;',
]
],
[
'label' => Yii::t('user', 'Information'),
'options' => [
'class' => 'disabled',
'onclick' => 'return false;',
]
],
],
]
) ?>
</div>
</div>
</div>
@ -60,16 +62,18 @@ $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([
'layout' => 'horizontal',
'enableAjaxValidation' => true,
'enableClientValidation' => false,
'fieldConfig' => [
'horizontalCssClasses' => [
'wrapper' => 'col-sm-9',
<?php $form = ActiveForm::begin(
[
'layout' => 'horizontal',
'enableAjaxValidation' => true,
'enableClientValidation' => false,
'fieldConfig' => [
'horizontalCssClasses' => [
'wrapper' => 'col-sm-9',
],
],
],
]); ?>
]
); ?>
<?= $this->render('_user', ['form' => $form, 'user' => $user]) ?>

View File

@ -1,15 +1,6 @@
<?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\user\models\UserSearch;
use Da\User\Search\UserSearch;
use yii\data\ActiveDataProvider;
use yii\grid\GridView;
use yii\helpers\Html;
@ -26,82 +17,99 @@ $this->title = Yii::t('user', 'Manage users');
$this->params['breadcrumbs'][] = $this->title;
?>
<?= $this->render('/_alert', [
'module' => Yii::$app->getModule('user'),
]) ?>
<?= $this->render(
'/_alert',
[
'module' => Yii::$app->getModule('user'),
]
) ?>
<?= $this->render('/admin/_menu') ?>
<?php Pjax::begin() ?>
<?= GridView::widget([
'dataProvider' => $dataProvider,
'filterModel' => $searchModel,
'layout' => "{items}\n{pager}",
'columns' => [
'username',
'email:email',
[
'attribute' => 'registration_ip',
'value' => function ($model) {
return $model->registration_ip == null
? '<span class="not-set">' . Yii::t('user', '(not set)') . '</span>'
: $model->registration_ip;
},
'format' => 'html',
],
[
'attribute' => 'created_at',
'value' => function ($model) {
if (extension_loaded('intl')) {
return Yii::t('user', '{0, date, MMMM dd, YYYY HH:mm}', [$model->created_at]);
} else {
return date('Y-m-d G:i:s', $model->created_at);
}
},
],
[
'header' => Yii::t('user', 'Confirmation'),
'value' => function ($model) {
if ($model->isConfirmed) {
return '<div class="text-center">
<?= GridView::widget(
[
'dataProvider' => $dataProvider,
'filterModel' => $searchModel,
'layout' => "{items}\n{pager}",
'columns' => [
'username',
'email:email',
[
'attribute' => 'registration_ip',
'value' => function ($model) {
return $model->registration_ip == null
? '<span class="not-set">' . Yii::t('user', '(not set)') . '</span>'
: $model->registration_ip;
},
'format' => 'html',
],
[
'attribute' => 'created_at',
'value' => function ($model) {
if (extension_loaded('intl')) {
return Yii::t('user', '{0, date, MMMM dd, YYYY HH:mm}', [$model->created_at]);
} else {
return date('Y-m-d G:i:s', $model->created_at);
}
},
],
[
'header' => Yii::t('user', 'Confirmation'),
'value' => function ($model) {
if ($model->isConfirmed) {
return '<div class="text-center">
<span class="text-success">' . Yii::t('user', 'Confirmed') . '</span>
</div>';
} else {
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',
'visible' => Yii::$app->getModule('user')->enableConfirmation,
} else {
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',
'visible' => Yii::$app->getModule('user')->enableConfirmation,
],
[
'header' => Yii::t('user', 'Block status'),
'value' => function ($model) {
if ($model->isBlocked) {
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],
[
'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',
],
[
'class' => 'yii\grid\ActionColumn',
'template' => '{update} {delete}',
],
],
[
'header' => Yii::t('user', 'Block status'),
'value' => function ($model) {
if ($model->isBlocked) {
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], [
'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',
],
[
'class' => 'yii\grid\ActionColumn',
'template' => '{update} {delete}',
],
],
]); ?>
]
); ?>
<?php Pjax::end() ?>

View File

@ -1,22 +1,13 @@
<?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\user\models\User;
use Da\User\Model\User;
use yii\bootstrap\Nav;
use yii\web\View;
/**
* @var View $this
* @var User $user
* @var string $content
* @var View $this
* @var User $user
* @var string $content
*/
$this->title = Yii::t('user', 'Update user account');
@ -25,9 +16,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') ?>
@ -35,67 +29,71 @@ $this->params['breadcrumbs'][] = $this->title;
<div class="col-md-3">
<div class="panel panel-default">
<div class="panel-body">
<?= Nav::widget([
'options' => [
'class' => 'nav-pills nav-stacked',
],
'items' => [
[
'label' => Yii::t('user', 'Account details'),
'url' => ['/user/admin/update', 'id' => $user->id]
<?= Nav::widget(
[
'options' => [
'class' => 'nav-pills nav-stacked',
],
[
'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', 'Assignments'),
'url' => ['/user/admin/assignments', 'id' => $user->id],
'visible' => isset(Yii::$app->extensions['dektrium/yii2-rbac']),
],
'<hr>',
[
'label' => Yii::t('user', 'Confirm'),
'url' => ['/user/admin/confirm', 'id' => $user->id],
'visible' => !$user->isConfirmed,
'linkOptions' => [
'class' => 'text-success',
'data-method' => 'post',
'data-confirm' => Yii::t('user', 'Are you sure you want to confirm this user?'),
'items' => [
[
'label' => Yii::t('user', 'Account details'),
'url' => ['/user/admin/update', 'id' => $user->id]
],
[
'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', 'Assignments'),
'url' => ['/user/admin/assignments', 'id' => $user->id],
],
'<hr>',
[
'label' => Yii::t('user', 'Confirm'),
'url' => ['/user/admin/confirm', 'id' => $user->id],
'visible' => !$user->isConfirmed,
'linkOptions' => [
'class' => 'text-success',
'data-method' => 'post',
'data-confirm' => Yii::t('user', 'Are you sure you want to confirm this user?'),
],
],
[
'label' => Yii::t('user', 'Block'),
'url' => ['/user/admin/block', 'id' => $user->id],
'visible' => !$user->isBlocked,
'linkOptions' => [
'class' => 'text-danger',
'data-method' => 'post',
'data-confirm' => Yii::t('user', 'Are you sure you want to block this user?'),
],
],
[
'label' => Yii::t('user', 'Unblock'),
'url' => ['/user/admin/block', 'id' => $user->id],
'visible' => $user->isBlocked,
'linkOptions' => [
'class' => 'text-success',
'data-method' => 'post',
'data-confirm' => Yii::t('user', 'Are you sure you want to unblock this user?'),
],
],
[
'label' => Yii::t('user', 'Delete'),
'url' => ['/user/admin/delete', 'id' => $user->id],
'linkOptions' => [
'class' => 'text-danger',
'data-method' => 'post',
'data-confirm' => Yii::t('user', 'Are you sure you want to delete this user?'),
],
],
],
[
'label' => Yii::t('user', 'Block'),
'url' => ['/user/admin/block', 'id' => $user->id],
'visible' => !$user->isBlocked,
'linkOptions' => [
'class' => 'text-danger',
'data-method' => 'post',
'data-confirm' => Yii::t('user', 'Are you sure you want to block this user?'),
],
],
[
'label' => Yii::t('user', 'Unblock'),
'url' => ['/user/admin/block', 'id' => $user->id],
'visible' => $user->isBlocked,
'linkOptions' => [
'class' => 'text-success',
'data-method' => 'post',
'data-confirm' => Yii::t('user', 'Are you sure you want to unblock this user?'),
],
],
[
'label' => Yii::t('user', 'Delete'),
'url' => ['/user/admin/delete', 'id' => $user->id],
'linkOptions' => [
'class' => 'text-danger',
'data-method' => 'post',
'data-confirm' => Yii::t('user', 'Are you sure you want to delete this user?'),
],
],
],
]) ?>
]
) ?>
</div>
</div>
</div>