-
Notifications
You must be signed in to change notification settings - Fork 918
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into django-2.2
- Loading branch information
Showing
108 changed files
with
2,868 additions
and
698 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,153 @@ | ||
| {# 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-protocol.html" import feature_card with context %} | ||
| {% from "macros.html" import fxa_email_form, fxa_link_fragment with context %} | ||
|
|
||
| {% extends "firefox/base-protocol.html" %} | ||
|
|
||
| {%- block page_title -%} | ||
| {# L10n: HTML page title #} | ||
| {{ _('Get a Firefox Account – Keep your data private, safe and synced') }} | ||
| {%- endblock -%} | ||
| {%- block page_desc -%} | ||
| {# L10n: HTML page description #} | ||
| {{ _('Securely sync your passwords, bookmarks and tabs across all your devices. Get a Firefox Account now – One login – Power and privacy everywhere.') }} | ||
| {%- endblock -%} | ||
|
|
||
| {% block page_css %} | ||
| {{ css_bundle('firefox_accounts_2019') }} | ||
| {% endblock %} | ||
|
|
||
| {% block body_class %}firefox-accounts mzp-t-firefox state-fxa-default {% endblock %} | ||
|
|
||
| {% block site_header %} | ||
| {% with hide_nav_download_button=True %} | ||
| {% include 'includes/protocol/navigation/index.html' %} | ||
| {% endwith %} | ||
| {% endblock %} | ||
|
|
||
| {% block content %} | ||
|
|
||
|
|
||
| <section class="c-accounts-hero"> | ||
| <div class="mzp-l-content"> | ||
| <div class="c-accounts-hero-body"> | ||
| {# L10n: the span here is for visual formatting to display the phrase "Join Firefox" in a different color. #} | ||
| <h1 class="c-accounts-hero-title">{{ _('There is a way to protect your privacy. <span>Join Firefox.</span>') }}</h1> | ||
|
|
||
| {# L10n: This refers to the way some tech companies treat personal information as a commodity, as if their users are the product they're selling to their advertisers. #} | ||
| <p class="c-accounts-hero-desc">{{ _('Take your stand against an industry that’s making you the product.') }}</p> | ||
| </div> | ||
|
|
||
| <div class="c-accounts-form"> | ||
| {{ fxa_email_form( | ||
| entrypoint='mozilla.org-accounts_page', | ||
| utm_source='accounts_page', | ||
| form_title=_('Join Firefox'), | ||
| intro_text=_('Enter your email address to get started.'), | ||
| button_class='mzp-c-button mzp-t-primary mzp-t-product', | ||
| style='trailhead', | ||
| utm_params={'campaign': 'accounts-trailhead', 'content': 'form-upper', 'medium': 'referral'}) | ||
| }} | ||
|
|
||
| <p class="fxa-signin">{{ _('Already have an account?') }} <a {{ fxa_link_fragment(entrypoint='mozilla.org-accounts_page', action='signin', utm_params={'campaign': 'accounts-trailhead', 'content': 'form-upper', 'source': 'accounts_page'}) }}>{{ _('Sign In') }}</a></p> | ||
| </div> | ||
| </div> | ||
| </section> | ||
|
|
||
| <section class="c-accounts-products"> | ||
| <div class="mzp-l-content"> | ||
| <h2 class="c-section-title">{{ _('Get technology that fights for you.') }}</h2> | ||
|
|
||
| <ul class="c-product-list"> | ||
| <li class="c-product-list-item t-product-firefox"> | ||
| <a href="{{ url('firefox') }}"> | ||
| {# L10n: This is not a complete proper name; "Firefox" is a proper name that shouldn't be translated, but you can choose to translate "browser". Span for formatting. #} | ||
| <h3 class="c-product-list-title">{{ _('Firefox <span>browser</span>') }}</h3> | ||
| <p class="c-product-list-desc">{{ _('Travel the internet with protection, on every device.') }}</p> | ||
| </a> | ||
| </li> | ||
| <li class="c-product-list-item t-product-lockwise"> | ||
| <a href="https://lockwise.firefox.com?utm_source=www.mozilla.org&utm_medium=referral&utm_campaign=accounts-trailhead&utm_content=product-list-item&entrypoint=mozilla.org-accounts_page" data-link-name="Firefox Lockwise" data-link-type="link"> | ||
| <h3 class="c-product-list-title">Firefox <span>Lockwise</span></h3> | ||
| <p class="c-product-list-desc">{{ _('Keep your passwords protected and portable.') }}</p> | ||
| </a> | ||
| </li> | ||
| <li class="c-product-list-item t-product-monitor"> | ||
| <a href="https://monitor.firefox.com?utm_source=www.mozilla.org&utm_medium=referral&utm_campaign=accounts-trailhead&utm_content=product-list-item&entrypoint=mozilla.org-accounts_page" data-link-name="Firefox Monitor" data-link-type="link"> | ||
| <h3 class="c-product-list-title">Firefox <span>Monitor</span></h3> | ||
| <p class="c-product-list-desc">{{ _('Get a lookout for data breaches.') }}</p> | ||
| </a> | ||
| </li> | ||
| <li class="c-product-list-item t-product-send"> | ||
| <a href="https://send.firefox.com?utm_source=www.mozilla.org&utm_medium=referral&utm_campaign=accounts-trailhead&utm_content=product-list-item&entrypoint=mozilla.org-accounts_page" data-link-name="Firefox Send" data-link-type="link"> | ||
| <h3 class="c-product-list-title">Firefox <span>Send</span></h3> | ||
| <p class="c-product-list-desc">{{ _('Share large files without prying eyes.') }}</p> | ||
| </a> | ||
| </li> | ||
| </ul> | ||
|
|
||
| <p class="c-accounts-products-tagline">{{ _('And get it all on every device, without feeling trapped in a single operating system.') }}</p> | ||
| </div> | ||
| </section> | ||
|
|
||
|
|
||
| <section class="c-accounts-value t-value-respect l-media-left"> | ||
| <div class="c-accounts-value-container"> | ||
| <div class="c-accounts-value-media"> | ||
| {{ high_res_img('firefox/accounts/trailhead/value-respect.jpg', {'alt': '', 'width': '800', 'height': '600'}) }} | ||
| </div> | ||
|
|
||
| <div class="c-accounts-value-content"> | ||
| <h3 class="c-accounts-value-title">{{ _('Get the respect you deserve.') }}</h3> | ||
|
|
||
| <p> | ||
| {% trans promise='https://blog.mozilla.org/firefox/firefox-data-privacy-promise/?utm_source=www.mozilla.org&utm_medium=referral&utm_campaign=accounts-trailhead&utm_content=accounts-value&utm_term=respect-you-deserve'|safe %} | ||
| You’ll always get the truth from us. Everything we make and do honors our <a href="{{ promise }}">Personal Data Promise</a>: | ||
| {% endtrans %} | ||
| </p> | ||
|
|
||
| {# L10n: Line breaks for formatting. #} | ||
| <p><strong>{{ _('Take less.<br> Keep it safe.<br> No secrets.') }}</strong></p> | ||
| </div> | ||
| </div> | ||
| </section> | ||
|
|
||
| <section class="c-accounts-value t-value-knowledge l-media-right"> | ||
| <div class="c-accounts-value-container"> | ||
| <div class="c-accounts-value-media"> | ||
| {{ high_res_img('firefox/accounts/trailhead/value-knowledge.jpg', {'alt': '', 'width': '800', 'height': '600'}) }} | ||
| </div> | ||
|
|
||
| <div class="c-accounts-value-content"> | ||
| <h3 class="c-accounts-value-title">{{ _('Get the knowledge to keep you safe.') }}</h3> | ||
| <p class="c-accounts-value-desc">{{ _('Learn everything you need to know (but don’t yet) about staying smart and safe online, from some of the world’s foremost experts.') }}</p> | ||
| </div> | ||
| </div> | ||
| </section> | ||
|
|
||
| <section class="c-accounts-movement"> | ||
| <div class="mzp-l-content"> | ||
| <h2 class="c-section-title">{{ _('And be part of protecting the internet for future generations.') }}</h2> | ||
|
|
||
| <div class="c-accounts-movement-container"> | ||
| <div class="c-accounts-movement-item t-movement-build"> | ||
| <h3 class="c-accounts-movement-title">{{ _('Help us build a better Firefox for all.') }}</h3> | ||
| <p class="c-accounts-movement-desc">{{ _('Get into the open source spirit by test-driving upcoming products.') }}</p> | ||
| </div> | ||
|
|
||
| <div class="c-accounts-movement-item t-movement-bigtech"> | ||
| {# L10n: "Big Tech" refers to large technology companies that dominate the web, such as Google and Facebook. Mozilla helps to keep these companies "in check" by challenging their dominance so they can't completely take over. #} | ||
| <h3 class="c-accounts-movement-title">{{ _('Help us keep Big Tech in check.') }}</h3> | ||
| <p class="c-accounts-movement-desc">{{ _('We support communities all over the world standing up for a healthier internet. Add your voice to the fight.') }}</p> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </section> | ||
| {% endblock %} | ||
|
|
||
| {% block js %} | ||
| {{ js_bundle('firefox_accounts_2019') }} | ||
| {% endblock %} |
25 changes: 25 additions & 0 deletions
25
bedrock/firefox/templates/firefox/developer/whatsnew-fx68-trailhead.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| {# 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/. -#} | ||
|
|
||
| {% add_lang_files "firefox/whatsnew_67.0.5" %} | ||
|
|
||
| {% extends "firefox/whatsnew/whatsnew-fx67.0.5.html" %} | ||
|
|
||
| {% block fxa_form %} | ||
| {{ fxa_email_form( | ||
| entrypoint='mozilla.org-whatsnew68a2', | ||
| button_class='mzp-c-button mzp-t-product mzp-t-small', | ||
| utm_source='whatsnew68a2', | ||
| style='trailhead', | ||
| utm_params={'campaign': 'fxa-embedded-form', 'content': 'whatsnew', 'medium': 'referral'}) | ||
| }} | ||
| {% endblock %} | ||
|
|
||
| {% block monitor_button %} | ||
| {{ monitor_button( | ||
| entrypoint='mozilla.org-whatsnew68a2', | ||
| utm_source='whatsnew68a2', | ||
| utm_campaign='whatsnew68a2' | ||
| ) }} | ||
| {% endblock %} |
Oops, something went wrong.