diff --git a/bedrock/firefox/templates/firefox/accounts-2019.html b/bedrock/firefox/templates/firefox/accounts-2019.html index 0f6eaf8ca1..b39b7fa593 100644 --- a/bedrock/firefox/templates/firefox/accounts-2019.html +++ b/bedrock/firefox/templates/firefox/accounts-2019.html @@ -5,7 +5,7 @@ {% from "macros-protocol.html" import feature_card with context %} {% from "macros.html" import fxa_email_form, fxa_link_fragment, monitor_button with context %} -{% extends "firefox/base-protocol.html" %} +{% extends "firefox/base/base-protocol.html" %} {% set _entrypoint = 'mozilla.org-firefox-accounts' %} {% set _utm_source = 'mozilla.org-firefox-accounts' %} diff --git a/bedrock/firefox/templates/firefox/accounts.html b/bedrock/firefox/templates/firefox/accounts.html index 98ede7aae7..41a69a51da 100644 --- a/bedrock/firefox/templates/firefox/accounts.html +++ b/bedrock/firefox/templates/firefox/accounts.html @@ -5,7 +5,7 @@ {% from "macros-protocol.html" import feature_card with context %} {% from "macros.html" import fxa_email_form, fxa_link_fragment, fxa_cta_link, google_play_button with context %} -{% extends "firefox/base-protocol.html" %} +{% extends "firefox/base/base-protocol.html" %} {% set _entrypoint = 'mozilla.org-firefox-accounts' %} diff --git a/bedrock/firefox/templates/firefox/all-unified.html b/bedrock/firefox/templates/firefox/all-unified.html index b48fbd3633..be2af70199 100644 --- a/bedrock/firefox/templates/firefox/all-unified.html +++ b/bedrock/firefox/templates/firefox/all-unified.html @@ -4,7 +4,7 @@ {% from "product-all-unified-macros.html" import build_locale_list, build_locale_list_item, build_link, select_product_list, product_options with context %} -{% extends "firefox/base-protocol.html" %} +{% extends "firefox/base/base-protocol.html" %} {%- block page_title -%} {#- L10n: HTML page title. Replace "English (US)" with your local language. -#} diff --git a/bedrock/firefox/templates/firefox/all.html b/bedrock/firefox/templates/firefox/all.html index 59ad4d22ce..6b6c03888e 100644 --- a/bedrock/firefox/templates/firefox/all.html +++ b/bedrock/firefox/templates/firefox/all.html @@ -1,5 +1,5 @@ {% from "product-all-macros.html" import build_search_box, build_table, build_row, build_link with context %} -{% extends "firefox/base-resp.html" %} +{% extends "firefox/base/base-resp.html" %} {% block page_title %} {%- if platform == 'android' -%} diff --git a/bedrock/firefox/templates/firefox/base-pebbles.html b/bedrock/firefox/templates/firefox/base/base-pebbles.html similarity index 100% rename from bedrock/firefox/templates/firefox/base-pebbles.html rename to bedrock/firefox/templates/firefox/base/base-pebbles.html diff --git a/bedrock/firefox/templates/firefox/base-protocol.html b/bedrock/firefox/templates/firefox/base/base-protocol.html similarity index 100% rename from bedrock/firefox/templates/firefox/base-protocol.html rename to bedrock/firefox/templates/firefox/base/base-protocol.html diff --git a/bedrock/firefox/templates/firefox/base-resp.html b/bedrock/firefox/templates/firefox/base/base-resp.html similarity index 100% rename from bedrock/firefox/templates/firefox/base-resp.html rename to bedrock/firefox/templates/firefox/base/base-resp.html diff --git a/bedrock/firefox/templates/firefox/best-browser.html b/bedrock/firefox/templates/firefox/best-browser.html index 7f791f17f9..a3095229a3 100644 --- a/bedrock/firefox/templates/firefox/best-browser.html +++ b/bedrock/firefox/templates/firefox/best-browser.html @@ -6,7 +6,7 @@ {% add_lang_files "firefox/best-browser" %} - {% extends "firefox/base-protocol.html" %} + {% extends "firefox/base/base-protocol.html" %} {% block page_title %}{{ _('Find your best browser for speed, privacy and security.') }}{% endblock %} diff --git a/bedrock/firefox/templates/firefox/campaign/berlin/base-variation.html b/bedrock/firefox/templates/firefox/campaign/berlin/base-variation.html index 35a98acbd9..f9f2bd0d4e 100644 --- a/bedrock/firefox/templates/firefox/campaign/berlin/base-variation.html +++ b/bedrock/firefox/templates/firefox/campaign/berlin/base-variation.html @@ -4,7 +4,7 @@ {% add_lang_files "firefox/campaign" %} -{% extends "firefox/base-pebbles.html" %} +{% extends "firefox/base/base-pebbles.html" %} {# "noindex" pages should not have the canonical or hreflang tags: bug 1442331 #} {% block canonical_urls %}{% endblock %} diff --git a/bedrock/firefox/templates/firefox/campaign/berlin/base.html b/bedrock/firefox/templates/firefox/campaign/berlin/base.html index 609c959c2d..37785380c9 100644 --- a/bedrock/firefox/templates/firefox/campaign/berlin/base.html +++ b/bedrock/firefox/templates/firefox/campaign/berlin/base.html @@ -4,7 +4,7 @@ {% add_lang_files "firefox/campaign" %} -{% extends "firefox/base-pebbles.html" %} +{% extends "firefox/base/base-pebbles.html" %} {# "noindex" pages should not have the canonical or hreflang tags: bug 1442331 #} {% block canonical_urls %}{% endblock %} diff --git a/bedrock/firefox/templates/firefox/campaign/better-browser/base.html b/bedrock/firefox/templates/firefox/campaign/better-browser/base.html index ad9b42760b..6de8b1b68a 100644 --- a/bedrock/firefox/templates/firefox/campaign/better-browser/base.html +++ b/bedrock/firefox/templates/firefox/campaign/better-browser/base.html @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -#} -{% extends "firefox/base-pebbles.html" %} +{% extends "firefox/base/base-pebbles.html" %} {# "noindex" pages should not have the canonical or hreflang tags: bug 1442331 #} {% block canonical_urls %}{% endblock %} diff --git a/bedrock/firefox/templates/firefox/campaign/compare/base.html b/bedrock/firefox/templates/firefox/campaign/compare/base.html index 3c79ea2d0a..41a695782b 100644 --- a/bedrock/firefox/templates/firefox/campaign/compare/base.html +++ b/bedrock/firefox/templates/firefox/campaign/compare/base.html @@ -4,7 +4,7 @@ {% from "macros-protocol.html" import call_out_compact with context %} -{% extends "firefox/base-protocol.html" %} +{% extends "firefox/base/base-protocol.html" %} {# "noindex" pages should not have the canonical or hreflang tags: bug 1442331 #} {% block canonical_urls %}{% endblock %} diff --git a/bedrock/firefox/templates/firefox/campaign/index-trailhead.html b/bedrock/firefox/templates/firefox/campaign/index-trailhead.html index c366fab1e6..8067cc6543 100644 --- a/bedrock/firefox/templates/firefox/campaign/index-trailhead.html +++ b/bedrock/firefox/templates/firefox/campaign/index-trailhead.html @@ -7,7 +7,7 @@ {% add_lang_files "firefox/campaign-trailhead" %} -{% extends "firefox/base-protocol.html" %} +{% extends "firefox/base/base-protocol.html" %} {% block page_title_prefix %}{{_('Download Firefox')}} — {% endblock %} diff --git a/bedrock/firefox/templates/firefox/campaign/index.html b/bedrock/firefox/templates/firefox/campaign/index.html index 58ed6a713d..bfd132592e 100644 --- a/bedrock/firefox/templates/firefox/campaign/index.html +++ b/bedrock/firefox/templates/firefox/campaign/index.html @@ -6,7 +6,7 @@ {% add_lang_files "firefox/campaign" %} -{% extends "firefox/base-protocol.html" %} +{% extends "firefox/base/base-protocol.html" %} {% block canonical_urls %} {# the SEM campaign page should set canonical to the /firefox/new/ page. #} diff --git a/bedrock/firefox/templates/firefox/channel/base.html b/bedrock/firefox/templates/firefox/channel/base.html index b52fa2a4a4..5328f8a64a 100644 --- a/bedrock/firefox/templates/firefox/channel/base.html +++ b/bedrock/firefox/templates/firefox/channel/base.html @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -#} -{% extends "firefox/base-resp.html" %} +{% extends "firefox/base/base-resp.html" %} {% add_lang_files "firefox/channel/index" %} diff --git a/bedrock/firefox/templates/firefox/concerts.html b/bedrock/firefox/templates/firefox/concerts.html index e89a59d865..f8fae8628f 100644 --- a/bedrock/firefox/templates/firefox/concerts.html +++ b/bedrock/firefox/templates/firefox/concerts.html @@ -4,7 +4,7 @@ {% from "macros-protocol.html" import hero with context %} -{% extends "firefox/base-protocol.html" %} +{% extends "firefox/base/base-protocol.html" %} {% block page_title_prefix %}Firefox Concert Series - {% endblock %} {% block page_title %}Watch free live concerts in Firefox{% endblock %} diff --git a/bedrock/firefox/templates/firefox/content-blocking-tour/index.html b/bedrock/firefox/templates/firefox/content-blocking-tour/index.html index 3c7d1a11a5..cf0967f17f 100644 --- a/bedrock/firefox/templates/firefox/content-blocking-tour/index.html +++ b/bedrock/firefox/templates/firefox/content-blocking-tour/index.html @@ -4,7 +4,7 @@ {% add_lang_files "firefox/tracking-protection-tour" %} -{% extends "firefox/base-resp.html" %} +{% extends "firefox/base/base-resp.html" %} {# "noindex" pages should not have the canonical or hreflang tags: bug 1442331 #} {% block canonical_urls %}{% endblock %} diff --git a/bedrock/firefox/templates/firefox/dedicated-profiles.html b/bedrock/firefox/templates/firefox/dedicated-profiles.html index 0410916394..0e36ad28a0 100644 --- a/bedrock/firefox/templates/firefox/dedicated-profiles.html +++ b/bedrock/firefox/templates/firefox/dedicated-profiles.html @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -#} -{% extends "/firefox/base-pebbles.html" %} +{% extends "/firefox/base/base-pebbles.html" %} {# "noindex" pages should not have the canonical or hreflang tags: bug 1442331 #} {% block canonical_urls %}{% endblock %} diff --git a/bedrock/firefox/templates/firefox/developer/firstrun.html b/bedrock/firefox/templates/firefox/developer/firstrun.html index 3af6d30f7c..396b49093c 100644 --- a/bedrock/firefox/templates/firefox/developer/firstrun.html +++ b/bedrock/firefox/templates/firefox/developer/firstrun.html @@ -4,7 +4,7 @@ {% add_lang_files "firefox/products/developer-quantum" "firefox/shared" %} -{% extends "firefox/base-protocol.html" %} +{% extends "firefox/base/base-protocol.html" %} {% block page_title %}{{_('Firefox Developer Edition')}}{% endblock %} {% block page_desc %}{{ _('Firefox Developer Edition is the blazing fast browser that offers cutting edge developer tools and latest features like CSS Grid support and framework debugging') }}{% endblock %} diff --git a/bedrock/firefox/templates/firefox/developer/index.html b/bedrock/firefox/templates/firefox/developer/index.html index 8623f179aa..67ce077f83 100644 --- a/bedrock/firefox/templates/firefox/developer/index.html +++ b/bedrock/firefox/templates/firefox/developer/index.html @@ -4,7 +4,7 @@ {% add_lang_files "firefox/products/developer-quantum" "firefox/shared" %} -{% extends "firefox/base-protocol.html" %} +{% extends "firefox/base/base-protocol.html" %} {% block page_title %}{{_('Firefox Developer Edition')}}{% endblock %} {% block page_desc %}{{ _('Firefox Developer Edition is the blazing fast browser that offers cutting edge developer tools and latest features like CSS Grid support and framework debugging') }}{% endblock %} diff --git a/bedrock/firefox/templates/firefox/developer/whatsnew.html b/bedrock/firefox/templates/firefox/developer/whatsnew.html index 59428000ad..eb14fb270b 100644 --- a/bedrock/firefox/templates/firefox/developer/whatsnew.html +++ b/bedrock/firefox/templates/firefox/developer/whatsnew.html @@ -4,7 +4,7 @@ {% add_lang_files "firefox/products/developer-quantum" "firefox/shared" %} -{% extends "firefox/base-protocol.html" %} +{% extends "firefox/base/base-protocol.html" %} {% block page_title %}{{_('Firefox Developer Edition')}}{% endblock %} {% block page_desc %}{{ _('Firefox Developer Edition is the blazing fast browser that offers cutting edge developer tools and latest features like CSS Grid support and framework debugging') }}{% endblock %} diff --git a/bedrock/firefox/templates/firefox/election/index-de.html b/bedrock/firefox/templates/firefox/election/index-de.html index 78a8b8728e..6b7a8c6257 100644 --- a/bedrock/firefox/templates/firefox/election/index-de.html +++ b/bedrock/firefox/templates/firefox/election/index-de.html @@ -4,7 +4,7 @@ {% from "macros-protocol.html" import hero, content_card with context %} -{% extends "firefox/base-protocol.html" %} +{% extends "firefox/base/base-protocol.html" %} {% block page_title %}Dein Europa. Deine Wahl. Deine Tools.{% endblock %} {% block page_desc %}Europa, du hast die Wahl: Firefox hilft dir, dich online besser zu schützen. Deine Tools gegen Targeting, Desinformation und Manipulation.{% endblock %} diff --git a/bedrock/firefox/templates/firefox/election/index-fr.html b/bedrock/firefox/templates/firefox/election/index-fr.html index 13d1189645..2da84e45c0 100644 --- a/bedrock/firefox/templates/firefox/election/index-fr.html +++ b/bedrock/firefox/templates/firefox/election/index-fr.html @@ -4,7 +4,7 @@ {% from "macros-protocol.html" import hero, content_card with context %} -{% extends "firefox/base-protocol.html" %} +{% extends "firefox/base/base-protocol.html" %} {% block page_title %}Votre Europe. Votre vote. Vos outils.{% endblock %} {% block page_desc %}Internet a changé la façon dont les gens votent. Préparez-vous aux élections européennes avec des outils qui vous aident à comprendre tous leurs enjeux.{% endblock %} diff --git a/bedrock/firefox/templates/firefox/election/index.html b/bedrock/firefox/templates/firefox/election/index.html index 93dbea710d..8ec4a0560e 100644 --- a/bedrock/firefox/templates/firefox/election/index.html +++ b/bedrock/firefox/templates/firefox/election/index.html @@ -4,7 +4,7 @@ {% from "macros-protocol.html" import hero, content_card with context %} -{% extends "firefox/base-protocol.html" %} +{% extends "firefox/base/base-protocol.html" %} {% block page_title %}EU Election{% endblock %} {% block page_desc %}Decode political ad targeting and keep trackers off your trail with these resources and tools.{% endblock %} diff --git a/bedrock/firefox/templates/firefox/enterprise/index.html b/bedrock/firefox/templates/firefox/enterprise/index.html index 0832747835..bff76bde11 100644 --- a/bedrock/firefox/templates/firefox/enterprise/index.html +++ b/bedrock/firefox/templates/firefox/enterprise/index.html @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -#} -{% extends "firefox/base-protocol.html" %} +{% extends "firefox/base/base-protocol.html" %} {% from "macros-protocol.html" import call_out_compact, feature_card, picto_card, hero with context %} diff --git a/bedrock/firefox/templates/firefox/facebookcontainer/index.html b/bedrock/firefox/templates/firefox/facebookcontainer/index.html index f24c01675c..9fd33191f5 100644 --- a/bedrock/firefox/templates/firefox/facebookcontainer/index.html +++ b/bedrock/firefox/templates/firefox/facebookcontainer/index.html @@ -4,7 +4,7 @@ {% from "macros.html" import google_play_button with context %} -{% extends "firefox/base-pebbles.html" %} +{% extends "firefox/base/base-pebbles.html" %} {% block page_title_prefix %}{% endblock %} {% block page_title %}{{_('Facebook Container for Firefox | Prevent Facebook from seeing what websites you visit.')}}{% endblock %} diff --git a/bedrock/firefox/templates/firefox/features/base.html b/bedrock/firefox/templates/firefox/features/base.html index 2f613627cf..4778cfd5d6 100644 --- a/bedrock/firefox/templates/firefox/features/base.html +++ b/bedrock/firefox/templates/firefox/features/base.html @@ -4,7 +4,7 @@ {% add_lang_files "firefox/shared" %} -{% extends "firefox/base-pebbles.html" %} +{% extends "firefox/base/base-pebbles.html" %} {% block page_css %} {{ css_bundle('firefox-features-hub-common') }} diff --git a/bedrock/firefox/templates/firefox/features/safebrowser.html b/bedrock/firefox/templates/firefox/features/safebrowser.html index e0fd6a5da7..e3bb3b1e29 100644 --- a/bedrock/firefox/templates/firefox/features/safebrowser.html +++ b/bedrock/firefox/templates/firefox/features/safebrowser.html @@ -4,7 +4,7 @@ {% from "macros-protocol.html" import call_out_compact, hero with context %} -{% extends "firefox/base-protocol.html" %} +{% extends "firefox/base/base-protocol.html" %} {% block page_title %}{{ _('A safe browser that fights for you') }}{% endblock %} diff --git a/bedrock/firefox/templates/firefox/fights-for-you.de.html b/bedrock/firefox/templates/firefox/fights-for-you.de.html index b69ea20e5a..d5dda065a5 100644 --- a/bedrock/firefox/templates/firefox/fights-for-you.de.html +++ b/bedrock/firefox/templates/firefox/fights-for-you.de.html @@ -5,7 +5,7 @@ {% from "macros.html" import google_play_button with context %} {% from "macros-protocol.html" import call_out, call_out_compact, hero, feature_card with context %} -{% extends "firefox/base-protocol.html" %} +{% extends "firefox/base/base-protocol.html" %} {% set referrals = '?utm_source=www.mozilla.org&utm_medium=referral&utm_campaign=fffy-page' %} diff --git a/bedrock/firefox/templates/firefox/fights-for-you.fr.html b/bedrock/firefox/templates/firefox/fights-for-you.fr.html index 132e5e0c28..a7d929f5df 100644 --- a/bedrock/firefox/templates/firefox/fights-for-you.fr.html +++ b/bedrock/firefox/templates/firefox/fights-for-you.fr.html @@ -5,7 +5,7 @@ {% from "macros.html" import google_play_button with context %} {% from "macros-protocol.html" import call_out, call_out_compact, hero, feature_card with context %} -{% extends "firefox/base-protocol.html" %} +{% extends "firefox/base/base-protocol.html" %} {% set referrals = '?utm_source=www.mozilla.org&utm_medium=referral&utm_campaign=fffy-page' %} diff --git a/bedrock/firefox/templates/firefox/fights-for-you.html b/bedrock/firefox/templates/firefox/fights-for-you.html index cf7538007f..3cbceb022d 100644 --- a/bedrock/firefox/templates/firefox/fights-for-you.html +++ b/bedrock/firefox/templates/firefox/fights-for-you.html @@ -5,7 +5,7 @@ {% from "macros.html" import google_play_button with context %} {% from "macros-protocol.html" import call_out, call_out_compact, hero, feature_card with context %} -{% extends "firefox/base-protocol.html" %} +{% extends "firefox/base/base-protocol.html" %} {% set referrals = '?utm_source=www.mozilla.org&utm_medium=referral&utm_campaign=fffy-page' %} diff --git a/bedrock/firefox/templates/firefox/firstrun/firstrun.html b/bedrock/firefox/templates/firefox/firstrun/firstrun.html index 45aa8af25d..4e04beb128 100644 --- a/bedrock/firefox/templates/firefox/firstrun/firstrun.html +++ b/bedrock/firefox/templates/firefox/firstrun/firstrun.html @@ -6,7 +6,7 @@ {% from "macros.html" import fxa_email_form, fxa_link_fragment with context %} -{% extends "firefox/base-protocol.html" %} +{% extends "firefox/base/base-protocol.html" %} {% set _entrypoint = 'mozilla.org-firstrun' %} diff --git a/bedrock/firefox/templates/firefox/home/index.html b/bedrock/firefox/templates/firefox/home/index.html index a50c9455a4..31b11434ca 100644 --- a/bedrock/firefox/templates/firefox/home/index.html +++ b/bedrock/firefox/templates/firefox/home/index.html @@ -4,7 +4,7 @@ {% add_lang_files "firefox/hub/home-quantum" "firefox/shared" %} -{% extends "firefox/base-pebbles.html" %} +{% extends "firefox/base/base-pebbles.html" %} {# Bug 1438302 Avoid duplicate content for en-CA and en-GB pages. #} {% if LANG == 'en-CA' %} diff --git a/bedrock/firefox/templates/firefox/installer-help.html b/bedrock/firefox/templates/firefox/installer-help.html index fc26bc89a9..abcfce6143 100644 --- a/bedrock/firefox/templates/firefox/installer-help.html +++ b/bedrock/firefox/templates/firefox/installer-help.html @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -#} -{% extends "/firefox/base-resp.html" %} +{% extends "/firefox/base/base-resp.html" %} {# "noindex" pages should not have the canonical or hreflang tags: bug 1442331 #} {% block canonical_urls %}{% endblock %} diff --git a/bedrock/firefox/templates/firefox/mobile.html b/bedrock/firefox/templates/firefox/mobile.html index e89fe70c72..81eaad3431 100644 --- a/bedrock/firefox/templates/firefox/mobile.html +++ b/bedrock/firefox/templates/firefox/mobile.html @@ -6,7 +6,7 @@ {% add_lang_files "firefox/sendto" %} -{% extends "firefox/base-pebbles.html" %} +{% extends "firefox/base/base-pebbles.html" %} {% block page_css %} {{ css_bundle('firefox-mobile') }} diff --git a/bedrock/firefox/templates/firefox/new/base.html b/bedrock/firefox/templates/firefox/new/base.html index f0609db567..caa2b3ca40 100644 --- a/bedrock/firefox/templates/firefox/new/base.html +++ b/bedrock/firefox/templates/firefox/new/base.html @@ -6,7 +6,7 @@ {% add_lang_files "firefox/new/quantum" %} -{% extends "firefox/base-pebbles.html" %} +{% extends "firefox/base/base-pebbles.html" %} {% block page_title_prefix %}{{_('Download Firefox')}} — {% endblock %} diff --git a/bedrock/firefox/templates/firefox/new/scene2.html b/bedrock/firefox/templates/firefox/new/scene2.html index 54f07a979b..58939ea212 100644 --- a/bedrock/firefox/templates/firefox/new/scene2.html +++ b/bedrock/firefox/templates/firefox/new/scene2.html @@ -6,7 +6,7 @@ {% add_lang_files "firefox/new/quantum" %} -{% extends "firefox/base-protocol.html" %} +{% extends "firefox/base/base-protocol.html" %} {# "scene2" page should not be indexed to avoid it appearing in search results: issue 7024 #} {% block canonical_urls %}{% endblock %} diff --git a/bedrock/firefox/templates/firefox/new/trailhead/base.html b/bedrock/firefox/templates/firefox/new/trailhead/base.html index 26bf5d2767..534fe15ad8 100644 --- a/bedrock/firefox/templates/firefox/new/trailhead/base.html +++ b/bedrock/firefox/templates/firefox/new/trailhead/base.html @@ -4,7 +4,7 @@ {% add_lang_files "firefox/new/trailhead" %} -{% extends "firefox/base-protocol.html" %} +{% extends "firefox/base/base-protocol.html" %} {% block page_title_prefix %}{{_('Download Firefox')}} — {% endblock %} diff --git a/bedrock/firefox/templates/firefox/new/yandex/base.html b/bedrock/firefox/templates/firefox/new/yandex/base.html index f3376a6208..0a6c0813e1 100644 --- a/bedrock/firefox/templates/firefox/new/yandex/base.html +++ b/bedrock/firefox/templates/firefox/new/yandex/base.html @@ -6,7 +6,7 @@ {% add_lang_files "firefox/new/quantum" %} -{% extends "firefox/base-pebbles.html" %} +{% extends "firefox/base/base-pebbles.html" %} {% block page_title_prefix %}{{_('Download Firefox')}} — {% endblock %} diff --git a/bedrock/firefox/templates/firefox/nightly_firstrun.html b/bedrock/firefox/templates/firefox/nightly_firstrun.html index a846cbe83b..97692cafdb 100644 --- a/bedrock/firefox/templates/firefox/nightly_firstrun.html +++ b/bedrock/firefox/templates/firefox/nightly_firstrun.html @@ -6,7 +6,7 @@ {% from "macros-protocol.html" import hero, picto_card with context %} -{% extends "/firefox/base-protocol.html" %} +{% extends "/firefox/base/base-protocol.html" %} {# "noindex" pages should not have the canonical or hreflang tags: bug 1442331 #} {% block canonical_urls %}{% endblock %} diff --git a/bedrock/firefox/templates/firefox/nightly_whatsnew.html b/bedrock/firefox/templates/firefox/nightly_whatsnew.html index 659bebd51c..18cf3008eb 100644 --- a/bedrock/firefox/templates/firefox/nightly_whatsnew.html +++ b/bedrock/firefox/templates/firefox/nightly_whatsnew.html @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -#} -{% extends "/firefox/base-pebbles.html" %} +{% extends "/firefox/base/base-pebbles.html" %} {% add_lang_files "firstrun" "mobile" %} {# "noindex" pages should not have the canonical or hreflang tags: bug 1442331 #} diff --git a/bedrock/firefox/templates/firefox/recommended.html b/bedrock/firefox/templates/firefox/recommended.html index c51a8719c7..55522822ad 100644 --- a/bedrock/firefox/templates/firefox/recommended.html +++ b/bedrock/firefox/templates/firefox/recommended.html @@ -4,7 +4,7 @@ {% from "macros-protocol.html" import call_out_compact, picto_card with context %} -{% extends "firefox/base-protocol.html" %} +{% extends "firefox/base/base-protocol.html" %} {# "noindex" pages should not have the canonical or hreflang tags: bug 1442331 #} {% block canonical_urls %}{% endblock %} diff --git a/bedrock/firefox/templates/firefox/releases/index.html b/bedrock/firefox/templates/firefox/releases/index.html index f0b47f974f..1da8b557d2 100644 --- a/bedrock/firefox/templates/firefox/releases/index.html +++ b/bedrock/firefox/templates/firefox/releases/index.html @@ -1,4 +1,4 @@ -{% extends "firefox/base-protocol.html" %} +{% extends "firefox/base/base-protocol.html" %} {% block page_title %}{{ _('Mozilla Firefox Release Notes') }}{% endblock %} {% block page_desc %}{{ _('Release notes for each version of Firefox.') }}{% endblock %} diff --git a/bedrock/firefox/templates/firefox/releases/notes.html b/bedrock/firefox/templates/firefox/releases/notes.html index d9f603e95e..fcc9adf5e5 100644 --- a/bedrock/firefox/templates/firefox/releases/notes.html +++ b/bedrock/firefox/templates/firefox/releases/notes.html @@ -4,7 +4,7 @@ {% from "macros-protocol.html" import call_out, call_out_compact %} -{% extends "firefox/base-protocol.html" %} +{% extends "firefox/base/base-protocol.html" %} {# page ID for gtm #} {# page_id may be over-ridden with more appropriate content #} diff --git a/bedrock/firefox/templates/firefox/releases/system_requirements.html b/bedrock/firefox/templates/firefox/releases/system_requirements.html index 54f09dbf90..8d5452b25d 100644 --- a/bedrock/firefox/templates/firefox/releases/system_requirements.html +++ b/bedrock/firefox/templates/firefox/releases/system_requirements.html @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. #} -{% extends "firefox/base-protocol.html" %} +{% extends "firefox/base/base-protocol.html" %} {% block gtm_page_id %}data-gtm-page-id="/firefox/system-requirements/"{% endblock %} diff --git a/bedrock/firefox/templates/firefox/switch.html b/bedrock/firefox/templates/firefox/switch.html index 3a740766cf..c35c17e3bf 100644 --- a/bedrock/firefox/templates/firefox/switch.html +++ b/bedrock/firefox/templates/firefox/switch.html @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. #} -{% extends "firefox/base-protocol.html" %} +{% extends "firefox/base/base-protocol.html" %} {% from "macros-protocol.html" import hero, picto_card with context %} diff --git a/bedrock/firefox/templates/firefox/testflight.html b/bedrock/firefox/templates/firefox/testflight.html index c626dbd012..046c8cf5d6 100644 --- a/bedrock/firefox/templates/firefox/testflight.html +++ b/bedrock/firefox/templates/firefox/testflight.html @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -#} -{% extends "firefox/base-resp.html" %} +{% extends "firefox/base/base-resp.html" %} {% block page_title_prefix %} {{ _('Firefox for iOS Beta') }} — diff --git a/bedrock/firefox/templates/firefox/tracking-protection-tour/index.html b/bedrock/firefox/templates/firefox/tracking-protection-tour/index.html index 13fa056e69..d8b5b8c650 100644 --- a/bedrock/firefox/templates/firefox/tracking-protection-tour/index.html +++ b/bedrock/firefox/templates/firefox/tracking-protection-tour/index.html @@ -4,7 +4,7 @@ {% add_lang_files "firefox/tracking-protection-tour" %} -{% extends "firefox/base-resp.html" %} +{% extends "firefox/base/base-resp.html" %} {# "noindex" pages should not have the canonical or hreflang tags: bug 1442331 #} {% block canonical_urls %}{% endblock %} diff --git a/bedrock/firefox/templates/firefox/unsupported-systems.html b/bedrock/firefox/templates/firefox/unsupported-systems.html index c7223246ca..f57fef8502 100644 --- a/bedrock/firefox/templates/firefox/unsupported-systems.html +++ b/bedrock/firefox/templates/firefox/unsupported-systems.html @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -#} -{% extends "/firefox/base-protocol.html" %} +{% extends "/firefox/base/base-protocol.html" %} {% block page_title %}{{ _('Unsupported Systems') }}{% endblock %} {% block page_desc %}{{ _('We’re sorry to report this, but your computer does not meet the minimum system requirements to run this version.') }}{% endblock %} diff --git a/bedrock/firefox/templates/firefox/whatsnew/base-pebbles.html b/bedrock/firefox/templates/firefox/whatsnew/base-pebbles.html index 9bad717241..71f8944d10 100644 --- a/bedrock/firefox/templates/firefox/whatsnew/base-pebbles.html +++ b/bedrock/firefox/templates/firefox/whatsnew/base-pebbles.html @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. #} -{% extends "firefox/base-pebbles.html" %} +{% extends "firefox/base/base-pebbles.html" %} {# "noindex" pages should not have the canonical or hreflang tags: bug 1442331 #} {% block canonical_urls %}{% endblock %} diff --git a/bedrock/firefox/templates/firefox/whatsnew/base.html b/bedrock/firefox/templates/firefox/whatsnew/base.html index d131afa732..f75f689e02 100644 --- a/bedrock/firefox/templates/firefox/whatsnew/base.html +++ b/bedrock/firefox/templates/firefox/whatsnew/base.html @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. #} -{% extends "firefox/base-resp.html" %} +{% extends "firefox/base/base-resp.html" %} {# "noindex" pages should not have the canonical or hreflang tags: bug 1442331 #} {% block canonical_urls %}{% endblock %} diff --git a/bedrock/firefox/templates/firefox/whatsnew/fx64/whatsnew-fx64-base.html b/bedrock/firefox/templates/firefox/whatsnew/fx64/whatsnew-fx64-base.html index 1ac91859b1..97f092c5a5 100644 --- a/bedrock/firefox/templates/firefox/whatsnew/fx64/whatsnew-fx64-base.html +++ b/bedrock/firefox/templates/firefox/whatsnew/fx64/whatsnew-fx64-base.html @@ -7,7 +7,7 @@ {% add_lang_files "firefox/whatsnew_64" %} -{% extends "firefox/base-protocol.html" %} +{% extends "firefox/base/base-protocol.html" %} {% if not is_translation %} {% set latest = _('Congrats! You’re using the latest version of Firefox.') %} diff --git a/bedrock/firefox/templates/firefox/whatsnew/index-lite.id.html b/bedrock/firefox/templates/firefox/whatsnew/index-lite.id.html index 1c6e4157ca..a253f867b4 100644 --- a/bedrock/firefox/templates/firefox/whatsnew/index-lite.id.html +++ b/bedrock/firefox/templates/firefox/whatsnew/index-lite.id.html @@ -6,7 +6,7 @@ {% from "macros.html" import send_to_device with context %} -{% extends "firefox/base-protocol.html" %} +{% extends "firefox/base/base-protocol.html" %} {% block page_title %}Firefox Lite{% endblock %} diff --git a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx63.html b/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx63.html index 2b785e0062..6a19a8f8c5 100644 --- a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx63.html +++ b/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx63.html @@ -8,7 +8,7 @@ {% add_lang_files "firefox/whatsnew_63" %} -{% extends "firefox/base-protocol.html" %} +{% extends "firefox/base/base-protocol.html" %} {% block page_title %}{{ _('See what’s new with Firefox') }}{% endblock %} diff --git a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx65.html b/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx65.html index 074b14d6ef..2214755b72 100644 --- a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx65.html +++ b/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx65.html @@ -8,7 +8,7 @@ {% add_lang_files "firefox/whatsnew_63" %} -{% extends "firefox/base-protocol.html" %} +{% extends "firefox/base/base-protocol.html" %} {% block page_title %}{{ _('See what’s new with Firefox') }}{% endblock %} diff --git a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx66.html b/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx66.html index acb35ddaa7..360a77a102 100644 --- a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx66.html +++ b/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx66.html @@ -7,7 +7,7 @@ {% add_lang_files "firefox/whatsnew_66" %} -{% extends "firefox/base-protocol.html" %} +{% extends "firefox/base/base-protocol.html" %} {% block page_title %}{{_('Get a Firefox Account – Keep your data private, safe and synced') }}{% endblock %} {% block page_desc %}{{_('Securely sync your passwords, bookmarks and tabs across all your devices. Get a Firefox Account now – One log-in – Power and privacy everywhere.') }}{% endblock %} diff --git a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx67.0.5.html b/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx67.0.5.html index 51ed6c8874..5b8e234721 100644 --- a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx67.0.5.html +++ b/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx67.0.5.html @@ -6,7 +6,7 @@ {% add_lang_files "firefox/whatsnew_67.0.5" %} -{% extends "firefox/base-protocol.html" %} +{% extends "firefox/base/base-protocol.html" %} {% block page_title %}{{ _('Get a Firefox Account – Keep your data private, safe and synced') }}{% endblock %} {% block page_desc %}{{ _('Securely sync your passwords, bookmarks and tabs across all your devices. Get a Firefox Account now – One login – Power and privacy everywhere.') }}{% endblock %} diff --git a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx67.html b/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx67.html index 20658aa3ae..2aa3cd5063 100644 --- a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx67.html +++ b/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx67.html @@ -8,7 +8,7 @@ {% add_lang_files "firefox/whatsnew_67" %} -{% extends "firefox/base-protocol.html" %} +{% extends "firefox/base/base-protocol.html" %} {% block page_title %}{{ _('Get a Firefox Account – Keep your data private, safe and synced') }}{% endblock %} {% block page_desc %}{{ _('Securely sync your passwords, bookmarks and tabs across all your devices. Get a Firefox Account now – One login – Power and privacy everywhere.') }}{% endblock %} diff --git a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx69.html b/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx69.html index b52a140858..f187fb6427 100644 --- a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx69.html +++ b/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx69.html @@ -6,7 +6,7 @@ {% add_lang_files "firefox/whatsnew_69" %} -{% extends "firefox/base-protocol.html" %} +{% extends "firefox/base/base-protocol.html" %} {% block page_title %}{{ _('Firefox Monitor — see if you’ve been in another company’s data breach') }}{% endblock %} {% block page_desc %}{{ _('Use Firefox Monitor to see if your info was compromised in another company’s data breach — and get automatically signed up for future alerts.') }}{% endblock %} diff --git a/bedrock/firefox/templates/firefox/windows-64-bit.html b/bedrock/firefox/templates/firefox/windows-64-bit.html index f8af5d948a..053f354a27 100644 --- a/bedrock/firefox/templates/firefox/windows-64-bit.html +++ b/bedrock/firefox/templates/firefox/windows-64-bit.html @@ -4,7 +4,7 @@ {% from "macros-protocol.html" import call_out_compact, hero with context %} - {% extends "firefox/base-protocol.html" %} + {% extends "firefox/base/base-protocol.html" %} {% block page_title %}{{ _('Firefox for Windows 64-bit') }}{% endblock %}