diff --git a/bedrock/firefox/redirects.py b/bedrock/firefox/redirects.py index 8c51da255f1..f2eae5a39ff 100644 --- a/bedrock/firefox/redirects.py +++ b/bedrock/firefox/redirects.py @@ -600,4 +600,8 @@ def mobile_app(request, *args, **kwargs): redirect(r"^firefox/flashback/?$", "firefox"), # issue 14222 redirect(r"^firefox/browsers/?$", "firefox"), + # issue 14248 + redirect(r"^firefox/privacy/products/?$", "products.landing"), + redirect(r"^firefox/privacy/safe-passwords/?$", "firefox.features.password-manager"), + redirect(r"^firefox/privacy/book/?$", "https://support.mozilla.org/kb/how-stay-safe-web"), ) diff --git a/bedrock/firefox/templates/firefox/privacy/base.html b/bedrock/firefox/templates/firefox/privacy/base.html index 8d99e354f01..0a95186976e 100644 --- a/bedrock/firefox/templates/firefox/privacy/base.html +++ b/bedrock/firefox/templates/firefox/privacy/base.html @@ -16,20 +16,10 @@ {{ css_bundle('protocol-picto') }} {{ css_bundle('protocol-callout') }} {{ css_bundle('protocol-card') }} - {{ css_bundle('firefox-privacy-common') }} -{% endblock %} - -{% block sub_navigation %} - {% include 'firefox/privacy/includes/sub-nav.html' %} {% endblock %} {% block content %}
{% block hub_content %}{% endblock %} - - {{ callout( - title=ftl('firefox-privacy-hub-read-the-privacy-notice-for', url=url('privacy.notices.firefox')), - class='call-out-privacy') - }}
{% endblock %} diff --git a/bedrock/firefox/templates/firefox/privacy/book.html b/bedrock/firefox/templates/firefox/privacy/book.html deleted file mode 100644 index cb48b782813..00000000000 --- a/bedrock/firefox/templates/firefox/privacy/book.html +++ /dev/null @@ -1,385 +0,0 @@ -{# - 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/. -#} - -{% from "macros-protocol.html" import split, picto with context %} - -{% extends "firefox/base/base-protocol.html" %} - -{% block page_title %}{{ ftl('privacy-book-little-book-of') }}{% endblock %} -{% block page_desc %}{{ ftl('privacy-book-the-internet-should') }}{% endblock %} - -{% block page_image %}{{ static('img/firefox/privacy/book/privacy-book-arrow-og.png') }}{% endblock %} - -{% block page_css %} - {{ css_bundle('protocol-split') }} - {{ css_bundle('protocol-card') }} - {{ css_bundle('protocol-picto') }} - {{ css_bundle('protocol-callout') }} - {{ css_bundle('privacy-book') }} -{% endblock %} - -{% block sub_navigation %} - {% include 'firefox/privacy/includes/sub-nav.html' %} -{% endblock %} - -{% block content %} -
-
- -

{{ ftl('privacy-book-little-book-of') }}

-

{{ ftl('privacy-book-how-to-stay') }}

- {{ download_firefox_thanks() }} -
-
- -{% call split( - image=resp_img('img/firefox/privacy/book/privacy-healthy-internet.jpg', - optional_attributes={ 'class': 'mzp-c-split-media-asset', 'loading': 'lazy' } - ), - block_class='mzp-l-split-reversed', - media_class='mzp-l-split-v-start', -) %} -

{{ ftl('privacy-book-a-healthy-private') }}

-

{{ ftl('privacy-book-we-believe-that') }}

-

{{ ftl('privacy-book-but-heres-good') }}

-{% endcall %} - -
-

{{ ftl('privacy-book-what-risks-are') }}

-

{{ ftl('privacy-book-theres-risk-always') }}

-
- -
- {% call split( - image=resp_img('img/firefox/privacy/book/privacy-book-arrow-on-face.jpg', - optional_attributes={ 'class': 'mzp-c-split-media-asset', 'loading': 'lazy'} - ), - media_class='mzp-l-split-v-start', - ) %} -

{{ ftl('privacy-book-data-breaches') }}

-

{{ ftl('privacy-book-even-when-organizations') }}

- -

{{ ftl('privacy-book-the-web-never') }}

-

{{ ftl('privacy-book-according-to-the') }}

- {% endcall %} - - {% call split( - image=resp_img('img/firefox/privacy/book/privacy-troll.jpg', - optional_attributes={ 'class': 'mzp-c-split-media-asset', 'loading': 'lazy' } - ), - block_class='mzp-l-split-reversed', - media_class='mzp-l-split-v-start', - ) %} -

{{ ftl('privacy-book-trackers-everywhere-') }}

-

{{ ftl('privacy-book-trackers-cookies-youve') }}

-

{{ ftl('privacy-book-tracking-cookies-are') }}

- -

{{ ftl('privacy-book-stalkers-trolls-') }}

-

{{ ftl('privacy-book-even-if-the') }}

- {% endcall %} -
- -{% call split( - block_id='fake-news', - image=resp_img('img/firefox/privacy/book/privacy-callouts.png', - optional_attributes={ 'class': 'mzp-c-split-media-asset', 'loading': 'lazy'} - ), - theme_class='mzp-t-dark mzp-t-background-secondary', - block_class='mzp-t-split-nospace', - media_class='mzp-l-split-v-start', -) %} -

{{ ftl('privacy-book-fake-news-and') }}

-

{{ ftl('privacy-book-news-recommendations-are') }}

- -

{{ ftl('privacy-book-how-much-control') }}

-

{{ ftl('privacy-book-many-of-us') }}

-{% endcall %} - -
- {% call split( - image=resp_img('img/firefox/privacy/book/privacy-digital-life-growing.jpg', - optional_attributes={ 'class': 'mzp-c-split-media-asset', 'loading': 'lazy'} - ), - block_class='c-tips-title mzp-l-split-reversed', - ) %} -

{{ ftl('privacy-book-tips-for') }}

- {% endcall %} - -
-

{{ ftl('privacy-book-starting-over') }}

-

{{ ftl('privacy-book-its-time-for') }}

-
- -
-

{{ ftl('privacy-book-a-tidy-browser') }}

-
    -
  1. -

    {{ ftl('privacy-book-delete-your-browser') }}

    -
  2. -
  3. -

    {{ ftl('privacy-book-delete-your-google') }}

    -
  4. -
-
- -
-

{{ ftl('privacy-book-convenience-may-be') }}

-

{{ ftl('privacy-book-all-of-us') }}

- -

{{ ftl('privacy-book-browser-while-many') }}

-

{{ ftl('privacy-book-give-firefox-focus') }}

-
- - - -
-

{{ ftl('privacy-book-sharing-is-caring') }}

-

{{ ftl('privacy-book-got-it-youre') }}

- -
    -
  1. -

    {{ ftl('privacy-book-the-art-of') }}

    -

    {{ ftl('privacy-book-the-easiest-way') }}

    -
  2. -
  3. {{ ftl('privacy-book-we-love-social') }}

  4. -
  5. {{ ftl('privacy-book-theres-actually-even') }}

  6. -
  7. {{ ftl('privacy-book-what-feels-right') }}

  8. -
-
- -
-

{{ ftl('privacy-book-what-does-the') }}

-

{{ ftl('privacy-book-to-an-extent') }}

-
- - {% call split( - image=resp_img('img/firefox/privacy/book/privacy-magnify.png', - optional_attributes={ 'class': 'mzp-c-split-media-asset', 'loading': 'lazy'} - ), - block_class='c-tips-magnify mzp-l-split-reversed', - ) %} -
    -
  1. {{ ftl('privacy-book-search-your-name') }}
  2. -
  3. {{ ftl('privacy-book-dont-have-time') }}
  4. -
  5. {{ ftl('privacy-book-breach-alert-if-v2') }}
  6. -
- {% endcall %} - - -
-

{{ ftl('privacy-book-stay-safe-online') }}

-

{{ ftl('privacy-book-there-are-a') }}

- -
    -
  1. {{ ftl('privacy-book-set-up-strong') }}
  2. -
  3. {{ ftl('privacy-book-some-online-services') }}
  4. -
  5. -

    {{ ftl('privacy-book-wondering-how-youre') }}

    -
  6. -
-
- -
-

{{ ftl('privacy-book-not-just-for') }}

-

{{ ftl('privacy-book-a-strong-password') }}

- -
    -
  1. {{ ftl('privacy-book-mfa-gets-its') }}
  2. -
  3. {{ ftl('privacy-book-there-are-many') }}
  4. -
- - -
- -
-

{{ ftl('privacy-book-safer-connections-public') }}

-

{{ ftl('privacy-book-public-wifi') }}

- - -
    -
  1. {{ ftl('privacy-book-ideally-avoid-publicly') }}
  2. -
  3. {{ ftl('privacy-book-perhaps-you-just') }}
  4. -
  5. {{ ftl('privacy-book-avoid-naming-your') }}
  6. -
  7. {{ ftl('privacy-book-disconnect-and-remove') }}
  8. -
-
- -
-

{{ ftl('privacy-book-how-about-your') }}

-

{{ ftl('privacy-book-bluetooth-is-a') }}

- -
- -
-

{{ ftl('privacy-book-the-secure-site') }}

-

{{ ftl('privacy-book-its-not-unusual') }}

- -
- -
-

{{ ftl('privacy-book-email-accounts-and') }}

-

{{ ftl('privacy-book-your-email-address') }}

- -
- -
-

{{ ftl('privacy-book-resist-the-urge') }}

-

{{ ftl('privacy-book-sometimes-its-easier') }}

-
- - {% call split( - image=resp_img('img/firefox/privacy/book/privacy-caution.jpg', - optional_attributes={ 'class': 'mzp-c-split-media-asset', 'loading': 'lazy', 'width': '1584', 'height': '1176' } - ), - ) %} -
    -
  1. {{ ftl('privacy-book-from-time-to') }}
  2. -
  3. {{ ftl('privacy-book-its-also-possible') }}
  4. -
- {% endcall %} - - -
-

{{ ftl('privacy-book-look-at-the') }}

-

{{ ftl('privacy-book-we-already-talked') }}

-
    -
  1. {{ ftl('privacy-book-you-can-of') }}
  2. -
  3. - {{ ftl('privacy-book-ask-yourselves-do') }} - - {% if LANG == 'de' %} - {{ ftl('privacy-book-de-blog-post') }} - {% endif %} -
  4. -
-
- -
-

{{ ftl('privacy-book-disable-unnecessary-location') }}

-

{{ ftl('privacy-book-todays-mobile-devices') }}

-
- - {% call split( - image=resp_img('img/firefox/privacy/book/privacy-globe.jpg', - optional_attributes={ 'class': 'mzp-c-split-media-asset', 'loading': 'lazy', 'width': '1596', 'height': '948' } - ), - block_class='mzp-l-split-reversed', - ) %} -
    -
  1. {{ ftl('privacy-book-many-social-media') }}
  2. -
  3. {{ ftl('privacy-book-for-each-of') }}
  4. -
  5. {{ ftl('privacy-book-another-reason-to') }}
  6. -
- {% endcall %} - -
-

{{ ftl('privacy-book-dont-need-it') }}

-

{{ ftl('privacy-book-even-if-you') }}

- - - -
    -
  1. -

    {{ ftl('privacy-book-the-more-apps') }}

    -
  2. -
  3. -

    {{ ftl('privacy-book-check-which-apps') }}

    -
  4. -
  5. -

    {{ ftl('privacy-book-also-reconsider-the') }}

    -
  6. -
- - -
-
- -{% call split( - block_id='trackers', - image=resp_img('img/firefox/privacy/book/privacy-target.png', optional_attributes={ 'class': 'mzp-c-split-media-asset'}), - block_class='mzp-t-split-nospace', - theme_class='mzp-t-dark mzp-t-background-secondary' -) %} -

{{ ftl('privacy-book-friendly-reminder-what') }}

-

{{ ftl('privacy-book-news-recommendations-are') }}

-

{{ ftl('privacy-book-we-distinguish-between') }}

-

{{ ftl('privacy-book-thirdparty-trackers-on') }}

-

{{ ftl('privacy-book-as-you-might') }}

-{% endcall %} - -
-

{{ ftl('privacy-book-questions-feedback') }}

-

{{ ftl('privacy-book-do-you-have') }}

- -

{{ ftl('privacy-book-x-formerly-twitter', fallback='privacy-book-twitter') }}

- {{ ftl('privacy-book-x', fallback="privacy-book-twitter") }} (@firefox) -
- -{% endblock %} diff --git a/bedrock/firefox/templates/firefox/privacy/includes/sub-nav.html b/bedrock/firefox/templates/firefox/privacy/includes/sub-nav.html deleted file mode 100644 index b3d59e0fff6..00000000000 --- a/bedrock/firefox/templates/firefox/privacy/includes/sub-nav.html +++ /dev/null @@ -1,36 +0,0 @@ -{# - 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/. -#} - -{% from "macros.html" import sub_nav with context %} - -{% if ftl_has_messages('sub-navigation-privacy', 'sub-navigation-our-promise', 'sub-navigation-our-products', 'sub-navigation-little-book-of-privacy') %} - {{ sub_nav( - title={ - 'text': ftl('sub-navigation-privacy', fallback='firefox-privacy-privacy') - }, - links=[ - { - 'text': ftl('sub-navigation-our-promise', fallback='firefox-privacy-our-promise'), - 'href': url('firefox.privacy.index'), - 'cta_name': "Our Promise" - }, - { - 'text': ftl('sub-navigation-our-products', fallback='firefox-privacy-our-products'), - 'href': url('firefox.privacy.products') , - 'cta_name': "Our Products" - }, - { - 'text': ftl('sub-navigation-little-book-of-privacy'), - 'href': url('firefox.privacy.book'), - 'cta_name': "Little Book of Privacy" - }, - { - 'text': ftl('sub-navigation-safe-passwords'), - 'href': url('firefox.privacy.passwords'), - 'cta_name': "Safe Passwords" - }] - ) }} -{% endif %} diff --git a/bedrock/firefox/templates/firefox/privacy/index.html b/bedrock/firefox/templates/firefox/privacy/index.html index 0121fb45f53..00a926ef6e7 100644 --- a/bedrock/firefox/templates/firefox/privacy/index.html +++ b/bedrock/firefox/templates/firefox/privacy/index.html @@ -4,7 +4,7 @@ file, You can obtain one at https://mozilla.org/MPL/2.0/. #} -{% from "macros-protocol.html" import callout, split, picto with context %} +{% from "macros-protocol.html" import picto %} {% extends "firefox/privacy/base.html" %} @@ -24,59 +24,33 @@ {% block hub_content %} - {% call split( - image=picture('img/firefox/privacy/promise/privacy-hero-700.png', - sources=[ - { - 'media': '(min-width: 768px)', - 'srcset': { - 'img/firefox/privacy/promise/privacy-hero-500.png': '500w', - 'img/firefox/privacy/promise/privacy-hero-700.png': '700w', - 'img/firefox/privacy/promise/privacy-hero-900.png': '900w', - 'img/firefox/privacy/promise/privacy-hero-1100.png': '1100w', - }, - 'sizes': { - 'default': 'calc(50vw - 192px)' - } - }, - { - 'media': '(max-width: 767px)', - 'srcset': { - 'img/placeholder.png': 'default' - } - } - ], - optional_attributes={ 'class': 'mzp-c-split-media-asset', 'height': '626', 'width': '680' } +
+ {% call picto( + title=ftl('firefox-privacy-hub-firefox-privacy-promise'), + body=True, + image=resp_img( + url='img/firefox/privacy/icon-privacy-promise.svg', + optional_attributes={ + 'class': 'mzp-c-picto-image', + 'width': '75', + 'loading': 'lazy' + } ), - block_class='privacy-promise-hero mzp-l-split-hide-media-on-sm-md mzp-t-split-nospace t-mobile-nospace', - theme_class='mzp-t-dark', - media_class='mzp-l-split-v-end' - ) %} -

{{ ftl('firefox-privacy-hub-firefox-products-are-designed')|safe }}

-

{{ ftl('firefox-privacy-hub-you-should-be-able-to-decide') }}

+ heading_level=1) %} {% endcall %} +
- {{ callout( - title=ftl('firefox-privacy-hub-thats-why-everything-we-make'), - class='call-out-data-promise') - }} - -
- {% call split( - image=resp_img('img/firefox/privacy/promise/less.jpg', srcset={ 'img/firefox/privacy/promise/less-high-res.jpg': '2x' }, optional_attributes={ 'class': 'mzp-c-split-media-asset'}), - block_class='privacy-promise-feature mzp-l-split-reversed' - ) %} +
+
+

