Skip to content

Commit

Permalink
[Auth] adds a yk-mail class the all mails
Browse files Browse the repository at this point in the history
  • Loading branch information
@cbleek
cbleek committed Dec 22, 2017
1 parent b4f4238 commit 37556ce
Show file tree
Hide file tree
Showing 13 changed files with 91 additions and 57 deletions.
11 changes: 7 additions & 4 deletions module/Auth/view/mail/first-external-login.en.phtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,13 @@
* @copyright 2013 - 2015 Cross Solution <http://cross-solution.de>
*/
?>
<?php echo $this->partial('mail/header'); ?>
<div class="yk-mail">
<?= $this->partial('mail/header'); ?>
<p>Hi,</p>

<p>You've registered the first time to the "YAWIK Demo" <?php echo
$this->application ? 'über "' . $this->application . '"' : ' via an external application' ?>.</p>
<p>
You've registered the first time to the "YAWIK Demo" <?= $this->application ? 'über "' . $this->application . '"' : ' via an external application' ?>.
</p>

<p>We've created Login data:</p>

Expand All @@ -27,4 +29,5 @@
please login and change your password <a href="<?php echo $this->serverUrl() . $this->url('lang/auth', array('lang' => 'de'))?>">YAWIK Demo</a>
</p>

<?php echo $this->partial('mail/footer') ?>
<?= $this->partial('mail/footer') ?>
</div>
18 changes: 11 additions & 7 deletions module/Auth/view/mail/first-external-login.phtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,23 +10,27 @@
* @copyright 2013 - 2015 Cross Solution <http://cross-solution.de>
*/
?>
<?php echo $this->partial('mail/header'); ?>
<div class="yk-mail">
<?= $this->partial('mail/header'); ?>
<p>Guten Tag,</p>

<p>Sie haben sich das erste Mal an "YAWIK Demo" <?php echo
$this->application ? 'über "' . $this->application . '"' : 'über eine externe Applikation' ?> angemeldet.</p>
<p>
Sie haben sich das erste Mal an "YAWIK Demo" <?= $this->application ? 'über "' . $this->application . '"' : 'über eine externe Applikation' ?>
angemeldet.
</p>

<p>Damit Sie sich in Zukunft zusätzlich auch bequem direkt am System anmelden können, haben wir Ihnen dafür Zugangsdaten generiert:</p>

<p>
<strong>Login:</strong> <?php echo $this->login ?><br>
<strong>Password:</strong> <?php echo $this->password ?>
<strong>Login:</strong> <?= $this->login ?><br>
<strong>Password:</strong> <?= $this->password ?>
</p>

<p>
Wir empfehlen Ihnen, nach dem ersten einloggen auf <a href="<?php echo $this->serverUrl() . $this->url('lang/auth', array('lang' => 'de'))?>">YAWIK Demo</a>
Wir empfehlen Ihnen, nach dem ersten einloggen auf <a href="<?= $this->serverUrl() . $this->url('lang/auth', array('lang' => 'de'))?>">YAWIK Demo</a>
das Passwort zu ändern. Dazu rufen Sie die Profil-Einstellungen über das Menü auf der rechten oberen Bildschirmseite auf und wählen den Punkt
"Passwort ändern".
</p>

<?php echo $this->partial('mail/footer') ?>
<?= $this->partial('mail/footer') ?>
</div>
29 changes: 18 additions & 11 deletions module/Auth/view/mail/first-socialmedia-login.en.phtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,29 +10,36 @@
* @copyright 2013 - 2015 Cross Solution <http://cross-solution.de>
*/
?>
<?php echo $this->partial('mail/header'); ?>
<p>Hello <?php echo $this->displayName?>,</p>
<div class="yk-mail">
<?= $this->partial('mail/header'); ?>
<p>Hello <?= $this->displayName?>,</p>

<p>welcome to the YAWIK demo. You've registered the first time via <?php echo $this->provider?>.</p>
<p>welcome to the YAWIK demo. You've registered the first time via <?= $this->provider?>.</p>

<p>Login data were generated, so you can log into YAWIK directly. This should only show you that YAWIK can be used completely
without social networks.</p>
<p>
Login data were generated, so you can log into YAWIK directly. This should only show you that YAWIK can be used
completely without social networks.
</p>

<p>
We've set your role to a recruiter. So you can create jobs and manage applications.
Changing the role is currently only possible directly on the mongo cli.
</p>


<p>Username: <?php echo $this->login ?><br>
<p>Username: <?= $this->login ?><br>


Secret: <?php echo $this->password ?></p>
Secret: <?= $this->password ?></p>


<p>Return to YAWIK and log in at: <a href="<?php $url = $this->serverUrl() . $this->url('lang/auth', array('lang' => 'en')); echo $url; ?>"><?php echo $url ?></a></p>
<p>
Return to YAWIK and log in at:
<a href="<?php $url = $this->serverUrl() . $this->url('lang/auth', array('lang' => 'en')); echo $url; ?>">
<?= $url ?>
</a>
</p>


