diff --git a/bedrock/firefox/redirects.py b/bedrock/firefox/redirects.py index 72b8ab67db6..4b78e412448 100644 --- a/bedrock/firefox/redirects.py +++ b/bedrock/firefox/redirects.py @@ -119,9 +119,6 @@ def firefox_mobile_faq(request, *args, **kwargs): redirect(r'^seamonkey-transition\.html$', 'http://www-archive.mozilla.org/seamonkey-transition.html'), - # bug 1121082 - redirect(r'^hello/?$', 'firefox.hello'), - # Bug 1186373 redirect(r'^firefox/hello/npssurvey/?$', 'https://www.surveygizmo.com/s3/2227372/Firefox-Hello-Product-Survey', @@ -499,9 +496,6 @@ def firefox_mobile_faq(request, *args, **kwargs): # bug 1260423 redirect(r'^firefox/choose/?$', 'firefox.new'), - # bug 1273837 - redirect(r'^firefox(?:\/\d+\.\d+(?:\.\d+)?(?:a\d+)?)?/hello/start/?$', 'firefox.hello'), - # bug 1283397 redirect(r'^firefox/pocket/?$', 'https://getpocket.com/firefox/'), @@ -512,4 +506,9 @@ def firefox_mobile_faq(request, *args, **kwargs): # bug 1293539 redirect(r'^firefox(?:\/\d+\.\d+(?:\.\d+)?(?:a\d+)?)?/tour/?$', 'https://support.mozilla.org/kb/get-started-firefox-overview-main-features'), + + # bug 1295332 + redirect(r'^hello/?$', 'https://support.mozilla.org/kb/hello-status'), + redirect(r'^firefox/hello/?$', 'https://support.mozilla.org/kb/hello-status'), + redirect(r'^firefox(?:\/\d+\.\d+(?:\.\d+)?(?:a\d+)?)?/hello/start/?$', 'https://support.mozilla.org/kb/hello-status'), ) diff --git a/bedrock/firefox/templates/firefox/hello/index-b.html b/bedrock/firefox/templates/firefox/hello/index-b.html deleted file mode 100644 index d6da1083965..00000000000 --- a/bedrock/firefox/templates/firefox/hello/index-b.html +++ /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 http://mozilla.org/MPL/2.0/. #} - -{% extends "firefox/hello/index.html" %} - -{% set_lang_files "firefox/hello-2016" %} - -{% block newsletter_subscribe %} - -{% endblock %} diff --git a/bedrock/firefox/templates/firefox/hello/index.html b/bedrock/firefox/templates/firefox/hello/index.html deleted file mode 100644 index 5a454d1b41c..00000000000 --- a/bedrock/firefox/templates/firefox/hello/index.html +++ /dev/null @@ -1,150 +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 http://mozilla.org/MPL/2.0/. -#} - -{% from "macros.html" import fxfamilynav with context %} - -{% extends "firefox/base-resp.html" %} - -{% set_lang_files "firefox/hello-2016" %} - -{% block page_title_prefix %}{{ _('Firefox Hello') }} — {% endblock %} -{% block page_title %}{{ _('Browse the Web with friends') }}{% endblock %} -{% block page_desc %}{{ _('Use Firefox Hello to browse Web pages with your friends. Make decisions together in real time when planning a trip, shopping and more.') }}{% endblock %} -{% block page_image %}{{ static('img/firefox/hello/hello-share.jpg') }}{% endblock %} -{% block body_id %}firefox-hello{% endblock %} -{% block body_class %}{% endblock %} - -{% block page_css %} - {% stylesheet 'firefox_hello' %} -{% endblock %} - -{% block optimizely %} - {% if switch('firefox-hello-optimizely') %} - {% include 'includes/optimizely.html' %} - {% endif %} -{% endblock %} - -{% block site_header %}{% endblock %} - -{% block site_header_unwrapped %} - {% call fxfamilynav('features') %} - {{ _('Try It Now') }} - {{ download_firefox(alt_copy=_('Download Now')) }} - {% endcall %} -{% endblock %} - -{% block content %} -
-
-
-

- {{ _('Heads up! Firefox Hello will be removed from Firefox soon.') }} - {{ _('Learn more') }} -

- {% if LANG.startswith('en-') %} -

Plan. Shop. Decide. Together.

- {% else %} -

{{ _('Plan. Shop. Decide. Together.') }}

- {% endif %} -

{{ _('Instantly browse any Web page with a friend.') }}

- {{ _('Try It Now') }} - Firefox Hello -
-
-
- -
-
-

{{ _('Get on the same page and make faster decisions in real time.') }}

- -
-
-
-
-
-

{{ _('Quick, easy and ready to go') }}

-
    -
  • {{ _('One click to send your friend an invitation') }}
    • -
  • {{ _('No logins, passwords or accounts required') }}
    • -
  • {{ _('Nothing extra to download — all you need is Firefox!') }}
    • -