{{ ftl('firefox-privacy-hub-take-less') }}

-

{{ ftl('firefox-privacy-hub-we-make-a-point-of-knowing') }}

+

{{ ftl('firefox-privacy-hub-we-make-a-point-of-knowing') }}

{{ ftl('firefox-privacy-hub-all-tech-companies-collect') }}

- {% endcall %} +
- {% call split( - image=resp_img('img/firefox/privacy/promise/safe.jpg', srcset={ 'img/firefox/privacy/promise/safe-high-res.jpg': '2x' }, optional_attributes={ 'class': 'mzp-c-split-media-asset'}), - block_class='privacy-promise-feature' - ) %} +

{{ ftl('firefox-privacy-hub-keep-it-safe') }}

-

{{ ftl('firefox-privacy-hub-we-do-the-hard-work-to-protect') }}

+

{{ ftl('firefox-privacy-hub-we-do-the-hard-work-to-protect') }}

{# Our lean-data page is en-US only, so only link to it for English locales. #} {% if LANG.startswith('en') %} @@ -88,65 +62,54 @@

{{ ftl('firefox-privacy-hub-we-do-the-hard {{ ftl('firefox-privacy-hub-data-security-is-complicated') }} {% endif %}

- {% endcall %} +

+
+ +
+

{{ ftl('firefox-privacy-hub-no-secrets') }}

+

{{ ftl('firefox-privacy-hub-youll-always-know-where-you') }}

+

+ {{ ftl('firefox-privacy-hub-theres-no-hidden-agenda-here-v2', privacy=url('privacy.notices.firefox')) }} +

+
+
- {% call split( - image=resp_img('img/firefox/privacy/promise/secrets.jpg', srcset={ 'img/firefox/privacy/promise/secrets-high-res.jpg': '2x' }, optional_attributes={ 'class': 'mzp-c-split-media-asset'}), - block_class='privacy-promise-feature mzp-l-split-reversed' - ) %} -

{{ ftl('firefox-privacy-hub-no-secrets') }}

-

{{ ftl('firefox-privacy-hub-youll-always-know-where-you') }}

+
+
-
- -
+ {% call picto( + title=ftl('firefox-privacy-hub-your-privacy-by-the-product'), + body=True, + image=resp_img( + url='img/icons/privacy-shield.svg', + optional_attributes={ + 'class': 'mzp-c-picto-image', + 'width': '150', + 'loading': 'lazy' + } + ), + base_el='li') %} +

{{ ftl('firefox-privacy-hub-firefox-products-work-differently') }}

+

{{ ftl('firefox-privacy-hub-read-the-privacy-notice-for', url=url('privacy.notices.firefox')) }}

+ {% endcall %} + +
{% endblock %} diff --git a/bedrock/firefox/templates/firefox/privacy/passwords.html b/bedrock/firefox/templates/firefox/privacy/passwords.html deleted file mode 100644 index bfcaeeaa24a..00000000000 --- a/bedrock/firefox/templates/firefox/privacy/passwords.html +++ /dev/null @@ -1,115 +0,0 @@ -{# - 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/. -#} - -{% from "macros.html" import fxa_email_form with context %} -{% from "macros-protocol.html" import callout, split with context %} - -{% extends "firefox/privacy/base.html" %} - -{% block page_title_full %}{{ ftl('privacy-passwords-security-guide-to') }}{% endblock %} -{% block page_desc %}{{ ftl('privacy-passwords-more-and-more-desc') }}{% endblock %} -{% block page_image %}{{ static('img/firefox/privacy/passwords/og.png') }}{% endblock %} - -{% block page_css %} - {{ super() }} - {{ css_bundle('firefox-privacy-products') }} - {{ css_bundle('seo') }} -{% endblock %} - -{% block body_class %}{{ super() }} privacy-passwords{% endblock %} - -{% block hub_content %} -{% call split( - block_class='mzp-t-split-nospace mzp-l-split-hide-media-on-sm-md mzp-l-split-center-on-sm-md t-mobile-nospace', - theme_class='mzp-t-dark', - media_class='mzp-l-split-media-overflow mzp-l-split-media-constrain-height', - image=resp_img('img/firefox/privacy/passwords/passwords.png', - srcset={ 'img/firefox/privacy/passwords/passwords-high-res.png': '2x' }, - optional_attributes={ 'class': 'mzp-c-split-media-asset'} - ), - ) %} - -

{{ ftl('privacy-passwords-a-security-guide') }}

-
-

{{ ftl('privacy-passwords-protecting-your-accounts') }}

-
- {{ download_firefox(dom_id='privacy-passwords-download', download_location='primary cta') }} -{% endcall %} - -
-
-

{{ ftl('privacy-passwords-more-and-more') }}

-

{{ ftl('privacy-passwords-tldr') }}

- - -

{{ ftl('privacy-passwords-its-hard-out') }}

-

{{ ftl('privacy-passwords-most-logins-today') }}

- -

{{ ftl('privacy-passwords-to-keep-your') }}

- -

{{ ftl('privacy-passwords-look-for-the') }}

-

{{ ftl('privacy-passwords-its-easy-to') }}

- {{ ftl('privacy-passwords-a-closed-lock') }} -

{{ ftl('privacy-passwords-the-lock-means') }}

- {{ ftl('privacy-passwords-a-padlock-with') }} -

{{ ftl('privacy-passwords-your-browser-also') }}

- {{ ftl('privacy-passwords-firefox-will-v2') }} -

{{ ftl('privacy-passwords-in-general-the') }}

- -

{{ ftl('privacy-passwords-strength-in-diversity') }}

-

{{ ftl('privacy-passwords-the-secret-to') }}

- {% set url_linkedin = 'href="https://blog.linkedin.com/2012/06/06/linkedin-member-passwords-compromised" rel="external noopener"' %} - {% set url_yahoo = 'href="https://www.wired.com/2016/12/yahoo-hack-billion-users/" rel="external noopener"' %} -

{{ ftl('privacy-passwords-when-an-attacker', url_linkedin=url_linkedin, url_yahoo=url_yahoo) }}

- {% set url_monitor = 'href="https://monitor.mozilla.org/" rel="external noopener"' %} - -

- {{ ftl('privacy-passwords-use-mozilla-monitor', url_monitor=url_monitor) }} -

- -

{{ ftl('privacy-passwords-security-questions-my') }}

-

{{ ftl('privacy-passwords-finally-most-websites') }}

-

{{ ftl('privacy-passwords-randomness-can-be') }}

- -

{{ ftl('privacy-passwords-get-help-from') }}

-

{{ ftl('privacy-passwords-now-all-of') }}

- - - {% set url_sumo_manager = 'href="https://support.mozilla.org/kb/password-manager-remember-delete-edit-logins" rel="external noopener"' %} - -

{{ ftl('privacy-passwords-when-youre-logged-v2', fallback='privacy-passwords-when-youre-logged', url_sumo_manager=url_sumo_manager) }}

- -

{{ ftl('privacy-passwords-twofactor-authentication-2fa') }}

-

{{ ftl('privacy-passwords-2fa-is-a') }}

- {% set url_sumo_2fa = 'href="https://support.mozilla.org/kb/secure-firefox-account-two-step-authentication" rel="external noopener"' %} - -

{{ ftl('privacy-passwords-your-mozilla-account', fallback='privacy-passwords-your-firefox-account', url_sumo_2fa=url_sumo_2fa) }}

- - - {% set url_2fa = 'href="https://2fa.directory" rel="external noopener"' %} -

{{ ftl('privacy-passwords-2fa-provides-much', url_2fa=url_2fa) }}

- -

{{ ftl('privacy-passwords-strong-diverse-and') }}

-

{{ ftl('privacy-passwords-for-better-or') }}

- {% set url_privacy_products = 'href="%s" rel="external noopener"'|format(url('firefox.privacy.products')) %} - {% set url_about_manifesto = 'href="%s" rel="external noopener"'|format(url('mozorg.about.manifesto')) %} -

{{ ftl('privacy-passwords-in-todays-internet-v2', url_privacy_products=url_privacy_products, url_about_manifesto=url_about_manifesto) }}

-
-
- -{% endblock %} diff --git a/bedrock/firefox/templates/firefox/privacy/products.html b/bedrock/firefox/templates/firefox/privacy/products.html deleted file mode 100644 index 957f25c6c98..00000000000 --- a/bedrock/firefox/templates/firefox/privacy/products.html +++ /dev/null @@ -1,252 +0,0 @@ -{# - 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/. -#} - -{% from "macros.html" import fxa_email_form with context %} -{% from "macros-protocol.html" import callout, split, picto with context %} - -{% extends "firefox/privacy/base.html" %} - -{% block page_title_full %}{{ ftl('firefox-privacy-hub-firefox-privacy-by-the') }}{% endblock %} -{% block page_desc %}{{ ftl('firefox-privacy-hub-mozilla-protects-your-privacy', fallback= 'firefox-privacy-hub-firefox-protects-your-privacy') }}{% endblock %} - -{% block page_css %} - {{ super() }} - {{ css_bundle('protocol-emphasis-box') }} - {{ css_bundle('firefox-privacy-products') }} -{% endblock %} - -{% block body_class %}{{ super() }} privacy-products{% endblock %} - -{% set _entrypoint = 'mozilla.org-privacy-products' %} -{% set _utm_campaign = 'privacy-products' %} - -{% block hub_content %} - - {{ callout( - title=ftl('firefox-privacy-hub-mozilla-protects-your-privacy-strong', fallback='firefox-privacy-hub-firefox-protects-your-privacy-strong')|safe, - class='privacy-products-callout-main', - heading_level=1) - }} - - {% call split( - image=resp_img('img/firefox/privacy/products/report.svg', optional_attributes={ 'class': 'mzp-c-split-media-asset', 'l10n': 'true'}), - block_class='privacy-products-hero mzp-t-dark mzp-l-split-hide-media-on-sm-md', - media_class='mzp-l-split-media-overflow' - ) %} -
-

{{ ftl('firefox-privacy-hub-firefox-browser') }}

-
-

- {{ ftl('firefox-privacy-hub-2000-trackers-blocked-automatically') }} -

- -

{{ ftl('firefox-privacy-hub-tracking-has-become-an') }}

- -

- {{ ftl('firefox-privacy-hub-if-you-want-to-see-what') }} -

- -

- - {{ ftl('firefox-privacy-hub-see-what-firefox-has-blocked') }} - -

- -

- {{ ftl('firefox-privacy-hub-get-enhanced-tracking-protection') }} -

- -
- {{ download_firefox(dom_id='download-button-primary-non-firefox', alt_copy=ftl('firefox-privacy-hub-download-the-firefox-browser'), download_location='primary cta') }} -
- -

- - {{ ftl('firefox-privacy-hub-update-your-firefox-browser') }} - -

- {% endcall %} - -
- -
- - {% call callout( - title=ftl('firefox-privacy-hub-more-than-s-trackers-blocked', trackers=10000000000), - class='privacy-products-tracker-counter mzp-t-dark', - include_cta=True - ) %} -

- - {{ ftl('firefox-privacy-hub-see-what-firefox-has-blocked') }} - -

- -
- {{ download_firefox(dom_id='download-button-secondary-non-firefox', alt_copy=ftl('firefox-privacy-hub-download-the-firefox-browser'), download_location='secondary cta') }} -
- -

- - {{ ftl('firefox-privacy-hub-update-your-firefox-browser') }} - -

- {% endcall %} - -
- {% call split( - image=resp_img('img/firefox/privacy/products/monitor.svg', optional_attributes={ 'class': 'mzp-c-split-media-asset'}), - media_class='mzp-l-split-h-center' - ) %} -
-

- {{ ftl('firefox-privacy-hub-mozilla-monitor') }} -

-
-

- {% if LANG == 'en-US' %} - When you enter your email address in Mozilla Monitor, we forget it immediately after we’ve checked to see where your - personal details have been exposed — unless you authorize us to continue monitoring your info for future exposures. - {% else %} - {{ ftl('firefox-privacy-hub-when-you-enter-your-email-v2') }} - {% endif %} -

-

- - {% if LANG == 'en-US' %} - Check for exposures now - {% else %} - {{ ftl('firefox-privacy-hub-check-for-breaches') }} - {% endif %} - -

- {% endcall %} - - {% if ftl_has_messages('firefox-privacy-hub-surf-stream-and-get-work') %} - {% call split( - image=resp_img('img/firefox/privacy/products/vpn.svg', optional_attributes={ 'class': 'mzp-c-split-media-asset'}), - block_class='mzp-l-split-reversed', - media_class='mzp-l-split-h-center' - ) %} -
-

{{ ftl('firefox-privacy-hub-mozilla-vpn') }}

-
-

{{ ftl('firefox-privacy-hub-surf-stream-and-get-work') }}

-

- - {{ ftl('firefox-privacy-hub-get-mozilla-vpn') }} - -

- {% endcall %} - {% endif %} - - {% if ftl_has_messages('firefox-privacy-hub-protection-for-your-whole') %} - {% set block_class = '' %} - {% else %} - {% set block_class = 'mzp-l-split-reversed' %} - {% endif %} - {% call split( - image=resp_img('img/firefox/privacy/products/pocket.png', - srcset={ 'img/firefox/privacy/products/pocket-high-res.png': '2x' }, - optional_attributes={ 'class': 'mzp-c-split-media-asset'} - ), - block_class=block_class, - media_class='mzp-l-split-h-center' - ) %} -
-

{{ ftl('firefox-privacy-hub-pocket') }}

-
-

{{ ftl('firefox-privacy-hub-pocket-recommends-high') }}

-

- - {{ ftl('firefox-privacy-hub-get-pocket') }} - -

- {% endcall %} - -
-
-

- {{ ftl('firefox-privacy-hub-your-mozilla-account', fallback='firefox-privacy-hub-your-firefox-account') }} -

-
- {{ ftl('firefox-privacy-hub-all-the-information-synced-v2', fallback='firefox-privacy-hub-all-the-information-synced') }} -
-
-
- {{ fxa_email_form( - entrypoint=_entrypoint, - form_title=ftl('firefox-privacy-hub-take-your-privacy-and-bookmarks-v2', fallback='firefox-privacy-hub-take-your-privacy-and-bookmarks'), - button_class='mzp-c-button mzp-t-primary mzp-t-product', - style='trailhead', - utm_campaign=_utm_campaign - ) }} - - -
-
-
- -{% endblock %} - -{% block js %} - {{ js_bundle('fxa_form') }} - {{ js_bundle('firefox-privacy-products') }} -{% endblock %} diff --git a/l10n/en/firefox/privacy-hub.ftl b/l10n/en/firefox/privacy-hub.ftl index 420bb0db50b..b074d5984ff 100644 --- a/l10n/en/firefox/privacy-hub.ftl +++ b/l10n/en/firefox/privacy-hub.ftl @@ -11,19 +11,6 @@ firefox-privacy-hub-firefox-privacy-promise = { -brand-name-firefox } Privacy Pr firefox-privacy-hub-firefox-takes-less-data-keeps = { -brand-name-firefox } takes less data, keeps it safe, and with no secrets. # The strong tag wraps a word that gets highlighted with a colorful underline for emphasis. The underline breaks if it is on two words, please omit the strong tags if they need to be around multiple words in your language -firefox-privacy-hub-firefox-products-are-designed = { -brand-name-firefox } products are designed to protect your privacy - -# Sub navigation title -firefox-privacy-privacy = Privacy - -# Sub navigation link -firefox-privacy-our-promise = Our Promise - -# Sub navigation link -firefox-privacy-our-products = Our Products - -firefox-privacy-hub-you-should-be-able-to-decide = You should be able to decide who sees your personal info. Not just among your friends, but with every advertiser and company on the internet — including us. -firefox-privacy-hub-thats-why-everything-we-make = That’s why everything we make and do honors our Personal Data Promise firefox-privacy-hub-take-less = Take Less firefox-privacy-hub-we-make-a-point-of-knowing = We make a point of knowing less about you firefox-privacy-hub-all-tech-companies-collect = All tech companies collect data to improve their products. But it doesn’t need to include so much of your personal info. The only data we want is the data that serves you in the end. We ask ourselves: do we actually need this? What do we need it for? And when can we delete it? @@ -37,12 +24,6 @@ firefox-privacy-hub-youll-always-know-where-you = You’ll always know where you # $privacy (url) - link to https://www.mozilla.org/privacy/firefox/ firefox-privacy-hub-theres-no-hidden-agenda-here-v2 = There’s no hidden agenda here. Our business doesn’t depend on secretly abusing your trust. Our Privacy Notice is actually readable. If you want to dig into every data-point we collect, our code is open. And so are we. -# Obsolete string -# Variables: -# $privacy (url) - link to https://www.mozilla.org/privacy/firefox/ -# $meetings (url) - link to https://wiki.mozilla.org/ -firefox-privacy-hub-theres-no-hidden-agenda-here = There’s no hidden agenda here. Our business doesn’t depend on secretly abusing your trust. Our Privacy Notice is actually readable. Anyone in the world can attend our weekly company meetings. If you want to dig into every datapoint we collect, our code is open. And so are we. - firefox-privacy-hub-why-trust-firefox = Why trust { -brand-name-firefox }? # Variables: @@ -52,91 +33,8 @@ firefox-privacy-hub-because-we-put-people-first = Because we put people first. I firefox-privacy-hub-learn-more-about-our-mission = Learn more about our mission firefox-privacy-hub-your-privacy-by-the-product = Your privacy, by the product firefox-privacy-hub-firefox-products-work-differently = { -brand-name-firefox } products work differently — because they’re designed to protect your privacy first. -firefox-privacy-hub-learn-about-our-products = Learn about our products -firefox-privacy-hub-firefox-privacy-by-the = { -brand-name-firefox } privacy, by the product - -# Obsolete string -firefox-privacy-hub-firefox-protects-your-privacy = { -brand-name-firefox } protects your privacy in every product. - -firefox-privacy-hub-mozilla-protects-your-privacy = { -brand-name-mozilla } protects your privacy in every product. - -# Obsolete string -firefox-privacy-hub-firefox-protects-your-privacy-strong = { -brand-name-firefox } protects your privacy in every product - -firefox-privacy-hub-mozilla-protects-your-privacy-strong = { -brand-name-mozilla } protects your privacy in every product. -firefox-privacy-hub-firefox-browser = { -brand-name-firefox-browser } -firefox-privacy-hub-2000-trackers-blocked-automatically = 2,000+ trackers blocked — automatically - -# "Enhanced Tracking Protection" is a feature name; it should be capitalized -firefox-privacy-hub-tracking-has-become-an = Tracking has become an epidemic online: companies follow every move, click and purchase, collecting data to predict and influence what you’ll do next. We think that’s a gross invasion of your privacy. That’s why { -brand-name-firefox } mobile and desktop browsers have Enhanced Tracking Protection on by default. - -firefox-privacy-hub-if-you-want-to-see-what = If you want to see what { -brand-name-firefox } is blocking for you, visit this page on your { -brand-name-firefox } desktop browser. -firefox-privacy-hub-see-what-firefox-has-blocked = See what { -brand-name-firefox } has blocked for you - -# "Enhanced Tracking Protection" is a feature name; it should be capitalized -firefox-privacy-hub-get-enhanced-tracking-protection = Get Enhanced Tracking Protection - -firefox-privacy-hub-download-the-firefox-browser = Download the { -brand-name-firefox } browser -firefox-privacy-hub-update-your-firefox-browser = Update your { -brand-name-firefox } browser -firefox-privacy-hub-invisible-to-the-top-trackers = Invisible to the top trackers -firefox-privacy-hub-meet-four-of-the-most-common = Meet four of the most common categories of trackers — who won’t meet you. -firefox-privacy-hub-always-in-your-control = Always in your control -firefox-privacy-hub-want-to-customize-what = Want to customize what gets blocked? Your settings are only one click away. -firefox-privacy-hub-protection-beyond-tracking = Protection beyond tracking -firefox-privacy-hub-if-you-have-a-mozilla-account = If you have a { -brand-name-mozilla-account }, you can also see how we’re helping you protect your personal info and passwords. - -# Obsolete string -firefox-privacy-hub-if-you-have-a-firefox-account = If you have a { -brand-name-firefox-account }, you can also see how we’re helping you protect your personal info and passwords. - -# Variables: -# $trackers (number) - localized number total of trackers blocked by Firefox users worldwide -firefox-privacy-hub-more-than-s-trackers-blocked = More than { $trackers } trackers blocked each day for { -brand-name-firefox } users worldwide - -firefox-privacy-hub-mozilla-monitor = { -brand-name-mozilla-monitor } - -firefox-privacy-hub-when-you-enter-your-email-v2 = When you enter your email address in { -brand-name-mozilla-monitor }, we forget it immediately after we’ve checked for a match in known data breaches — unless you authorize us to continue monitoring new breaches for your personal information. - -firefox-privacy-hub-check-for-breaches = Check for breaches -firefox-privacy-hub-firefox-lockwise = { -brand-name-firefox-lockwise } -firefox-privacy-hub-the-passwords-and-credentials = The passwords and credentials you save in { -brand-name-firefox-lockwise } are encrypted on all your devices, so not even we can see them. -firefox-privacy-hub-firefox-send = { -brand-name-firefox-send } -firefox-privacy-hub-we-cant-see-the-names-or = We can’t see the names or content of the large files you share through { -brand-name-firefox-send } because they’re encrypted end-to-end — you choose who sees what you send, and you can even set an expiration date and password. -firefox-privacy-hub-send-a-file = Send a file -firefox-privacy-hub-pocket = { -brand-name-pocket } -firefox-privacy-hub-pocket-recommends-high = { -brand-name-pocket } recommends high-quality, human-curated articles without collecting your browsing history or sharing your personal information with advertisers. -firefox-privacy-hub-get-pocket = Get { -brand-name-pocket } -firefox-privacy-hub-your-mozilla-account = Your { -brand-name-mozilla-account } - -# Obsolete string -firefox-privacy-hub-your-firefox-account = Your { -brand-name-firefox-account } - -firefox-privacy-hub-all-the-information-synced-v2 = All the information synced through your { -brand-name-mozilla-account } — from browser history to passwords — is encrypted. And your account password is the only key. - -# Obsolete string -firefox-privacy-hub-all-the-information-synced = All the information synced through your { -brand-name-firefox-account } — from browser history to passwords — is encrypted. And your account password is the only key. - -firefox-privacy-hub-take-your-privacy-and-bookmarks-v2 = Take your privacy and bookmarks everywhere with a { -brand-name-mozilla-account }. - -# Obsolete string -firefox-privacy-hub-take-your-privacy-and-bookmarks = Take your privacy and bookmarks everywhere with a { -brand-name-firefox-account }. - -# Variables: -# $signin (string) - anchor link url and attributes -# $class_name (string) - CSS class name for sign in link -# $learn_more (url) - link to https://www.mozilla.org/firefox/accounts/ -firefox-privacy-hub-already-have-an-account-v2 = Already have an account? Sign in or learn more about joining { -brand-name-mozilla }. - -# Obsolete string -# Variables: -# $signin (string) - anchor link url and attributes -# $class_name (string) - CSS class name for sign in link -# $learn_more (url) - link to https://www.mozilla.org/firefox/accounts/ -firefox-privacy-hub-already-have-an-account = Already have an account? Sign In or learn more about joining { -brand-name-firefox }. # Variables: # $url (url) - link to https://www.mozilla.org/privacy/firefox/ firefox-privacy-hub-read-the-privacy-notice-for = Read the Privacy Notice for our products -firefox-privacy-hub-mozilla-vpn = { -brand-name-mozilla-vpn } -firefox-privacy-hub-surf-stream-and-get-work = Surf, stream and get work done on servers in over 30 countries for a secure internet connection with a new perspective. -firefox-privacy-hub-get-mozilla-vpn = Get { -brand-name-mozilla-vpn } diff --git a/l10n/en/firefox/privacy/book.ftl b/l10n/en/firefox/privacy/book.ftl deleted file mode 100644 index 62828fe38e8..00000000000 --- a/l10n/en/firefox/privacy/book.ftl +++ /dev/null @@ -1,210 +0,0 @@ -# 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/. - -### URL: https://www-dev.allizom.org/firefox/privacy/book - -# HTML page title -privacy-book-little-book-of = Little Book of Privacy - -# HTML page description -privacy-book-the-internet-should = The internet should be safe, open and private. Here are 15 tips for you to reclaim your privacy and gain back control over your online experience! - -privacy-book-how-to-stay = How to stay relaxed and be secure online. - -privacy-book-healthy-internet = Healthy Internet - -privacy-book-a-healthy-private = A healthy, private internet for powerful users - -privacy-book-we-believe-that = We believe that the internet should be safe, open and inclusive. It needs to offer choice and the possibility to stay private. Wait — what’s privacy again? In recent times, this term has mostly been associated with violations, data leaks and personal information that’s being sold from one company to another. Internet users feel betrayed, hopeless and don’t believe in a private web experience anymore. And we get why. - -privacy-book-but-heres-good = But here’s good news: you can reclaim your privacy and gain back control over your very own internet experience! It’s actually surprisingly easy. Everyone can do it (promise!). All it’ll take is some time to read this booklet, pick the tips you want to implement and get started. - -privacy-book-what-risks-are = What risks are you actually facing? - -privacy-book-theres-risk-always = There’s risk, always, everywhere – online as well as offline. Of course, not everyone is exposed to them equally, and the ways people (can) protect themselves vary. On the web, it depends on how and how much you browse and where you’re located. In any case, it’s crucial to understand the risks you want to address before taking any steps. Here’s what to be aware in particular: - -privacy-book-data-breaches = Data breaches & fake profiles: - -privacy-book-even-when-organizations = Even when organizations are careful with user data, it’s possible that email addresses, passwords and even more sensitive data could get exposed in a data breach. Or, sometimes, we may even unintentionally reveal more than we should or want to about ourselves. Unfortunately, scammers only need a few personal details in order to create fake profiles, which may cast a bad light on the person/people affected for a long time. - -privacy-book-the-web-never = The web never forgets: - -privacy-book-according-to-the = According to the GDPR, you can ask for your data to be handed over to you or have it deleted; however, sites might not comply with this request and neither may those who don’t offer their services out of Europe. - -privacy-book-trackers-everywhere- = Trackers everywhere: - -privacy-book-trackers-cookies-youve = Trackers, cookies? You’ve most likely heard about them before. Trackers are tiny elements on websites that observe and record your behavior in order to pass it on to the page owner(s) or third parties. Some of them even track you across numerous websites. - -privacy-book-tracking-cookies-are = Tracking cookies are supposed to tell website owners and advertisers about your browsing behavior and what you’re interested in. It is then used to personalize your web experience. Oftentimes that means that you see customized ads, matched to your interests. Ultimately, the cookies put together a lot of information about you and store it in a profile. That may sound convenient but, unfortunately, these profiles aren’t necessarily accurate. In the best case, that means that you get less relevant ads. In the worst case, the information you see on some websites doesn’t fit your needs and expectations. Also, be aware that your profile can influence, for example, the prices at which products and services are offered to you. - -privacy-book-stalkers-trolls- = Stalkers, trolls & other types of harassment: - -privacy-book-even-if-the = Even if the Internet rarely allows us to be completely anonymous, it is still easy to hide behind an online identity. Some people take advantage of this to bully, troll or rant against others. Especially in social networks and forums, this has become a major issue in recent years. Since we leave so many traces on the internet, this may have further, even more unpleasant consequences. In a worst case scenario, if someone finds enough personal information about you online, they could follow you from online to offline. - -privacy-book-fake-news-and = Fake News & Filter Bubbles: - -privacy-book-news-recommendations-are = News recommendations are convenient and, let’s be honest, many of us prefer to read content that is in line with our opinion. But what if that content isn’t accurate? Or what if we lose sight of the big picture because we are only exposed to a small part of it – how can we form our own opinion? - -privacy-book-how-much-control = How much control do we really have? And how much do we willingly give away? - -privacy-book-many-of-us = Many of us feel that we have little control over their security, privacy and the quality of the information we see online. Maybe that’s how you feel, too. Yes, there is room for improvement – but all too often we are rather lazy and use only a fraction of the tools available to us. Or we rely on convenient all-in-one solutions, putting a huge amount of personal data in the hands of a single company without hesitation. Why? Because we don’t want to give it more thought than absolutely necessary. Or maybe also because we simply don’t know how many alternatives we actually have. - -# Span is for visual formatting. -privacy-book-tips-for = 15 tips for a better digital life. - -privacy-book-starting-over = Starting over: - -privacy-book-its-time-for = It’s time for a Data Detox! Together with the Tactical Tech Collective, { -brand-name-mozilla } has put together a nice little package of practical tips, called the Data Detox Kit. It’s a program that will make you feel like a whole new online person. Don’t feel ready yet for the full program? Feel free to begin with one of the following tips instead (or all of them)! - -# Span is for visual formatting -privacy-book-a-tidy-browser = A tidy browser, a tidy mind – well, that may not be directly what “they” say but it’s still true! - -privacy-book-delete-your-browser = Delete your browser history. Whether you’re using { -brand-name-firefox }, { -brand-name-chrome }, { -brand-name-safari }, or a different product – all of them offer this functionality. You’ll usually find it in the settings menu under “Security” or in a separate area. This is how to take care of it in { -brand-name-firefox }. - -privacy-book-delete-your-google = Delete your { -brand-name-google } activities history. Log into your account, open the “My Activity” section, and scroll through it. Surprised by all the information stored here, maybe even shocked? Feel free to delete it: In the menu on the left, click to go to “Delete Activity by“ > change date to “All time“ and products to “All Products“ > click “Delete“ > click “OK“ to delete if a pop-up appears. - -privacy-book-convenience-may-be = Convenience may be tempting – but isn’t always the best solution: - -privacy-book-all-of-us = All of us, some more and some less, tend towards convenience. Sometimes that means that we willingly give up a lot of control. In order not to have to start a major digital cleanup every other week, simply make sure that not so much of your data is collected in the first place. It’s easier than you might think! One simple way: avoid all-in-one solutions. They can put together a 360-degrees view on you and also, they’re not necessarily the perfect fit for all users anyway. Time to try some alternatives! Let us give a couple of examples: - -privacy-book-search-engine-title = Search engine: - -privacy-book-search-engine-duckduckgo = { -brand-name-duckduckgo }, unlike other providers, doesn’t create user profiles or filter results, so all users get the same search outcome. It is available in your browser’s search bar and as a browser extension. - -privacy-book-email-have-title = E-Mail: - -privacy-book-email-have-you = Have you heard about Posteo? It’s an independent e-mail provider based in Berlin that offers sustainable e-mail services, address books and calendars that are super-secure, encrypted, ad-free and user-financed through a low monthly fee. - -privacy-book-browser-while-title = Browser: - -privacy-book-browser-while-many = While many users choose their favorite browser to use on their desktop computer, most never switch the pre-installed browser apps on their mobile devices. - -privacy-book-give-firefox-focus = Give { -brand-name-firefox-focus } a try. Our super-fast privacy browser blocks many known cookies and tracking, and lets you browse the web well protected. - -privacy-book-messenger-signal-title = Messenger: - -privacy-book-messenger-signal-is = Signal is a free and secure encrypted messenger for { -brand-name-ios }, { -brand-name-android } and various computer operating systems. The application is also backed by a foundation that supports open source and advocates freedom of speech. - -privacy-book-sharing-is-caring = Sharing is caring – but there needs to be limits! - -privacy-book-got-it-youre = Got it: you’re really into sharing and happy to let your friends try your cake, use your car occasionally or don’t even mind lending your favorite pen to a stranger. However, when it comes to your data, you might want to consider being less generous and set clear limits: - -privacy-book-the-art-of = The art of saying no: Tell your web browser what to store and what not – for example, you might like it to save your passwords but not your browsing history. You can also choose if you want to share usage information with the browser maker and whether or not you allow cookies. BTW: When using { -brand-name-firefox }, you don’t need to worry about the latter. We already block a lot of third-party cookies by default and the privacy settings in { -brand-name-firefox } make it incredibly easy to choose between standard and rather strict preferences. - -privacy-book-the-easiest-way = The easiest way to protect your privacy in all browsers is to stay below the radar of data collectors. If you’re using private/incognito mode, your browser won’t save a history of your activity on your device or cookies set during that browsing session. - -privacy-book-we-love-social = We love social media! However, these websites (and others) might not work properly when you’re browsing privately: They will not only track what you do while being logged in, but also your activities beyond the respective network that takes place in the same browser window. For them, your browsing information is particularly valuable because they’re able to connect it to your account and might ultimately get to know you better than some of your best friends. Worried? No need to, { -brand-name-firefox } is here to help: Get the { -brand-name-facebook-container } extension, which makes it harder for { -brand-name-facebook } to track you on the web outside of { -brand-name-facebook }. - -privacy-book-theres-actually-even = There’s actually even more to keep in mind when it comes to social networks: as you know, they’re made to share personal stuff with people we know (some better, some less). It’s on you to decide how much private information you want to share though. That applies to your posts as well as your location, things you like, your phone number or who you spend time with. Remember: all of this data is not only visible to the respective social network, but might also be for advertisers and the general public if you keep your profile publicly available. Also, if you share less, there’s less that could fall into the hands of people you don’t know or trust. - -privacy-book-what-feels-right = What feels right for you today might change tomorrow. And that’s totally fine. It doesn’t hurt to reevaluate your view on the analogue world and the web occasionally and adjust them if necessary. - -privacy-book-what-does-the = What does the world know about you? - -privacy-book-to-an-extent = To an extent, we can control what information about ourselves is available on the web. Unfortunately, this can’t protect us entirely against dangers. A particularly bad one is identity theft. Here’s what you might want to consider: - -privacy-book-search-your-name = Search your name online occasionally. This will give you an idea of what others find out if they’re interested in you, what information is already around, and what you might want to get removed. - -privacy-book-dont-have-time = Don’t have time? Set up a { -brand-name-google } Alert for your name and get notified if you are mentioned on a website. - -privacy-book-breach-alert-if-v2 = Breach alert: If your data actually becomes public through a known breach, it is crucial to react as quickly as possible and change your passwords. { -brand-name-mozilla-monitor } is a handy tool that will send you a message if that happens. - -privacy-book-stay-safe-online = Stay safe online: - -privacy-book-there-are-a = There are a bunch of tools that can help improve your level of privacy and security. And that’s great! However, you’ll still require passwords to protect your accounts. Would you expect the newest high-end home security system to protect you from burglars if you had no apartment door? Here’s what to do: - -privacy-book-set-up-strong = Set up strong passwords. It might not come as a surprise: “password”, “12345” or your birthday are most likely not the best choices. A strong password is, in the ideal case, random, contains upper and lower case letters, numbers and special characters. So-called passphrases may also be an option, as they are difficult to unlock by algorithms (and even more so by humans) – similar to randomly compiled passwords. Also, make sure to get a separate password for each of your logins so that, in case one gets leaked during a data breach, you don’t have to update all of your logins. - -privacy-book-some-online-services = Some online services will ask you to additionally protect your accounts with security questions. They suggest e.g. the name of your pet, your first car or your home address as a kid. However, anyone who knows you well enough (or manages to get that information from a data leak or even just a quick web search) might know the answers to these questions too, which makes them ineffective. The solution is easy: there’s no need to provide correct answers to security questions when setting them up. The respective services will not check on accuracy; just make sure to remember the answers you provide. - -privacy-book-wondering-how-youre = Wondering how you’re supposed to come up with and remember all your passwords and security answers? Please don’t write them on a piece of paper that you keep next to your computer (yep, people do that). Instead, get a password manager that not only safely store your passwords, security answers and other private information, but also helps you generate random passwords and lets you easily use them across all of your devices. - -privacy-book-not-just-for = Not just for IT professionals: - -privacy-book-a-strong-password = A strong password is important and a first step towards enhanced online security. Want to double the safety? Try multi-factor authentication (MFA) – many services offer it already! - -privacy-book-mfa-gets-its = MFA gets its name from the fact that it requires multiple factors – like, for example, a password and a biometric scan – to log you into your account. You might know that system already from ATMs, where you need both your bank card and a PIN to withdraw money. - -privacy-book-there-are-many = There are many different options for MFA, depending on the types of devices you use; you may choose physical keys or entirely software-based solutions. All of them share one major advantage: Nobody will be able to log into your accounts unless they have the required factors. Even if one (a physical key or a password, due to a data breach) gets stolen, you’re going to be safer. - -privacy-book-safer-connections-public = Safer connections: - -privacy-book-public-wifi = Public WIFI is unquestionably convenient – especially when you can connect without a login. Unfortunately, that means that these networks may not be very safe because they’re basically unprotected. Here are our recommendations: - -privacy-book-ideally-avoid-publicly = Ideally, avoid publicly accessible WIFI networks, especially if they are not password protected. Anyone can access them and poorly protected devices in the network can easily be attacked. - -privacy-book-perhaps-you-just = Perhaps you just need to do something urgently and depend on a public WIFI. That’s fine. If the network asks you to enter an email address in order to connect, please don’t enter the one you normally use. Rather get a new one for less trustworthy sites and services and don’t use it for personal email correspondence, important accounts or online banking. That way, you won’t really mind if you receive a lot of spam afterwards. - -privacy-book-avoid-naming-your = Avoid naming your phone, tablet or computer after yourself. It might seem convenient and easy to remember but it also helps others to recognize them as yours. - -privacy-book-disconnect-and-remove = Disconnect and remove all used public WIFIs once you don’t need them anymore. Otherwise, your devices may automatically reconnect to them whenever you’re nearby. You may not even notice it but it does create an unnecessary security risk. - -privacy-book-how-about-your = How about your Bluetooth? - -privacy-book-bluetooth-is-a = Bluetooth is a great invention that can save us a lot of cable clutter. However, most people don’t use it permanently. If you don’t own a smartwatch or another device that needs to be connected to your phone all the time, switch Bluetooth off. This can save battery power and, at the same time, removes a weak point that intruders might make use of. - -privacy-book-the-secure-site = The secure site: - -privacy-book-its-not-unusual = It’s not unusual to see addresses on the internet start with HTTP. This is a protocol that makes it possible to load web pages in the browser. Try, whenever possible, to use the encrypted option HTTPS instead. This is especially true if you are using a public WIFI: even if the connection itself is not encrypted, HTTPS will ensure that the data you transmit is encrypted nevertheless. - -privacy-book-email-accounts-and = Email accounts and online identities: - -privacy-book-your-email-address = Your email address doesn’t necessarily reveal a lot about you. However, if you use the same address for a number of services and websites, you leave a trace. Your email address may become the center of your online identity, connected to all types of (browsing or account) data. Maybe you want to think about getting more than one for different purposes? - -privacy-book-resist-the-urge = Resist the urge to click: - -privacy-book-sometimes-its-easier = Sometimes it’s easier said than done – don’t click on dubious links! Most web users know to be particularly careful when it comes to e-mails that appear to come from their bank or an online retailer. However, when we receive links from friends and family it should be fine, right? Well, there are exceptions: - -privacy-book-from-time-to = From time to time social media accounts get hijacked and scammers send fraudulent links to the friends of the affected person. If you receive a message from a friend’s account that looks fishy or contains an odd, unknown link, give them a call to find out if they actually sent that note. - -privacy-book-its-also-possible = It’s also possible that nobody’s account got hijacked but your uncle still sends you a fraudulent link because he simply doesn’t know better. If you don’t know the site and prefer to be safe over being sorry, do a quick web search before clicking! - -privacy-book-look-at-the = Look at the bigger picture: - -privacy-book-we-already-talked = We already talked about how people tend to like convenience – remember? When it comes to information we consume, it might be nice to just see our attitude and expectations confirmed because it’s pleasant and calming. But does that make the information accurate? Do we get the big picture or just a rather small extract? - -privacy-book-you-can-of = You can, of course, have your favorites but check out different outlets from time to time to learn about different opinions and give other perspectives a chance. - -privacy-book-ask-yourselves-do = Ask yourself: Do the different outlets report on the issues you care about? And is the information shared more or less consistent or does it differ a lot? That’s the best way to battle filter bubbles and misinformation. - -# This sentence will only be shown to "DE" locale because the blog post is in German only. -privacy-book-de-blog-post = If you want to learn more about the latter, here’s an interesting blog post that can be helpful. - -privacy-book-disable-unnecessary-location = Disable (unnecessary) location services: - -privacy-book-todays-mobile-devices = Today’s mobile devices typically have the ability to determine, store and share their location. That’s convenient for navigation or when you’ve lost your phone. At the same time though, this quite sensitive piece of information may also be used by apps, even if you don’t want it. - -privacy-book-many-social-media = Decide case by case: Many social media apps offer to share your location when you post something. It’s up to you if you want others to know where you are and it’s totally fine to say no. - -privacy-book-for-each-of = Decide for each app: For each of the apps on your device that wants access to your location information, you can decide if you want to share it. All major operating systems allow for you to change your settings so that you limit access for individual or all apps. - -privacy-book-another-reason-to = Avoid background localization: Another reason to do so is that some apps not only save your location when you use them – many of them also run the location service in the background and may create complete motion profiles of you over time. The app vendor may then use this information for a lot of purposes, even sell it, which may not suit you. - -privacy-book-dont-need-it = Don’t need it? Delete it! - -privacy-book-even-if-you = Even if you bought a smartphone with lots of memory so you’d never have to delete anything ever again, cleaning it out from time to time isn’t a bad idea. Why? - -privacy-book-the-more-apps = Limit the weakpoints. The more apps you have on your device, the more entities have access to your data – and it’s impossible to have the full overview all the time. - -privacy-book-check-which-apps = Spring-clean your phone: Check which apps you have installed on your device and if you’re still using them. Delete the ones (and any related accounts) you actually don’t need anymore. - -privacy-book-also-reconsider-the = Limit the access. Also, reconsider the permissions you once gave to the remaining apps, including social networks, and ask yourself: Does this app really need access to my location? My contacts? My photos? My camera and microphone? - -privacy-book-friendly-reminder-what = Friendly reminder: What are trackers again? - -privacy-book-we-distinguish-between = We distinguish between first and third-party trackers, or tracking cookies. You may find first-party trackers on news sites, for example. Their job is to notice when a new or recurring reader comes to the site, check out which articles they read, how much time they spend on each page, and so on. They may use this information to improve the quality of their offering and determine what readers actually like. - -privacy-book-thirdparty-trackers-on = Third-party trackers, on the other hand, may log a visitor’s entire website visit, for example, for the purpose of displaying targeted ads to them. This even works across different websites someone visits; plus, there’s rarely just one tracker on a site. They often work hand in hand with others to find new ways to convince you through ads to spend money, sign up for services, and then share more information about yourself. - -privacy-book-as-you-might = As you might already assume, this information is very valuable. That’s why the companies who have it make a lot of money by selling it to others. Unfortunately, no one involves you in this decision. That’s why { -brand-name-firefox } blocks many third-party trackers by default in order to give you back more control over your online experience and reduce your chances of being followed around the web by ads and dubious companies. - -privacy-book-questions-feedback = Questions & Feedback - -privacy-book-do-you-have = Do you have questions or feedback? Please don’t hesitate to reach out to us, we’re looking forward to hearing from you! - -# Obsolete string -privacy-book-twitter = { -brand-name-twitter } - -privacy-book-x = X -privacy-book-x-formerly-twitter = X (formerly Twitter) diff --git a/l10n/en/firefox/privacy/passwords.ftl b/l10n/en/firefox/privacy/passwords.ftl deleted file mode 100644 index 0e3da0dbb2c..00000000000 --- a/l10n/en/firefox/privacy/passwords.ftl +++ /dev/null @@ -1,83 +0,0 @@ -# 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/. - -### URL: https://www-dev.allizom.org/firefox/privacy/safe-passwords - -# HTML page title -privacy-passwords-security-guide-to = Security guide to safer logins and passwords - -# HTML page description -privacy-passwords-more-and-more-desc = More and more of the sensitive, valuable things in our life are guarded through password-protected online accounts. How should we protect our logins? - -# page content -privacy-passwords-a-security-guide = A security guide to safer logins and passwords -privacy-passwords-protecting-your-accounts = Protecting your accounts doesn’t have to be complicated — and { -brand-name-firefox } can help. -privacy-passwords-more-and-more = More and more of the sensitive, valuable things in our life are guarded through password-protected online accounts — love letters, medical records, bank accounts and more. Websites use login procedures to protect those valuable things. Generally, as long as someone can’t log into your account, they can’t read your email or transfer money out of your bank account. As we live our lives online, how should we protect our logins? - -# tl;dr is an abbreviation for "Too long; didn't read". This is a playful way to say "summary" or "overview" -privacy-passwords-tldr = tl;dr: -privacy-passwords-use-random-passwords = Use random passwords, and use a different password for every site -privacy-passwords-pay-attention-to = Pay attention to the browser’s security signals, and be suspicious -privacy-passwords-make-your-answers = Make your answers to security questions just as strong as your passwords -privacy-passwords-use-a-password = Use a password manager to make creating and remembering passwords easier -privacy-passwords-use-twofactor-authentication = Use “two-factor authentication” wherever you can -privacy-passwords-its-hard-out = It’s hard out there for a password -privacy-passwords-most-logins-today = Most logins today are protected by a password. If an attacker can get your password, they can access your account and do anything you could do with that account. So when you ask how secure your account is, you should really be thinking about how safe your password is. And that means you have to think about all the different ways that an attacker could access your account’s password: -privacy-passwords-seeing-you-use = Seeing you use it with an unencrypted website -privacy-passwords-guessing-it = Guessing it -privacy-passwords-stealing-a-file = Stealing a file that has your password in it -privacy-passwords-using-password-recovery = Using password recovery to reset it -privacy-passwords-tricking-you-into = Tricking you into giving it to them -privacy-passwords-to-keep-your = To keep your login safe, you need to prevent as many of these as possible. Each risk has a different corresponding mitigation. -privacy-passwords-look-for-the = Look for the lock in your browser -privacy-passwords-its-easy-to = It’s easy to prevent attackers from stealing your password when you log into an unencrypted website: Think twice before you type your password if you don’t see a lock icon in the URL bar, like this: -privacy-passwords-a-closed-lock = A closed padlock appears just before the website address in the URL bar in all major browsers. -privacy-passwords-the-lock-means = The lock means that the website you’re using is encrypted, so that even if someone is watching your browsing on the network (like another person on a public WiFi hotspot), they won’t be able to see your password. { -brand-name-firefox } will try to warn you when you’re about to enter your password on an unencrypted site. -privacy-passwords-a-padlock-with = A padlock with a line through it indicates the connection is not secure. -privacy-passwords-your-browser-also = Your browser also helps keep you informed about how trustworthy sites are, to help keep you safe from phishing. On the one hand, when you try to visit a website that is known to be a phishing site, { -brand-name-firefox } (and any major browser) will display a full-screen warning — pay attention and think twice about using that site! - -privacy-passwords-firefox-will-v2 = { -brand-name-firefox } will display a warning instead of the website if it is known to be a phishing site. - -privacy-passwords-in-general-the = In general, the best defense against phishing is to be suspicious of what you receive, whether it shows up in email, a text message or on the phone. Instead of taking action on what someone sent you, visit the site directly. For example, if an email says you need to reset your PayPal password, don’t click the link. Type in paypal.com yourself. If the bank calls, call them back. -privacy-passwords-strength-in-diversity = Strength in diversity -privacy-passwords-the-secret-to = The secret to preventing guessing, theft or password reset is a whole lot of randomness. When attackers try to guess passwords, they usually do two things: 1) Use “dictionaries” — lists of common passwords that people use all the time, and 2) make some random guesses. The longer and more random your password is, the less likely that either of these guessing techniques will find it. - -# $url_linkedin (string) - link to https://blog.linkedin.com/2012/06/06/linkedin-member-passwords-compromised with additional attributes for analytics -# $url_yahoo (string) - link to https://www.wired.com/2016/12/yahoo-hack-billion-users/ with additional attributes for analytics -privacy-passwords-when-an-attacker = When an attacker steals the password database for a site that you use (like LinkedIn or Yahoo), there’s nothing you can do but change your password for that site. That’s bad, but the damage can be much worse if you’ve re-used that password with other websites — then the attacker can access your accounts on those sites as well. To keep the damage contained, always use different passwords for different websites. - -# $url_monitor (string) - link to https://monitor.mozilla.org/ with additional attributes for analytics -privacy-passwords-use-mozilla-monitor = Use { -brand-name-mozilla-monitor } to keep an eye on email addresses associated with your accounts. If your email address appears in a known corporate data breach, you’ll be alerted and provided steps to follow to protect the affected account. - -privacy-passwords-security-questions-my = Security Questions: My mother’s maiden name is “Ff926AKa9j6Q” -privacy-passwords-finally-most-websites = Finally, most websites let you recover your password if you’ve forgotten it. Usually these systems make you answer some “security questions” before you can reset your password. The answers to these questions need to be just as secret as your password. Otherwise, an attacker can guess the answers and set your password to something they know. -privacy-passwords-randomness-can-be = Randomness can be a problem, since the security questions that sites often use are also things people tend to know about you, like your birthplace, your birthday, or your relatives’ names, or that can be gleaned from sources such as social media. The good news is that the website doesn’t care whether the answer is real or not — you can lie! But lie productively: Give answers to the security questions that are long and random, like your passwords. -privacy-passwords-get-help-from = Get help from a password manager -privacy-passwords-now-all-of = Now, all of this sounds pretty intimidating. The human mind isn’t good at coming up with long sequences of random letters, let alone remembering them. That’s where a password manager comes in. Built right into the browser, { -brand-name-firefox } will ask if you want to generate a unique, complex password, then securely save your login information, which you can access anytime in about:logins. - - -# Obsolete string -# $url_sumo-manager (string) - link to https://support.mozilla.org/kb/password-manager-remember-delete-edit-logins with additional attributes for analytics -privacy-passwords-when-youre-logged = When you’re logged into { -brand-name-firefox } with your { -brand-name-firefox } account, you can sync across all your devices and access your passwords from a { -brand-name-firefox } mobile browser. Learn more about how to use the built-in password manager to the fullest here. - -# $url_sumo_manager (string) - link to https://support.mozilla.org/kb/password-manager-remember-delete-edit-logins with additional attributes for analytics -privacy-passwords-when-youre-logged-v2 = When you’re logged into { -brand-name-firefox } with your { -brand-name-mozilla-account }, you can sync across all your devices and access your passwords from a { -brand-name-firefox } mobile browser. Learn more about how to use the built-in password manager to the fullest. -privacy-passwords-twofactor-authentication-2fa = Two-Factor Authentication (2FA) -privacy-passwords-2fa-is-a = 2FA is a great way to level-up your security. When setting up a new account, some sites will give you the option to add a “second factor” to the login process. Often, this means linking your phone number to your account, so after you enter your password, you will be prompted to enter a secure code texted directly to you. This way, if a hacker has managed to get your password, they still won’t be able to get into your account, since they don’t have your phone. - -# Obsolete string -# $url_sumo_2fa (string) - link to https://support.mozilla.org/kb/secure-firefox-account-two-step-authentication with additional attributes for analytics -privacy-passwords-your-firefox-account = Your { -brand-name-firefox } account, for instance, can be protected with 2FA, which you can learn more about here. - -# $url_sumo_2fa (string) - link to https://support.mozilla.org/kb/secure-firefox-account-two-step-authentication with additional attributes for analytics -privacy-passwords-your-mozilla-account = Your { -brand-name-mozilla-account }, for example, can be protected with 2FA, which you can learn more about here. - -# $url_2fa (string) - link to https://2fa.directory with additional attributes for analytics -privacy-passwords-2fa-provides-much = 2FA provides much better security than passwords alone, but not every website supports it. You can find a list of websites that support 2FA at https://2fa.directory, as well as a list of sites that don’t support 2FA and ways you can ask them to add support. -privacy-passwords-strong-diverse-and = Strong, diverse, and multi-factor -privacy-passwords-for-better-or = For better or worse, we’re going to be using passwords to protect our online accounts for the foreseeable future. Use passwords that are strong and different for each site, and use a password manager to help you remember them safely. Set long, random answers for security questions (even if they’re not the truth). And use two-factor authentication on any site that supports it. - -# $url_privacy_products (string) - link to https://www.mozilla.org/firefox/privacy/products/ with additional attributes for analytics -# $url_about_manifesto (string) - link to https://www.mozilla.org/about/manifesto/ with additional attributes for analytics -privacy-passwords-in-todays-internet-v2 = In today’s internet, where thousands of passwords are stolen every day and accounts are traded on the black market, it’s worth the effort to keep your online life safe. When you use { -brand-name-firefox } products, some of the effort is taken off your plate, because all our products are built to uphold our privacy promise. And { -brand-name-firefox } is always guided by { -brand-name-mozilla }’s mission, the not-for-profit we are backed by, to build a better internet. diff --git a/l10n/en/sub_navigation.ftl b/l10n/en/sub_navigation.ftl index 2e86ac44e6d..0c43ae35efa 100644 --- a/l10n/en/sub_navigation.ftl +++ b/l10n/en/sub_navigation.ftl @@ -35,9 +35,6 @@ sub-navigation-firefox-for-mobile = { -brand-name-firefox } for Mobile sub-navigation-chromebook = { -brand-name-chromebook } -# Obsolete string -sub-navigation-firefox-accounts = { -brand-name-firefox-accounts } - sub-navigation-mozilla-account = { -brand-name-mozilla-account } sub-navigation-sync = { -brand-name-sync } sub-navigation-windows = { -brand-name-windows } @@ -54,8 +51,3 @@ sub-navigation-private-browsing = Private Browsing sub-navigation-what-is-a-browser = What is a Browser? sub-navigation-browsing-history = Browsing History sub-navigation-browser-history = Browser History -sub-navigation-privacy = Privacy -sub-navigation-our-promise= Our Promise -sub-navigation-our-products = Our Products -sub-navigation-little-book-of-privacy = Little Book of Privacy -sub-navigation-safe-passwords = Safe Passwords diff --git a/media/css/firefox/privacy/book.scss b/media/css/firefox/privacy/book.scss deleted file mode 100644 index f99f29dc617..00000000000 --- a/media/css/firefox/privacy/book.scss +++ /dev/null @@ -1,101 +0,0 @@ -// 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/. - -$font-path: '/media/protocol/fonts'; -$image-path: '/media/protocol/img'; - -@import '~@mozilla-protocol/core/protocol/css/includes/lib'; -@import '~@mozilla-protocol/core/protocol/css/components/inline-list'; - -// * -------------------------------------------------------------------------- */ -// Split component adjustments - -.data-breaches .mzp-c-split:not(:first-of-type) { - padding-top: 0; -} - -.mzp-c-split { - h2 { - @include text-title-md; - } - - h3 { - @include text-title-sm; - } -} - -.mzp-c-split-media { - max-width: 100%; -} - -// * -------------------------------------------------------------------------- */ -// 15 tips section - -body { - counter-reset: tips; -} - -.c-tips { - h2 { - @include text-title-2xl; - - span { - @include text-title-md; - color: $color-ink-05; - display: block; - } - } - - h3 { - @include text-title-md; - - &::before { - counter-increment: tips; - content: counter(tips) '. '; - color: $color-pink-50; - } - - span { - color: $color-pink-50; - } - } - - ol { - margin: $spacing-lg 0; - - li { - margin-left: 30px; - margin-bottom: $spacing-2xl; - list-style-type: upper-alpha; - - &::marker { - font-weight: bold; - @include text-title-xs; - } - - strong { - @include text-title-xs; - display: block; - margin-bottom: $spacing-xs; - } - } - } -} - -.mzp-c-picto-heading { - @include text-title-sm; -} - -.questions { - margin: $layout-xl auto; - - h3 { - @include text-title-sm; - margin-top: $spacing-xl; - } -} - -.mzp-c-callout.mzp-t-hero { - background: $color-white; -} diff --git a/media/css/firefox/privacy/common.scss b/media/css/firefox/privacy/common.scss deleted file mode 100644 index 444d1ae25a6..00000000000 --- a/media/css/firefox/privacy/common.scss +++ /dev/null @@ -1,30 +0,0 @@ -// 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/. - -$font-path: '/media/protocol/fonts'; -$image-path: '/media/protocol/img'; -$brand-theme: 'firefox'; - -@import '~@mozilla-protocol/core/protocol/css/includes/lib'; -@import '../../protocol/components/sub-navigation'; - -/* -------------------------------------------------------------------------- */ -// Privacy Notice Call Out - -.call-out-privacy { - background-color: $color-white; - - .mzp-c-callout-title { - @include text-title-xs; - background: url('/media/img/firefox/privacy/icon-privacy.svg') top center no-repeat; - padding-top: 70px + $spacing-lg; - } -} - -/* -------------------------------------------------------------------------- */ -// Reduce vertical padding on stacked split components - -.mzp-c-split + .mzp-c-split { - padding-top: 0; -} diff --git a/media/css/firefox/privacy/products.scss b/media/css/firefox/privacy/products.scss deleted file mode 100644 index f7226176152..00000000000 --- a/media/css/firefox/privacy/products.scss +++ /dev/null @@ -1,216 +0,0 @@ -// 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/. - -$font-path: '/media/protocol/fonts'; -$image-path: '/media/protocol/img'; - -@import '~@mozilla-protocol/core/protocol/css/includes/lib'; -@import '~@mozilla-protocol/core/protocol/css/components/logos/wordmark'; -@import '~@mozilla-protocol/core/protocol/css/components/logos/wordmark-product-monitor'; -@import '~@mozilla-protocol/core/protocol/css/components/logos/wordmark-product-vpn'; -@import '~@mozilla-protocol/core/protocol/css/components/logos/wordmark-product-pocket'; -@import '~@mozilla-protocol/core/protocol/css/components/logos/wordmark-product-firefox'; -@import '../../protocol/components/fxa-form'; - -.t-medium .mzp-l-content, -.t-medium .mzp-c-split-container { - max-width: $content-xl; -} - -// * -------------------------------------------------------------------------- */ -// Top Page Call Out - -.privacy-products-callout-main { - background-color: $color-white; - - .mzp-c-callout-title { - @include text-title-md; - margin: $spacing-md 0; - - strong { - @include zap('/media/protocol/img/zaps/zap-09.svg'); - } - } -} - -// * -------------------------------------------------------------------------- */ -// Main Hero - -.privacy-products { - .mzp-t-dark .mzp-c-cta-link { - color: $color-blue-10; - } -} - -.privacy-products-hero-sub-title { - @include text-title-sm; -} - -.privacy-products-hero-tagline { - font-weight: bold; - margin-top: $spacing-2xl; -} - -@media #{$mq-md} { - .privacy-products { - padding-bottom: $spacing-lg; - } -} - -// * -------------------------------------------------------------------------- */ -// Pictos - -.privacy-products-etp { - & > .mzp-l-content { - padding-top: 0; - @media #{$mq-md} { - padding-bottom: 0; - } - } - - .mzp-c-picto { - max-width: 100%; - - &:not(:last-of-type) { - margin-bottom: $spacing-2xl; - } - - @media #{$mq-md} { - &:not(:last-of-type) { - margin-bottom: 0; - } - } - } - - .mzp-c-picto-image img { - height: 80px; - width: auto; - } -} - -// * -------------------------------------------------------------------------- */ -// Tracker Counter Call Out - -.privacy-products-tracker-counter.mzp-t-dark { - @include light-links; - background-color: $color-violet-80; - - .mzp-c-callout-title { - margin: 0 auto $spacing-lg; - max-width: 24em; - - @media #{$mq-md} { - @include font-size(32px); - } - - @media #{$mq-lg} { - @include font-size(40px); - } - } - - .mzp-c-cta-link { - color: $color-blue-30; - } -} - -// * -------------------------------------------------------------------------- */ -// Product List Splits - -.privacy-products-list { - .mzp-c-wordmark { - margin-bottom: $spacing-lg; - } - - .mzp-c-split-media { - max-width: 100%; - } - - .mzp-c-split-media-asset { - margin-right: auto; - margin-left: auto; - } - - @media #{$mq-lg} { - margin: $layout-xl auto; - } -} - -.privacy-products-accounts .mzp-c-emphasis-box { - padding: $spacing-lg; - - @media #{$mq-lg} { - margin: $spacing-md auto; - max-width: 320px; - padding: $spacing-xl; - } -} - -.privacy-products-accounts { - align-items: center; - - > div:first-of-type { - margin-bottom: $spacing-xl; - } - - @media #{$mq-md} { - padding-top: 0; - padding-bottom: 0; - - > div:first-of-type { - margin-bottom: 0; - } - } -} - -.callout-privacy { - background-color: $color-marketing-gray-10; -} - -.fxa-email-form .mzp-c-form-title { - @include font-firefox; -} - -// * -------------------------------------------------------------------------- */ -// Conditional CTA Hooks - -.show-firefox-desktop-70, -.show-firefox-desktop-old, -.show-mobile { - display: none; -} - -.state-firefox-desktop-70 { - .show-firefox-desktop-70 { - display: block; - } - - .show-default { - display: none; - } -} - -.state-firefox-desktop-old { - .show-firefox-desktop-old { - display: block; - } - - .show-default { - display: none; - - &.show-firefox-desktop-old { - display: block; - } - } -} - -.android, -.ios { - .show-mobile { - display: block; - } - - .show-default { - display: none; - } -} diff --git a/media/css/firefox/privacy/promise.scss b/media/css/firefox/privacy/promise.scss index c0e58a7ef30..f4c5a637b01 100644 --- a/media/css/firefox/privacy/promise.scss +++ b/media/css/firefox/privacy/promise.scss @@ -7,70 +7,6 @@ $image-path: '/media/protocol/img'; @import '~@mozilla-protocol/core/protocol/css/includes/lib'; -// * -------------------------------------------------------------------------- */ -// Main Hero - -.privacy-promise-hero { - p { - @include text-body-lg; - } - - .mzp-c-split-media-asset { - padding-top: $spacing-xl; - } - - @media #{$mq-md} { - .mzp-c-split-bg { - padding-top: 0; - padding-bottom: 0; - } - - .mzp-c-split-body { - padding-top: $spacing-2xl; - padding-bottom: $spacing-2xl; - } - } -} - -// * -------------------------------------------------------------------------- */ -// Data Promise Call Out - -.call-out-data-promise { - background: $color-white; - - .mzp-c-callout-title { - @include text-title-sm; - } -} - -// * -------------------------------------------------------------------------- */ -// Privacy Promise Splits - -.privacy-promise-feature { - h2 { - color: $color-violet-70; - } - - .privacy-promise-sub-title { - @include text-title-xs; - } -} - -.mzp-c-split-media { - max-width: 100%; -} - -// * -------------------------------------------------------------------------- */ -// Picto Cards - -.mzp-l-columns .mzp-c-picto { - margin-bottom: $layout-md; - @media #{$mq-md} { - margin-bottom: 0; - padding: $spacing-2xl $spacing-2xl 0; - } -} - -.privacy-promise-learn-more { - background-color: $color-marketing-gray-10; +h1.mzp-c-picto-heading { + @include text-title-xl; } diff --git a/media/css/firefox/seo.scss b/media/css/firefox/seo.scss deleted file mode 100644 index c79dc1638b1..00000000000 --- a/media/css/firefox/seo.scss +++ /dev/null @@ -1,42 +0,0 @@ -// 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/. - -$font-path: '/media/protocol/fonts'; -$image-path: '/media/protocol/img'; - -@import '~@mozilla-protocol/core/protocol/css/includes/lib'; -@import '~@mozilla-protocol/core/protocol/css/components/logos/logo-product-firefox'; - -.c-hero-desc { - @include text-body-xl; - margin-bottom: $layout-md; -} - -.mzp-c-button-download-container { - margin-bottom: 0; -} - -.mzp-c-logo { - margin-left: auto; - margin-right: auto; - - @media #{$mq-md} { - margin-left: 0; - margin-right: 0; - } -} - -// images -.mzp-c-article img { - display: block; - margin: $layout-sm auto; - text-align: center; -} - -// * -------------------------------------------------------------------------- */ -// Call out - -.mzp-c-callout-compact.mzp-t-dark { - background: $color-ink-80; -} diff --git a/media/img/firefox/privacy/book/privacy-book-arrow-og.jpg b/media/img/firefox/privacy/book/privacy-book-arrow-og.jpg deleted file mode 100644 index 8b6d36f5d1c..00000000000 Binary files a/media/img/firefox/privacy/book/privacy-book-arrow-og.jpg and /dev/null differ diff --git a/media/img/firefox/privacy/book/privacy-book-arrow-on-face.jpg b/media/img/firefox/privacy/book/privacy-book-arrow-on-face.jpg deleted file mode 100644 index c26cf093212..00000000000 Binary files a/media/img/firefox/privacy/book/privacy-book-arrow-on-face.jpg and /dev/null differ diff --git a/media/img/firefox/privacy/book/privacy-callouts.png b/media/img/firefox/privacy/book/privacy-callouts.png deleted file mode 100644 index 771f453a55c..00000000000 Binary files a/media/img/firefox/privacy/book/privacy-callouts.png and /dev/null differ diff --git a/media/img/firefox/privacy/book/privacy-caution.jpg b/media/img/firefox/privacy/book/privacy-caution.jpg deleted file mode 100644 index 99fdcc406ed..00000000000 Binary files a/media/img/firefox/privacy/book/privacy-caution.jpg and /dev/null differ diff --git a/media/img/firefox/privacy/book/privacy-chains.png b/media/img/firefox/privacy/book/privacy-chains.png deleted file mode 100644 index 290914b9c61..00000000000 Binary files a/media/img/firefox/privacy/book/privacy-chains.png and /dev/null differ diff --git a/media/img/firefox/privacy/book/privacy-cleaning.png b/media/img/firefox/privacy/book/privacy-cleaning.png deleted file mode 100644 index 1d753342df3..00000000000 Binary files a/media/img/firefox/privacy/book/privacy-cleaning.png and /dev/null differ diff --git a/media/img/firefox/privacy/book/privacy-coffee.png b/media/img/firefox/privacy/book/privacy-coffee.png deleted file mode 100644 index 54937f52c92..00000000000 Binary files a/media/img/firefox/privacy/book/privacy-coffee.png and /dev/null differ diff --git a/media/img/firefox/privacy/book/privacy-devices.png b/media/img/firefox/privacy/book/privacy-devices.png deleted file mode 100644 index 212eb38cffc..00000000000 Binary files a/media/img/firefox/privacy/book/privacy-devices.png and /dev/null differ diff --git a/media/img/firefox/privacy/book/privacy-digital-life-growing.jpg b/media/img/firefox/privacy/book/privacy-digital-life-growing.jpg deleted file mode 100644 index fc80868e7fd..00000000000 Binary files a/media/img/firefox/privacy/book/privacy-digital-life-growing.jpg and /dev/null differ diff --git a/media/img/firefox/privacy/book/privacy-eyes.png b/media/img/firefox/privacy/book/privacy-eyes.png deleted file mode 100644 index 4c2ea3c3449..00000000000 Binary files a/media/img/firefox/privacy/book/privacy-eyes.png and /dev/null differ diff --git a/media/img/firefox/privacy/book/privacy-globe.jpg b/media/img/firefox/privacy/book/privacy-globe.jpg deleted file mode 100644 index d0ac6d3a638..00000000000 Binary files a/media/img/firefox/privacy/book/privacy-globe.jpg and /dev/null differ diff --git a/media/img/firefox/privacy/book/privacy-healthy-internet.jpg b/media/img/firefox/privacy/book/privacy-healthy-internet.jpg deleted file mode 100644 index 450378b38eb..00000000000 Binary files a/media/img/firefox/privacy/book/privacy-healthy-internet.jpg and /dev/null differ diff --git a/media/img/firefox/privacy/book/privacy-icon-browser.svg b/media/img/firefox/privacy/book/privacy-icon-browser.svg deleted file mode 100644 index f746fbeeca1..00000000000 --- a/media/img/firefox/privacy/book/privacy-icon-browser.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/media/img/firefox/privacy/book/privacy-icon-email.svg b/media/img/firefox/privacy/book/privacy-icon-email.svg deleted file mode 100644 index deeee7a92fa..00000000000 --- a/media/img/firefox/privacy/book/privacy-icon-email.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/media/img/firefox/privacy/book/privacy-icon-messenger.svg b/media/img/firefox/privacy/book/privacy-icon-messenger.svg deleted file mode 100644 index d46b0a75001..00000000000 --- a/media/img/firefox/privacy/book/privacy-icon-messenger.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/media/img/firefox/privacy/book/privacy-icon-search.svg b/media/img/firefox/privacy/book/privacy-icon-search.svg deleted file mode 100644 index c112a62b5bb..00000000000 --- a/media/img/firefox/privacy/book/privacy-icon-search.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/media/img/firefox/privacy/book/privacy-identities.jpg b/media/img/firefox/privacy/book/privacy-identities.jpg deleted file mode 100644 index 2930d7e1a15..00000000000 Binary files a/media/img/firefox/privacy/book/privacy-identities.jpg and /dev/null differ diff --git a/media/img/firefox/privacy/book/privacy-joystick-sonos.png b/media/img/firefox/privacy/book/privacy-joystick-sonos.png deleted file mode 100644 index 3cfe4573527..00000000000 Binary files a/media/img/firefox/privacy/book/privacy-joystick-sonos.png and /dev/null differ diff --git a/media/img/firefox/privacy/book/privacy-keys.jpg b/media/img/firefox/privacy/book/privacy-keys.jpg deleted file mode 100644 index 9e5021b4fa7..00000000000 Binary files a/media/img/firefox/privacy/book/privacy-keys.jpg and /dev/null differ diff --git a/media/img/firefox/privacy/book/privacy-magnify.png b/media/img/firefox/privacy/book/privacy-magnify.png deleted file mode 100644 index 3cc86b21175..00000000000 Binary files a/media/img/firefox/privacy/book/privacy-magnify.png and /dev/null differ diff --git a/media/img/firefox/privacy/book/privacy-social-face.jpg b/media/img/firefox/privacy/book/privacy-social-face.jpg deleted file mode 100644 index 94b1cec48ee..00000000000 Binary files a/media/img/firefox/privacy/book/privacy-social-face.jpg and /dev/null differ diff --git a/media/img/firefox/privacy/book/privacy-target.png b/media/img/firefox/privacy/book/privacy-target.png deleted file mode 100644 index 8f345c7716a..00000000000 Binary files a/media/img/firefox/privacy/book/privacy-target.png and /dev/null differ diff --git a/media/img/firefox/privacy/book/privacy-troll.jpg b/media/img/firefox/privacy/book/privacy-troll.jpg deleted file mode 100644 index af26263f84e..00000000000 Binary files a/media/img/firefox/privacy/book/privacy-troll.jpg and /dev/null differ diff --git a/media/img/firefox/privacy/passwords/accounts.png b/media/img/firefox/privacy/passwords/accounts.png deleted file mode 100644 index ea74a265f83..00000000000 Binary files a/media/img/firefox/privacy/passwords/accounts.png and /dev/null differ diff --git a/media/img/firefox/privacy/passwords/deceptive.png b/media/img/firefox/privacy/passwords/deceptive.png deleted file mode 100644 index c5aa60494e4..00000000000 Binary files a/media/img/firefox/privacy/passwords/deceptive.png and /dev/null differ diff --git a/media/img/firefox/privacy/passwords/lock.png b/media/img/firefox/privacy/passwords/lock.png deleted file mode 100644 index 03f6fa78d2e..00000000000 Binary files a/media/img/firefox/privacy/passwords/lock.png and /dev/null differ diff --git a/media/img/firefox/privacy/passwords/manager.png b/media/img/firefox/privacy/passwords/manager.png deleted file mode 100644 index 20fb3b7c52b..00000000000 Binary files a/media/img/firefox/privacy/passwords/manager.png and /dev/null differ diff --git a/media/img/firefox/privacy/passwords/og.png b/media/img/firefox/privacy/passwords/og.png deleted file mode 100644 index fc5793ddd33..00000000000 Binary files a/media/img/firefox/privacy/passwords/og.png and /dev/null differ diff --git a/media/img/firefox/privacy/passwords/passwords-high-res.png b/media/img/firefox/privacy/passwords/passwords-high-res.png deleted file mode 100644 index 23922a53c76..00000000000 Binary files a/media/img/firefox/privacy/passwords/passwords-high-res.png and /dev/null differ diff --git a/media/img/firefox/privacy/passwords/passwords.png b/media/img/firefox/privacy/passwords/passwords.png deleted file mode 100644 index 8f4a5e2a393..00000000000 Binary files a/media/img/firefox/privacy/passwords/passwords.png and /dev/null differ diff --git a/media/img/firefox/privacy/passwords/secure.png b/media/img/firefox/privacy/passwords/secure.png deleted file mode 100644 index 894c1649107..00000000000 Binary files a/media/img/firefox/privacy/passwords/secure.png and /dev/null differ diff --git a/media/img/firefox/privacy/products/icon-control.svg b/media/img/firefox/privacy/products/icon-control.svg deleted file mode 100644 index 22833f2c446..00000000000 --- a/media/img/firefox/privacy/products/icon-control.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/media/img/firefox/privacy/products/icon-invisible.svg b/media/img/firefox/privacy/products/icon-invisible.svg deleted file mode 100644 index 2fef62e147e..00000000000 --- a/media/img/firefox/privacy/products/icon-invisible.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/media/img/firefox/privacy/products/icon-protection.svg b/media/img/firefox/privacy/products/icon-protection.svg deleted file mode 100644 index 5714c333d6d..00000000000 --- a/media/img/firefox/privacy/products/icon-protection.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/media/img/firefox/privacy/products/monitor.svg b/media/img/firefox/privacy/products/monitor.svg deleted file mode 100644 index 281e754b4ed..00000000000 --- a/media/img/firefox/privacy/products/monitor.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/media/img/firefox/privacy/products/pocket-high-res.png b/media/img/firefox/privacy/products/pocket-high-res.png deleted file mode 100644 index 0ab9d1c8ee6..00000000000 Binary files a/media/img/firefox/privacy/products/pocket-high-res.png and /dev/null differ diff --git a/media/img/firefox/privacy/products/pocket.png b/media/img/firefox/privacy/products/pocket.png deleted file mode 100644 index 99ace7ef8b5..00000000000 Binary files a/media/img/firefox/privacy/products/pocket.png and /dev/null differ diff --git a/media/img/firefox/privacy/products/report.svg b/media/img/firefox/privacy/products/report.svg deleted file mode 100644 index 0246af0f9b0..00000000000 --- a/media/img/firefox/privacy/products/report.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/media/img/firefox/privacy/products/vpn.svg b/media/img/firefox/privacy/products/vpn.svg deleted file mode 100644 index 028bf8faf2a..00000000000 --- a/media/img/firefox/privacy/products/vpn.svg +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/media/img/firefox/privacy/promise/less-high-res.jpg b/media/img/firefox/privacy/promise/less-high-res.jpg deleted file mode 100755 index 19fd339024e..00000000000 Binary files a/media/img/firefox/privacy/promise/less-high-res.jpg and /dev/null differ diff --git a/media/img/firefox/privacy/promise/less.jpg b/media/img/firefox/privacy/promise/less.jpg deleted file mode 100755 index 4f33d221d9d..00000000000 Binary files a/media/img/firefox/privacy/promise/less.jpg and /dev/null differ diff --git a/media/img/firefox/privacy/promise/privacy-hero-1100.png b/media/img/firefox/privacy/promise/privacy-hero-1100.png deleted file mode 100644 index babde90166d..00000000000 Binary files a/media/img/firefox/privacy/promise/privacy-hero-1100.png and /dev/null differ diff --git a/media/img/firefox/privacy/promise/privacy-hero-500.png b/media/img/firefox/privacy/promise/privacy-hero-500.png deleted file mode 100644 index e546494e422..00000000000 Binary files a/media/img/firefox/privacy/promise/privacy-hero-500.png and /dev/null differ diff --git a/media/img/firefox/privacy/promise/privacy-hero-700.png b/media/img/firefox/privacy/promise/privacy-hero-700.png deleted file mode 100644 index 351896d7a81..00000000000 Binary files a/media/img/firefox/privacy/promise/privacy-hero-700.png and /dev/null differ diff --git a/media/img/firefox/privacy/promise/privacy-hero-900.png b/media/img/firefox/privacy/promise/privacy-hero-900.png deleted file mode 100644 index ca15c96ba7a..00000000000 Binary files a/media/img/firefox/privacy/promise/privacy-hero-900.png and /dev/null differ diff --git a/media/img/firefox/privacy/promise/safe-high-res.jpg b/media/img/firefox/privacy/promise/safe-high-res.jpg deleted file mode 100755 index 74d7255f99b..00000000000 Binary files a/media/img/firefox/privacy/promise/safe-high-res.jpg and /dev/null differ diff --git a/media/img/firefox/privacy/promise/safe.jpg b/media/img/firefox/privacy/promise/safe.jpg deleted file mode 100755 index a59381f90e1..00000000000 Binary files a/media/img/firefox/privacy/promise/safe.jpg and /dev/null differ diff --git a/media/img/firefox/privacy/promise/secrets-high-res.jpg b/media/img/firefox/privacy/promise/secrets-high-res.jpg deleted file mode 100755 index 454214fe464..00000000000 Binary files a/media/img/firefox/privacy/promise/secrets-high-res.jpg and /dev/null differ diff --git a/media/img/firefox/privacy/promise/secrets.jpg b/media/img/firefox/privacy/promise/secrets.jpg deleted file mode 100755 index 6e9b22ec45c..00000000000 Binary files a/media/img/firefox/privacy/promise/secrets.jpg and /dev/null differ diff --git a/media/img/l10n/de/firefox/privacy/products/report.svg b/media/img/l10n/de/firefox/privacy/products/report.svg deleted file mode 100644 index c2c924315c7..00000000000 --- a/media/img/l10n/de/firefox/privacy/products/report.svg +++ /dev/null @@ -1 +0,0 @@ - 3189+ Tracker blockiertMoDiMiDoFrSaSo diff --git a/media/img/l10n/en-US/firefox/privacy/products/report.svg b/media/img/l10n/en-US/firefox/privacy/products/report.svg deleted file mode 100644 index fdcc8536f1f..00000000000 --- a/media/img/l10n/en-US/firefox/privacy/products/report.svg +++ /dev/null @@ -1 +0,0 @@ - 3,189+ trackers blockedMonTueWedThuFriSatSun diff --git a/media/img/l10n/fr/firefox/privacy/products/report.svg b/media/img/l10n/fr/firefox/privacy/products/report.svg deleted file mode 100644 index decfe4436ed..00000000000 --- a/media/img/l10n/fr/firefox/privacy/products/report.svg +++ /dev/null @@ -1 +0,0 @@ - 3189+ traqueurs bloquésLunMarMerJeuVenSamDim diff --git a/media/js/firefox/privacy/products.js b/media/js/firefox/privacy/products.js deleted file mode 100644 index ffa4ee39f3a..00000000000 --- a/media/js/firefox/privacy/products.js +++ /dev/null @@ -1,60 +0,0 @@ -/* - * 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/. - */ - -(function () { - 'use strict'; - - var client = Mozilla.Client; - - function handleOpenProtectionReport(e) { - e.preventDefault(); - - // UA - window.dataLayer.push({ - event: 'in-page-interaction', - eAction: 'link click', - eLabel: 'See what Firefox has blocked for you' - }); - // GA4 - window.dataLayer.push({ - event: 'widget_action', - type: 'protection report', - action: 'open', - label: 'See what Firefox has blocked for you' - }); - - Mozilla.UITour.showProtectionReport(); - } - - if (client.isFirefoxDesktop) { - if (client._getFirefoxMajorVersion() >= 70) { - // show "See what Firefox has blocked for you" links. - document - .querySelector('main') - .classList.add('state-firefox-desktop-70'); - - // Intercept link clicks to open about:protections page using UITour. - Mozilla.UITour.ping(function () { - var protectionReportLinks = document.querySelectorAll( - '.js-open-about-protections' - ); - - for (var i = 0; i < protectionReportLinks.length; i++) { - protectionReportLinks[i].addEventListener( - 'click', - handleOpenProtectionReport, - false - ); - } - }); - } else { - // show "Update your Firefox browser" links. - document - .querySelector('main') - .classList.add('state-firefox-desktop-old'); - } - } -})(window.Mozilla); diff --git a/media/static-bundles.json b/media/static-bundles.json index ccaf9478d86..7989278e500 100644 --- a/media/static-bundles.json +++ b/media/static-bundles.json @@ -477,24 +477,12 @@ ], "name": "firefox_whatsnew_127_na" }, - { - "files": [ - "css/firefox/privacy/common.scss" - ], - "name": "firefox-privacy-common" - }, { "files": [ "css/firefox/privacy/promise.scss" ], "name": "firefox-privacy-promise" }, - { - "files": [ - "css/firefox/privacy/products.scss" - ], - "name": "firefox-privacy-products" - }, { "files": [ "css/privacy/privacy-email.scss" @@ -789,12 +777,6 @@ ], "name": "windows-64-bit" }, - { - "files": [ - "css/firefox/seo.scss" - ], - "name": "seo" - }, { "files": [ "css/firefox/more/misinformation.scss" @@ -928,12 +910,6 @@ ], "name": "chromebook" }, - { - "files": [ - "css/firefox/privacy/book.scss" - ], - "name": "privacy-book" - }, { "files": [ "css/foundation/reimagine-open.scss" @@ -1631,12 +1607,6 @@ ], "name": "firefox_whatsnew_127_na" }, - { - "files": [ - "js/firefox/privacy/products.js" - ], - "name": "firefox-privacy-products" - }, { "files": [ "js/mozorg/manifesto.js" diff --git a/tests/functional/firefox/privacy/__init__.py b/tests/functional/firefox/privacy/__init__.py deleted file mode 100644 index 448bb8652d6..00000000000 --- a/tests/functional/firefox/privacy/__init__.py +++ /dev/null @@ -1,3 +0,0 @@ -# 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/. diff --git a/tests/functional/firefox/privacy/test_products.py b/tests/functional/firefox/privacy/test_products.py deleted file mode 100644 index a16c3dbc1b0..00000000000 --- a/tests/functional/firefox/privacy/test_products.py +++ /dev/null @@ -1,16 +0,0 @@ -# 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/. - -import pytest - -from pages.firefox.privacy.products import FirefoxPrivacyProductsPage - - -@pytest.mark.smoke -@pytest.mark.skip_if_firefox(reason="Download buttons are shown to non-Firefox browsers only") -@pytest.mark.nondestructive -def test_download_button_displayed(base_url, selenium): - page = FirefoxPrivacyProductsPage(selenium, base_url).open() - assert page.primary_download_button.is_displayed - assert page.secondary_download_button.is_displayed diff --git a/tests/redirects/map_globalconf.py b/tests/redirects/map_globalconf.py index d27ed9a3722..3fa2fb164af 100644 --- a/tests/redirects/map_globalconf.py +++ b/tests/redirects/map_globalconf.py @@ -1297,5 +1297,9 @@ # issue 14647 url_test("/privacy/hubs/", "/privacy/archive/mozilla-hubs/notice-2024-06/"), url_test("/about/legal/terms/hubs/", "/privacy/archive/mozilla-hubs/tos-2024-06/"), + # issue 14248 + url_test("/firefox/privacy/products/", "/products/"), + url_test("/firefox/privacy/safe-passwords/", "/firefox/features/password-manager/"), + url_test("/firefox/privacy/book/", "https://support.mozilla.org/kb/how-stay-safe-web"), ) )