refactor(templates): Add more location data to emails #243

vbudhram · 2016-12-21T17:01:53Z

This PR adds adds a new verify account sync template. This does not change the verify account email for non-sync users. It also adds location data to

verify sync account email
password reset email
password change success email

It also contains some slight text tweaks to the emails.

Fixes #189

vladikoff · 2016-12-21T17:03:16Z

templates/verify.html

+{{#if timestamp }}<span style="display:block;margin:2px 0;">{{ timestamp }}</span>{{/if}}
+
+
+      </p>


do we need the 2 line breaks here in these?

This is strange, these files are generated from grunt templates. I'll check to see what might be causing the extra breaks.

vladikoff · 2016-12-21T17:04:11Z

Fixes #189

vladikoff · 2016-12-21T17:05:07Z

templates/verify.txt

+{{ device }}
+{{#if location}}{{ location }}{{/if}}
+{{#if ip}}{{t "IP address: %(ip)s" }}{{/if}}
+{{#if timestamp}}{{ timestamp }}{{/if}}


let's not put the timestamp in the verify email because @ryanfeeley does not have that one in the template. Other 2 emails should have it though

vladikoff · 2016-12-21T17:05:38Z

templates/verify.txt

+{{#if ip}}{{t "IP address: %(ip)s" }}{{/if}}
+{{#if timestamp}}{{ timestamp }}{{/if}}
+
+{{t "Verify email →"}} {{{link}}}


should this use an HTML right arrow → ?

vladikoff · 2016-12-21T17:05:57Z

templates/verify.html

@@ -35,7 +42,7 @@ <h1 style="font-family: sans-serif; font-weight: normal; margin: 0 0 24px 0; tex
            <w:anchorlock/>
            <center>
          <![endif]-->
-          <a href="{{{link}}}" id="button-link" style="font-family:sans-serif; color: #fff; display: block; padding: 15px; text-decoration: none; width: 280px;">{{t "Activate now"}}</a>
+          <a href="{{{link}}}" id="button-link" style="font-family:sans-serif; color: #fff; display: block; padding: 15px; text-decoration: none; width: 280px;">{{t "Verify email →"}}</a>


same as https://github.com/mozilla/fxa-auth-mailer/pull/243/files#r93478631

vladikoff · 2016-12-21T17:07:24Z

partials/verify.html

+    <h1 style="font-family: sans-serif; font-weight: normal; margin: 0 0 24px 0; text-align: center;"><% block verify_title %>{{t "Ready, set sync"}}<% endblock %></h1>
+    <p class="primary" style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0 0 24px 0; text-align: center;"><% block verify_content %>{{t "Confirm you’ve received this email and we’ll help you install and sync Firefox on all your devices starting with:"}}<br/><br/>
+      <% include "./location/location.html" %>
+      <% endblock %></p>


the <p> tag seems not closed

vladikoff · 2016-12-21T20:18:24Z

templates/verification_reminder_first.html

@@ -11,7 +11,7 @@
 <!--Logo-->
 <tr style="page-break-before: always">
  <td align="center" id="firefox-logo" style="padding: 20px 0;">
-    <img src="http://image.e.mozilla.org/lib/fe9915707361037e75/m/2/fxlogojg.gif" height="95" width="88" alt="" style="-ms-interpolation-mode: bicubic;" />
+    <img src="http://v14d.com/g/choose_what_to_sync_devices2x.jpg" height="152" width="310" alt="" style="-ms-interpolation-mode: bicubic;" />


let's not forget to update that ;D

Should this be updated before merge or could I file a follow up issue for it?

vbudhram · 2016-12-21T21:42:52Z

@ryanfeeley Here are the rendered out updates to the emails. Am I missing anything?

Password reset requested:

Verify Sync Account:

Password change completed:

vladikoff · 2016-12-21T21:59:57Z

templates/password_reset.html

+      <img src="http://image.e.mozilla.org/lib/fe9915707361037e75/m/2/fxlogojg.gif" height="95" width="88" alt="" style="-ms-interpolation-mode: bicubic;" />
+    {{/if}}
+    {{#if sync}}
+      <img src="http://v14d.com/g/choose_what_to_sync_devices2x.jpg" height="152" width="310" alt="" style="-ms-interpolation-mode: bicubic;" />


@vbudhram , @jbuck knows where the file should go. The file to upload would be https://github.com/mozilla/fxa-auth-mailer/issues/189#issuecomment-268599408

https://image.e.mozilla.org/lib/fe9915707361037e75/m/3/fxa_dec2016.jpeg

…word change, password reset

vbudhram · 2016-12-22T22:18:06Z

@vladikoff Updated image and ran email on acid for new sync template, https://www.emailonacid.com/app/acidtest/display/summary/8tugyvPCXUR8ugpAaxuXcH4ZAfKjA6cDBPkdevhdhzQqC. Is there anything else I am missing, r?

vladikoff · 2016-12-23T00:02:17Z

mailer.js

    return this.send({
      acceptLanguage: message.acceptLanguage,
      email: message.email,
      headers: headers,
-      subject: gettext('Verify your Firefox Account'),
+      subject: gettext(subject),


@vbudhram this gettext(subject) will not work for string extraction, the strings need to be written out as gettext('Stuff here') in the code

vladikoff · 2016-12-23T00:08:28Z

partials/base/base.html

+      <img src="http://image.e.mozilla.org/lib/fe9915707361037e75/m/2/fxlogojg.gif" height="95" width="88" alt="" style="-ms-interpolation-mode: bicubic;" />
+    {{/if}}
+    {{#if sync}}
+      <img src="https://image.e.mozilla.org/lib/fe9915707361037e75/m/3/fxa_dec2016.jpeg" height="152" width="310" alt="" style="-ms-interpolation-mode: bicubic;" />


vbudhram · 2016-12-23T01:07:02Z

mailer.js

@@ -259,7 +259,7 @@ module.exports = function (log) {
    log.trace({ op: 'mailer.verifyEmail', email: message.email, uid: message.uid })

    var templateName = 'verifyEmail'
-    var subject = 'Verify your Firefox Account'
+    var subject = gettext('Verify your Firefox Account')


vladikoff · 2016-12-23T01:08:07Z

test/local/mailer_tests.js

  'unblockCodeEmail',
+  'recoveryEmail',
+  'verifyEmail',


@vbudhram should the new "Verify Sync" template be in this array?

from irc: no, same template, depends on service

vladikoff · 2016-12-23T01:14:44Z

New Templates are Good 👍

vbudhram added the WIP label Dec 21, 2016

vbudhram added this to the FxA-0: quality milestone Dec 21, 2016

vbudhram self-assigned this Dec 21, 2016

vbudhram added the waffle:active label Dec 21, 2016

vladikoff reviewed Dec 21, 2016

View changes

templates/verify.txt

{{#if ip}}{{t "IP address: %(ip)s" }}{{/if}}

{{#if timestamp}}{{ timestamp }}{{/if}}

{{t "Verify email →"}} {{{link}}}

This comment has been minimized.

Sign in to view

vladikoff Dec 21, 2016
Contributor

should this use an HTML right arrow → ?

vladikoff reviewed Dec 21, 2016

View changes

vbudhram changed the title ~~refactor(templates): Add to more emails~~ refactor(templates): Add more location data to emails Dec 21, 2016

vladikoff reviewed Dec 21, 2016

View changes

vbudhram added waffle:review and removed WIP waffle:active labels Dec 21, 2016

vladikoff reviewed Dec 21, 2016

View changes

vbudhram mentioned this pull request Dec 22, 2016

refactor(signin): Use new verify account sync template and add location data to others mozilla/fxa-auth-server#1600

Merged

1 of 1 task complete

refactor(templates): Add new sync template, add location data to pass…

50e80aa

…word change, password reset

vbudhram force-pushed the issue-189-add-location-to-more-emails branch from 3114e16 to 50e80aa Dec 22, 2016

vladikoff reviewed Dec 23, 2016

View changes

vladikoff added 2 commits Dec 23, 2016

fix(mailer): prepare subject for string extraction

793d1e8

fix(template): remove extra line break in templates

b1ddaa9

vbudhram reviewed Dec 23, 2016

View changes

vladikoff reviewed Dec 23, 2016

View changes

vladikoff removed the waffle:review label Dec 23, 2016

vladikoff deleted the issue-189-add-location-to-more-emails branch Dec 23, 2016

mozilla / fxa-auth-mailer Archived

refactor(templates): Add more location data to emails #243

refactor(templates): Add more location data to emails #243

vbudhram commented Dec 21, 2016 •

edited

This comment has been minimized.

This comment has been minimized.

vladikoff commented Dec 21, 2016

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

vbudhram commented Dec 21, 2016

This comment has been minimized.

This comment has been minimized.

vbudhram commented Dec 22, 2016

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

vladikoff commented Dec 23, 2016

		{{#if timestamp }}<span style="display:block;margin:2px 0;">{{ timestamp }}</span>{{/if}}


		</p>

mozilla / fxa-auth-mailer Archived

refactor(templates): Add more location data to emails #243

refactor(templates): Add more location data to emails #243

Conversation

vbudhram commented Dec 21, 2016 • edited

This comment has been minimized.

vladikoff Dec 21, 2016 Contributor

This comment has been minimized.

vbudhram Dec 21, 2016 Author Contributor

vladikoff commented Dec 21, 2016

This comment has been minimized.

vladikoff Dec 21, 2016 Contributor

This comment has been minimized.

vladikoff Dec 21, 2016 Contributor

This comment has been minimized.

vladikoff Dec 21, 2016 Contributor

This comment has been minimized.

vladikoff Dec 21, 2016 Contributor

This comment has been minimized.

vladikoff Dec 21, 2016 Contributor

This comment has been minimized.

vbudhram Dec 21, 2016 Author Contributor

vbudhram commented Dec 21, 2016

This comment has been minimized.

vladikoff Dec 21, 2016 Contributor

This comment has been minimized.

jbuck Dec 22, 2016 Member

vbudhram commented Dec 22, 2016

This comment has been minimized.

vladikoff Dec 23, 2016 Contributor

This comment has been minimized.

vladikoff Dec 23, 2016 Contributor

This comment has been minimized.

vbudhram Dec 23, 2016 Author Contributor

This comment has been minimized.

vladikoff Dec 23, 2016 Contributor

This comment has been minimized.

vladikoff Dec 23, 2016 Contributor

vladikoff commented Dec 23, 2016

vbudhram commented Dec 21, 2016 •

edited

vladikoff Dec 21, 2016
Contributor

vbudhram Dec 21, 2016
Author Contributor

vladikoff Dec 21, 2016
Contributor

vladikoff Dec 21, 2016
Contributor

vladikoff Dec 21, 2016
Contributor

vladikoff Dec 21, 2016
Contributor

vladikoff Dec 21, 2016
Contributor

vbudhram Dec 21, 2016
Author Contributor

vladikoff Dec 21, 2016
Contributor

jbuck Dec 22, 2016
Member

vladikoff Dec 23, 2016
Contributor

vladikoff Dec 23, 2016
Contributor

vbudhram Dec 23, 2016
Author Contributor

vladikoff Dec 23, 2016
Contributor

vladikoff Dec 23, 2016
Contributor