v2

bedrock/firefox/templates/firefox/all/base.html

@@ -5,7 +5,6 @@
 #}
 {% extends "firefox/base/base-protocol.html" %}
 
-{% from "macros.html" import google_play_button, apple_app_store_button with context %}
 {% set android_url = play_store_url('firefox', 'firefox-all') %}
 {% set ios_url = app_store_url('firefox', 'firefox-all') %}
 
@@ -41,14 +40,42 @@ <h1 class="c-intro-heading">{{ ftl('firefox-all-choose-which-firefox') }}</h1>
         <p>{{ self.page_desc() }}</p>
       </div>
       <div class="c-selection-form">
-        {% block main %}
-        {% endblock %}
+        {% include 'firefox/all/product.html' %}
+        {% include 'firefox/all/platform.html' %}
+        {% include 'firefox/all/lang.html' %}
+        {% include 'firefox/all/download.html' %}
       </div>
     </div>
   </div>
 </main>
 
-{% block modal %}
-{% endblock %}
 
+<div id="installer-help" class="c-help mzp-u-modal-content">
+  <ul>
+    <li>
+      <h2 class="c-help-title">{{ ftl('firefox-all-64-bit-installers') }}</h2>
+      <p class="c-help-desc">
+        {{ ftl('firefox-all-choose-a-64-bit-installer') }}
+      </p>
+    </li>
+    <li>
+      <h2 class="c-help-title">{{ ftl('firefox-all-32-bit-installers') }}</h2>
+      <p class="c-help-desc">
+        {{ ftl('firefox-all-choose-a-32-bit-installer', url='https://support.mozilla.org/kb/choosing-firefox-cpu-architecture-windows-os') }}
+      </p>
+    </li>
+    <li>
+      <h2 class="c-help-title">{{ ftl('firefox-all-msi-installers') }}</h2>
+      <p class="c-help-desc">
+        {{ ftl('firefox-all-windows-installers-for') }}
+      </p>
+    </li>
+    <li>
+      <h2 class="c-help-title">{{ ftl('firefox-all-arm64-installers') }}</h2>
+      <p class="c-help-desc">
+        {{ ftl('firefox-all-arm64-installers-optimized') }}
+      </p>
+    </li>
+  </ul>
+</div>
 {% endblock %}

bedrock/firefox/templates/firefox/all/download.html

@@ -3,15 +3,57 @@
   License, v. 2.0. If a copy of the MPL was not distributed with this
   file, You can obtain one at https://mozilla.org/MPL/2.0/.
 #}
-{% extends "firefox/all/base.html" %}
 
-{% block main %}
+{% from "macros.html" import google_play_button, apple_app_store_button with context %}
 
-  {# Show download #}
-  <div>
-    <a href="{{ download_url }}" id="download-button-primary" class="mzp-c-button mzp-t-product" data-link-type="download" data-download-location="primary cta">
-      {{ ftl('download-button-download-now') }}
-    </a>
+
+
+{# Show download #}
+
+<div class="all-step">4. Download</div>
+
+{% if product and platform and locale %}
+<div>
+  <a href="{{ download_url }}" id="download-button-primary" class="mzp-c-button mzp-t-product" data-link-type="download" data-download-location="primary cta">
+    {{ ftl('download-button-download-now') }}
+  </a>
+</div>
+
+
+  <p class="c-linux-debian">
+    {{ ftl('download-button-using-debian', attrs='href="https://support.mozilla.org/kb/install-firefox-linux#w_install-firefox-deb-package-for-debian-based-distributions" rel="external noopener" data-cta-type="link" data-cta-text="You can set up our APT repository instead"'|safe) }}
+  </p>
+
+  <p class="c-download-error hidden">
+    {{ ftl('firefox-all-sorry-we-couldnt-find') }}
+  </p>
+
+  <a href="#all-downloads" id="download-button-primary" class="mzp-c-button mzp-t-product c-download-button" data-link-type="download" data-download-location="primary cta">
+    {{ ftl('download-button-download-now') }}
+  </a>
+
+  <div id="download-android-primary" data-product="android_release" class="c-download-button">
+    <ul class="c-download-list">
+      <li>{{ google_play_button(href=android_url, id='playStoreLink-release') }}</li>
+      <li><a href="{{ url('firefox.browsers.mobile.get-app') }}" class="c-get-app" data-cta-type="link" data-cta-text="Get It Now" data-cta-position="banner">{{ ftl('firefox-all-product-send-link') }}</a></li>
+    </ul>
+  </div>
+
+  <div id="download-android-beta-primary" data-product="android_beta" class="c-download-button">
+    {{ google_play_button(href=android_beta_url, id='playStoreLink-beta') }}
   </div>
 
-{% endblock %}
+  <div id="download-android-nightly-primary" data-product="android_nightly" class="c-download-button">
+    {{ google_play_button(href=android_nightly_url, id='playStoreLink-nightly') }}
+  </div>
+
+  <div id="download-ios-primary" data-product="ios_release" class="c-download-button">
+    <ul class="c-download-list">
+      <li>
+        {{ apple_app_store_button(href=ios_url, id='appStoreLink-ios') }}
+      </li>
+      <li><a href="{{ url('firefox.browsers.mobile.get-app') }}" class="c-get-app" data-cta-type="link" data-cta-text="Get It Now" data-cta-position="primary">{{ ftl('firefox-all-product-send-link') }}</a></li>
+    </ul>
+  </div>
+</div>
+{% endif %}