Show proper Windows download link based on architecture

Author: bluewave41

media/css/cms/pages/flare26-channels.css

@@ -176,6 +176,19 @@ ul.download-list strong {
     display: block !important;
 }
 
+.windows .force-win64 .os_win,
+.windows .force-win64-aarch64 .os_win {
+    display: none !important;
+}
+
+.windows .force-win64 .os_win64 {
+    display: block !important;
+}
+
+.windows .force-win64-aarch64 .os_win64-aarch64 {
+    display: block !important;
+}
+
 /* add spacing between displayed buttons */
 .download-list {
     display: grid;

media/css/protocol/components/_download-button.scss

@@ -101,6 +101,19 @@ ul.download-list {
     display: block !important;
 }
 
+.windows .force-win64 .os_win,
+.windows .force-win64-aarch64 .os_win {
+    display: none !important;
+}
+
+.windows .force-win64 .os_win64 {
+    display: block !important;
+}
+
+.windows .force-win64-aarch64 .os_win64-aarch64 {
+    display: block !important;
+}
+
 // add spacing between displayed buttons
 .download-list {
     display: grid;

springfield/firefox/templates/firefox/includes/download-button.html

@@ -61,7 +61,7 @@
     {# ESR download buttons to display on unsupported systems: issue 13317 #}
     {% include 'firefox/includes/download-unsupported.html' %}
   {% endif %}
-  <ul class="download-list fl-download-list">
+  <ul class="download-list fl-download-list{%if force_arch %} force-{{ force_arch }}{% endif %}">
     {% for plat in builds %}
       <li class="os_{{ plat.os }}{% if plat.arch %} {{ plat.arch }}{% endif %}">
         <a class="download-link button {{ button_class }} fl-button mzp-c-button mzp-t-product ga-product-download"

springfield/firefox/templates/firefox/installer-help.html

@@ -57,7 +57,7 @@ <h1 class="mzp-c-callout-title">{{ ftl('installer-help-page-title') }}</h1>
     <section class="installer-channel-card mzp-c-card mzp-c-card-extra-small">
       <img src="{{ static(channel_logo) }}" alt="{{ ftl('installer-help-firefox-release-title') }}" width="347" height="64">
       <div class="mzp-c-card-content">
-        {{ download_firefox(installer_channel, platform='desktop', force_direct=True, force_full_installer=True, locale=installer_lang, button_class='mzp-t-md', alt_copy=ftl('download-button-download-now')) }}
+        {{ download_firefox(installer_channel, platform='desktop', force_direct=True, force_full_installer=True, locale=installer_lang, button_class='mzp-t-md', alt_copy=ftl('download-button-download-now'), force_arch=installer_arch) }}
       </div>
     </section>
   {% else %}

springfield/firefox/templatetags/helpers.py

@@ -114,6 +114,7 @@ def download_firefox(
     button_class="mzp-t-xl",
     locale_in_transition=False,
     download_location=None,
+    force_arch=None,
 ):
     """Output a "download firefox" button.
 
@@ -171,6 +172,7 @@ def download_firefox(
         "button_class": button_class,
         "download_location": download_location,
         "fluent_l10n": ctx["fluent_l10n"],
+        "force_arch": force_arch,
     }
 
     html = render_to_string("firefox/includes/download-button.html", data, request=ctx["request"])

springfield/firefox/views.py

@@ -64,9 +64,13 @@ def get_context_data(self, **kwargs):
         ctx = super().get_context_data(**kwargs)
         installer_lang = self.request.GET.get("installer_lang", None)
         installer_channel = self.request.GET.get("channel", None)
+        installer_arch = self.request.GET.get("installer_arch", None)
         ctx["installer_lang"] = None
         ctx["installer_channel"] = None
 
+        if installer_arch is not None:
+            ctx["installer_arch"] = {"1": "win", "2": "win64", "3": "win64-aarch64"}[installer_arch]
+
         if installer_lang and installer_lang in firefox_desktop.languages:
             ctx["installer_lang"] = installer_lang