Moves base /firefox html files into own folder (Fixes #7662)

This commit is contained in:
Errolyn 2019-09-05 01:49:43 -07:00 коммит произвёл Alex Gibson
Родитель f840884c2b
Коммит bb2369c243
60 изменённых файлов: 57 добавлений и 57 удалений

Просмотреть файл

@ -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' %}

Просмотреть файл

@ -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' %}

Просмотреть файл

@ -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. -#}

Просмотреть файл

@ -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' -%}

Просмотреть файл

@ -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 %}

Просмотреть файл

@ -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 %}

Просмотреть файл

@ -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 %}

Просмотреть файл

@ -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 %}

Просмотреть файл

@ -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 %}

Просмотреть файл

@ -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 %}

Просмотреть файл

@ -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. #}

Просмотреть файл

@ -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" %}

Просмотреть файл

@ -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 %}

Просмотреть файл

@ -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 %}

Просмотреть файл

@ -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 %}

Просмотреть файл

@ -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 %}

Просмотреть файл

@ -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 %}

Просмотреть файл

@ -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 %}

Просмотреть файл

@ -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 %}

Просмотреть файл

@ -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 %}

Просмотреть файл

@ -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 %}

Просмотреть файл

@ -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 %}

Просмотреть файл

@ -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 %}

Просмотреть файл

@ -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') }}

Просмотреть файл

@ -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 %}

Просмотреть файл

@ -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' %}

Просмотреть файл

@ -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' %}

Просмотреть файл

@ -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' %}

Просмотреть файл

@ -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' %}

Просмотреть файл

@ -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' %}

Просмотреть файл

@ -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 %}

Просмотреть файл

@ -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') }}

Просмотреть файл

@ -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 %}

Просмотреть файл

@ -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 %}

Просмотреть файл

@ -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 %}

Просмотреть файл

@ -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 %}

Просмотреть файл

@ -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 %}

Просмотреть файл

@ -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 #}

Просмотреть файл

@ -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 %}

Просмотреть файл

@ -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 %}

Просмотреть файл

@ -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 #}

Просмотреть файл

@ -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 %}

Просмотреть файл

@ -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 %}

Просмотреть файл

@ -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') }} —

Просмотреть файл

@ -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 %}

Просмотреть файл

@ -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 %}{{ _('Were sorry to report this, but your computer does not meet the minimum system requirements to run this version.') }}{% endblock %}

Просмотреть файл

@ -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 %}

Просмотреть файл

@ -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 %}

Просмотреть файл

@ -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! Youre using the latest version of Firefox.') %}

Просмотреть файл

@ -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 %}

Просмотреть файл

@ -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 whats new with Firefox') }}{% endblock %}

Просмотреть файл

@ -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 whats new with Firefox') }}{% endblock %}

Просмотреть файл

@ -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 %}

Просмотреть файл

@ -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 %}

Просмотреть файл

@ -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 %}

Просмотреть файл

@ -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 youve been in another companys data breach') }}{% endblock %}
{% block page_desc %}{{ _('Use Firefox Monitor to see if your info was compromised in another companys data breach — and get automatically signed up for future alerts.') }}{% endblock %}

Просмотреть файл

@ -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 %}