Skip to content

Commit

Permalink
Overhaul Firefox feature pages [fix #11144]
Browse files Browse the repository at this point in the history
  • Loading branch information
@craigcook
craigcook committed Jul 26, 2023
1 parent 44ca4fe commit 5afc805
Show file tree
Hide file tree
Showing 176 changed files with 1,603 additions and 1,981 deletions.
13 changes: 7 additions & 6 deletions bedrock/firefox/redirects.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ def firefox_channel(*args, **kwargs):
# Bug 979531, 1003727, 979664, 979654, 979660
redirect(r"^firefox/customize/?$", "https://support.mozilla.org/kb/customize-firefox-controls-buttons-and-toolbars"),
redirect(r"^firefox/(?:performance|happy|speed|memory)/?$", "firefox.features.fast"),
redirect(r"^firefox/security/?$", "firefox.features.independent"),
redirect(r"^firefox/security/?$", "firefox.features.private"),
redirect(r"^firefox/technology/?$", "https://developer.mozilla.org/docs/Tools"),
# Previously Bug 979527 / Github #10004 "Getting Started" Page
redirect(r"^(products/)?firefox/central(/|\.html|-lite\.html)?$", "firefox"),
Expand Down Expand Up @@ -451,15 +451,15 @@ def firefox_channel(*args, **kwargs):
redirect(r"^firefox/android/faq/?", "https://support.mozilla.org/products/mobile"),
# bug 1392796
redirect(r"^firefox/desktop/fast/?", "firefox.features.fast"),
redirect(r"^firefox/desktop/trust/?", "firefox.features.independent"),
redirect(r"^firefox/desktop/tips/?", "firefox.features.index"),
redirect(r"^firefox/desktop/trust/?", "firefox.features.private"),
redirect(r"^firefox/desktop/tips/?", "firefox.features.tips"),
redirect(r"^firefox/desktop/customize/?", "https://support.mozilla.org/kb/customize-firefox-controls-buttons-and-toolbars"),
redirect(r"^firefox/private-browsing/?", "firefox.features.private-browsing"),
# bug 1405436
redirect(r"^firefox/organic", "/firefox/"),
redirect(r"^firefox/landing/better", "/firefox/"),
redirect(r"^firefox/(new/)?addon", "https://addons.mozilla.org"),
redirect(r"^firefox/tips", "/firefox/features/"),
redirect(r"^firefox/tips", "firefox.features.tips"),
redirect(r"^firefox/new/.+", "/firefox/new/"),
redirect(r"^firefox/38\.0\.3/releasenotes/$", "/firefox/38.0.5/releasenotes/"),
redirect(r"^firefox/default\.htm", "/firefox/"),
Expand Down Expand Up @@ -498,8 +498,6 @@ def firefox_channel(*args, **kwargs):
redirect(r"^/firefox/election/?$", "firefox"),
# fxa
redirect(r"^firefox/accounts/features/?", "firefox.accounts"),
# issue 9490
redirect(r"^firefox/features/sync/?", "firefox.sync"),
# bug 1577449
redirect(r"^firefox/features/send-tabs/?", "https://support.mozilla.org/kb/send-tab-firefox-desktop-other-devices"),
# issue 6512
Expand Down Expand Up @@ -553,4 +551,7 @@ def firefox_channel(*args, **kwargs):
redirect(r"^/exp/?$", "mozorg.home"),
# issue 12107
redirect(r"^/firefox/families/?$", "firefox.family.index"),
redirect(r"^firefox/features/memory/?$", "firefox.features.fast"),
redirect(r"^firefox/features/independent/?$", "firefox.features.index"),
redirect(r"^firefox/features/safebrowser/?$", "firefox.features.private"),
)
2 changes: 1 addition & 1 deletion bedrock/firefox/templates/firefox/accounts.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ <h2 class="c-sub-navigation-title is-summary">
</h2>
<ul class="c-sub-navigation-list is-details is-closed">
<li class="c-sub-navigation-item">
<a href="{{ url('firefox.sync') }}" data-link-type="nav" data-link-position="subnav" data-link-name="Sync">{{ ftl('sub-navigation-sync') }}</a>
<a href="{{ url('firefox.features.sync') }}" data-link-type="nav" data-link-position="subnav" data-link-name="Sync">{{ ftl('sub-navigation-sync') }}</a>
</li>
</ul>
</div>
Expand Down
260 changes: 124 additions & 136 deletions bedrock/firefox/templates/firefox/features/adblocker.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,140 +4,128 @@
file, You can obtain one at https://mozilla.org/MPL/2.0/.
#}

{% from "macros-protocol.html" import call_out_compact, call_out with context %}

{% extends "firefox/base/base-protocol.html" %}

{% block page_title %}{{ ftl('features-adblocker-how-to-block-annoying') }}{% endblock %}

