leonardo/yii2-usuario
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed all tests

Browse Source
This commit is contained in:
Antonio Ramirez
2016-12-11 21:34:22 +01:00
parent 4588d77129
commit 4c9b9671b5
37 changed files with 214 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/User/resources/views/admin/create.php
View File

@ -16,7 +16,7 @@ $this->params['breadcrumbs'][] = $this->title;
?>
<?= $this->render(
'/_alert',
'/shared/_alert',
[
'module' => Yii::$app->getModule('user'),
]

4
lib/User/resources/views/admin/index.php
View File

@ -18,7 +18,7 @@ $this->params['breadcrumbs'][] = $this->title;
?>
<?= $this->render(
'/_alert',
'/shared/_alert',
[
'module' => Yii::$app->getModule('user'),
]
@ -75,7 +75,7 @@ $this->params['breadcrumbs'][] = $this->title;
}
},
'format' => 'raw',
'visible' => Yii::$app->getModule('user')->enableConfirmation,
'visible' => Yii::$app->getModule('user')->enableEmailConfirmation,
],
[
'header' => Yii::t('user', 'Block status'),

2
lib/User/resources/views/admin/update.php
View File

@ -17,7 +17,7 @@ $this->params['breadcrumbs'][] = $this->title;
?>
<?= $this->render(
'/_alert',
'/shared/_alert',
[
'module' => Yii::$app->getModule('user'),
]

2
lib/User/resources/views/security/login.php
View File

@ -14,7 +14,7 @@ $this->title = Yii::t('user', 'Sign in');
$this->params['breadcrumbs'][] = $this->title;
?>
<?= $this->render('/_alert', ['module' => Yii::$app->getModule('user')]) ?>
<?= $this->render('/shared/_alert', ['module' => Yii::$app->getModule('user')]) ?>
<div class="row">
<div class="col-md-4 col-md-offset-4 col-sm-6 col-sm-offset-3">

2
lib/User/resources/views/settings/account.php
View File

@ -13,7 +13,7 @@ $this->title = Yii::t('user', 'Account settings');
$this->params['breadcrumbs'][] = $this->title;
?>
<?= $this->render('/_alert', ['module' => Yii::$app->getModule('user')]) ?>
<?= $this->render('/shared/_alert', ['module' => Yii::$app->getModule('user')]) ?>
<div class="row">
<div class="col-md-3">

2
lib/User/resources/views/settings/networks.php
View File

@ -13,7 +13,7 @@ $this->title = Yii::t('user', 'Networks');
$this->params['breadcrumbs'][] = $this->title;
?>
<?= $this->render('/_alert', ['module' => Yii::$app->getModule('user')]) ?>
<?= $this->render('/shared/_alert', ['module' => Yii::$app->getModule('user')]) ?>
<div class="row">
<div class="col-md-3">

2
lib/User/resources/views/settings/profile.php
View File

@ -21,7 +21,7 @@ $this->title = Yii::t('user', 'Profile settings');
$this->params['breadcrumbs'][] = $this->title;
?>
<?= $this->render('/_alert', ['module' => Yii::$app->getModule('user')]) ?>
<?= $this->render('/shared/_alert', ['module' => Yii::$app->getModule('user')]) ?>
<div class="row">
<div class="col-md-3">

13
lib/User/resources/views/shared/message.php
View File

@ -1,8 +1,8 @@
<?php
/**
* @var yii\web\View $this
* @var \Da\User\Module $module
* @var yii\web\View $this
* @var \Da\User\Module $module
* @var string $title
*/
@ -10,6 +10,9 @@ $this->title = $title;
?>
<?= $this->render('_alert', [
'module' => $module,
]);
<?= $this->render(
'_alert',
[
'module' => $module,
]
);

53
lib/User/resources/views/widgets/assignments/form.php Normal file
View File

@ -0,0 +1,53 @@
<?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\models\Assignment;
use kartik\select2\Select2;
use yii\bootstrap\Alert;
use yii\helpers\Html;
use yii\widgets\ActiveForm;
/**
* @var $model Assignment
*/
?>
<?php if ($model->updated): ?>
<?= Alert::widget([
'options' => [
'class' => 'alert-success'
],
'body' => Yii::t('rbac', 'Assignments have been updated'),
]) ?>
<?php endif ?>
<?php $form = ActiveForm::begin([
'enableClientValidation' => false,
'enableAjaxValidation' => false,
]) ?>
<?= Html::activeHiddenInput($model, 'user_id') ?>
<?= $form->field($model, 'items')->widget(Select2::className(), [
'data' => $model->getAvailableItems(),
'options' => [
'id' => 'items',
'multiple' => true
],
]) ?>
<?= Html::submitButton(Yii::t('rbac', 'Update assignments'), ['class' => 'btn btn-success btn-block']) ?>
<?php ActiveForm::end() ?>

50
lib/User/resources/views/widgets/login/login.php Normal file
View File

@ -0,0 +1,50 @@
<?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\helpers\Url;
use yii\widgets\ActiveForm;
use yii\helpers\Html;
/**
* @var yii\web\View $this
* @var yii\widgets\ActiveForm $form
* @var dektrium\user\models\LoginForm $model
* @var string $action
*/
?>
<?php if (Yii::$app->user->isGuest): ?>
<?php $form = ActiveForm::begin([
'id' => 'login-widget-form',
'action' => Url::to(['/user/security/login']),
'enableAjaxValidation' => true,
'enableClientValidation' => false,
'validateOnBlur' => false,
'validateOnType' => false,
'validateOnChange' => false,
]) ?>
<?= $form->field($model, 'login')->textInput(['placeholder' => 'Login']) ?>
<?= $form->field($model, 'password')->passwordInput(['placeholder' => 'Password']) ?>
<?= $form->field($model, 'rememberMe')->checkbox() ?>
<?= Html::submitButton(Yii::t('user', 'Sign in'), ['class' => 'btn btn-primary btn-block']) ?>
<?php ActiveForm::end(); ?>
<?php else: ?>
<?= Html::a(Yii::t('user', 'Logout'), ['/user/security/logout'], [
'class' => 'btn btn-danger btn-block',
'data-method' => 'post'
]) ?>
<?php endif ?>