From 7c9b97ac58cfd02f9d516ffbd608fbddc84ba79e Mon Sep 17 00:00:00 2001 From: Baptiste Lemoine Date: Sun, 12 Apr 2020 17:50:25 +0200 Subject: [PATCH] more emails --- src/Controller/PollController.php | 14 ++++++++++---- templates/email-base.html.twig | 12 ++++++++++++ templates/emails/vote-notification.html.twig | 2 -- 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/src/Controller/PollController.php b/src/Controller/PollController.php index a177ad0..c66f387 100644 --- a/src/Controller/PollController.php +++ b/src/Controller/PollController.php @@ -255,7 +255,7 @@ class PollController extends AbstractController { * @return int */ // public function sendCreationMailAction( Owner $admin_user, Poll $poll, \Swift_Mailer $mailer) { - public function testSendCreationMailAction( MailService $mail_service, $emailChoice = 'creation_comment' ) { + public function testSendCreationMailAction( MailService $mail_service, $emailChoice = 'creation_poll_admin' ) { $em = $this->getDoctrine()->getRepository( Owner::class ); $foundOwner = $em->find( 1 ); $poll = $foundOwner->getPolls()[ 0 ]; @@ -264,13 +264,19 @@ class PollController extends AbstractController { $emailChoicesTemplates = [ 'creation_poll' => 'creation-mail.html.twig', + 'creation_poll_admin' => 'author-mail.html.twig', + 'owner_list' => 'owner-list.html.twig', + 'expiration' => 'expiration-mail.html.twig', 'creation_comment' => 'comment-notification.html.twig', 'creation_vote' => 'vote-notification.html.twig', ]; $emailChoicesTitles = [ - 'creation_poll' => 'Framadate | Création de sondage - ' . $poll->getTitle(), - 'creation_comment' => 'Framadate | Commentaire de ' . $foundOwner->getPseudo() . ' - sondage ' . $poll->getTitle(), - 'creation_vote' => 'Framadate | Commentaire de ' . $foundOwner->getPseudo() . ' - sondage ' . $poll->getTitle(), + 'creation_poll' => 'Framadate | Création de sondage - lien public - ' . $poll->getTitle(), + 'creation_poll_admin' => 'Framadate | Création de sondage - lien admin - ', + 'owner_list' => 'Framadate | Vos sondages créés', + 'expiration' => 'Framadate | Notice d\'expiration du sondage '. $poll->getTitle(), + 'creation_comment' => 'Framadate | Commentaire de "' . $foundOwner->getPseudo() . '" - sondage ' . $poll->getTitle(), + 'creation_vote' => 'Framadate | Vote de "' . $foundOwner->getPseudo() . '" - sondage ' . $poll->getTitle(), ]; // $mail_service->sendCreationMailAction( $foundOwner, $poll ); diff --git a/templates/email-base.html.twig b/templates/email-base.html.twig index 2965a4a..dcce573 100644 --- a/templates/email-base.html.twig +++ b/templates/email-base.html.twig @@ -8,11 +8,22 @@ padding: 1em; } .footer-content{ + margin-top: 1em; background: #ccc; } ul { border-left: 3px solid #ddd; } + a { + padding: 1em; border-radius: 3px; + background: #7d6c99; + color: #201b27; + margin: 0.5rem 0; + display: inline-block; + } + h1,h2,h3{ + color: #3c334a; + }
{% block title %} @@ -23,6 +34,7 @@ {% endif %}
{% endblock %} + {% block stylesheets %}{% endblock %}
diff --git a/templates/emails/vote-notification.html.twig b/templates/emails/vote-notification.html.twig index afaf090..b1b174d 100644 --- a/templates/emails/vote-notification.html.twig +++ b/templates/emails/vote-notification.html.twig @@ -5,8 +5,6 @@ {{ owner.pseudo }} vient de voter au sondage. - - {{ owner.votes |length }}
Vous pouvez retrouver votre sondage avec le lien suivant : {% include 'emails/partial/admin_link.html.twig' %}