{% block page_desc %}
{{ ftl('features-adblocker-how-to-stop-seeing-too') }}
{% endblock %}

{% block page_css %}
{{ super() }}
{{ css_bundle('protocol-call-out') }}
{{ css_bundle('adblocker') }}
{% endblock %}

{% block body_class %}mzp-t-firefox{% endblock %}

{% block sub_navigation %}
{% include "firefox/features/includes/subnav.html" %}
{% endblock %}

{% block content %}
<section class="mzp-c-call-out mzp-t-hero mzp-t-product-firefox">
<div class="mzp-l-content">
<h1 class="mzp-c-call-out-title">{{ ftl('features-adblocker-the-ad-blocker-a-secret') }}</h1>
<h2 class="mzp-c-call-out-subtitle">{{ ftl('features-adblocker-so-many-ads-so-little') }}</h2>
<div class="mzp-c-call-out-desc">
<p>{{ ftl('features-adblocker-the-average-person-sees') }}</p>
<p>
{{ ftl('features-adblocker-an-ad-blocker-is-a-piece') }}
</p>
<p>
{{ ftl('features-adblocker-these-ads-might-be-loud', firefox=url('firefox.new'), addons='https://blog.mozilla.org/firefox/ad-blocker-roundup-5-adblockers-that-improve-your-internet-experience/') }}
</p>
</div>
<div class="mzp-c-call-out-cta">
{{ download_firefox(download_location='primary cta') }}
</div>
</div>
</section>

<section class="mzp-l-content mzp-t-content-md">
<h2 class="section-title">{{ ftl('features-adblocker-find-the-right-ad-blocker') }}</h2>
<p>
{{ ftl('features-adblocker-theres-adblocker-ultimate', url='https://addons.mozilla.org/firefox/addon/adblocker-ultimate/?src=collection&collection_id=314d7111-6e17-485e-9946-315cb2f477e7') }}
</p>
<p>
{{ ftl('features-adblocker-popup-ads-are-the-worst', url='https://addons.mozilla.org/firefox/addon/popup-blocker/?src=collection&collection_id=314d7111-6e17-485e-9946-315cb2f477e7') }}
</p>
<p>
{{ ftl('features-adblocker-one-of-the-most-popular', url='https://addons.mozilla.org/firefox/addon/adblock-for-firefox/?src=collection&collection_id=314d7111-6e17-485e-9946-315cb2f477e7') }}
</p>

<h2 class="section-title">{{ftl('features-adblocker-create-a-tracker-free') }}</h2>
<p>
{{ ftl('features-adblocker-on-firefox-you-can-use', privacy='https://restoreprivacy.com/firefox-privacy/', blocking='https://support.mozilla.org/kb/content-blocking') }}
</p>

{{ high_res_img('img/firefox/features/adblocker/content-blocking-title.png', {'alt': '', 'class': 'block-image'}) }}

<h2 class="section-title">{{ftl('features-adblocker-choose-your-level-of-protection') }}</h2>
<p>
{{ ftl('features-adblocker-to-start-click-on-the') }}
</p>

<h2 class="section-title">{{ftl('features-adblocker-go-easy-with-standard') }}</h2>
<p>
{{ ftl('features-adblocker-if-ads-dont-bother-you', url=url('firefox.features.private-browsing')) }}
</p>

{{ high_res_img('img/firefox/features/adblocker/content-blocking.png', {'alt': '', 'class': 'block-image'}) }}

<h2 class="section-title">{{ftl('features-adblocker-get-tough-with-strict') }}</h2>
<p>
{{ ftl('features-adblocker-if-seeing-too-many-ads') }}
</p>

<h2 class="section-title">{{ftl('features-adblocker-do-it-yourself-custom') }}</h2>
<p>
{{ ftl('features-adblocker-the-custom-setting-gives') }}
</p>

{{ high_res_img('img/firefox/features/adblocker/content-blocking-custom.png', {'alt': '', 'class': 'block-image'}) }}

<h2 class="section-title">{{ftl('features-adblocker-cover-your-trail-block') }}</h2>
<p>
{{ ftl('features-adblocker-click-on-the-trackers') }}
</p>

{{ high_res_img('img/firefox/features/adblocker/custom-trackers.png', {'alt': '', 'class': 'block-image'}) }}

<h2 class="section-title">{{ftl('features-adblocker-take-a-bite-out-of-cookies') }}</h2>
<p>
{{ ftl('features-adblocker-cookies-are-sent-by-websites', url='https://support.mozilla.org/kb/storage') }}
</p>
<p>
{{ ftl('features-adblocker-in-firefox-you-can-block') }}
</p>
{{ high_res_img('img/firefox/features/adblocker/third-party-cookies.png', {'alt': '', 'class': 'block-image'}) }}

