diff --git a/bedrock/base/templates/base-protocol.html b/bedrock/base/templates/base-protocol.html index ef557691378..c2c76a343fe 100644 --- a/bedrock/base/templates/base-protocol.html +++ b/bedrock/base/templates/base-protocol.html @@ -6,7 +6,7 @@ {# Note the "windows" class, without javascript platform-specific assets default to windows #} - + {# Note: Must be within first 512 bytes of page #} diff --git a/bedrock/mozorg/redirects.py b/bedrock/mozorg/redirects.py index ed957eb7634..a5d10321c1b 100644 --- a/bedrock/mozorg/redirects.py +++ b/bedrock/mozorg/redirects.py @@ -559,7 +559,7 @@ def decider(request, **kwargs): redirect(r"^/exp/firefox/?$", "firefox"), redirect(r"^/exp/firefox/new/?$", "firefox.new"), redirect(r"^/exp/firefox/accounts/?$", "firefox.accounts"), - redirect(r"^/exp/opt-out/?$", "privacy.convert-opt-out"), + redirect(r"^/exp/opt-out/?$", "privacy.websites"), # Issue 13211 redirect(r"^/en/$", "/en-US/", permanent=True), # Issue 13554 diff --git a/bedrock/privacy/templates/privacy/convert-opt-out.html b/bedrock/privacy/templates/privacy/convert-opt-out.html deleted file mode 100644 index d557855a612..00000000000 --- a/bedrock/privacy/templates/privacy/convert-opt-out.html +++ /dev/null @@ -1,62 +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/. -#} - -{% extends "base-protocol.html" %} - -{% block page_title %}Opt-out of Convert experiments{% endblock %} - -{% block page_desc %}Your privacy is very important to Mozilla. This page will enable you to opt-out of Convert experiments on www.mozilla.org{% endblock %} - -{% block experiments %} - -{% endblock %} - -{% block canonical_urls %}{% endblock %} - -{% block page_css %} - {{ css_bundle('protocol-article') }} -{% endblock %} - -{% block content %} -
-
-

Opt-out of Convert experiments

- -

- {% with convert='https://www.convert.com/', websites=url('privacy.notices.websites'), privacy='https://www.convert.com/privacy-notice/' %} - Your privacy is very important to Mozilla. In an effort to improve user experiences on www.mozilla.org, Mozilla sometimes runs - website experiments using a tool called Convert. Convert does not collect any personally - identifiable information, is committed to data privacy and security, and does not share data with any parties other than - Mozilla. You can read more information in the Mozilla Websites Privacy Policy and the - Convert Privacy Policy. - {% endwith %} -

- -

- If you still want to opt-out of Convert experiments on www.mozilla.org, you can do so by clicking the link below. - The link will automatically replace Convert cookies and verify your opt-out status. -

- - - -

Opt-out of Convert experiments

- -

If you change your mind, you can opt-in again here:

- -

Opt-in to Convert experiments

- -

- {% with dnt='https://support.mozilla.org/kb/how-do-i-turn-do-not-track-feature' %} - Note: If you already have Do Not Track enabled then Convert will respect your preference, - and you will not be entered into website experiments. - {% endwith %} -

-
-
- -{% endblock %} diff --git a/bedrock/privacy/urls.py b/bedrock/privacy/urls.py index 97f9010fe6a..a1dc820af60 100644 --- a/bedrock/privacy/urls.py +++ b/bedrock/privacy/urls.py @@ -20,7 +20,6 @@ path("thunderbird/", views.thunderbird_notices, name="privacy.notices.thunderbird"), path("websites/", views.websites_notices, name="privacy.notices.websites"), page("websites/data-preferences/", "privacy/data-preferences.html", ftl_files=["privacy/data-preferences"]), - page("websites/convert-opt-out/", "privacy/convert-opt-out.html"), path("firefox-monitor/", views.firefox_monitor_notices, name="privacy.notices.firefox-monitor"), path("mdn-plus/", views.mdn_plus, name="privacy.notices.mdn-plus"), path("ad-targeting-guidelines/", views.ad_targeting_guidelines, name="privacy.notices.ad-targeting-guidelines"), diff --git a/bedrock/settings/__init__.py b/bedrock/settings/__init__.py index 561c7066243..e77ded158ce 100644 --- a/bedrock/settings/__init__.py +++ b/bedrock/settings/__init__.py @@ -179,9 +179,6 @@ "www.googletagmanager.com", "www.google-analytics.com", "creativecommons.org", - "cdn-4.convertexperiments.com", - "logs.convertexperiments.com", - "images.ctfassets.net", ] _csp_script_src = [ # TODO fix things so that we don't need this @@ -194,17 +191,11 @@ "tagmanager.google.com", "www.youtube.com", "s.ytimg.com", - "cdn-4.convertexperiments.com", - "app.convert.com", - "data.track.convertexperiments.com", - "1003350.track.convertexperiments.com", - "1003343.track.convertexperiments.com", "js.stripe.com", ] _csp_style_src = [ # TODO fix things so that we don't need this "'unsafe-inline'", - "app.convert.com", ] _csp_child_src = [ "www.googletagmanager.com", @@ -221,9 +212,6 @@ "www.googletagmanager.com", "www.google-analytics.com", "region1.google-analytics.com", - "logs.convertexperiments.com", - "1003350.metrics.convertexperiments.com", - "1003343.metrics.convertexperiments.com", "sentry.prod.mozaws.net", # DEPRECATED. TODO: remove this once all sites are talking to sentry.io instead "o1069899.sentry.io", "o1069899.ingest.sentry.io", diff --git a/bedrock/settings/base.py b/bedrock/settings/base.py index 0a267cf864b..15a70ec93f5 100644 --- a/bedrock/settings/base.py +++ b/bedrock/settings/base.py @@ -1218,9 +1218,6 @@ def before_send(event, hint): # # where "103" in the variable name is the funnelcake ID. -# Issue 7508 - Convert.com experiment sandbox -CONVERT_PROJECT_ID = "10039-1003350" if DEV else "10039-1003343" - # VPN ========================================================================================== # URL for Mozilla VPN sign-in links diff --git a/docs/abtest.rst b/docs/abtest.rst index 1a3a64d635f..cf6f7f76887 100644 --- a/docs/abtest.rst +++ b/docs/abtest.rst @@ -8,70 +8,6 @@ A/B Testing =========== -Convert experiments -------------------- - -Conversion rate optimization (CRO) experiments on bedrock can be run using a -third-party tool called `Convert `_. Convert experiments -are for relatively simple multivariate experiments, such as testing changes -to headlines, images, or button copy. - -The Convert script is not included in part of bedrock's base bundle for -performance reasons. To use Convert on a page, you can load the script -behind a feature flag, which can be turned on / off for only the duration -of an experiment. The script should be loaded inside the ``experiments`` -block in your template: - -.. code-block:: jinja - - {% block experiments %} - {% if switch('experiment-convert-page-name', ['en-US']) %} - {{ js_bundle('convert') }} - {% endif %} - {% endblock %} - -Convert A/B tests can be implemented using the `Convert dashboard -`_ and editor. Convert experiments should be coded and -tested against staging, before being reviewed and scheduled to run in -production. - -QA for Convert experiments -~~~~~~~~~~~~~~~~~~~~~~~~~~ - -The process for QA'ing Convert experiments is as follows: - -#. Bedrock feature switch should be activated on staging. -#. Experiment is built and configured to run on ``https://www.allizom.org/*`` -#. In the Github issue for an experiment, someone will request review by an engineer. - -An engineer reviewing the experiment will: - -#. Verify that the experiment is not configured to run on https://www.mozilla.org/ (production) yet. -#. Activate the experiment to run on stage. - -During review, the engineer will compare the following to the experiment plan: - -#. The experiment’s logic. -#. Any JS included (in Convert editor’s JS field). -#. Any CSS included (in Convert editor’s CSS field). -#. The target audience is configured. -#. The goals are configured. -#. The distribution percentages are configured. -#. The target URLs are configured. - -Once the engineer is satisfied, the engineer (or someone else with write privileges) will: - -#. Add ``https://www.mozilla.org/*`` to the list of URLs the experiment can run on. -#. Reset the experiment (eliminating any data gathered during QA). -#. Enable the bedrock feature switch in production. -#. Activate (or schedule) the experiment. - -After an experiment is finished, the feature switch should be deactivated in production. - -.. Note:: - - ``*`` should be replaced by the exact URL pathname for the experiment page. - Traffic Cop experiments ----------------------- diff --git a/media/js/base/convert-snippet.js b/media/js/base/convert-snippet.js deleted file mode 100644 index 28ef605c7b5..00000000000 --- a/media/js/base/convert-snippet.js +++ /dev/null @@ -1,28 +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 CONVERT_PROJECT_ID = document - .getElementsByTagName('html')[0] - .getAttribute('data-convert-project-id'); - - // Load third-party JS async and respect DNT. - if ( - CONVERT_PROJECT_ID && - typeof Mozilla.dntEnabled === 'function' && - !Mozilla.dntEnabled() - ) { - var newScriptTag = document.createElement('script'); - var target = document.getElementsByTagName('script')[0]; - newScriptTag.src = - 'https://cdn-4.convertexperiments.com/js/' + - CONVERT_PROJECT_ID + - '.js'; - target.parentNode.insertBefore(newScriptTag, target); - } -})(); diff --git a/media/static-bundles.json b/media/static-bundles.json index dae9686375c..76be00f42b7 100644 --- a/media/static-bundles.json +++ b/media/static-bundles.json @@ -1832,12 +1832,6 @@ ], "name": "annual_report_modal" }, - { - "files": [ - "js/base/convert-snippet.js" - ], - "name": "convert" - }, { "files": [ "js/libs/modernizr.custom.inputtypes.js",