<?php
echo $this->partial('mail/footer');
?>
<?= $this->partial('mail/footer'); ?>
</div>
14 changes: 8 additions & 6 deletions module/Auth/view/mail/first-socialmedia-login.phtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,11 @@
* @copyright 2013 - 2015 Cross Solution <http://cross-solution.de>
*/
?>
<div class="yk-mail">
<?php echo $this->partial('mail/header'); ?>
<p>Hello <?php echo $this->displayName?>,</p>
<p>Hello <?= $this->displayName?>,</p>

<p>Herzlich willkommen beim YAWIK demo. Sie haben sich das erste mal über <?php echo $this->provider?> angebeldet.</p>
<p>Herzlich willkommen beim YAWIK demo. Sie haben sich das erste mal über <?= $this->provider?> angebeldet.</p>

<p>
Wir haben für Sie Zugangsdaten generiert. Das soll Ihnen zeigen, dass Sie YAWIK auch ganz ohne
Expand All @@ -25,14 +26,15 @@
</p>


<p>Benutzername: <?php echo $this->login ?><br>
<p>Benutzername: <?= $this->login ?><br>


Kennwort: <?php echo $this->password ?></p>
Kennwort: <?= $this->password ?></p>


<p>Loggen Sie sich ein unter: <a href="<?php $url = $this->serverUrl() . $this->url('lang/auth', array('lang' => 'en')); echo $url; ?>"><?php echo $url ?></a></p>
<p>Loggen Sie sich ein unter: <a href="<?php $url = $this->serverUrl() . $this->url('lang/auth', array('lang' => 'en')); echo $url; ?>"><?= $url ?></a></p>



<?php echo $this->partial('mail/footer'); ?>
<?= $this->partial('mail/footer'); ?>
</div>
6 changes: 4 additions & 2 deletions module/Auth/view/mail/forgot-password.en.phtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
/* @var Auth\Entity\User $user */
$user = $this->user;
?>
<div class="yk-mail">
<?php echo $this->partial('mail/header', ['title' => 'reset password']); ?>
<p>
Dear <?=$user->getInfo()->getLastName(); ?>,
Expand All @@ -21,11 +22,12 @@ $user = $this->user;
</p>

<p>
<a href="<?php echo $this->resetlink; ?>"><?php echo $this->resetlink; ?></a>
<a href="<?= $this->resetlink; ?>"><?= $this->resetlink; ?></a>
</p>

<p>
If you do not have requested for a new password, please just ignore this mail.
</p>

<?php echo $this->partial('mail/footer.en', array()); ?>
<?= $this->partial('mail/footer.en', array()); ?>
</div>
8 changes: 5 additions & 3 deletions module/Auth/view/mail/forgot-password.phtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,21 @@
/* @var Auth\Entity\User $user */
$user = $this->user;
?>
<?php echo $this->partial('mail/header', ['title' => 'Kennwort zurücksenden']); ?>
<div class="yk-mail">
<?= $this->partial('mail/header', ['title' => 'Kennwort zurücksenden']); ?>

<p> Guten Tag <?=$user->getInfo()->getLastName(); ?>,</p>
<p>
um ein neues Passwort für das Bewerbermanagement zu vergeben, klicken Sie bitte auf folgenden Link:
</p>
<p>
<a href="<?php echo $this->resetlink; ?>"><?php echo $this->resetlink; ?></a>
<a href="<?= $this->resetlink; ?>"><?= $this->resetlink; ?></a>
</p>
<p>
Sollten Sie kein neues Passwort angefordert haben, brauchen Sie nichts weiter zu tun.
<p>
Bitte informieren Sie uns aber, falls Sie Bedenken bezüglich der Sicherheit Ihres Passwortes haben.
</p>

<?php echo $this->partial('mail/footer',array()); ?>
<?= $this->partial('mail/footer',array()); ?>
</div>
6 changes: 4 additions & 2 deletions module/Auth/view/mail/new-registration.de.phtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,13 @@

$this->mail->setSubject('Ein neur Benutzer hat sich registriert.');
?>
<?php echo $this->partial('mail/header'); ?>
<div class="yk-mail">
<?= $this->partial('mail/header'); ?>

<p>Ein neuer Benutzer hat sich registriert: <?=$this->user->getInfo()->getDisplayName(false) ?>
&lt;<?=$this->user->getInfo()->getEmail()?>&gt;</p>

<p>Die Bestätigung der Registrierung ist noch nicht erfolgt.</p>

<?php echo $this->partial('mail/footer'); ?>
<?= $this->partial('mail/footer'); ?>
</div>
6 changes: 4 additions & 2 deletions module/Auth/view/mail/new-registration.phtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,13 @@

$this->mail->setSubject('A new user just registered.');
?>
<?php echo $this->partial('mail/header'); ?>
<div class="yk-mail">
<?= $this->partial('mail/header'); ?>

<p>A new user registered: <?=$this->user->getInfo()->getDisplayName(false) ?>
&lt;<?=$this->user->getInfo()->getEmail()?>&gt;</p>

<p>This user is not confirmed yet.</p>

