From 9087bcad17d2e076b212404dcba052d1db43d0f4 Mon Sep 17 00:00:00 2001 From: Stephanie Hobson Date: Wed, 3 Apr 2024 21:50:44 -0700 Subject: [PATCH] v2 - not working --- .../templates/firefox/all/download.html | 17 ++ .../templates/firefox/all/installer.html | 261 ++---------------- .../all/{products.html => product.html} | 51 ++-- bedrock/firefox/views.py | 4 +- media/css/firefox/all/all-unified.scss | 8 +- 5 files changed, 79 insertions(+), 262 deletions(-) create mode 100644 bedrock/firefox/templates/firefox/all/download.html rename bedrock/firefox/templates/firefox/all/{products.html => product.html} (63%) diff --git a/bedrock/firefox/templates/firefox/all/download.html b/bedrock/firefox/templates/firefox/all/download.html new file mode 100644 index 00000000000..b042dff12db --- /dev/null +++ b/bedrock/firefox/templates/firefox/all/download.html @@ -0,0 +1,17 @@ +{# + This Source Code Form is subject to the terms of the Mozilla Public + 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 %} + + {# Show download #} +
+ + {{ ftl('download-button-download-now') }} + +
+ +{% endblock %} diff --git a/bedrock/firefox/templates/firefox/all/installer.html b/bedrock/firefox/templates/firefox/all/installer.html index 400e4e6cfe7..af0115e9c9b 100644 --- a/bedrock/firefox/templates/firefox/all/installer.html +++ b/bedrock/firefox/templates/firefox/all/installer.html @@ -1,237 +1,32 @@ {# - This Source Code Form is subject to the terms of the Mozilla Public - 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/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') %} - -{%- block page_title -%} - {{ ftl('firefox-all-download-the-firefox') }} -{%- endblock -%} - -{%- block page_desc -%} - {{ ftl('firefox-all-everyone-deserves-access') }} -{%- endblock -%} - -{% block page_css %} - {{ css_bundle('firefox_all_unified') }} -{% endblock %} - -{% block old_ie_styles %} - {{ super() }} - {{ css_bundle('firefox_all_unified_old_ie') }} -{% endblock %} - -{% block site_header %} - {% with hide_nav_cta=True %} - {% include 'includes/protocol/navigation/navigation.html' %} - {% endwith %} -{% endblock %} - -{% block content %} -
-
-
-
-

{{ ftl('firefox-all-choose-which-firefox') }}

-

{{ self.page_desc() }}

- - {% if product %} - {% if product.slug == "desktop-release" %} - - {% elif product.slug == "desktop-beta" %} - - {% elif product.slug == "desktop-developer" %} - - {% elif product.slug == "desktop-nightly" %} - - {% elif product.slug == "desktop-esr" %} - - {% elif product.slug == "android-release" %} - - {% elif product.slug == "android-release" %} - - {% endif %} - {% endif %} -
- -
-
-
- {% if product %} -

< start over

- {% endif %} - - {# Choose product #} -

{{ ftl('firefox-all-which-browser-would') }} - - {{ ftl('firefox-all-get-help') }} - -

- {% if product %} -

{{ product and product.name }}

- {% else %} -

Desktop

-
    - {% for p in products %} - {% if p.slug.startswith('desktop-release') %} -
  • {{ p.name }}
    • - {% endif %} - {% endfor %} -
- -

Or get a non-standard version

- -
    - {% for p in products %} - {% if p.slug.startswith('desktop') and not p.slug.endswith('release') %} -
  • {{ p.name }}
    • - {% endif %} - {% endfor %} -
- -

Mobile

- - - -

Or get a non-standard version

- -
    - {% for p in products %} - {% if p.slug.startswith('android') and not p.slug.endswith('release')%} -
  • {{ p.name }}
    • - {% endif %} - {% endfor %} -
- - {% endif %} - - {# Choose platform #} - {% if product %} -

{{ ftl('firefox-all-select-your-preferred-installer') }} - - {{ ftl('firefox-all-get-help') }} - -

- {% if platform %} -

{{ platform_name }}

- {% else %} -
    - {% for platform, name in platforms %} -
  • {{ name }}
    • - {% endfor %} -
- {% endif %} - {% endif %} - - {# Choose language #} - {% if product and platform %} -

{{ ftl('firefox-all-select-your-preferred-language') }}

- {% if locale %} -

{{ locale_name }}

- {% else %} -
    - {% for locale, name in locales %} -
  • {{ name }}
    • - {% endfor %} -
- {% endif %} - {% endif %} - - {# Show download #} - {% if product and platform and locale %} - - {% endif %} -
-
-
-
- -
- -
- + This Source Code Form is subject to the terms of the Mozilla Public + 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 %} + {# Choose platform #} + {% if product %} +

{{ ftl('firefox-all-select-your-preferred-installer') }} + + {{ ftl('firefox-all-get-help') }} + +

+ {% if platform %} +

{{ platform_name }}

+ {% else %} + + {% endif %} + {% endif %} +{% endblock%} + + +{% block modal %}
{% endblock %} diff --git a/bedrock/firefox/views.py b/bedrock/firefox/views.py index 837b5e705ff..b3e2d13e00d 100644 --- a/bedrock/firefox/views.py +++ b/bedrock/firefox/views.py @@ -365,7 +365,7 @@ def firefox_drilldown(request, product_slug=None, platform=None, locale=None): platform_name = None locale_name = None download_url = None - template_name = "firefox/all/products.html" # TKTK + template_name = "firefox/all/product.html" # TKTK # The mobile products don't drill down, so short-circuit them here. if product: @@ -434,7 +434,7 @@ def firefox_drilldown(request, product_slug=None, platform=None, locale=None): context.update( products=[{"slug": k, "name": v["name"]} for k, v in product_map.items()], ) - template_name = "firefox/all/products.html" + template_name = "firefox/all/product.html" return l10n_utils.render(request, template_name, context, ftl_files=ftl_files) diff --git a/media/css/firefox/all/all-unified.scss b/media/css/firefox/all/all-unified.scss index adf7f86a89d..29ac1f74118 100644 --- a/media/css/firefox/all/all-unified.scss +++ b/media/css/firefox/all/all-unified.scss @@ -89,15 +89,21 @@ $image-path: '/media/protocol/img'; margin-top: $spacing-sm; } +.c-product-channels { + padding-left: $spacing-xl; +} + .c-product-list { padding-left: 36px; - li { + li, + .release { background: center left / contain no-repeat; padding-left: 2em; margin-bottom: 1em; } + .release, .desktop-release, .desktop-esr { background-image: url('#{$image-path}/logos/firefox/browser/logo.svg');