fix views

This commit is contained in:
Antonio Ramirez
2016-12-11 00:56:05 +01:00
parent 005ab4f1b8
commit 1ebe58d2ce
25 changed files with 238 additions and 302 deletions

View File

@ -1,19 +1,10 @@
<?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\Html;
/**
* @var dektrium\user\models\User $user
* @var dektrium\user\models\Token $token
* @var \Da\User\Model\User $user
* @var \Da\User\Model\Token $token
*/
?>
<p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.6; font-weight: normal; margin: 0 0 10px; padding: 0;">

View File

@ -1,14 +1,4 @@
<?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 $this
* @var yii\mail\BaseMessage $content

View File

@ -1,14 +1,4 @@
<?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 string $content main view render result
*/

View File

@ -1,18 +1,8 @@
<?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\Html;
/**
* @var dektrium\user\models\Token $token
* @var \Da\User\Model\Token $token
*/
?>
<p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.6; font-weight: normal; margin: 0 0 10px; padding: 0;">

View File

@ -1,19 +1,10 @@
<?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\Html;
/**
* @var dektrium\user\models\User $user
* @var dektrium\user\models\Token $token
* @var \Da\User\Model\User $user
* @var \Da\User\Model\Token $token
*/
?>
<p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.6; font-weight: normal; margin: 0 0 10px; padding: 0;">

View File

@ -1,17 +1,8 @@
<?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 dektrium\user\models\User $user
* @var dektrium\user\models\Token $token
* @var \Da\User\Model\User $user
* @var \Da\User\Model\Token $token
*/
?>
<?= Yii::t('user', 'Hello') ?>,

View File

@ -1,16 +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.
*/
/**
* @var dektrium\user\models\Token $token
* @var \Da\User\Model\Token $token
*/
?>
<?= Yii::t('user', 'Hello') ?>,

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 dektrium\user\models\User $user
* @var dektrium\user\models\Token $token
* @var \Da\User\Model\User $user
* @var \Da\User\Model\Token $token
*/
?>
<?= Yii::t('user', 'Hello') ?>,

View File

@ -1,32 +1,23 @@
<?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 dektrium\user\models\User
* @var \Da\User\Model\User $user
* @var \Da\User\Model\Token $token
* @var \Da\User\Module $module
*/
?>
<?= Yii::t('user', 'Hello') ?>,
<?= Yii::t('user', 'Your account on {0} has been created', Yii::$app->name) ?>.
<?php if ($module->enableGeneratingPassword): ?>
<?= Yii::t('user', 'We have generated a password for you') ?>:
<?= $user->password ?>
<?php if ($module->generatePasswords): ?>
<?= Yii::t('user', 'We have generated a password for you') ?>:
<?= $user->password ?>
<?php endif ?>
<?php if ($token !== null): ?>
<?= Yii::t('user', 'In order to complete your registration, please click the link below') ?>.
<?= $token->url ?>
<?= Yii::t('user', 'If you cannot click the link, please try pasting the text into your browser') ?>.
<?= Yii::t('user', 'In order to complete your registration, please click the link below') ?>.
<?= $token->url ?>
<?= Yii::t('user', 'If you cannot click the link, please try pasting the text into your browser') ?>.
<?php endif ?>
<?= Yii::t('user', 'If you did not make this request you can ignore this email') ?>.

View File

@ -1,21 +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\helpers\Html;
/**
* @var dektrium\user\Module $module
* @var dektrium\user\models\User $user
* @var dektrium\user\models\Token $token
* @var bool $showPassword
* @var \Da\User\Module $module
* @var \Da\User\Model\User $user
* @var \Da\User\Model\Token $token
* @var bool $showPassword
*/
?>
@ -25,22 +15,22 @@ use yii\helpers\Html;
<p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.6; font-weight: normal; margin: 0 0 10px; padding: 0;">
<?= Yii::t('user', 'Your account on {0} has been created', Yii::$app->name) ?>.
<?php if ($showPassword || $module->enableGeneratingPassword): ?>
<?php if ($showPassword || $module->generatePasswords): ?>
<?= Yii::t('user', 'We have generated a password for you') ?>: <strong><?= $user->password ?></strong>
<?php endif ?>
</p>
<?php if ($token !== null): ?>
<p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.6; font-weight: normal; margin: 0 0 10px; padding: 0;">
<?= Yii::t('user', 'In order to complete your registration, please click the link below') ?>.
</p>
<p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.6; font-weight: normal; margin: 0 0 10px; padding: 0;">
<?= Html::a(Html::encode($token->url), $token->url); ?>
</p>
<p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.6; font-weight: normal; margin: 0 0 10px; padding: 0;">
<?= Yii::t('user', 'If you cannot click the link, please try pasting the text into your browser') ?>.
</p>
<p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.6; font-weight: normal; margin: 0 0 10px; padding: 0;">
<?= Yii::t('user', 'In order to complete your registration, please click the link below') ?>.
</p>
<p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.6; font-weight: normal; margin: 0 0 10px; padding: 0;">
<?= Html::a(Html::encode($token->url), $token->url); ?>
</p>
<p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.6; font-weight: normal; margin: 0 0 10px; padding: 0;">
<?= Yii::t('user', 'If you cannot click the link, please try pasting the text into your browser') ?>.
</p>
<?php endif ?>
<p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.6; font-weight: normal; margin: 0 0 10px; padding: 0;">