<?php echo $this->partial('mail/footer.en'); ?>
<?= $this->partial('mail/footer.en'); ?>
</div>
12 changes: 7 additions & 5 deletions module/Auth/view/mail/register.en.phtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,15 @@
* Sends a confirmation link to the user, after registration
*/
?>
<?php echo $this->partial('mail/header'); ?>
<p>Dear <?php echo $this->name; ?>,</p>
<div class="yk-mail">
<?= $this->partial('mail/header'); ?>
<p>Dear <?= $this->name; ?>,</p>

<p>You've successfully registered on <?php echo $this->siteName; ?></p>
<p>You've successfully registered on <?= $this->siteName; ?></p>

<p>please confirm your registration by clicking the following link:</p>

<a href="<?php echo $this->confirmationlink; ?>"><?php echo $this->confirmationlink; ?></a>
<a href="<?= $this->confirmationlink; ?>"><?= $this->confirmationlink; ?></a>

<?php echo $this->partial('mail/footer.en'); ?>
<?= $this->partial('mail/footer.en'); ?>
</div>
11 changes: 7 additions & 4 deletions module/Auth/view/mail/register.phtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,15 @@
* Sends a confirmation link to the user, after registration
*/
?>
<p>Sehr geehrte/-r Herr/Frau <?php echo $this->name; ?>,</p>
<div class="yk-mail">
<?= $this->partial('mail/header'); ?>
<p>Sehr geehrte/-r Herr/Frau <?= $this->name; ?>,</p>

<p>Sie haben sich erfolgreich auf <?php echo $this->siteName; ?> registriert.</p>
<p>Sie haben sich erfolgreich auf <?= $this->siteName; ?> registriert.</p>

<p>Zur Bestätigung Ihrer Registrierung und Freischaltung Ihres Kontos klicken Sie bitte auf folgenden Link:</p>

<a href="<?php echo $this->confirmationlink; ?>"><?php echo $this->confirmationlink; ?></a>
<a href="<?= $this->confirmationlink; ?>"><?= $this->confirmationlink; ?></a>

<?php echo $this->partial('mail/footer'); ?>
<?= $this->partial('mail/footer'); ?>
</div>
6 changes: 4 additions & 2 deletions module/Auth/view/mail/user-confirmed.de.phtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,13 @@

$this->mail->setSubject('Ein Benutzer wurde bestätigt.');
?>
<?php echo $this->partial('mail/header'); ?>
<div class="yk-mail">
<?= $this->partial('mail/header'); ?>

<p>Ein Benutzer hat seine Registrierung bestätigt: <?=$this->user->getInfo()->getDisplayName(false) ?>
&lt;<?=$this->user->getInfo()->getEmail()?>&gt;</p>

<p>Der Benutzeraccount ist jetzt vollständig registriert und aktiv.</p>

<?php echo $this->partial('mail/footer'); ?>
<?= $this->partial('mail/footer'); ?>
</div>
6 changes: 4 additions & 2 deletions module/Auth/view/mail/user-confirmed.phtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,13 @@

$this->mail->setSubject('A registered user was confirmed.');
?>
<?php echo $this->partial('mail/header'); ?>
<div class="yk-mail">
<?= $this->partial('mail/header'); ?>

<p>A user was just confirmed: <?=$this->user->getInfo()->getDisplayName(false) ?>
&lt;<?=$this->user->getInfo()->getEmail()?>&gt;</p>

<p>This user is now fully registered and active.</p>

<?php echo $this->partial('mail/footer.en'); ?>
<?= $this->partial('mail/footer.en'); ?>
</div>
15 changes: 8 additions & 7 deletions module/Organizations/view/mail/invite-employee.phtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,22 +23,22 @@
*
*/
?>

<div class="yk-mail">
<?= $this->partial('mail/header') ?>
<p>
<?php if ($this->user): echo sprintf($this->translate('Hello %s'), $this->user);
else: echo $this->translate('Hello');
endif;?>,
</p>

<p>
<?php echo sprintf($this->translate('%s invited you to join the team of %s'),
$this->inviter, $this->organization) ?>
<?= sprintf($this->translate('%s invited you to join the team of %s'), $this->inviter, $this->organization) ?>
</p>

<p>
<?php echo $this->translate('You can accept this invitation by visiting the following link') ?>:
<?= $this->translate('You can accept this invitation by visiting the following link') ?>:
</p>
<?php echo $this->link($this->serverUrl($this->url)) ?>
<?= $this->link($this->serverUrl($this->url)) ?>

<?php if ($this->hasAssociation): ?>
<p>
Expand All @@ -58,7 +58,8 @@
<?php endif ?>

<p>
<?php echo $this->translate('If you do not want to accept this invitation you can ignore this mail and the request is canceled automatically after a week.'); ?>
<?= $this->translate('If you do not want to accept this invitation you can ignore this mail and the request is canceled automatically after a week.'); ?>
</p>

<?php echo $this->partial('mail/footer') ?>
<?= $this->partial('mail/footer') ?>
</div>

0 comments on commit 37556ce

Please sign in to comment.