diff --git a/config/development.json b/config/development.json
index 36fac301..c6ea3163 100644
--- a/config/development.json
+++ b/config/development.json
@@ -11,9 +11,7 @@
"features": {
"autologin": "true",
"iam_api_lookup": "true",
- "maintenance_mode": "false",
- "mozilla_accounts_banner_pre": "false",
- "mozilla_accounts_banner_post": "true"
+ "maintenance_mode": "false"
},
"supportedLoginMethods": [ "github", "google-oauth2", "firefoxaccounts", "email" ],
"csp": "default-src 'none'; connect-src 'self' https://iam.api.test.sso.allizom.org; script-src 'self' https://cdn.sso.allizom.org https://www.googletagmanager.com https://www.google-analytics.com; style-src 'self' https://cdn.sso.allizom.org; font-src 'self' https://cdn.sso.allizom.org; img-src 'self' https://cdn.sso.allizom.org https://www.google-analytics.com",
diff --git a/config/local.json b/config/local.json
index aaa62e8a..962a8b9b 100644
--- a/config/local.json
+++ b/config/local.json
@@ -11,9 +11,7 @@
"features": {
"autologin": "true",
"iam_api_lookup": "true",
- "maintenance_mode": "false",
- "mozilla_accounts_banner_pre": "false",
- "mozilla_accounts_banner_post": "true"
+ "maintenance_mode": "false"
},
"supportedLoginMethods": [ "github", "google-oauth2", "firefoxaccounts", "email" ],
"csp": "default-src *",
diff --git a/config/production.json b/config/production.json
index cd0c6078..53d59d29 100644
--- a/config/production.json
+++ b/config/production.json
@@ -10,9 +10,7 @@
"features": {
"autologin": "true",
"iam_api_lookup": "true",
- "maintenance_mode": "false",
- "mozilla_accounts_banner_pre": "false",
- "mozilla_accounts_banner_post": "true"
+ "maintenance_mode": "false"
},
"supportedLoginMethods": [ "github", "google-oauth2", "firefoxaccounts", "email" ],
"csp": "default-src 'none'; connect-src 'self' https://iam.api.sso.mozilla.com; script-src 'self' https://cdn.sso.mozilla.com https://www.googletagmanager.com https://www.google-analytics.com; style-src 'self' https://cdn.sso.mozilla.com; font-src 'self' https://cdn.sso.mozilla.com; img-src 'self' https://cdn.sso.mozilla.com https://www.google-analytics.com",
diff --git a/src/html/index.html b/src/html/index.html
index cd796f9c..f16055ca 100644
--- a/src/html/index.html
+++ b/src/html/index.html
@@ -34,8 +34,6 @@
iam_api_lookup: {{{ features.iam_api_lookup }}}
supportedLoginMethods: {{{ supportedLoginMethods }}}
maintenance_mode: "{{{ features.maintenance_mode }}}"
- mozilla_accounts_banner_pre: "{{{ features.mozilla_accounts_banner_pre }}}"
- mozilla_accounts_banner_post: "{{{ features.mozilla_accounts_banner_post }}}"
Display names:
github: {{{ displayNames.github }}}
google-oauth2: {{{ displayNames.google-oauth2 }}}
@@ -62,74 +60,6 @@
We are currently experiencing an issue & working hard to resolve it. Please try to login again in a few minutes. Request help via moc@mozilla.com , IRC #moc or Slack #mozsm-all.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Firefox accounts will be renamed Mozilla accounts on Nov 1
-
-
- You’ll still sign in with the same username and password, and there are no other changes to the products that you use.
- Learn more
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- We’ve renamed Firefox accounts to Mozilla accounts. You’ll still sign in with the same username and password, and there are no other changes to the products that you use.
- Learn more
-
-
-
-
-
-
@@ -150,13 +80,7 @@
-
-
-
- Log in with Firefox
-
-
-
+
Sign in with Mozilla
@@ -195,12 +119,7 @@
-
-
-
- Continue with Firefox
-
-
+
Continue with Mozilla
@@ -249,13 +168,7 @@
Why an email?
-
-
-
- Continue with Firefox
-
-
-
+
Continue with Mozilla
@@ -351,9 +264,7 @@ Auto-login settings
"features" : {
"autologin": "{{{ features.autologin }}}",
"iam_api_lookup": "{{{ features.iam_api_lookup }}}",
- "maintenance_mode": "{{{ features.maintenance_mode }}}",
- "mozilla_accounts_banner_pre": "{{{ features.mozilla_accounts_banner_pre }}}",
- "mozilla_accounts_banner_post": "{{{ features.mozilla_accounts_banner_post }}}"
+ "maintenance_mode": "{{{ features.maintenance_mode }}}"
},
"supportedLoginMethods": "{{{ supportedLoginMethods }}}",
"logout_url": "{{{ logout_url }}}",
diff --git a/src/js/decorators.js b/src/js/decorators.js
index 3ececb7f..10a7b92c 100644
--- a/src/js/decorators.js
+++ b/src/js/decorators.js
@@ -4,8 +4,6 @@
var decorators = {
'check-if-maintenance-mode': require( 'decorators/check-if-maintenance-mode' ),
- 'check-if-accounts-banner-pre': require( 'decorators/check-if-accounts-banner-pre' ),
- 'check-if-accounts-banner-post': require( 'decorators/check-if-accounts-banner-post' ),
'check-keyboard': require( 'decorators/check-keyboard' ),
'decide-screen': require( 'decorators/decide-screen' ),
'display-rp-name': require( 'decorators/display-rp-name' ),
@@ -17,7 +15,6 @@ var decorators = {
'load-ga': require( 'decorators/load-ga' ),
'prevent-clickjack': require( 'decorators/prevent-clickjack' ),
'track-password-manager-usage': require( 'decorators/track-password-manager-usage' ),
- 'show-mozilla-accounts': require( 'decorators/show-mozilla-accounts' ),
'set-autologin-preference': require( 'decorators/set-autologin-preference' ),
'submit-with-enter': require( 'decorators/submit-with-enter' ),
'tooltip': require( 'decorators/tooltip' ),
diff --git a/src/js/decorators/check-if-accounts-banner-post.js b/src/js/decorators/check-if-accounts-banner-post.js
deleted file mode 100644
index cbc99725..00000000
--- a/src/js/decorators/check-if-accounts-banner-post.js
+++ /dev/null
@@ -1,9 +0,0 @@
-var ui = require( 'helpers/ui' );
-
-module.exports = function checkIfAccountBannerPost( banner ) {
- var mozilla_accounts_banner_post = NLX.features.mozilla_accounts_banner_post;
-
- if ( mozilla_accounts_banner_post === 'true' && window.localStorage.getItem('mozilla-accounts-banner-post') != 1 ) {
- ui.show( banner );
- }
-};
diff --git a/src/js/decorators/check-if-accounts-banner-pre.js b/src/js/decorators/check-if-accounts-banner-pre.js
deleted file mode 100644
index 591356c3..00000000
--- a/src/js/decorators/check-if-accounts-banner-pre.js
+++ /dev/null
@@ -1,9 +0,0 @@
-var ui = require( 'helpers/ui' );
-
-module.exports = function checkIfAccountBannerPre( banner ) {
- var mozilla_accounts_banner_pre = NLX.features.mozilla_accounts_banner_pre;
-
- if ( mozilla_accounts_banner_pre === 'true' && window.localStorage.getItem('mozilla-accounts-banner-pre') != 1 ) {
- ui.show( banner );
- }
-};
diff --git a/src/js/decorators/show-mozilla-accounts.js b/src/js/decorators/show-mozilla-accounts.js
deleted file mode 100644
index b0958e17..00000000
--- a/src/js/decorators/show-mozilla-accounts.js
+++ /dev/null
@@ -1,11 +0,0 @@
-var ui = require( 'helpers/ui' );
-
-module.exports = function showMozillaAccounts( accounts ) {
- var mozilla_accounts_banner_post = NLX.features.mozilla_accounts_banner_post;
- var firefox_accounts = document.getElementById('firefoxaccounts');
-
- if ( mozilla_accounts_banner_post === 'true') {
- ui.show( accounts );
- firefox_accounts.remove();
- }
-};
diff --git a/src/js/handlers.js b/src/js/handlers.js
index 8005dab1..122d921e 100644
--- a/src/js/handlers.js
+++ b/src/js/handlers.js
@@ -7,8 +7,6 @@
// no component, they are in the general 'handlers' folder (src/assets/js/handlers).
module.exports = {
- 'mozilla-accounts-pre': require( 'handlers/mozilla-accounts-pre' ),
- 'mozilla-accounts-post': require( 'handlers/mozilla-accounts-post' ),
'enter': require( 'handlers/enter' ),
'go-to-initial-page': require( 'handlers/go-to-initial-page' ),
'authorise-ldap': require( 'handlers/authorise-ldap' ),
diff --git a/src/js/handlers/mozilla-accounts-post.js b/src/js/handlers/mozilla-accounts-post.js
deleted file mode 100644
index 7bfdeec3..00000000
--- a/src/js/handlers/mozilla-accounts-post.js
+++ /dev/null
@@ -1,5 +0,0 @@
-module.exports = function mozillaAccountsPost ( element ) {
- var banner = document.getElementById("accounts-banner-post");
- banner.style.display = "none";
- window.localStorage.setItem('mozilla-accounts-banner-post', 1)
-};
diff --git a/src/js/handlers/mozilla-accounts-pre.js b/src/js/handlers/mozilla-accounts-pre.js
deleted file mode 100644
index 8e4bf1d0..00000000
--- a/src/js/handlers/mozilla-accounts-pre.js
+++ /dev/null
@@ -1,5 +0,0 @@
-module.exports = function mozillaAccountsPre( element ) {
- var banner = document.getElementById("accounts-banner-pre");
- banner.style.display = "none";
- window.localStorage.setItem('mozilla-accounts-banner-pre', 1)
-};