-
-
-
-
-

{{ _('Made for sharing the Web') }}

-
    -
  • {{ _('Collaborate and make decisions in real time') }}
    • -
  • {{ _('Share what you’re looking at, safely and securely') }}
    • -
  • {{ _('Invite friends, even if they don’t use Firefox')|format('https://support.mozilla.org/kb/which-browsers-will-work-firefox-hello-video-chat') }}
    • -
-
-
-
-
-
-
-

{{ _('Share this page with a friend.') }}

- {{ _('Try It Now') }} -
-

{{ _('Get the latest version of Firefox to start browsing Web pages with your friends.') }}

-

{{ _('Get Firefox to start browsing Web pages with your friends.') }}

- {{ download_firefox(platform='desktop', force_direct=true, dom_id='download-fx-secondary') }} -
-

{{ _('Use Firefox on your desktop or laptop to start browsing the Web with your friends.') }} {{ _('Learn more')}}

- - - -
-
-
- - {% block newsletter_subscribe %} - {% if LANG.startswith('en-') %} - - {% endif %} - {% endblock %} - - -{% endblock %} - -{% block email_form %}{% endblock %} - -{% block js %} - {% javascript 'firefox_hello' %} -{% endblock %} diff --git a/bedrock/firefox/templates/firefox/includes/top-menu.html b/bedrock/firefox/templates/firefox/includes/top-menu.html index 492b488888a..93caba256eb 100644 --- a/bedrock/firefox/templates/firefox/includes/top-menu.html +++ b/bedrock/firefox/templates/firefox/includes/top-menu.html @@ -10,7 +10,6 @@
  • {#
    before first sub/minor link #} {{ _('Sync') }} - {{ _('Hello') }}
    • diff --git a/bedrock/firefox/urls.py b/bedrock/firefox/urls.py index 2709510fb81..61abef2e2d9 100644 --- a/bedrock/firefox/urls.py +++ b/bedrock/firefox/urls.py @@ -41,7 +41,6 @@ page('firefox/developer', 'firefox/developer.html'), page('firefox/features', 'firefox/features.html'), page('firefox/geolocation', 'firefox/geolocation.html'), - url(r'^firefox/hello/$', views.hello, name='firefox.hello'), page('firefox/interest-dashboard', 'firefox/interest-dashboard.html'), page('firefox/android', 'firefox/android/index.html'), page('firefox/android/faq', 'firefox/android/faq.html'), diff --git a/bedrock/firefox/views.py b/bedrock/firefox/views.py index 9add8ccf6ee..9a2e7f01b50 100644 --- a/bedrock/firefox/views.py +++ b/bedrock/firefox/views.py @@ -354,16 +354,6 @@ def get_template_names(self): return [template] -def hello(request): - variant = request.GET.get('v', '') - if variant == 'b': - template = 'firefox/hello/index-b.html' - else: - template = 'firefox/hello/index.html' - - return l10n_utils.render(request, template) - - class FeedbackView(TemplateView): donate_url = ('https://donate.mozilla.org/' diff --git a/bedrock/settings/static_media.py b/bedrock/settings/static_media.py index fe9c74315d7..2b5c75ce054 100644 --- a/bedrock/settings/static_media.py +++ b/bedrock/settings/static_media.py @@ -370,14 +370,6 @@ ), 'output_filename': 'css/firefox_developer-bundle.css', }, - 'firefox_hello': { - 'source_filenames': ( - 'css/firefox/family-nav.less', - 'css/newsletter/fxnewsletter-subscribe.less', - 'css/firefox/hello/index.less', - ), - 'output_filename': 'css/firefox_hello-bundle.css', - }, 'firefox_ios': { 'source_filenames': ( 'css/firefox/family-nav.less', @@ -1289,17 +1281,6 @@ ), 'output_filename': 'js/firefox_feedback-bundle.js', }, - 'firefox_hello': { - 'source_filenames': ( - 'js/base/uitour-lib.js', - 'js/libs/jquery.waypoints.min.js', - 'js/libs/jquery.waypoints-sticky.min.js', - 'js/firefox/family-nav.js', - 'js/base/mozilla-svg-image-fallback.js', - 'js/firefox/hello/index.js', - ), - 'output_filename': 'js/firefox_hello-bundle.js', - }, 'firefox_ios': { 'source_filenames': ( 'js/base/mozilla-smoothscroll.js', diff --git a/media/css/firefox/hello/index.less b/media/css/firefox/hello/index.less deleted file mode 100644 index 289e4f8bfd3..00000000000 --- a/media/css/firefox/hello/index.less +++ /dev/null @@ -1,882 +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 http://mozilla.org/MPL/2.0/. - -@import "../../sandstone/lib.less"; - -/*! updated 2016-03-02 */ - -#outer-wrapper { - background: @mozIDBlue; -} - -#wrapper { - width: 100%; - padding: 0; -} - -h1, h2, h3, h4, h5, h6 { - color: #fff; - text-shadow: none; -} - -.container { - width: @widthDesktop - (@baseLine * 2); - padding: (@baseLine * 2) 0; - - @media only screen and (max-width: @breakDesktop) { - width: @widthTablet - (@gridGutterWidth * 2); - } - - @media only screen and (max-width: @breakTablet) { - width: @widthMobileLandscape; - } - - @media only screen and (max-width: @breakMobileLandscape) { - width: @widthMobile - (@gridGutterWidth * 2); - } -} - -a.try-hello-button, -a.try-hello-button:link, -a.try-hello-button:visited { - .inline-block; - padding-left: 75px; - margin-bottom: @baseLine; - .at2x('/media/img/firefox/hello/hello-smiley.png', 40px, 38px); - background-position: 22px center; - background-repeat: no-repeat; - cursor: pointer; - - @media only screen and (max-width: @breakDesktop) { - .font-size(26px); - } - - @media only screen and (max-width: @breakTablet) { - .font-size(24px); - } - - @media only screen and (max-width: @breakMobileLandscape) { - .font-size(20px); - } -} - -#fxfamilynav-header { - a.try-hello-button { - background-image: none; - margin-bottom: 0; - padding: 5px 18px; - } -} - -/** - * Conditional messaging - * --------------------- - */ - -.no-js { - .non-fx { - display: block; - } - - .nav-download-button, - .hello-wordmark { - display: inline-block; - } - - .fx-up-to-date, - .fx-out-of-date, - a.try-hello-button, - .mobile { - display: none; - } - - .download-dumb { - text-align: center; - } -} - -.js { - .fx-up-to-date, - .fx-out-of-date, - .non-fx, - .mobile, - .download-button, - .hello-wordmark, - .nav-download-button, - a.try-hello-button { - display: none; - } -} - -.firefox-up-to-date { - .fx-up-to-date { - display: block; - } - - a.try-hello-button { - display: inline-block; - } - - .fx-out-of-date, - .non-fx, - .mobile, - .download-button, - .hello-wordmark, - .nav-download-button, - #conditional-download-bar { - display: none; - } -} - -.firefox-out-of-date { - .fx-out-of-date, - .nav-download-button, - #conditional-download-bar { - display: block; - } - - .download-button, - .hello-wordmark { - display: inline-block; - } - - .fx-up-to-date, - .non-fx, - .mobile, - a.try-hello-button { - display: none; - } -} - -.non-firefox { - .non-fx, - .nav-download-button, - #conditional-download-bar { - display: block; - } - - .download-button, - .hello-wordmark { - display: inline-block; - } - - .fx-up-to-date, - .fx-out-of-date, - .mobile, - a.try-hello-button { - display: none; - } -} - -.mobile-device { - .fx-up-to-date, - .fx-out-of-date, - .non-fx, - .download-button, - .nav-download-button, - a.try-hello-button { - display: none; - } - - .mobile, - #conditional-download-bar { - display: block; - } - - .hello-wordmark { - display: inline-block; - } -} - -#download-fx-primary, -#download-fx-secondary { - .download-link { - &:hover, - &:focus { - text-decoration: none; - } - } - .download-other { - a:link, - a:visited { - color: #fff; - } - } - .unsupported-download { - color: #fff; - a:link, - a:visited { - color: #fff; - text-decoration: underline; - } - } - .download-heading { - color: #fff; - } -} - -#try-hello { - padding: (@baseLine * 3) 0 (@baseLine * 2); - .at2x('/media/img/firefox/hello/texture-grain.png', 300px, 300px); - background-position: top left; - background-repeat: repeat; - - @media only screen and (max-width: @breakTablet) { - text-align: center; - padding: @baseLine 0; - } - - header { - min-height: 393px; - padding-right: 471px; - .at2x('/media/img/firefox/hello/hero-characters.png', 451px, 393px); - background-position: top right; - background-repeat: no-repeat; - - @media only screen and (max-width: @breakDesktop) { - .background-size(338px 295px); - min-height: 295px; - padding-right: 358px; - - .hello-wordmark { - width: 80%; - } - } - - @media only screen and (max-width: @breakTablet) { - background-image: none; - min-height: 0; - padding-right: 0; - } - } - - h1 { - .open-sans; - .font-size(60px); - line-height: 1.2; - margin-bottom: @baseLine; - - @media only screen and (max-width: @breakDesktop) { - .font-size(44px); - } - - @media only screen and (max-width: @breakTablet) { - .font-size(40px); - } - - @media only screen and (max-width: @breakMobileLandscape) { - .font-size(36px); - } - } - - p { - color: #fff; - } - - .tagline { - .font-size(34px); - line-height: 1.2; - - @media only screen and (max-width: @breakDesktop) { - .font-size(30px); - } - - @media only screen and (max-width: @breakTablet) { - .font-size(26px); - } - - @media only screen and (max-width: @breakMobileLandscape) { - .font-size(22px); - } - } - - a.try-hello-button { - margin-top: @baseLine; - } - - .hello-wordmark { - margin-top: @baseLine * 2; - } - - .notification { - .font-size(20px); - margin-left: 30px; - position: relative; - - a:link, - a:visited { - color: @textColorSpaceYellow; - } - - &:before { - background: url('/media/img/firefox/common/icon-alert.svg') center center no-repeat; - content: ''; - height: 25px; - left: -30px; - margin: 0 4px 0 0; - position: absolute; - top: 4px; - width: 25px; - } - - @media only screen and (max-width: @breakTablet) { - margin-left: 0; - - &:before { - .inline-block; - position: static; - vertical-align: text-bottom; - } - } - } -} - -.html-rtl { - #try-hello { - header { - padding-right: 0; - padding-left: 471px; - background-position: top left; - - @media only screen and (max-width: @breakDesktop) { - padding-right: 0; - padding-left: 358px; - } - - @media only screen and (max-width: @breakTablet) { - padding-left: 0; - padding-right: 0; - } - } - - .notification { - margin-left: 0; - margin-right: 30px; - - &:before { - left: auto; - right: -30px; - margin: 0 0 0 4px; - } - - @media only screen and (max-width: @breakTablet) { - margin-right: 0; - } - } - } -} - -#use-cases { - position: relative; - padding: (@baseLine * 3) 0; - .clearfix(); - background: #fff; - color: #41484e; - text-align: center; - - h2 { - color: #41484e; - .font-size(36px); - max-width: 15em; - margin: 0 auto 12px; - line-height: 1.2; - } - - @media only screen and (max-width: @breakDesktop) { - h2 { - .font-size(32px); - } - } - - @media only screen and (max-width: @breakTablet) { - padding: @baseLine 0; - - h2 { - .font-size(30px); - } - } - - @media only screen and (max-width: @breakMobileLandscape) { - h2 { - .font-size(28px); - } - } - - ul { - position: relative; - list-style-type: none; - margin: (@baseLine * 2) 0 0; - padding: 0; - .clearfix; - - li { - width: (@widthDesktop / 2) - (@gridGutterWidth * 3); - margin: 0; - - h3 { - position: relative; - padding-top: 220px; - margin-bottom: @baseLine * 2; - color: #41484e; - .open-sans; - .font-size(30px); - font-weight: bold; - - &:before { - position: absolute; - top: 0; - left: 0; - width: 100%; - height: 194px; - content: ''; - .at2x('/media/img/firefox/hello/use-cases-sprite.png', 205px, 388px); - background-position: center top; - background-repeat: no-repeat; - } - } - - p { - .font-size(25px); - } - - &.plan { - float: left; - - h3:before { - background-position: center 0; - } - } - - &.shop { - float: right; - - h3:before { - background-position: center -196px; - } - } - - @media only screen and (max-width: @breakDesktop) { - width: (@widthTablet / 2) - (@gridGutterWidth * 2); - } - - @media only screen and (max-width: @breakTablet) { - width: auto; - margin: 0 0 (@baseLine * 2); - - &.plan, - &.shop { - float: none; - } - - - h3 { - .font-size(28px); - } - - p { - .font-size(22px); - } - } - - @media only screen and (max-width: @breakTablet) { - - h3 { - .font-size(26px); - } - - p { - .font-size(20px); - } - } - } - } -} - -#features { - display: table; - width: 100%; - position: relative; - background: #0083B6; - - h2 { - .open-sans; - .font-size(30px); - font-weight: bold; - margin-bottom: @baseLine * 2; - padding-left: 35px; - } - - ul li { - position: relative; - list-style-type: none; - color: #fff; - .font-size(25px); - margin: 0 0 @baseLine; - padding-left: 35px; - - &:before { - position: absolute; - top: 11px; - left: 0; - width: 19px; - height: 17px; - content: ''; - .at2x('/media/img/firefox/hello/check-mark.png', 19px, 17px); - background-position: left top; - background-repeat: no-repeat; - } - } - - @media only screen and (max-width: @breakTablet) { - display: block; - - h2 { - .font-size(28px); - } - - ul li { - .font-size(22px); - } - } - - @media only screen and (max-width: @breakMobileLandscape) { - h2 { - .font-size(26px); - } - - ul li { - .font-size(20px); - } - } - - .split-container { - display: table-cell; - width: 50%; - padding: (@baseLine * 5) 0; - vertical-align: top; - .at2x('/media/img/firefox/hello/texture-grain.png', 300px, 300px); - background-position: top left; - background-repeat: repeat; - - @media only screen and (max-width: @breakTablet) { - display: block; - width: 100%; - padding: (@baseLine * 3) 0; - } - - section { - width: (@widthDesktop / 2) - (@gridGutterWidth * 3); - - @media only screen and (max-width: @breakDesktop) { - width: (@widthTablet / 2) - (@gridGutterWidth * 3); - } - } - } - .quick { - background-color: #00A6E4; - - section { - float: right; - padding: 315px (@baseLine * 2) 0 0; - .at2x('/media/img/firefox/hello/quick.png', 440px, 275px); - background-position: top left; - background-repeat: no-repeat; - } - } - .sharing { - background-color: #0083B6; - - section { - float: left; - padding: 315px 0 0 (@baseLine * 2); - .at2x('/media/img/firefox/hello/sharing.png', 440px, 275px); - background-position: (@gridGutterWidth * 2) 0; - background-repeat: no-repeat; - } - } - - .quick section, - .sharing section { - @media only screen and (max-width: @breakDesktop) { - .background-size(320px, 200px); - padding-top: 240px; - } - - @media only screen and (max-width: @breakTablet) { - width: @widthMobileLandscape - @gridGutterWidth; - float: none; - margin: 0 auto; - .background-size(420px, 263px); - background-position: top left; - padding: 303px 0 0 0; - } - - @media only screen and (max-width: @breakMobileLandscape) { - width: @widthMobile - @gridGutterWidth; - .background-size(300px, 188px); - padding: 228px 0 0 0; - } - } - - a:link, - a:visited { - color: @textColorSpaceYellow; - } -} - -.html-rtl { - #features { - - h2 { - padding-left: 0; - padding-right: 35px; - } - - ul li { - padding-left: 0; - padding-right: 35px; - - &:before { - left: auto; - right: 0; - } - } - - .quick { - section { - float: left; - padding-right: 0; - padding-left: @baseLine * 2; - background-position: (@gridGutterWidth * 2) 0; - } - } - .sharing { - - section { - float: right; - padding-left: 0; - padding-right: @baseLine * 2; - background-position: top left; - } - } - - .quick section, - .sharing section { - - @media only screen and (max-width: @breakDesktop) { - padding-top: 240px; - } - - @media only screen and (max-width: @breakTablet) { - float: none; - padding: 303px 0 0 0; - background-position: top left; - } - - @media only screen and (max-width: @breakMobileLandscape) { - padding: 228px 0 0 0; - } - } - } -} - -#share-hello, -#conditional-download-bar { - background-color: #005CA8; - padding: @baseLine 0; - - .mobile { - width: 840px; - .clearfix; - - h2 { - margin-top: @baseLine; - } - - .more:link, - .more:visited { - color: @textColorSpaceYellow; - } - - img { - float: right; - } - - @media only screen and (max-width: @breakDesktop) { - width: 650px; - } - - @media only screen and (max-width: @breakTablet) { - width: 100%; - text-align: center; - - h2 { - margin-top: 0; - } - - img { - float: none; - margin-top: @baseLine; - } - } - - @media only screen and (max-width: @breakMobileLandscape) { - .more { - display: block; - } - } - } - - h2 { - float: left; - width: (@widthDesktop / 2) - (@gridGutterWidth * 2); - .font-size(36px); - line-height: 1.2; - font-style: italic; - - @media only screen and (max-width: @breakDesktop) { - width: (@widthTablet / 2) - (@gridGutterWidth * 2); - .font-size(34px); - } - - @media only screen and (max-width: @breakTablet) { - width: auto; - float: none; - text-align: center; - .font-size(32px); - } - - @media only screen and (max-width: @breakTablet) { - .font-size(30px); - } - } - - .fx-up-to-date { - position: relative; - .clearfix; - - a.try-hello-button { - .border-box(); - float: right; - max-width: 50%; - margin-bottom: 0; - border: 2px #fff solid; - } - - @media only screen and (max-width: @breakTablet) { - text-align: center; - - a.try-hello-button { - float: none; - max-width: none; - margin: @baseLine auto; - } - } - } - - .download-button { - float: right; - margin-top: @baseLine; - - @media only screen and (max-width: @breakTablet) { - float: none; - margin: @baseLine auto; - text-align: center; - } - } -} - -.non-firefox, -.firefox-out-of-date { - @media only screen and (max-width: @breakTablet) { - #share-hello, - #conditional-download-bar { - text-align: center; - } - } -} - -.html-rtl { - #share-hello, - #conditional-download-bar { - h2 { - float: right; - - @media only screen and (max-width: @breakTablet) { - float: none; - } - } - - .mobile img { - float: left; - - @media only screen and (max-width: @breakTablet) { - float: none; - } - } - - .fx-up-to-date { - a.try-hello-button { - float: left; - - @media only screen and (max-width: @breakTablet) { - float: none; - } - } - } - - .download-button { - float: left; - - @media only screen and (max-width: @breakTablet) { - float: none; - } - } - } -} - -#need-help { - color: #000; - background: #fff; - text-align: right; - .font-size(25px); - - @media only screen and (max-width: @breakDesktop) { - .font-size(23px); - } - - @media only screen and (max-width: @breakTablet) { - text-align: center; - .font-size(20px); - } - - a:link, - a:visited { - color: @linkBlue; - } - - a:hover, - a:active, - a:focus { - color: @linkBlue; - } -} - -.html-rtl { - #need-help { - text-align: left; - - @media only screen and (max-width: @breakTablet) { - text-align: center; - } - } -} - -#colophon { - margin: 0; -} - -#newsletter-subscribe.compact .form-title h3 { - .font-size(32px); -} diff --git a/media/img/firefox/hello/check-mark-high-res.png b/media/img/firefox/hello/check-mark-high-res.png deleted file mode 100644 index bf1286cbc1e..00000000000 Binary files a/media/img/firefox/hello/check-mark-high-res.png and /dev/null differ diff --git a/media/img/firefox/hello/check-mark.png b/media/img/firefox/hello/check-mark.png deleted file mode 100644 index 348ee9e036c..00000000000 Binary files a/media/img/firefox/hello/check-mark.png and /dev/null differ diff --git a/media/img/firefox/hello/desktop-hello.svg b/media/img/firefox/hello/desktop-hello.svg deleted file mode 100644 index ec75b50f787..00000000000 --- a/media/img/firefox/hello/desktop-hello.svg +++ /dev/null @@ -1 +0,0 @@ -firefox_picto_ffx-desktop-hello \ No newline at end of file diff --git a/media/img/firefox/hello/firefox-hello-logo-white.png b/media/img/firefox/hello/firefox-hello-logo-white.png deleted file mode 100644 index 1e3a7a3caa5..00000000000 Binary files a/media/img/firefox/hello/firefox-hello-logo-white.png and /dev/null differ diff --git a/media/img/firefox/hello/firefox-hello-logo-white.svg b/media/img/firefox/hello/firefox-hello-logo-white.svg deleted file mode 100644 index 827c64adf13..00000000000 --- a/media/img/firefox/hello/firefox-hello-logo-white.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/media/img/firefox/hello/hello-share.jpg b/media/img/firefox/hello/hello-share.jpg deleted file mode 100644 index e8385a867a6..00000000000 Binary files a/media/img/firefox/hello/hello-share.jpg and /dev/null differ diff --git a/media/img/firefox/hello/hello-smiley-high-res.png b/media/img/firefox/hello/hello-smiley-high-res.png deleted file mode 100644 index 211ac7110bc..00000000000 Binary files a/media/img/firefox/hello/hello-smiley-high-res.png and /dev/null differ diff --git a/media/img/firefox/hello/hello-smiley.png b/media/img/firefox/hello/hello-smiley.png deleted file mode 100644 index 59e59e54c45..00000000000 Binary files a/media/img/firefox/hello/hello-smiley.png and /dev/null differ diff --git a/media/img/firefox/hello/hero-characters-high-res.png b/media/img/firefox/hello/hero-characters-high-res.png deleted file mode 100644 index 0f3f0471e2e..00000000000 Binary files a/media/img/firefox/hello/hero-characters-high-res.png and /dev/null differ diff --git a/media/img/firefox/hello/hero-characters.png b/media/img/firefox/hello/hero-characters.png deleted file mode 100644 index 1aa43522f66..00000000000 Binary files a/media/img/firefox/hello/hero-characters.png and /dev/null differ diff --git a/media/img/firefox/hello/quick-high-res.png b/media/img/firefox/hello/quick-high-res.png deleted file mode 100644 index 6b68ea38be7..00000000000 Binary files a/media/img/firefox/hello/quick-high-res.png and /dev/null differ diff --git a/media/img/firefox/hello/quick.png b/media/img/firefox/hello/quick.png deleted file mode 100644 index 29f8c6ee14a..00000000000 Binary files a/media/img/firefox/hello/quick.png and /dev/null differ diff --git a/media/img/firefox/hello/sharing-high-res.png b/media/img/firefox/hello/sharing-high-res.png deleted file mode 100644 index 6dee047f73c..00000000000 Binary files a/media/img/firefox/hello/sharing-high-res.png and /dev/null differ diff --git a/media/img/firefox/hello/sharing.png b/media/img/firefox/hello/sharing.png deleted file mode 100644 index c9123f6824e..00000000000 Binary files a/media/img/firefox/hello/sharing.png and /dev/null differ diff --git a/media/img/firefox/hello/texture-grain-high-res.png b/media/img/firefox/hello/texture-grain-high-res.png deleted file mode 100644 index 41136794fff..00000000000 Binary files a/media/img/firefox/hello/texture-grain-high-res.png and /dev/null differ diff --git a/media/img/firefox/hello/texture-grain.png b/media/img/firefox/hello/texture-grain.png deleted file mode 100644 index f511adeb2df..00000000000 Binary files a/media/img/firefox/hello/texture-grain.png and /dev/null differ diff --git a/media/img/firefox/hello/use-cases-sprite-high-res.png b/media/img/firefox/hello/use-cases-sprite-high-res.png deleted file mode 100644 index 438611aed0d..00000000000 Binary files a/media/img/firefox/hello/use-cases-sprite-high-res.png and /dev/null differ diff --git a/media/img/firefox/hello/use-cases-sprite.png b/media/img/firefox/hello/use-cases-sprite.png deleted file mode 100644 index ee6217929c9..00000000000 Binary files a/media/img/firefox/hello/use-cases-sprite.png and /dev/null differ diff --git a/media/img/firefox/hello/video-screenshot.jpg b/media/img/firefox/hello/video-screenshot.jpg deleted file mode 100644 index 5cf9ce17795..00000000000 Binary files a/media/img/firefox/hello/video-screenshot.jpg and /dev/null differ diff --git a/media/js/firefox/hello/index.js b/media/js/firefox/hello/index.js deleted file mode 100644 index b7e9119cb28..00000000000 --- a/media/js/firefox/hello/index.js +++ /dev/null @@ -1,131 +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 http://mozilla.org/MPL/2.0/. */ - -/* globals Promise */ - -(function(Mozilla, window, $) { - 'use strict'; - - var $window = $(window); - var $document = $(document); - var client = Mozilla.Client; - var $outerWrapper = $('#outer-wrapper'); - var $tryHelloButton = $('.try-hello-button'); - - function shouldOpenHelloMenu() { - // check for the browser channel info - var appInfo = new Promise(function(resolve, reject) { - Mozilla.UITour.getConfiguration('appinfo', function(config) { - if (config && config.defaultUpdateChannel) { - resolve(config.defaultUpdateChannel); - } else { - reject('UITour: defaultUpdateChannel property not found.'); - } - }); - }); - - // see if Hello is an available target in toolbar/overflow/customize menu - var availableTargets = new Promise(function(resolve, reject) { - Mozilla.UITour.getConfiguration('availableTargets', function(config) { - if (config && config.targets) { - resolve(config.targets); - } else { - reject('UITour: targets property not found.'); - } - }); - }); - - return new Promise(function(resolve, reject) { - Promise.all([appInfo, availableTargets]).then(function(results) { - var channel = results[0]; - var targets = results[1]; - resolve(channel !== 'esr' && targets && targets.indexOf('loop') > -1); - }, function(reason) { - reject(reason); - }); - }); - } - - function openHelloMenu() { - Mozilla.UITour.showMenu('loop', function() { - $document.one('click.hello', closeHelloMenu); - $window.one('resize.hello', closeHelloMenu); - $document.on('visibilitychange.hello', handleVisibilityChange); - - window.dataLayer.push({ - 'event': 'hello-interactions', - 'category': '/hello interactions', - 'location': 'productPage', - 'browserAction': 'Open' - }); - }); - } - - function closeHelloMenu() { - Mozilla.UITour.hideMenu('loop'); - $document.off('click.hello'); - $document.off('visibilitychange.hello'); - $window.off('resize.hello'); - } - - function handleVisibilityChange() { - if (document.hidden) { - closeHelloMenu(); - } - } - - function trackEligibleView() { - shouldOpenHelloMenu().then(function(result) { - var view = result ? 'EligibleView' : 'IneligibleView'; - window.dataLayer.push({ - 'event': 'hello-interactions', - 'category': '/hello interactions', - 'location': 'productPage', - 'browserAction': view - }); - }); - } - - function handleHelloButtonClick(e) { - e.preventDefault(); - shouldOpenHelloMenu().then(function(result) { - if (result) { - openHelloMenu(); - } else { - window.location = e.target.href; - } - }, function() { - // if promise rejected then simply go to SUMO. - window.location = e.target.href; - }); - } - - function initHelloPage() { - - if (client.isFirefoxDesktop) { - // The new Firefox Hello is available to Firefox 45 users and upward. - if (client.FirefoxMajorVersion >= 45) { - $outerWrapper.addClass('firefox-up-to-date'); - // ping UITour to make sure it's working before binding - // click handlers. - Mozilla.UITour.ping(function() { - $tryHelloButton.on('click', handleHelloButtonClick); - trackEligibleView(); - }); - } else { - $outerWrapper.addClass('firefox-out-of-date'); - } - } else if (client.isMobile) { - $outerWrapper.addClass('mobile-device'); - } else { - $outerWrapper.addClass('non-firefox'); - } - - // show fallback Hello wordmark for older browsers - Mozilla.SVGImage.fallback(); - } - - initHelloPage(); - -})(window.Mozilla, window, window.jQuery); diff --git a/tests/functional/firefox/test_hello.py b/tests/functional/firefox/test_hello.py deleted file mode 100644 index 60d3e6f57a3..00000000000 --- a/tests/functional/firefox/test_hello.py +++ /dev/null @@ -1,26 +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 http://mozilla.org/MPL/2.0/. - -import pytest - -from pages.firefox.hello import HelloPage - - -@pytest.mark.smoke -@pytest.mark.skipif(reason='Skipped until Firefox 45 is available on Sauce Labs') -@pytest.mark.skip_if_not_firefox(reason='Hello button is shown only to Firefox browsers.') -@pytest.mark.nondestructive -def test_try_hello_button_is_displayed(base_url, selenium): - page = HelloPage(selenium, base_url).open() - assert page.is_try_hello_header_button_displayed - assert page.is_try_hello_footer_button_displayed - - -@pytest.mark.smoke -@pytest.mark.skip_if_firefox(reason='Download button is not shown for Firefox browsers.') -@pytest.mark.nondestructive -def test_download_button_is_displayed(base_url, selenium): - page = HelloPage(selenium, base_url).open() - assert page.primary_download_button.is_displayed - assert page.secondary_download_button.is_displayed diff --git a/tests/functional/newsletter/test_newsletter_embed.py b/tests/functional/newsletter/test_newsletter_embed.py index ddac6bcc3ee..ba90b6786c3 100644 --- a/tests/functional/newsletter/test_newsletter_embed.py +++ b/tests/functional/newsletter/test_newsletter_embed.py @@ -19,7 +19,6 @@ from pages.firefox.desktop.desktop import DesktopPage from pages.firefox.desktop.customize import CustomizePage from pages.firefox.desktop.all import FirefoxDesktopBasePage -from pages.firefox.hello import HelloPage from pages.firefox.sync import FirefoxSyncPage from pages.plugincheck import PluginCheckPage from pages.smarton.landing import SmartOnLandingPage @@ -45,7 +44,6 @@ (FirefoxDesktopBasePage, {'slug': 'fast'}), (FirefoxDesktopBasePage, {'slug': 'trust'}), (FirefoxSyncPage, None), - (HelloPage, None), (PluginCheckPage, None), (SmartOnLandingPage, None), pytest.mark.skip_if_not_firefox((SmartOnBasePage, {'slug': 'tracking'}), diff --git a/tests/pages/firefox/hello.py b/tests/pages/firefox/hello.py deleted file mode 100644 index 58d70ff9b2c..00000000000 --- a/tests/pages/firefox/hello.py +++ /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 http://mozilla.org/MPL/2.0/. - -from selenium.webdriver.common.by import By - -from pages.firefox.base import FirefoxBasePage -from pages.regions.download_button import DownloadButton - - -class HelloPage(FirefoxBasePage): - - URL_TEMPLATE = '/{locale}/firefox/hello' - - _try_hello_header_locator = (By.CSS_SELECTOR, '#try-hello .try-hello-button') - _try_hello_footer_locator = (By.CSS_SELECTOR, '#share-hello .try-hello-button') - _primary_download_locator = (By.ID, 'download-fx-primary') - _secondary_download_locator = (By.ID, 'download-fx-secondary') - - @property - def is_try_hello_header_button_displayed(self): - return self.is_element_displayed(*self._try_hello_header_locator) - - @property - def is_try_hello_footer_button_displayed(self): - return self.is_element_displayed(*self._try_hello_footer_locator) - - @property - def primary_download_button(self): - el = self.find_element(*self._primary_download_locator) - return DownloadButton(self, root=el) - - @property - def secondary_download_button(self): - el = self.find_element(*self._secondary_download_locator) - return DownloadButton(self, root=el) diff --git a/tests/redirects/map_globalconf.py b/tests/redirects/map_globalconf.py index 9939966ef94..1252312ceae 100644 --- a/tests/redirects/map_globalconf.py +++ b/tests/redirects/map_globalconf.py @@ -280,8 +280,10 @@ url_test('/thunderbird/about/{board,press,staff}/', 'http://website-archive.mozilla.org/www.mozilla.org/thunderbird/thunderbird/about/{board,press,staff}/'), - # bug 1121082 - url_test('/hello/', '/firefox/hello/'), + # bug 1295332 + url_test('/hello/', 'https://support.mozilla.org/kb/hello-status'), + url_test('/firefox/hello/start', 'https://support.mozilla.org/kb/hello-status'), + url_test('/firefox/{46.0,46.0.1,46.0a1,46.0a2}/hello/start', 'https://support.mozilla.org/kb/hello-status'), # bug 1148127 url_test('/products/', '/firefox/products/'), @@ -1065,10 +1067,6 @@ # Bug 1260423 url_test('/firefox/choose', '/firefox/new/'), - # Bug 1273837 - url_test('/firefox/{46.0,46.0.1,46.0a1,46.0a2}/hello/start', '/firefox/hello/'), - url_test('/firefox/hello/start', '/firefox/hello/'), - # Bug 1283397 url_test('/firefox/pocket', 'https://getpocket.com/firefox/'),