<h2 class="section-title">{{ftl('features-adblocker-send-a-do-not-track-signal') }}</h2>
<p>
{{ ftl('features-adblocker-if-you-dont-want-your', url='https://support.mozilla.org/kb/how-do-i-turn-do-not-track-feature') }}
</p>

{{ high_res_img('img/firefox/features/adblocker/dnt_screenshot.png', {'alt': '', 'class': 'block-image'}) }}

<h2 class="section-title">{{ftl('features-adblocker-speed-up-thanks-to-ad') }}</h2>
<p>
{{ ftl('features-adblocker-in-some-cases-an-ad-blocker') }}
</p>
<p>
{{ ftl('features-adblocker-if-you-want-to-learn-more', url=url('firefox.new')) }}
</p>
</section>

{% call call_out_compact(
title=ftl('features-adblocker-take-control-of-your-browser'),
class='mzp-t-product-firefox mzp-t-firefox'
) %}
<div class="download-firefox">
{{ download_firefox(download_location='secondary cta') }}
</div>
{% endcall %}

{% endblock %}

{% block sticky_promo %}
{% with non_fx_only=True %}
{% include '/includes/sticky-promo.html' %}
{% endwith %}
{% endblock %}

{% block js %}
{{ js_bundle('sticky_promo') }}
{% extends "firefox/features/base-article.html" %}

{% block page_desc %}{{ ftl('features-adblocker-how-to-stop-seeing-too') }}{% endblock %}

{% block article_title_short %}Ad blocking{% endblock %}
{% block article_title %}{{ ftl('features-adblocker-the-ad-blocker-a-secret') }}{% endblock %}

{% block article_content %}
<h2>{{ ftl('features-adblocker-so-many-ads-so-little') }}</h2>
<p>{{ ftl('features-adblocker-the-average-person-sees') }}</p>
<p>{{ ftl('features-adblocker-an-ad-blocker-is-a-piece') }}</p>
<p>{{ ftl('features-adblocker-these-ads-might-be-loud', firefox=url('firefox.new'), addons='https://blog.mozilla.org/firefox/ad-blocker-roundup-5-adblockers-that-improve-your-internet-experience/?utm_source=www.mozilla.org&utm_medium=referral&utm_campaign=firefox-features') }}</p>

<h2>{{ ftl('features-adblocker-find-the-right-ad-blocker') }}</h2>
<p>{{ ftl('features-adblocker-theres-adblocker-ultimate', url='https://addons.mozilla.org/firefox/addon/adblocker-ultimate/?src=collection&collection_id=314d7111-6e17-485e-9946-315cb2f477e7&utm_source=www.mozilla.org&utm_medium=referral&utm_campaign=firefox-features') }}</p>
<p>{{ ftl('features-adblocker-popup-ads-are-the-worst', url='https://addons.mozilla.org/firefox/addon/popup-blocker/?src=collection&collection_id=314d7111-6e17-485e-9946-315cb2f477e7&utm_source=www.mozilla.org&utm_medium=referral&utm_campaign=firefox-features') }}</p>
<p>{{ ftl('features-adblocker-one-of-the-most-popular', url='https://addons.mozilla.org/firefox/addon/adblock-for-firefox/?src=collection&collection_id=314d7111-6e17-485e-9946-315cb2f477e7&utm_source=www.mozilla.org&utm_medium=referral&utm_campaign=firefox-features') }}</p>

<h2>{{ftl('features-adblocker-create-a-tracker-free') }}</h2>
<p>{{ ftl('features-adblocker-on-firefox-you-can-use', privacy='https://restoreprivacy.com/firefox-privacy/', blocking='https://support.mozilla.org/kb/content-blocking?utm_source=www.mozilla.org&utm_medium=referral&utm_campaign=firefox-features') }}</p>

<figure class="c-article-figure">
{{ resp_img(
url="img/firefox/features/adblocker/content-blocking-title.png",
srcset={
"img/firefox/features/adblocker/content-blocking-title-high-res.png": "2x"
},
optional_attributes={
"alt": "",
"width": "600"
}
) }}
</figure>

<h2>{{ftl('features-adblocker-choose-your-level-of-protection') }}</h2>
<p>{{ ftl('features-adblocker-to-start-click-on-the') }}</p>

<h2>{{ftl('features-adblocker-go-easy-with-standard') }}</h2>
<p>{{ ftl('features-adblocker-if-ads-dont-bother-you', url=url('firefox.features.private-browsing')) }}</p>

<figure class="c-article-figure">
{{ resp_img(
url="img/firefox/features/adblocker/content-blocking.png",
srcset={
"img/firefox/features/adblocker/content-blocking-high-res.png": "2x"
},
optional_attributes={
"alt": "",
"width": "600"
}
) }}
</figure>

