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

Fix merge with upstream

Browse Source
This commit is contained in:
E.Alamo
2018-05-27 07:09:02 +02:00
parent 1d0168379a 71f9587374
commit 83d6f9547e
121 changed files with 2598 additions and 407 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/User/resources/views/settings/account.php
View File

@ -31,7 +31,7 @@ $module = Yii::$app->getModule('user');
<div class="row">
<div class="col-md-3">
<?= $this->render('_menu') ?>
<?= $this->render('/settings/_menu') ?>
</div>
<div class="col-md-9">
<div class="panel panel-default">
@ -81,7 +81,7 @@ $module = Yii::$app->getModule('user');
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
aria-hidden="true">&times;</span></button>
<h4 class="modal-title" id="myModalLabel">
<?= Yii::t('usuario', 'Two Factor Authentication') ?></h4>
<?= Yii::t('usuario', 'Two Factor Authentication (2FA)') ?></h4>
</div>
<div class="modal-body">
...
@ -96,25 +96,25 @@ $module = Yii::$app->getModule('user');
</div>
<div class="panel panel-info">
<div class="panel-heading">
<h3 class="panel-title"><?= Yii::t('usuario', 'Two-Factor Authentication') ?></h3>
<h3 class="panel-title"><?= Yii::t('usuario', 'Two Factor Authentication (2FA)') ?></h3>
</div>
<div class="panel-body">
<p>
<?= Yii::t('usuario', 'Two-factor auth protects you against stolen credentials') ?>.
<?= Yii::t('usuario', 'Two factor authentication protects you against stolen credentials') ?>.
</p>
<div class="text-right">
<?= Html::a(
Yii::t('usuario', 'Disable Two-Factor Auth'),
Yii::t('usuario', 'Disable two factor authentication'),
['two-factor-disable', 'id' => $model->getUser()->id],
[
'id' => 'disable_tf_btn',
'class' => 'btn btn-warning ' . ($model->getUser()->auth_tf_enabled ? '' : 'hide'),
'data-method' => 'post',
'data-confirm' => Yii::t('usuario', 'This will disable two-factor auth. Are you sure?'),
'data-confirm' => Yii::t('usuario', 'This will disable two factor authentication. Are you sure?'),
]
) ?>
<?= Html::a(
Yii::t('usuario', 'Enable Two-factor auth'),
Yii::t('usuario', 'Enable two factor authentication'),
'#tfmodal',
[
'id' => 'enable_tf_btn',

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

@ -28,7 +28,7 @@ $this->params['breadcrumbs'][] = $this->title;
<div class="row">
<div class="col-md-3">
<?= $this->render('_menu') ?>
<?= $this->render('/networks/_menu') ?>
</div>
<div class="col-md-9">
<div class="panel panel-default">

5
src/User/resources/views/settings/profile.php
View File

@ -32,7 +32,7 @@ $timezoneHelper = $model->make(TimezoneHelper::class);
<div class="row">
<div class="col-md-3">
<?= $this->render('_menu') ?>
<?= $this->render('/profile/_menu') ?>
</div>
<div class="col-md-9">
<div class="panel panel-default">
@ -71,7 +71,8 @@ $timezoneHelper = $model->make(TimezoneHelper::class);
->hint(
Html::a(
Yii::t('usuario', 'Change your avatar at Gravatar.com'),
'http://gravatar.com'
'http://gravatar.com',
['target' => '_blank']
)
) ?>

2
src/User/resources/views/settings/two-factor.php
View File

@ -29,7 +29,7 @@
<div class="row">
<div class="col-md-offset-3 col-md-6 text-center">
<div class="input-group">
<input type="text" class="form-control" id="tfcode" placeholder="<?= Yii::t('usuario', 'Two-factor code') ?>"/>
<input type="text" class="form-control" id="tfcode" placeholder="<?= Yii::t('usuario', 'Two factor authentication code') ?>"/>
<span class="input-group-btn">
<button type="button" class="btn btn-primary btn-submit-code">
<?= Yii::t('usuario', 'Enable') ?>