[fix bug 1555626] Add signin action to fxa_link_fragment macro

mozilla · May 30, 2019 · 78ae58b · 78ae58b
1 parent d10f732
commit 78ae58b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/bedrock/base/templates/macros.html b/bedrock/base/templates/macros.html
@@ -233,6 +233,8 @@ <h3>{{ _('Your download link was sent.') }}</h3>
 
   {% 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
@@ -290,7 +290,7 @@ <h2>{{ _('You deserve peace of mind everywhere.') }}</h2>
             button_text=_('Create an Account'))
           }}
 
-          <p class="fxa-signin">{{ _('Already have an account?') }} <a {{ fxa_link_fragment(entrypoint='mozzila.org-accounts_page', utm_params={'campaign': 'fxa-embedded-form', 'content': '/firefox/accounts/', 'source': 'accounts-page'}) }}>{{ _('Sign In') }}</a></p>
+          <p class="fxa-signin">{{ _('Already have an account?') }} <a {{ fxa_link_fragment(entrypoint='mozzila.org-accounts_page', action='signin', utm_params={'campaign': 'fxa-embedded-form', 'content': '/firefox/accounts/', 'source': 'accounts-page'}) }}>{{ _('Sign In') }}</a></p>
         </div>
       </div>
 

diff --git a/bedrock/firefox/templates/firefox/accounts-2019.html b/bedrock/firefox/templates/firefox/accounts-2019.html
@@ -52,7 +52,7 @@ <h1 class="c-accounts-hero-title">{{ _('There is a way to protect your privacy.
         utm_params={'campaign': 'accounts-trailhead', 'content': 'form-upper', 'medium': 'referral'})
       }}
 
-      <p class="fxa-signin">{{ _('Already have an account?') }} <a {{ fxa_link_fragment(entrypoint='mozilla.org-accounts_page', utm_params={'campaign': 'accounts-trailhead', 'content': 'form-upper', 'source': 'accounts_page'}) }}>{{ _('Sign In') }}</a></p>
+      <p class="fxa-signin">{{ _('Already have an account?') }} <a {{ fxa_link_fragment(entrypoint='mozilla.org-accounts_page', action='signin', utm_params={'campaign': 'accounts-trailhead', 'content': 'form-upper', 'source': 'accounts_page'}) }}>{{ _('Sign In') }}</a></p>
     </div>
   </div>
 </section>
-Original file line number
+Diff line change
@@ Expand Up / @@ -290,7 +290,7 @@ <h2>{{ _('You deserve peace of mind everywhere.') }}</h2> @@
                 button_text=_('Create an Account'))
               }}
-              <p class="fxa-signin">{{ _('Already have an account?') }} <a {{ fxa_link_fragment(entrypoint='mozzila.org-accounts_page', utm_params={'campaign': 'fxa-embedded-form', 'content': '/firefox/accounts/', 'source': 'accounts-page'}) }}>{{ _('Sign In') }}</a></p>
+              <p class="fxa-signin">{{ _('Already have an account?') }} <a {{ fxa_link_fragment(entrypoint='mozzila.org-accounts_page', action='signin', utm_params={'campaign': 'fxa-embedded-form', 'content': '/firefox/accounts/', 'source': 'accounts-page'}) }}>{{ _('Sign In') }}</a></p>
             </div>
           </div>
@@ Expand Down @@