<h2>{{ftl('features-adblocker-get-tough-with-strict') }}</h2>
<p>{{ ftl('features-adblocker-if-seeing-too-many-ads') }}</p>

<h2>{{ftl('features-adblocker-do-it-yourself-custom') }}</h2>
<p>{{ ftl('features-adblocker-the-custom-setting-gives') }}</p>

<figure class="c-article-figure">
{{ resp_img(
url="img/firefox/features/adblocker/content-blocking-custom.png",
srcset={
"img/firefox/features/adblocker/content-blocking-custom-high-res.png": "2x"
},
optional_attributes={
"alt": "",
"width": "600"
}
) }}
</figure>

<h2>{{ftl('features-adblocker-cover-your-trail-block') }}</h2>
<p>{{ ftl('features-adblocker-click-on-the-trackers') }}</p>

<figure class="c-article-figure">
{{ resp_img(
url="img/firefox/features/adblocker/custom-trackers.png",
srcset={
"img/firefox/features/adblocker/custom-trackers-high-res.png": "2x"
},
optional_attributes={
"alt": "",
"width": "600"
}
) }}
</figure>

<h2>{{ftl('features-adblocker-take-a-bite-out-of-cookies') }}</h2>
<p>{{ ftl('features-adblocker-cookies-are-sent-by-websites', url='https://support.mozilla.org/kb/storage?utm_source=www.mozilla.org&utm_medium=referral&utm_campaign=firefox-features') }}</p>
<p>{{ ftl('features-adblocker-in-firefox-you-can-block') }}</p>

<figure class="c-article-figure">
{{ resp_img(
url="img/firefox/features/adblocker/third-party-cookies.png",
srcset={
"img/firefox/features/adblocker/third-party-cookies-high-res.png": "2x"
},
optional_attributes={
"alt": "",
"width": "600"
}
) }}
</figure>

<h2>{{ftl('features-adblocker-send-a-do-not-track-signal') }}</h2>
<p>{{ ftl('features-adblocker-if-you-dont-want-your', url='https://support.mozilla.org/kb/how-do-i-turn-do-not-track-feature?utm_source=www.mozilla.org&utm_medium=referral&utm_campaign=firefox-features') }}</p>

<figure class="c-article-figure">
{{ resp_img(
url="img/firefox/features/adblocker/dnt_screenshot.png",
srcset={
"img/firefox/features/adblocker/dnt_screenshot.png": "2x"
},
optional_attributes={
"alt": "",
"width": "600"
}
) }}
</figure>

<h2>{{ ftl('features-adblocker-speed-up-thanks-to-ad') }}</h2>
<p>{{ ftl('features-adblocker-in-some-cases-an-ad-blocker') }}</p>
<p>{{ ftl('features-adblocker-if-you-want-to-learn-more', url=url('firefox.new')) }}</p>
{% endblock %}
37 changes: 37 additions & 0 deletions bedrock/firefox/templates/firefox/features/add-ons.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
{#
This Source Code Form is subject to the terms of the Mozilla Public
License, v. 2.0. If a copy of the MPL was not distributed with this
file, You can obtain one at https://mozilla.org/MPL/2.0/.
#}

{% extends "firefox/features/base-article.html" %}

{% block article_title_short %}{{ ftl('features-add-ons-firefox-add-ons') }}{% endblock %}
{% block article_title %}{{ ftl('features-add-ons-firefox-add-ons-and-browser-extensions') }}{% endblock %}

{% block article_content %}
<p>{{ ftl('features-add-ons-extensions-also-known-as-add-ons') }}</p>

<figure class="c-article-figure">
{{ resp_img(
url="img/firefox/features/addons.png",
srcset={
"img/firefox/features/addons-high-res.png": "1.5x"
},
optional_attributes={
"alt": "",
"width": "600"
}
) }}
</figure>

<p>
{{ ftl('features-add-ons-there-are-firefox-add-ons-that',
fbcontainer='href="%s"'|safe|format(url('firefox.facebookcontainer.index')),
translate='href="https://addons.mozilla.org/firefox/addon/simple-translate/?utm_source=www.mozilla.org&utm_medium=referral&utm_campaign=firefox-features" rel="external noopener"',
language='href="https://addons.mozilla.org/firefox/addon/languagetool/?utm_source=www.mozilla.org&utm_medium=referral&utm_campaign=firefox-features" rel="external noopener"',
customize='href="%s"'|safe|format(url('firefox.features.customize')),
amo='href="https://addons.mozilla.org/firefox/?utm_source=www.mozilla.org&utm_medium=referral&utm_campaign=firefox-features" rel="external noopener"',
) }}
</p>
{% endblock article_content %}
Loading

0 comments on commit 5afc805

Please sign in to comment.