Skip to content

Commit

Permalink
Moves base /firefox html files into own folder (Fixes #7662)
Browse files Browse the repository at this point in the history
  • Loading branch information
Errolyn authored and alexgibson committed Sep 5, 2019
1 parent f840884 commit bb2369c
Show file tree
Hide file tree
Showing 60 changed files with 57 additions and 57 deletions.
2 changes: 1 addition & 1 deletion bedrock/firefox/templates/firefox/accounts-2019.html
Original file line number Diff line number Diff line change
Expand Up @@ -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' %}
Expand Down
2 changes: 1 addition & 1 deletion bedrock/firefox/templates/firefox/accounts.html
Original file line number Diff line number Diff line change
Expand Up @@ -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' %}

Expand Down
2 changes: 1 addition & 1 deletion bedrock/firefox/templates/firefox/all-unified.html
Original file line number Diff line number Diff line change
Expand Up @@ -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. -#}
Expand Down
2 changes: 1 addition & 1 deletion bedrock/firefox/templates/firefox/all.html
Original file line number Diff line number Diff line change
@@ -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' -%}
Expand Down
2 changes: 1 addition & 1 deletion bedrock/firefox/templates/firefox/best-browser.html
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}<meta name="robots" content="noindex,follow">{% endblock %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}<meta name="robots" content="noindex,follow">{% endblock %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}<meta name="robots" content="noindex,follow">{% endblock %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}<meta name="robots" content="noindex,follow">{% endblock %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}

Expand Down
2 changes: 1 addition & 1 deletion bedrock/firefox/templates/firefox/campaign/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -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. #}
Expand Down
2 changes: 1 addition & 1 deletion bedrock/firefox/templates/firefox/channel/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -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" %}

Expand Down
2 changes: 1 addition & 1 deletion bedrock/firefox/templates/firefox/concerts.html
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}<meta name="robots" content="noindex,follow">{% endblock %}
Expand Down
2 changes: 1 addition & 1 deletion bedrock/firefox/templates/firefox/dedicated-profiles.html
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}<meta name="robots" content="noindex,follow">{% endblock %}
Expand Down
2 changes: 1 addition & 1 deletion bedrock/firefox/templates/firefox/developer/firstrun.html
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down
2 changes: 1 addition & 1 deletion bedrock/firefox/templates/firefox/developer/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down
2 changes: 1 addition & 1 deletion bedrock/firefox/templates/firefox/developer/whatsnew.html
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down
2 changes: 1 addition & 1 deletion bedrock/firefox/templates/firefox/election/index-de.html
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down
2 changes: 1 addition & 1 deletion bedrock/firefox/templates/firefox/election/index-fr.html
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down
2 changes: 1 addition & 1 deletion bedrock/firefox/templates/firefox/election/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down
2 changes: 1 addition & 1 deletion bedrock/firefox/templates/firefox/enterprise/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down
2 changes: 1 addition & 1 deletion bedrock/firefox/templates/firefox/features/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -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') }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}

Expand Down
2 changes: 1 addition & 1 deletion bedrock/firefox/templates/firefox/fights-for-you.de.html
Original file line number Diff line number Diff line change
Expand Up @@ -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&amp;utm_medium=referral&amp;utm_campaign=fffy-page' %}

Expand Down
2 changes: 1 addition & 1 deletion bedrock/firefox/templates/firefox/fights-for-you.fr.html
Original file line number Diff line number Diff line change
Expand Up @@ -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&amp;utm_medium=referral&amp;utm_campaign=fffy-page' %}

Expand Down
2 changes: 1 addition & 1 deletion bedrock/firefox/templates/firefox/fights-for-you.html
Original file line number Diff line number Diff line change
Expand Up @@ -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&amp;utm_medium=referral&amp;utm_campaign=fffy-page' %}

Expand Down
2 changes: 1 addition & 1 deletion bedrock/firefox/templates/firefox/firstrun/firstrun.html
Original file line number Diff line number Diff line change
Expand Up @@ -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' %}

Expand Down
2 changes: 1 addition & 1 deletion bedrock/firefox/templates/firefox/home/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -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' %}
Expand Down
2 changes: 1 addition & 1 deletion bedrock/firefox/templates/firefox/installer-help.html
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}<meta name="robots" content="noindex,follow">{% endblock %}
Expand Down
2 changes: 1 addition & 1 deletion bedrock/firefox/templates/firefox/mobile.html
Original file line number Diff line number Diff line change
Expand Up @@ -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') }}
Expand Down
2 changes: 1 addition & 1 deletion bedrock/firefox/templates/firefox/new/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}

Expand Down
2 changes: 1 addition & 1 deletion bedrock/firefox/templates/firefox/new/scene2.html
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}<meta name="robots" content="noindex,follow">{% endblock %}
Expand Down
2 changes: 1 addition & 1 deletion bedrock/firefox/templates/firefox/new/trailhead/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}

Expand Down
2 changes: 1 addition & 1 deletion bedrock/firefox/templates/firefox/new/yandex/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}

Expand Down
2 changes: 1 addition & 1 deletion bedrock/firefox/templates/firefox/nightly_firstrun.html
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}<meta name="robots" content="noindex,follow">{% endblock %}
Expand Down
2 changes: 1 addition & 1 deletion bedrock/firefox/templates/firefox/nightly_whatsnew.html
Original file line number Diff line number Diff line change
Expand Up @@ -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 #}
Expand Down
2 changes: 1 addition & 1 deletion bedrock/firefox/templates/firefox/recommended.html
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}<meta name="robots" content="noindex,follow">{% endblock %}
Expand Down
2 changes: 1 addition & 1 deletion bedrock/firefox/templates/firefox/releases/index.html
Original file line number Diff line number Diff line change
@@ -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 %}
Expand Down
2 changes: 1 addition & 1 deletion bedrock/firefox/templates/firefox/releases/notes.html
Original file line number Diff line number Diff line change
Expand Up @@ -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 #}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}

Expand Down
2 changes: 1 addition & 1 deletion bedrock/firefox/templates/firefox/switch.html
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}

Expand Down
2 changes: 1 addition & 1 deletion bedrock/firefox/templates/firefox/testflight.html
Original file line number Diff line number Diff line change
Expand Up @@ -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') }} —
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}<meta name="robots" content="noindex,follow">{% endblock %}
Expand Down
Loading

0 comments on commit bb2369c

Please sign in to comment.