Skip to content

Commit

Permalink
Merge pull request #3391 from malena/bug-1196569-private-browsing-pro…
Browse files Browse the repository at this point in the history 
…duct-page

Bug 1196569 - Private Browsing product page
  • Loading branch information
Schalk Neethling committed Oct 29, 2015
2 parents d6d5524 + a4cd22d commit 4bf3e32
Show file tree
Hide file tree
Showing 14 changed files with 966 additions and 4 deletions.
169 changes: 169 additions & 0 deletions bedrock/firefox/templates/firefox/private-browsing.html
View file
@@ -0,0 +1,169 @@
{# 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 http://mozilla.org/MPL/2.0/. -#}

{% from "macros.html" import fxfamilynav with context %}

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

{% block page_title %}{{ _('Firefox Web browser — Private Browsing with Tracking Protection — Mozilla') }}{% endblock %}
{% block page_desc %}{{ _('Get more protection and the most privacy, only from Firefox. No other browser gives you so much control over your digital footprint.')}}{% endblock %}
{% block body_id %}firefox-private-browsing{% endblock %}
{% block body_class %}mozid{% endblock %}

{% block page_css %}
{% stylesheet 'firefox_private_browsing' %}
{% endblock %}

{% block site_header %}{% endblock %}

{% block site_header_unwrapped %}
{{ fxfamilynav('desktop', 'private-browsing') }}
{% endblock %}

{% block content %}

<main role="main">
<section class="intro">
<div class="container">
<header>
<h1>{{ _('More protection. <br>The most privacy. <br>Only from Firefox.') }}</h1>
<div class="download-buttons">
<div class="firefox-latest-cta">
<a href="https://support.mozilla.org/kb/private-browsing-use-firefox-without-history/" class="button-flat-dark" data-highlight="privateWindow" role="button">{{ _('Try Private Browsing') }}</a>
</div>
<div class="non-firefox-cta">
<p>{{ _('To give the new Private Browsing a try, download Firefox.') }}</p>
<div class="desktop-download-button">
{{ download_firefox(small=True, icon=False) }}
</div>
<div class="android-download-button">
<a rel="external" href="{{ settings.GOOGLE_PLAY_FIREFOX_LINK }}" data-button-type="download" data-interaction="download click" data-download-version="Firefox for Android">
{{ high_res_img('firefox/android/btn-google-play.png', {'alt': 'Get it on Google Play', 'width': '129', 'height': '45', 'l10n': True}) }}
</a>
</div>
<div class="ios-download-button">
<a href="{{ settings.APPLE_APPSTORE_FIREFOX_LINK }}&amp;ct=mozorg-ios_page-appstore-button">
<img src="{{ l10n_img('firefox/ios/btn-app-store.svg') }}" alt="{{ _('Download on the App Store') }}">
</a>
</div>
</div>
<div class="firefox-old-cta">
<p>{{ _('Your Firefox is not up to date. Download the latest version to use the new Private Browsing.') }}</p>
{{ download_firefox(small=True, icon=False) }}
</div>
</div>
</header>
<div class="critter-animation">
{% include 'firefox/includes/tracking-protection-animation.html' %}
</div>
</div>
</section>

<section class="tracking-protection" id="tracking-protection">
<div class="container">
<h2>{{ _('No other browser gives you so much control over your digital footprint.') }}
</h2>
<div class="blurb private-browsing">
<h3>{{ _('Private Browsing') }}</h3>
<p>{{ _('Firefox won’t save things like your browsing history, searches or cookies, but it will keep new bookmarks and files you download.') }}</p>
</div>
<div class="blurb with-tracking">
<h3>{{ _('With Tracking Protection')}}</h3>
<p>{{ _('Minimize the ability of hidden third parties from tracking your browsing activity across many sites.') }}</p>
</div>
<p class="footer">
<strong>
<a class="android-link" href="https://support.mozilla.org/en-US/kb/private-browsing-firefox-android">{{ _('Learn how to use Private Browsing') }}</a>
<a class="ios-link" href="https://support.mozilla.org/kb/private-browsing-firefox-ios">{{ _('Learn how to use Private Browsing') }}</a>
<a class="desktop-link" href="https://support.mozilla.org/en-US/kb/private-browsing-use-firefox-without-history">{{ _('Learn more about Private Browsing') }}</a>
</strong>
<small id="tracking-protection-caveat"> {{ _('Tracking Protection is only available with Firefox for Android and Desktop') }}</small>
</p>

</div>
</section>

<section class="when-to-use" id="when-to-use">
<div class="container">
<h2>{{ _('When to use Private Browsing') }}</h2>
<ul>
<li>
<h3>{{ _('To minimize your digital footprint') }}</h3>
<p>{{ _('Tracking Protection blocks Internet companies from following you across the Web') }}</p>
</li>
<li>
<h3>{{ _('Online banking from a shared device or computer') }}</h3>
<p>{{ _('Your username and password won’t be saved') }}</p>
</li>
<li>
<h3>{{ _('To help you plan a surprise, like a birthday or a trip') }}</h3>
<p>{{ _('No one can see your browsing history') }}</p>
</li>
</ul>

</div>
</section>

<section class="control-center" id="control-center">
<div class="container">
<h2>{{ _('The Control Center has you covered') }}</h2>
<p>
{{ _('When you see the shield to the left of the address bar, that means Firefox is protecting you from potential trackers.') }}
{{ _('You can disable Tracking Protection for a single site, or turn it off entirely. It’s up to you.') }}
</p>
<p class="footer">
<strong>
<a class="android-link" href="https://support.mozilla.org/kb/mixed-content-blocker-firefox-android">{{ _('Learn more about the Control Center') }}</a>
<a class="desktop-link" href="https://support.mozilla.org/kb/control-center-site-privacy-and-security-firefox">{{ _('Learn more about the Control Center') }}</a>
</strong>
<small id="control-center-caveat">
{{ _('Control Center is not available on Android devices, but a shield will still be displayed to let you know when you are protected.') }}</small>
</p>
</div>
</section>

<section class="cta" id="cta">
<div class="container">
<div class="download-buttons">
<div class="firefox-latest-cta">
<h2>{{ _('Try it now to stay in control') }}</h2>
<a href="https://support.mozilla.org/kb/private-browsing-use-firefox-without-history/" class="button-flat-dark" data-highlight="privateWindow" role="button">{{ _('Try Private Browsing') }}</a>
</div>
<div class="non-firefox-cta">
<h2>{{ _('To give the new Private Browsing a try, download Firefox.') }}</h2>
<div class="desktop-download-button">
{{ download_firefox(small=True, icon=False) }}
</div>
<div class="android-download-button">
<a rel="external" href="{{ settings.GOOGLE_PLAY_FIREFOX_LINK }}" data-button-type="download" data-interaction="download click" data-download-version="Firefox for Android">
{{ high_res_img('firefox/android/btn-google-play.png', {'alt': 'Get it on Google Play', 'width': '129', 'height': '45', 'l10n': True}) }}
</a>
</div>
<div class="ios-download-button">
<a href="{{ settings.APPLE_APPSTORE_FIREFOX_LINK }}&amp;ct=mozorg-ios_page-appstore-button">
<img src="{{ l10n_img('firefox/ios/btn-app-store.svg') }}" alt="{{ _('Download on the App Store') }}">
</a>
</div>
</div>
<div class="firefox-old-cta">
<h2>{{ _('Your Firefox is not up to date. Download the latest version to use the new Private Browsing.') }}</h2>
{{ download_firefox(small=True, icon=False) }}
</div>
</div>
</div>
</section>

</main>

{% endblock %}

{% block email_form %}{% endblock %}

{% block js %}
<!--[if IE 9]>
{% javascript 'matchmedia_addlistener' %}
{% javascript 'firefox_hello_ie9' %}
<![endif]-->
{% javascript 'firefox_private_browsing' %}
{% endblock %}
1 change: 1 addition & 0 deletions bedrock/firefox/urls.py
View file
Expand Up @@ -50,6 +50,7 @@
page('firefox/ios', 'firefox/ios.html'),
page('firefox/os/faq', 'firefox/os/faq.html'),
page('firefox/products', 'firefox/family/index.html'),
page('firefox/private-browsing', 'firefox/private-browsing.html'),
url('^firefox/send-to-device-post/$', views.send_to_device_ajax,
name='firefox.send-to-device-post'),
url('^firefox/sms/$', views.sms_send, name='firefox.sms'),
Expand Down
20 changes: 20 additions & 0 deletions bedrock/settings/static_media.py
View file
Expand Up @@ -464,6 +464,15 @@
),
'output_filename': 'css/firefox_push-bundle.css',
},
'firefox_private_browsing': {
'source_filenames': (
'css/firefox/family-nav.less',
'css/firefox/tracking-protection-animation.less',
'css/firefox/private_browsing/private-browsing-conditionals.less',
'css/firefox/private_browsing/private-browsing.less',
),
'output_filename': 'css/firefox_private_browsing-bundle.css',
},
'firefox_releases_index': {
'source_filenames': (
'css/base/menu-resp.less',
Expand Down Expand Up @@ -1159,6 +1168,17 @@
),
'output_filename': 'js/firefox_pocket-bundle.js',
},
'firefox_private_browsing': {
'source_filenames': (
'js/firefox/australis/australis-uitour.js',
'js/base/mozilla-highlight-target.js',
'js/libs/jquery.waypoints.min.js',
'js/libs/jquery.waypoints-sticky.min.js',
'js/firefox/family-nav.js',
'js/firefox/private-browsing.js'
),
'output_filename': 'js/firefox_private_browsing-bundle.js',
},
'firefox_os': {
'source_filenames': (
'js/base/mozilla-modal.js',
Expand Down
3 changes: 3 additions & 0 deletions etc/httpd/global.conf
View file
Expand Up @@ -288,6 +288,9 @@ RewriteRule ^/en-US/firefox/channel/android(/?)$ /b/en-US/firefox/channel/androi
# bug 1059518
RewriteRule ^/(\w{2,3}(?:-\w{2})?/)?firefox/tiles(.*)$ /b/$1firefox/tiles$2 [PT]

# bug 1196569
RewriteRule ^/(\w{2,3}(?:-\w{2})?/)?firefox/private-browsing(/?)$ /b/$1firefox/private-browsing$2 [PT]

# bug 784737
RewriteRule ^/(\w{2,3}(?:-\w{2})?/)?firefox/memory(.*)$ /b/$1firefox/memory$2 [PT]

Expand Down
4 changes: 0 additions & 4 deletions media/css/firefox/ios.less
View file
Expand Up @@ -10,10 +10,6 @@
.mozid {
color: #fff;

#outer-wrapper {
.aurora-bars();
}

#wrapper {
width: 100%;
overflow: hidden;
Expand Down

0 comments on commit 4bf3e32

Please sign in to comment.