From 78ae58b20ac3aed01df44d33f8083b0d4e8cf970 Mon Sep 17 00:00:00 2001 From: Craig Cook Date: Thu, 30 May 2019 12:32:09 -0700 Subject: [PATCH] [fix bug 1555626] Add signin action to fxa_link_fragment macro --- bedrock/base/templates/macros.html | 2 ++ bedrock/firefox/templates/firefox/accounts-2018.html | 2 +- bedrock/firefox/templates/firefox/accounts-2019.html | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/bedrock/base/templates/macros.html b/bedrock/base/templates/macros.html index 0850baec50a..f270493e9bf 100644 --- a/bedrock/base/templates/macros.html +++ b/bedrock/base/templates/macros.html @@ -233,6 +233,8 @@

{{ _('Your download link was sent.') }}

{% if action == 'signup' %} {% set fxa_path = 'signup' %} + {% elif action == 'signin' %} + {% set fxa_path = 'signin' %} {% else %} {% do fxa_queries.insert(0, 'action=email') %} {% endif %} diff --git a/bedrock/firefox/templates/firefox/accounts-2018.html b/bedrock/firefox/templates/firefox/accounts-2018.html index 7d7255f4c99..5fe8119cb8b 100644 --- a/bedrock/firefox/templates/firefox/accounts-2018.html +++ b/bedrock/firefox/templates/firefox/accounts-2018.html @@ -290,7 +290,7 @@

{{ _('You deserve peace of mind everywhere.') }}

button_text=_('Create an Account')) }} -

{{ _('Already have an account?') }} {{ _('Sign In') }}

+

{{ _('Already have an account?') }} {{ _('Sign In') }}

diff --git a/bedrock/firefox/templates/firefox/accounts-2019.html b/bedrock/firefox/templates/firefox/accounts-2019.html index 53105993d92..48319073c98 100644 --- a/bedrock/firefox/templates/firefox/accounts-2019.html +++ b/bedrock/firefox/templates/firefox/accounts-2019.html @@ -52,7 +52,7 @@

{{ _('There is a way to protect your privacy. utm_params={'campaign': 'accounts-trailhead', 'content': 'form-upper', 'medium': 'referral'}) }} - +